Ticket #7319: small_actioncontroller_doc_fixes_and_additions.diff

actionpack/lib/action_controller/base.rb

@@ -535 +535 @@
-        self.class.controller_path
-      end
-
+      # Test whether the session is enabled for this request.
-      def session_enabled?
-        request.session_options[:disabled] != false
-      end

actionpack/lib/action_controller/url_rewriter.rb

@@ -76 +76 @@
-    alias_method :to_s, :to_str
-
-    private
+      # Given a path and options, returns a rewritten URL string
-      def rewrite_url(path, options)
-        rewritten_url = ""
-        unless options[:only_path]
@@ -91 +92 @@
-        rewritten_url
-      end
-
+      # Given a Hash of options, generates a route
-      def rewrite_path(options)
-        options = options.symbolize_keys
-        options.update(options[:params].symbolize_keys) if options[:params]

actionpack/lib/action_controller/assertions/routing_assertions.rb

@@ -66 +66 @@
-      end
-
-      private
+        # Recognizes the route for a given path.
-        def recognized_request_for(path, request_method = nil)
-          path = "/#{path}" unless path.first == '/'
-

actionpack/lib/action_controller/assertions/response_assertions.rb

@@ -119 +119 @@
-      end
-
-      private
+        # Recognizes the route for a given path.
-        def recognized_request_for(path, request_method = nil)
-          path = "/#{path}" unless path.first == '/'
-
@@ -131 +132 @@
-          request
-        end
-
+        # Proxy to to_param if the object will respond to it.
-        def parameterize(value)
-          value.respond_to?(:to_param) ? value.to_param : value
-        end

actionpack/lib/action_controller/assertions/dom_assertions.rb

@@ -1 +1 @@
-module ActionController
-  module Assertions
-    module DomAssertions
-test 2 html strings to be equivalent, i.e. identical up to reordering of attributes
+Test two HTML strings for equivalency (e.g., identical up to reordering of attributes)
-      def assert_dom_equal(expected, actual, message="")
-        clean_backtrace do
-          expected_dom = HTML::Document.new(expected).root
@@ -11 +11 @@
-        end
-      end
-      
-negated form of +assert_dom_equivalent+
+The negated form of +assert_dom_equivalent+.
-      def assert_dom_not_equal(expected, actual, message="")
-        clean_backtrace do
-          expected_dom = HTML::Document.new(expected).root

actionpack/lib/action_controller/assertions/model_assertions.rb

@@ -1 +1 @@
-module ActionController
-  module Assertions
-    module ModelAssertions
-ensures that the passed record is valid by active record standards. returns the error messages if not
+Ensures that the passed record is valid by ActiveRecord standards and returns any error messages if it is not.
-      def assert_valid(record)
-        clean_backtrace do
-          assert record.valid?, record.errors.full_messages.join("\n")

railties/lib/initializer.rb

@@ -201 +201 @@
-      silence_warnings do
-        config = configuration
-        constants = self.class.constants
+        
-        eval(IO.read(configuration.environment_path), binding, configuration.environment_path)
+        
-        (self.class.constants - constants).each do |const|
-          Object.const_set(const, self.class.const_get(const))
-        end