actionpack 3.2.2 → 3.2.3.rc1

data/CHANGELOG.md

@@ -1,4 +1,26 @@
-## Rails 3.2.2 (unreleased) ##
+## Rails 3.2.3 (unreleased) ##
+
+*   Do not include the authenticity token in forms where remote: true as ajax forms use the meta-tag value *DHH*
+
+*   Turn off verbose mode of rack-cache, we still have X-Rack-Cache to
+    check that info. Closes #5245. *Santiago Pastorino*
+
+*   Fix #5238, rendered_format is not set when template is not rendered. *Piotr Sarnacki*
+
+*   Upgrade rack-cache to 1.2. *José Valim*
+
+*   ActionController::SessionManagement is deprecated. *Santiago Pastorino*
+
+*   Since the router holds references to many parts of the system like engines, controllers and the application itself, inspecting the route set can actually be really slow, therefore we default alias inspect to to_s. *José Valim*
+
+*   Add a new line after the textarea opening tag. Closes #393 *Rafael Mendonça França*
+
+*   Always pass a respond block from to responder. We should let the responder to decide what to do with the given overridden response block, and not short circuit it. *sikachu*
+
+*   Fixes layout rendering regression from 3.2.2. *José Valim*
+
+
+## Rails 3.2.2 (March 1, 2012) ##
 
 *   Format lookup for partials is derived from the format in which the template is being rendered. Closes #5025 part 2 *Santiago Pastorino*
 
@@ -10,6 +32,7 @@
     This is a behavior change, previously the hidden tag had a value of the disabled checkbox.
     *Tadas Tamosauskas*
 
+
 ## Rails 3.2.1 (January 26, 2012) ##
 
 *   Documentation improvements.

data/lib/abstract_controller/layouts.rb

@@ -237,8 +237,7 @@ module AbstractController
       #
       # If the specified layout is a:
       # String:: the String is the template name
-      # Symbol:: call the method specified by the symbol, which will return
-      #   the template name
+      # Symbol:: call the method specified by the symbol, which will return the template name
       # false::  There is no layout
       # true::   raise an ArgumentError
       # nil::    Force default layout behavior with inheritance

data/lib/abstract_controller/rendering.rb

@@ -106,6 +106,7 @@ module AbstractController
     # Find and renders a template based on the options given.
     # :api: private
     def _render_template(options) #:nodoc:
+      lookup_context.rendered_format = nil if options[:formats]
       view_renderer.render(view_context, options)
     end
 

data/lib/action_controller/base.rb

@@ -192,7 +192,6 @@ module ActionController
       Renderers::All,
       ConditionalGet,
       RackDelegation,
-      SessionManagement,
       Caching,
       MimeResponds,
       ImplicitRender,

data/lib/action_controller/metal/mime_responds.rb

@@ -235,16 +235,8 @@ module ActionController #:nodoc:
 
       if collector = retrieve_collector_from_mimes(&block)
         options = resources.size == 1 ? {} : resources.extract_options!
-
-        if defined_response = collector.response
-          if action = options.delete(:action)
-            render :action => action
-          else
-            defined_response.call
-          end
-        else
-          (options.delete(:responder) || self.class.responder).call(self, resources, options)
-        end
+        options[:default_response] = collector.response
+        (options.delete(:responder) || self.class.responder).call(self, resources, options)
       end
     end
 
@@ -281,6 +273,7 @@ module ActionController #:nodoc:
       if format
         self.content_type ||= format.to_s
         lookup_context.formats = [format.to_sym]
+        lookup_context.rendered_format = lookup_context.formats.first
         collector
       else
         head :not_acceptable

data/lib/action_controller/metal/redirecting.rb

@@ -93,7 +93,7 @@ module ActionController
           _compute_redirect_to_location options.call
         else
           url_for(options)
-        end.gsub(/[\r\n]/, '')
+        end.gsub(/[\0\r\n]/, '')
       end
   end
 end

data/lib/action_controller/metal/responder.rb

@@ -129,6 +129,7 @@ module ActionController #:nodoc:
       @resources = resources
       @options = options
       @action = options.delete(:action)
+      @default_response = options.delete(:default_response)
     end
 
     delegate :head, :render, :redirect_to,   :to => :controller
@@ -171,7 +172,7 @@ module ActionController #:nodoc:
     # responds to :to_format and display it.
     #
     def to_format
-      if get? || !has_errors?
+      if get? || !has_errors? || response_overridden?
         default_render
       else
         display_errors
@@ -225,7 +226,11 @@ module ActionController #:nodoc:
     # controller.
     #
     def default_render
-      controller.default_render(options)
+      if @default_response
+        @default_response.call(options)
+      else
+        controller.default_render(options)
+      end
     end
 
     # Display is just a shortcut to render a resource with the current format.
@@ -273,5 +278,9 @@ module ActionController #:nodoc:
     def json_resource_errors
       {:errors => resource.errors}
     end
+
+    def response_overridden?
+      @default_response.present?
+    end
   end
 end

data/lib/action_controller/metal/session_management.rb

@@ -2,6 +2,11 @@ module ActionController #:nodoc:
   module SessionManagement #:nodoc:
     extend ActiveSupport::Concern
 
+    included do
+      ActiveSupport::Deprecation.warn "ActionController::SessionManagement " \
+       "is deprecated because it has no contents since Rails 3.1", caller
+    end
+
     module ClassMethods
 
     end

data/lib/action_controller/test_case.rb

@@ -457,7 +457,6 @@ module ActionController
         @request.session["flash"].sweep
 
         @controller.request = @request
-        @controller.params.merge!(parameters)
         build_request_uri(action, parameters)
         @controller.class.class_eval { include Testing }
         @controller.recycle!
@@ -483,11 +482,6 @@ module ActionController
         end
       end
 
-      # Cause the action to be rescued according to the regular rules for rescue_action when the visitor is not local
-      def rescue_action_in_public!
-        @request.remote_addr = '208.77.188.166' # example.com
-      end
-
       included do
         include ActionController::TemplateAssertions
         include ActionDispatch::Assertions

data/lib/action_dispatch/middleware/session/cookie_store.rb

@@ -59,7 +59,7 @@ module ActionDispatch
       end
 
       def set_session(env, sid, session_data, options)
-        session_data.merge("session_id" => sid)
+        session_data.merge!("session_id" => sid)
       end
 
       def set_cookie(env, session_id, cookie)

data/lib/action_dispatch/middleware/static.rb

@@ -38,6 +38,7 @@ module ActionDispatch
     end
 
     def escape_glob_chars(path)
+      path.force_encoding('binary') if path.respond_to? :force_encoding
       path.gsub(/[*?{}\[\]]/, "\\\\\\&")
     end
   end

data/lib/action_dispatch/railtie.rb

@@ -16,7 +16,7 @@ module ActionDispatch
     config.action_dispatch.rack_cache = {
       :metastore => "rails:/",
       :entitystore => "rails:/",
-      :verbose => true
+      :verbose => false
     }
 
     initializer "action_dispatch.configure" do |app|

data/lib/action_dispatch/routing/mapper.rb

@@ -325,7 +325,7 @@ module ActionDispatch
         #   +call+ or a string representing a controller's action.
         #
         #      match 'path', :to => 'controller#action'
-        #      match 'path', :to => lambda { [200, {}, "Success!"] }
+        #      match 'path', :to => lambda { |env| [200, {}, "Success!"] }
         #      match 'path', :to => RackApp
         #
         # [:on]

data/lib/action_dispatch/routing/route_set.rb

@@ -9,6 +9,12 @@ require 'action_controller/metal/exceptions'
 module ActionDispatch
   module Routing
     class RouteSet #:nodoc:
+      # Since the router holds references to many parts of the system
+      # like engines, controllers and the application itself, inspecting
+      # the route set can actually be really slow, therefore we default
+      # alias inspect to to_s.
+      alias inspect to_s
+
       PARAMETERS_KEY = 'action_dispatch.request.path_parameters'
 
       class Dispatcher #:nodoc:

data/lib/action_dispatch/testing/assertions/response.rb

@@ -83,7 +83,7 @@ module ActionDispatch
             refer
           else
             @controller.url_for(fragment)
-          end.gsub(/[\r\n]/, '')
+          end.gsub(/[\0\r\n]/, '')
         end
 
         def validate_request!

data/lib/action_pack/version.rb

@@ -2,8 +2,8 @@ module ActionPack
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 2
-    PRE   = nil
+    TINY  = 3
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/lib/action_view/helpers/date_helper.rb

@@ -940,7 +940,10 @@ module ActionView
         # Returns the id attribute for the input tag.
         #  => "post_written_on_1i"
         def input_id_from_type(type)
-          input_name_from_type(type).gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '')
+          id = input_name_from_type(type).gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '')
+          id = @options[:namespace] + '_' + id if @options[:namespace]
+
+          id
         end
 
         # Given an ordering of datetime components, create the selection HTML

data/lib/action_view/helpers/form_helper.rb

@@ -1072,7 +1072,7 @@ module ActionView
           options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
         end
 
-        content_tag("textarea", ERB::Util.html_escape(options.delete('value') || value_before_type_cast(object)), options)
+        content_tag("textarea", "\n#{options.delete('value') || value_before_type_cast(object)}", options)
       end
 
       def to_check_box_tag(options = {}, checked_value = "1", unchecked_value = "0")

data/lib/action_view/helpers/form_tag_helper.rb

@@ -27,7 +27,9 @@ module ActionView
       #   is added to simulate the verb over post.
       # * <tt>:authenticity_token</tt> - Authenticity token to use in the form. Use only if you need to
       #   pass custom authenticity token string, or to not add authenticity_token field at all
-      #   (by passing <tt>false</tt>).
+      #   (by passing <tt>false</tt>). If this is a remote form, the authenticity_token will by default
+      #   not be included as the ajax handler will get it from the meta-tag (but you can force it to be
+      #   rendered anyway in that case by passing <tt>true</tt>).
       # * A list of parameters to feed to the URL the form will be posted to.
       # * <tt>:remote</tt> - If set to true, will allow the Unobtrusive JavaScript drivers to control the
       #   submit behavior. By default this behavior is an ajax submit.
@@ -609,8 +611,17 @@ module ActionView
             # responsibility of the caller to escape all the values.
             html_options["action"]  = url_for(url_for_options)
             html_options["accept-charset"] = "UTF-8"
+            
             html_options["data-remote"] = true if html_options.delete("remote")
-            html_options["authenticity_token"] = html_options.delete("authenticity_token") if html_options.has_key?("authenticity_token")
+
+            if html_options["data-remote"] && html_options["authenticity_token"] == true
+              # Include the default authenticity_token, which is only generated when its set to nil,
+              # but we needed the true value to override the default of no authenticity_token on data-remote.
+              html_options["authenticity_token"] = nil
+            elsif html_options["data-remote"]
+              # The authenticity token is taken from the meta tag in this case
+              html_options["authenticity_token"] = false
+            end
           end
         end
 

data/lib/action_view/renderer/partial_renderer.rb

@@ -221,6 +221,14 @@ module ActionView
       setup(context, options, block)
       identifier = (@template = find_partial) ? @template.identifier : @path
 
+      @lookup_context.rendered_format ||= begin
+        if @template && @template.formats.present?
+          @template.formats.first
+        else
+          formats.first
+        end
+      end
+
       if @collection
         instrument(:collection, :identifier => identifier || "collection", :count => @collection.size) do
           render_collection

data/lib/action_view/renderer/template_renderer.rb

@@ -8,8 +8,13 @@ module ActionView
       @details = extract_details(options)
       extract_format(options[:file] || options[:template], @details)
       template = determine_template(options)
-      @lookup_context.rendered_format ||= template.formats.first
-      @lookup_context.formats = template.formats
+      context  = @lookup_context
+
+      unless context.rendered_format
+        context.rendered_format = template.formats.first
+        context.formats = template.formats
+      end
+
       render_template(template, options[:layout], options[:locals])
     end
 

data/lib/sprockets/helpers/rails_helper.rb

@@ -81,7 +81,7 @@ module Sprockets
     private
       def debug_assets?
         compile_assets? && (Rails.application.config.assets.debug || params[:debug_assets])
-      rescue NoMethodError
+      rescue NameError
         false
       end
 

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
+  hash: 15424079
+  prerelease: true
   segments: 
   - 3
   - 2
-  - 2
-  version: 3.2.2
+  - 3
+  - rc
+  - 1
+  version: 3.2.3.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,59 +17,62 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-01 00:00:00 Z
+date: 2012-03-27 00:00:00 -03:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 15424079
         segments: 
         - 3
         - 2
-        - 2
-        version: 3.2.2
+        - 3
+        - rc
+        - 1
+        version: 3.2.3.rc1
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activemodel
+  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 15424079
         segments: 
         - 3
         - 2
-        - 2
-        version: 3.2.2
+        - 3
+        - rc
+        - 1
+        version: 3.2.3.rc1
+  requirement: *id002
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack-cache
+  name: activemodel
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 1
-        - 1
-        version: "1.1"
+        - 2
+        version: "1.2"
+  requirement: *id003
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: builder
+  name: rack-cache
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,12 +83,12 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
+  requirement: *id004
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack
+  name: builder
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,12 +99,12 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
+  requirement: *id005
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: rack
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,12 +115,12 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
+  requirement: *id006
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: journey
+  name: rack-test
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -126,12 +131,12 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
+  requirement: *id007
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: sprockets
+  name: journey
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -142,12 +147,12 @@ dependencies:
         - 1
         - 2
         version: 2.1.2
+  requirement: *id008
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: erubis
+  name: sprockets
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -158,12 +163,12 @@ dependencies:
         - 7
         - 0
         version: 2.7.0
+  requirement: *id009
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: tzinfo
+  name: erubis
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -174,8 +179,10 @@ dependencies:
         - 3
         - 29
         version: 0.3.29
+  requirement: *id010
   type: :development
-  version_requirements: *id010
+  name: tzinfo
+  prerelease: false
 description: Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.
 email: david@loudthinking.com
 executables: []
@@ -376,6 +383,7 @@ files:
 - lib/sprockets/helpers.rb
 - lib/sprockets/railtie.rb
 - lib/sprockets/static_compiler.rb
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -398,16 +406,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).