From bd9805871b576984e13c3d99558eda27d22c06c5 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 29 May 2010 19:26:02 -0700
Subject: Include backtrace in failsafe log. Rescue possible exceptions in
 failsafe response.

---
 actionpack/lib/action_dispatch/middleware/show_exceptions.rb            | 2 +-
 .../middleware/templates/rescues/_request_and_response.erb              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 2dd2ec9fe9..f9e81a02d3 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -72,7 +72,7 @@ module ActionDispatch
           rescue_action_in_public(exception)
         end
       rescue Exception => failsafe_error
-        $stderr.puts "Error during failsafe response: #{failsafe_error}"
+        $stderr.puts "Error during failsafe response: #{failsafe_error}\n  #{failsafe_error.backtrace * "\n  "}"
         FAILSAFE_RESPONSE
       end
 
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
index 09ff052fd0..e963b04524 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
@@ -13,7 +13,7 @@
   request_dump = clean_params.empty? ? 'None' : clean_params.inspect.gsub(',', ",\n")
 
   def debug_hash(hash)
-    hash.sort_by { |k, v| k.to_s }.map { |k, v| "#{k}: #{v.inspect}" }.join("\n")
+    hash.sort_by { |k, v| k.to_s }.map { |k, v| "#{k}: #{v.inspect rescue $!.message}" }.join("\n")
   end
 %>
 
-- 
cgit v1.2.3


From ab1407cc5bbfe67f9e59335fe0a4e8ac82d513c6 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Fri, 4 Jun 2010 09:47:25 -0700
Subject: Improve performance of commonly used request methods

---
 actionpack/lib/action_dispatch/http/request.rb | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 8560a6fc9c..98f4f5ae18 100755
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -52,9 +52,11 @@ module ActionDispatch
     # the application should use), this \method returns the overridden
     # value, not the original.
     def request_method
-      method = env["REQUEST_METHOD"]
-      HTTP_METHOD_LOOKUP[method] || raise(ActionController::UnknownHttpMethod, "#{method}, accepted HTTP methods are #{HTTP_METHODS.to_sentence(:locale => :en)}")
-      method
+      @request_method ||= begin
+        method = env["REQUEST_METHOD"]
+        HTTP_METHOD_LOOKUP[method] || raise(ActionController::UnknownHttpMethod, "#{method}, accepted HTTP methods are #{HTTP_METHODS.to_sentence(:locale => :en)}")
+        method
+      end
     end
 
     # Returns a symbol form of the #request_method
@@ -66,9 +68,11 @@ module ActionDispatch
     # even if it was overridden by middleware. See #request_method for
     # more information.
     def method
-      method = env["rack.methodoverride.original_method"] || env['REQUEST_METHOD']
-      HTTP_METHOD_LOOKUP[method] || raise(ActionController::UnknownHttpMethod, "#{method}, accepted HTTP methods are #{HTTP_METHODS.to_sentence(:locale => :en)}")
-      method
+      @method ||= begin
+        method = env["rack.methodoverride.original_method"] || env['REQUEST_METHOD']
+        HTTP_METHOD_LOOKUP[method] || raise(ActionController::UnknownHttpMethod, "#{method}, accepted HTTP methods are #{HTTP_METHODS.to_sentence(:locale => :en)}")
+        method
+      end
     end
 
     # Returns a symbol form of the #method
@@ -113,6 +117,10 @@ module ActionDispatch
       Http::Headers.new(@env)
     end
 
+    def fullpath
+      @fullpath ||= super
+    end
+
     def forgery_whitelisted?
       get? || xhr? || content_mime_type.nil? || !content_mime_type.verify_request?
     end
@@ -134,6 +142,10 @@ module ActionDispatch
     end
     alias :xhr? :xml_http_request?
 
+    def ip
+      @ip ||= super
+    end
+
     # Which IP addresses are "trusted proxies" that can be stripped from
     # the right-hand-side of X-Forwarded-For
     TRUSTED_PROXIES = /^127\.0\.0\.1$|^(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\./i
@@ -145,7 +157,7 @@ module ActionDispatch
     # delimited list in the case of multiple chained proxies; the last
     # address which is not trusted is the originating IP.
     def remote_ip
-      (@env["action_dispatch.remote_ip"] || ip).to_s
+      @remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s
     end
 
     # Returns the lowercase name of the HTTP server software.
-- 
cgit v1.2.3


From cb1b2a719ac2ba31dc8d66195c0be32798255be0 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Fri, 4 Jun 2010 10:03:53 -0700
Subject: Stop the flash middleware from forcibly loading sessions even if the
 user doesn't use sessions at all

---
 actionpack/lib/action_dispatch/middleware/flash.rb                | 4 ++--
 .../lib/action_dispatch/middleware/session/abstract_store.rb      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index adde183cdb..043966a585 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -170,13 +170,13 @@ module ActionDispatch
     end
 
     def call(env)
-      if (session = env['rack.session']) && (flash = session['flash'])
+      if (session = env['rack.session']) && session.key?('flash')
         flash.sweep
       end
 
       @app.call(env)
     ensure
-      if (session = env['rack.session']) && (flash = session['flash']) && flash.empty?
+      if (session = env['rack.session']) && session.key?('flash') && session['flash'].empty?
         session.delete('flash')
       end
     end
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index 15493cd2eb..3e8d64b0c6 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -51,11 +51,11 @@ module ActionDispatch
           super
         end
 
-        private
-          def loaded?
-            @loaded
-          end
+        def loaded?
+          @loaded
+        end
 
+        private
           def load!
             stale_session_check! do
               id, session = @by.send(:load_session, @env)
-- 
cgit v1.2.3


From ff4c218095687ef9925baaca78d644579831d3c1 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Fri, 4 Jun 2010 10:27:21 -0700
Subject: Memoizing methods on request means we need to clear them out on
 recycle!

---
 actionpack/lib/action_controller/test_case.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 34499fa784..37906b79f6 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -155,6 +155,8 @@ module ActionController
       @formats = nil
       @env.delete_if { |k, v| k =~ /^(action_dispatch|rack)\.request/ }
       @env.delete_if { |k, v| k =~ /^action_dispatch\.rescue/ }
+      @method = @request_method = nil
+      @fullpath = @ip = @remote_ip = nil
       @env['action_dispatch.request.query_parameters'] = {}
     end
   end
@@ -167,9 +169,7 @@ module ActionController
       @block = nil
       @length = 0
       @body = []
-      @charset = nil
-      @content_type = nil
-
+      @charset = @content_type = nil
       @request = @template = nil
     end
   end
-- 
cgit v1.2.3


From b8af484476d1dda685f058a0f185608cd18a862e Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Fri, 4 Jun 2010 11:49:55 -0700
Subject: No need to unescape params twice if we came from Rack::Mount

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 0d071dd7fe..5c4c96d9fc 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -29,13 +29,6 @@ module ActionDispatch
         def prepare_params!(params)
           merge_default_action!(params)
           split_glob_param!(params) if @glob_param
-
-          params.each do |key, value|
-            if value.is_a?(String)
-              value = value.dup.force_encoding(Encoding::BINARY) if value.respond_to?(:force_encoding)
-              params[key] = URI.unescape(value)
-            end
-          end
         end
 
         def controller(params, raise_error=true)
@@ -466,6 +459,13 @@ module ActionDispatch
 
         req = Rack::Request.new(env)
         @set.recognize(req) do |route, matches, params|
+          params.each do |key, value|
+            if value.is_a?(String)
+              value = value.dup.force_encoding(Encoding::BINARY) if value.encoding_aware?
+              params[key] = URI.unescape(value)
+            end
+          end
+
           dispatcher = route.app
           if dispatcher.is_a?(Dispatcher) && dispatcher.controller(params, false)
             dispatcher.prepare_params!(params)
-- 
cgit v1.2.3


From a6b39428431abeaa0251bbf4b6582e578f81783f Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Fri, 4 Jun 2010 17:28:04 -0700
Subject: Optimize LookupContext

---
 .../lib/action_dispatch/routing/route_set.rb       | 13 ++++++--
 actionpack/lib/action_view/base.rb                 |  1 +
 actionpack/lib/action_view/lookup_context.rb       | 35 +++++++++++++++-------
 actionpack/lib/action_view/template/handlers.rb    |  2 +-
 4 files changed, 37 insertions(+), 14 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 5c4c96d9fc..750912b251 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -12,6 +12,7 @@ module ActionDispatch
         def initialize(options={})
           @defaults = options[:defaults]
           @glob_param = options.delete(:glob)
+          @controllers = {}
         end
 
         def call(env)
@@ -32,9 +33,15 @@ module ActionDispatch
         end
 
         def controller(params, raise_error=true)
-          if params && params.has_key?(:controller)
-            controller = "#{params[:controller].camelize}Controller"
-            ActiveSupport::Inflector.constantize(controller)
+          if params && params.key?(:controller)
+            controller_param = params[:controller]
+            unless controller = @controllers[controller_param]
+              controller_name = "#{controller_param.camelize}Controller"
+              controller = @controllers[controller_param] =
+                ActiveSupport::Dependencies.ref(controller_name)
+            end
+
+            controller.get
           end
         rescue NameError => e
           raise ActionController::RoutingError, e.message, e.backtrace if raise_error
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index f4af763afe..16d7d25279 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -201,6 +201,7 @@ module ActionView #:nodoc:
     end
 
     def self.process_view_paths(value)
+      return value.dup if value.is_a?(PathSet)
       ActionView::PathSet.new(Array.wrap(value))
     end
 
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 7021342b4a..801b08b19d 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -13,8 +13,12 @@ module ActionView
     mattr_accessor :registered_details
     self.registered_details = []
 
+    mattr_accessor :registered_detail_setters
+    self.registered_detail_setters = []
+
     def self.register_detail(name, options = {}, &block)
       self.registered_details << name
+      self.registered_detail_setters << [name, "#{name}="]
       Accessors.send :define_method, :"_#{name}_defaults", &block
       Accessors.module_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{name}
@@ -60,7 +64,7 @@ module ActionView
       @details, @details_key = { :handlers => default_handlers }, nil
       @frozen_formats, @skip_default_locale = false, false
       self.view_paths = view_paths
-      self.update_details(details, true)
+      self.initialize_details(details)
     end
 
     module ViewPaths
@@ -116,11 +120,11 @@ module ActionView
       end
 
       def default_handlers #:nodoc:
-        @default_handlers ||= Template::Handlers.extensions
+        @@default_handlers ||= Template::Handlers.extensions
       end
 
       def handlers_regexp #:nodoc:
-        @handlers_regexp ||= /\.(?:#{default_handlers.join('|')})$/
+        @@handlers_regexp ||= /\.(?:#{default_handlers.join('|')})$/
       end
     end
 
@@ -141,10 +145,13 @@ module ActionView
       end
 
       # Overload formats= to reject [:"*/*"] values.
-      def formats=(value)
-        value = nil    if value == [:"*/*"]
-        value << :html if value == [:js]
-        super(value)
+      def formats=(values)
+        if values && values.size == 1
+          value = values.first
+          values = nil    if value == :"*/*"
+          values << :html if value == :js
+        end
+        super(values)
       end
 
       # Do not use the default locale on template lookup.
@@ -170,14 +177,22 @@ module ActionView
         super(@skip_default_locale ? I18n.locale : _locale_defaults)
       end
 
+      def initialize_details(details)
+        details = details.dup
+        
+        registered_detail_setters.each do |key, setter|
+          send(setter, details[key])
+        end
+      end
+
       # Update the details keys by merging the given hash into the current
       # details hash. If a block is given, the details are modified just during
       # the execution of the block and reverted to the previous value after.
-      def update_details(new_details, force=false)
+      def update_details(new_details)
         old_details = @details.dup
 
-        registered_details.each do |key|
-          send(:"#{key}=", new_details[key]) if force || new_details.key?(key)
+        registered_detail_setters.each do |key, setter|
+          send(setter, new_details[key]) if new_details.key?(key)
         end
 
         if block_given?
diff --git a/actionpack/lib/action_view/template/handlers.rb b/actionpack/lib/action_view/template/handlers.rb
index 35488c0391..6228d7ac39 100644
--- a/actionpack/lib/action_view/template/handlers.rb
+++ b/actionpack/lib/action_view/template/handlers.rb
@@ -19,7 +19,7 @@ module ActionView #:nodoc:
       @@default_template_handlers = nil
     
       def self.extensions
-        @@template_handlers.keys
+        @@template_extensions ||= @@template_handlers.keys
       end
 
       # Register a class that knows how to handle template files with the given
-- 
cgit v1.2.3


From 7ace23abacfecf6d34630bb5141faf80a8b88634 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 5 Jun 2010 21:31:16 -0700
Subject: Restore flash sweep

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 043966a585..18771fe782 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -170,7 +170,7 @@ module ActionDispatch
     end
 
     def call(env)
-      if (session = env['rack.session']) && session.key?('flash')
+      if (session = env['rack.session']) && (flash = session['flash'])
         flash.sweep
       end
 
-- 
cgit v1.2.3


From 509f3d7d2f346b83dfd22aec681feffbd2d25803 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 5 Jun 2010 20:34:30 -0700
Subject: Simplify middleware stack lazy compares using named const references

---
 actionpack/lib/action_dispatch/middleware/stack.rb | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index e3180dba77..4240e7a5d5 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -5,13 +5,13 @@ module ActionDispatch
     class Middleware
       attr_reader :args, :block
 
-      def initialize(klass, *args, &block)
-        @klass, @args, @block = klass, args, block
+      def initialize(klass_or_name, *args, &block)
+        @ref = ActiveSupport::Dependencies::Reference.new(klass_or_name)
+        @args, @block = args, block
       end
 
       def klass
-        return @klass if @klass.respond_to?(:new)
-        @klass = ActiveSupport::Inflector.constantize(@klass.to_s)
+        @ref.get
       end
 
       def ==(middleware)
@@ -21,11 +21,7 @@ module ActionDispatch
         when Class
           klass == middleware
         else
-          if lazy_compare?(@klass) && lazy_compare?(middleware)
-            normalize(@klass) == normalize(middleware)
-          else
-            klass.name == normalize(middleware.to_s)
-          end
+          normalize(@ref.name) == normalize(middleware)
         end
       end
 
@@ -39,10 +35,6 @@ module ActionDispatch
 
     private
 
-      def lazy_compare?(object)
-        object.is_a?(String) || object.is_a?(Symbol)
-      end
-
       def normalize(object)
         object.to_s.strip.sub(/^::/, '')
       end
-- 
cgit v1.2.3


From 9f93de9d3dd7db8de67cb0ee10ea03cdba9b6e5c Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 6 Jun 2010 12:07:40 -0700
Subject: Reset request.parameters after assigning params for functional tests

---
 actionpack/lib/action_controller/test_case.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 37906b79f6..21281b606e 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -139,14 +139,16 @@ module ActionController
         end
       end
 
-      params = self.request_parameters.dup
+      # Clear the combined params hash in case it was already referenced.
+      @env.delete("action_dispatch.request.parameters")
 
+      params = self.request_parameters.dup
       %w(controller action only_path).each do |k|
         params.delete(k)
         params.delete(k.to_sym)
       end
-
       data = params.to_query
+
       @env['CONTENT_LENGTH'] = data.length.to_s
       @env['rack.input'] = StringIO.new(data)
     end
-- 
cgit v1.2.3


From 83729e2fe36a0a629c2a5a52a7e2970287d57036 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 6 Jun 2010 19:14:53 -0400
Subject: Formats should always be an array.

---
 actionpack/lib/action_view/render/layouts.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_view/render/layouts.rb b/actionpack/lib/action_view/render/layouts.rb
index 31b09d9f0a..255c44450d 100644
--- a/actionpack/lib/action_view/render/layouts.rb
+++ b/actionpack/lib/action_view/render/layouts.rb
@@ -65,7 +65,7 @@ module ActionView
         if formats.size == 1
           _find_layout(layout)
         else
-          update_details(:formats => self.formats.first){ _find_layout(layout) }
+          update_details(:formats => [self.formats.first]) { _find_layout(layout) }
         end
       rescue ActionView::MissingTemplate => e
         update_details(:formats => nil) do
-- 
cgit v1.2.3


From ac9f8e1b7bbbfa13ff75c86ef72fe6641ba26eb3 Mon Sep 17 00:00:00 2001
From: Rizwan Reza <rizwanreza@gmail.com>
Date: Sun, 6 Jun 2010 14:00:09 +0430
Subject: Router accepts member routes on resource. [#4624 state:resolved]

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 8a8d21c434..63c553dd07 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -622,13 +622,22 @@ module ActionDispatch
         end
 
         def member
-          unless @scope[:scope_level] == :resources
-            raise ArgumentError, "can't use member outside resources scope"
+          unless [:resources, :resource].include?(@scope[:scope_level])
+            raise ArgumentError, "You can't use member action outside resources and resource scope."
           end
 
-          with_scope_level(:member) do
-            scope(':id', :name_prefix => parent_resource.member_name, :as => "") do
-              yield
+          case @scope[:scope_level]
+          when :resources
+            with_scope_level(:member) do
+              scope(':id', :name_prefix => parent_resource.member_name, :as => "") do
+                yield
+              end
+            end
+          when :resource
+            with_scope_level(:member) do
+              scope(':id', :as => "") do
+                yield
+              end
             end
           end
         end
-- 
cgit v1.2.3


From 5273bd97e6746bd5bdc2450ad5a2d60f6a6eb7ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 7 Jun 2010 10:13:41 +0200
Subject: Make AP test suite green once again and speed up performance in
 layouts lookup for some cases.

---
 actionpack/lib/action_view/base.rb           |  2 +-
 actionpack/lib/action_view/lookup_context.rb | 51 ++++++++++++++++++----------
 actionpack/lib/action_view/render/layouts.rb | 15 ++------
 3 files changed, 37 insertions(+), 31 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 16d7d25279..7dd9dea358 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -184,7 +184,7 @@ module ActionView #:nodoc:
     attr_internal :captures, :request, :controller, :template, :config
 
     delegate :find_template, :template_exists?, :formats, :formats=, :locale, :locale=,
-             :view_paths, :view_paths=, :with_fallbacks, :update_details, :to => :lookup_context
+             :view_paths, :view_paths=, :with_fallbacks, :update_details, :with_layout_format, :to => :lookup_context
 
     delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,
              :flash, :action_name, :controller_name, :to => :controller
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 801b08b19d..3aaa5e401c 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -19,6 +19,7 @@ module ActionView
     def self.register_detail(name, options = {}, &block)
       self.registered_details << name
       self.registered_detail_setters << [name, "#{name}="]
+
       Accessors.send :define_method, :"_#{name}_defaults", &block
       Accessors.module_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{name}
@@ -27,12 +28,7 @@ module ActionView
 
         def #{name}=(value)
           value = Array.wrap(value.presence || _#{name}_defaults)
-
-          if value != @details[:#{name}]
-            @details_key = nil
-            @details = @details.dup if @details.frozen?
-            @details[:#{name}] = value.freeze
-          end
+          _set_detail(:#{name}, value) if value != @details[:#{name}]
         end
       METHOD
     end
@@ -63,8 +59,11 @@ module ActionView
     def initialize(view_paths, details = {})
       @details, @details_key = { :handlers => default_handlers }, nil
       @frozen_formats, @skip_default_locale = false, false
+
       self.view_paths = view_paths
-      self.initialize_details(details)
+      self.registered_detail_setters.each do |key, setter|
+        send(setter, details[key])
+      end
     end
 
     module ViewPaths
@@ -177,11 +176,20 @@ module ActionView
         super(@skip_default_locale ? I18n.locale : _locale_defaults)
       end
 
-      def initialize_details(details)
-        details = details.dup
-        
-        registered_detail_setters.each do |key, setter|
-          send(setter, details[key])
+      # A method which only uses the first format in the formats array for layout lookup.
+      # This method plays straight with instance variables for performance reasons.
+      def with_layout_format
+        if formats.size == 1
+          yield
+        else
+          old_formats = formats
+          _set_detail(:formats, formats[0,1])
+
+          begin
+            yield
+          ensure
+            _set_detail(:formats, formats)
+          end
         end
       end
 
@@ -195,14 +203,21 @@ module ActionView
           send(setter, new_details[key]) if new_details.key?(key)
         end
 
-        if block_given?
-          begin
-            yield
-          ensure
-            @details = old_details
-          end
+        begin
+          yield
+        ensure
+          @details_key = nil
+          @details = old_details
         end
       end
+
+    protected
+
+      def _set_detail(key, value)
+        @details_key = nil
+        @details = @details.dup if @details.frozen?
+        @details[key] = value.freeze
+      end
     end
 
     include Accessors
diff --git a/actionpack/lib/action_view/render/layouts.rb b/actionpack/lib/action_view/render/layouts.rb
index 255c44450d..a9dfc0cced 100644
--- a/actionpack/lib/action_view/render/layouts.rb
+++ b/actionpack/lib/action_view/render/layouts.rb
@@ -57,15 +57,11 @@ module ActionView
     # This is the method which actually finds the layout using details in the lookup
     # context object. If no layout is found, it checkes if at least a layout with
     # the given name exists across all details before raising the error.
-    #
-    # If self.formats contains several formats, just the first one is considered in
-    # the layout lookup.
     def find_layout(layout)
       begin
-        if formats.size == 1
-          _find_layout(layout)
-        else
-          update_details(:formats => [self.formats.first]) { _find_layout(layout) }
+        with_layout_format do
+          layout =~ /^\// ?
+            with_fallbacks { find_template(layout) } : find_template(layout)
         end
       rescue ActionView::MissingTemplate => e
         update_details(:formats => nil) do
@@ -74,11 +70,6 @@ module ActionView
       end
     end
 
-    def _find_layout(layout) #:nodoc:
-      layout =~ /^\// ?
-        with_fallbacks { find_template(layout) } : find_template(layout)
-    end
-
     # Contains the logic that actually renders the layout.
     def _render_layout(layout, locals, &block) #:nodoc:
       layout.render(self, locals){ |*name| _layout_for(*name, &block) }
-- 
cgit v1.2.3


From 1a8f784a236058101c6e8b6387aefc96e86a1e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 7 Jun 2010 11:20:54 +0200
Subject: member on resource should not expect an ID.

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 63c553dd07..ae4417b56c 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -635,9 +635,7 @@ module ActionDispatch
             end
           when :resource
             with_scope_level(:member) do
-              scope(':id', :as => "") do
-                yield
-              end
+              yield
             end
           end
         end
-- 
cgit v1.2.3