@@ -237,7 +237,7 @@ module Merb Merb::Config.setup(options) end - attr_accessor :configuration #:nodoc: + attr_accessor :configuration # Set configuration parameters from a code block, where each method # evaluates to a config parameter. @@ -261,7 +261,7 @@ module Merb # ==== Parameters # method<~to_s>:: Method name as hash key value. # *args:: Value to set the configuration parameter to. - def method_missing(method, *args) #:nodoc: + def method_missing(method, *args) if method.to_s[-1,1] == '=' @configuration[method.to_s.tr('=','').to_sym] = *args else @@ -271,14 +271,14 @@ module Merb end # class << self - class ConfigBlock #:nodoc: + class ConfigBlock - def initialize(klass, &block) #:nodoc: + def initialize(klass, &block) @klass = klass instance_eval(&block) end - def method_missing(method, *args) #:nodoc: + def method_missing(method, *args) @klass[method] = *args end lib/merb-core/config.rb @@ -90,7 +90,7 @@ module Merb # <p>You tried to access <%= @tried_to_access %> but that URL is # restricted to administrators.</p> # - module ControllerExceptions #:nodoc: all + module ControllerExceptions # Mapping of status code names to their numeric value. STATUS_CODES = {} @@ -294,7 +294,7 @@ module Merb # Required to show exceptions in the log file # # e<Exception>:: The exception that a message is being generated for - def self.exception(e) #:nodoc: + def self.exception(e) "#{ e.message } - (#{ e.class })\n" << "#{(e.backtrace or []).join("\n")}" end lib/merb-core/controller/exceptions.rb @@ -51,7 +51,7 @@ module Merb::AuthenticationMixin BasicAuthentication.new(self, realm, &authenticator) end - class BasicAuthentication #:nodoc: + class BasicAuthentication # So we can have access to the status codes include Merb::ControllerExceptions lib/merb-core/controller/mixins/authentication.rb @@ -103,7 +103,7 @@ module Merb # ==== Parameters # base<Module>:: The module that ResponderMixin was mixed into - def self.included(base) # :nodoc: + def self.included(base) base.extend(ClassMethods) base.class_eval do class_inheritable_accessor :class_provided_formats @@ -285,7 +285,7 @@ module Merb # 3. If it's */*, use the first provided format # 4. Look for one that is provided, in order of request # 5. Raise 406 if none found - def _perform_content_negotiation # :nodoc: + def _perform_content_negotiation raise Merb::ControllerExceptions::NotAcceptable if _provided_formats.empty? if (fmt = params[:format]) && !fmt.empty? accepts = [fmt.to_sym] lib/merb-core/controller/mixins/responder.rb @@ -234,7 +234,7 @@ require 'rexml/light/node' # It's mainly just adding vowels, as I ht cd wth n vwls :) # This represents the hard part of the work, all I did was change the # underlying parser. -class REXMLUtilityNode # :nodoc: +class REXMLUtilityNode attr_accessor :name, :attributes, :children, :type cattr_accessor :typecasts, :available_typecasts @@ -397,7 +397,7 @@ class REXMLUtilityNode # :nodoc: end end -class ToHashParser # :nodoc: +class ToHashParser def self.from_xml(xml) stack = [] lib/merb-core/core_ext/hash.rb @@ -3,7 +3,7 @@ require 'openssl' # to generate the HMAC message digest # Most of this code is taken from bitsweat's implementation in rails module Merb - module SessionMixin #:nodoc: + module SessionMixin # Adds a before and after dispatch hook for setting up the cookie session # store. lib/merb-core/dispatch/session/cookie.rb @@ -1,6 +1,6 @@ module Merb - module SessionMixin #:nodoc: + module SessionMixin # Adds a before and after dispatch hook for setting up the memcached # session store. @@ -108,7 +108,7 @@ module Merb end # Don't try to reload in dev mode. - def reloadable? #:nodoc: + def reloadable? false end lib/merb-core/dispatch/session/memcached.rb @@ -1,6 +1,6 @@ module Merb - module SessionMixin #:nodoc: + module SessionMixin # Adds a before and after dispatch hook for setting up the memory session # store. lib/merb-core/dispatch/session/memory.rb @@ -33,7 +33,7 @@ require "time" # httpdate # Merb::Logger.new(log{String, IO},level{Symbol, String}) module Merb - class << self #:nodoc: + class << self attr_accessor :logger end lib/merb-core/logger.rb @@ -567,7 +567,7 @@ Inflector.inflections do |inflect| inflect.uncountable(%w(equipment information rice money species series fish sheep)) end -module Inflections #:nodoc: +module Inflections def pluralize Inflector.pluralize(self) simple_benches/inflector.rb @@ -1,6 +1,6 @@ -class CodeStatistics #:nodoc: +class CodeStatistics TEST_TYPES = %w(Units Functionals Unit\ tests Functional\ tests Integration\ tests) tools/code_statistics.rb b38c164be5ebda892ac73e9792b6a099f25270cf Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/0ff80a0797da59e2a76e9d3dce6bfda886293232 0ff80a0797da59e2a76e9d3dce6bfda886293232 2008-05-12T17:39:34-07:00 2008-05-12T17:39:34-07:00 remove :nodoc: from merb-core DO NOT USE :nodoc: EVAR!! dd1066ee117b443b19b05e3419cc375fd9c002e4 Ezra Zygmuntowicz ez@engineyard.com