Merge commit 'rails/master'

Conflicts:
	activerecord/lib/active_record/associations.rb

10 files changed, 136 insertions, 107 deletions

diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index ef66b24dd6..796ef40584 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -119,17 +119,17 @@ module AbstractController
         when true
           raise ArgumentError, "Layouts must be specified as a String, Symbol, false, or nil"
         when nil
-          self.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
+          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def _layout(details)
               self.class.cache_layout(details) do
-                if view_paths.exists?("#{_implied_layout_name}", details, "layouts")
+                if template_exists?("#{_implied_layout_name}", details, :_prefix => "layouts")
                   "#{_implied_layout_name}"
                 else
                   super
                 end
               end
             end
-          ruby_eval
+          RUBY
         end
         self.class_eval { private :_layout }
       end
@@ -167,7 +167,7 @@ module AbstractController
     # details<Hash{Symbol => Object}>:: A list of details to restrict
     #   the lookup to. By default, layout lookup is limited to the
     #   formats specified for the current request.
-    def _layout_for_name(name, details = {:formats => formats})
+    def _layout_for_name(name, details)
       name && _find_layout(name, details)
     end
 
@@ -183,7 +183,7 @@ module AbstractController
     def _find_layout(name, details)
       # TODO: Make prefix actually part of details in ViewPath#find_by_parts
       prefix = details.key?(:prefix) ? details.delete(:prefix) : "layouts"
-      view_paths.find(name, details, prefix)
+      find_template(name, details, :_prefix => prefix)
     end
 
     # Returns the default layout for this controller and a given set of details.
diff --git a/actionpack/lib/abstract_controller/rendering_controller.rb b/actionpack/lib/abstract_controller/rendering_controller.rb
index feca1bc4b7..bbf941aa32 100644
--- a/actionpack/lib/abstract_controller/rendering_controller.rb
+++ b/actionpack/lib/abstract_controller/rendering_controller.rb
@@ -112,12 +112,18 @@ module AbstractController
       name = (options[:_template_name] || action_name).to_s
 
       options[:_template] ||= with_template_cache(name) do
-        view_paths.find(
-          name, { :formats => formats }, options[:_prefix], options[:_partial]
-        )
+        find_template(name, { :formats => formats }, options)
       end
     end
-    
+
+    def find_template(name, details, options)
+      view_paths.find(name, details, options[:_prefix], options[:_partial])
+    end
+
+    def template_exists?(name, details, options)
+      view_paths.exists?(name, details, options[:_prefix], options[:_partial])
+    end
+
     def with_template_cache(name)
       yield
     end
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 698189bd46..0dae68c7b7 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -51,7 +51,7 @@ module ActionController
 
       def method_for_action(action_name)
         super || begin
-          if view_paths.exists?(action_name.to_s, {:formats => formats, :locales => [I18n.locale]}, controller_path)
+          if template_exists?(action_name.to_s, {:formats => formats}, :_prefix => controller_path)
             "default_render"
           end
         end
diff --git a/actionpack/lib/action_controller/legacy/layout.rb b/actionpack/lib/action_controller/legacy/layout.rb
index 43aea0eba2..53762158fc 100644
--- a/actionpack/lib/action_controller/legacy/layout.rb
+++ b/actionpack/lib/action_controller/legacy/layout.rb
@@ -191,7 +191,7 @@ module ActionController #:nodoc:
       def memoized_find_layout(layout, formats) #:nodoc:
         return layout if layout.nil? || layout.respond_to?(:render)
         prefix = layout.to_s =~ /layouts\// ? nil : "layouts"
-        view_paths.find(layout.to_s, {:formats => formats}, prefix)
+        find_template(layout.to_s, {:formats => formats}, :_prefix => prefix)
       end
 
       def find_layout(*args)
@@ -200,7 +200,7 @@ module ActionController #:nodoc:
       end
 
       def layout_list #:nodoc:
-        Array(view_paths).sum([]) { |path| Dir["#{path.to_str}/layouts/**/*"] }
+        Array(view_paths).sum([]) { |path| Dir["#{path}/layouts/**/*"] }
       end
       memoize :layout_list
 
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb
index 5fb244e3eb..2fccf01040 100644
--- a/actionpack/lib/action_controller/testing/process.rb
+++ b/actionpack/lib/action_controller/testing/process.rb
@@ -133,7 +133,7 @@ module ActionController #:nodoc:
       @request.env['REQUEST_METHOD'] = http_method
 
       parameters ||= {}
-      @request.assign_parameters(@controller.class.controller_path, action.to_s, parameters)
+      @request.assign_parameters(@controller.class.name.underscore.sub(/_controller$/, ''), action.to_s, parameters)
 
       @request.session = ActionController::TestSession.new(session) unless session.nil?
       @request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
index 9cfd6956d0..bd552b458a 100644
--- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -49,7 +49,18 @@ module ActionDispatch
         :expire_after => nil,
         :httponly     => true
       }.freeze
+      
+      class OptionsHash < Hash
+        def initialize(by, env, default_options)
+          @session_data = env[CookieStore::ENV_SESSION_KEY]
+          default_options.each { |key, value| self[key] = value }
+        end
 
+        def [](key)
+          key == :id ? @session_data[:session_id] : super(key)
+        end
+      end
+      
       ENV_SESSION_KEY = "rack.session".freeze
       ENV_SESSION_OPTIONS_KEY = "rack.session.options".freeze
       HTTP_SET_COOKIE = "Set-Cookie".freeze
@@ -90,8 +101,8 @@ module ActionDispatch
 
       def call(env)
         env[ENV_SESSION_KEY] = AbstractStore::SessionHash.new(self, env)
-        env[ENV_SESSION_OPTIONS_KEY] = @default_options.dup
-
+        env[ENV_SESSION_OPTIONS_KEY] = OptionsHash.new(self, env, @default_options)
+        
         status, headers, body = @app.call(env)
 
         session_data = env[ENV_SESSION_KEY]
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 70176a0ea4..d90afb1913 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -40,6 +40,7 @@ module ActionView
   autoload :MissingTemplate,   'action_view/base'
   autoload :Partials,          'action_view/render/partials'
   autoload :Resolver,          'action_view/template/resolver'
+  autoload :PathResolver,      'action_view/template/resolver'
   autoload :PathSet,           'action_view/paths'
   autoload :Rendering,         'action_view/render/rendering'
   autoload :Renderable,        'action_view/template/renderable'
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index c71840d41f..6b00e7afb5 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -286,7 +286,9 @@ module ActionView
           end
           javascript_src_tag(joined_javascript_name, options)
         else
-          ensure_javascript_sources!(expand_javascript_sources(sources, recursive)).collect { |source| javascript_src_tag(source, options) }.join("\n")
+          sources = expand_javascript_sources(sources, recursive)
+          ensure_javascript_sources!(sources) if cache
+          sources.collect { |source| javascript_src_tag(source, options) }.join("\n")
         end
       end
 
@@ -435,7 +437,9 @@ module ActionView
           end
           stylesheet_tag(joined_stylesheet_name, options)
         else
-          ensure_stylesheet_sources!(expand_stylesheet_sources(sources, recursive)).collect { |source| stylesheet_tag(source, options) }.join("\n")
+          sources = expand_stylesheet_sources(sources, recursive)
+          ensure_stylesheet_sources!(sources) if cache
+          sources.collect { |source| stylesheet_tag(source, options) }.join("\n")
         end
       end
 
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index ff5a2134ff..7fae0f6b8d 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -106,7 +106,7 @@ module ActionView
       #   escape_once("&lt;&lt; Accept & Checkout")
       #   # => "&lt;&lt; Accept &amp; Checkout"
       def escape_once(html)
-        html.to_s.gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] }
+        ActiveSupport::Multibyte.clean(html.to_s).gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] }
       end
 
       private
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 0b4c62d4d0..f5591ead09 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -1,9 +1,28 @@
 require "pathname"
+require "active_support/core_ext/class"
 require "action_view/template/template"
 
 module ActionView
   # Abstract superclass
   class Resolver
+
+    class_inheritable_accessor(:registered_details)
+    self.registered_details = {}
+
+    def self.register_detail(name, options = {})
+      registered_details[name] = lambda do |val|
+        val ||= yield
+        val |= [nil] unless options[:allow_nil] == false
+        val
+      end
+    end
+
+    register_detail(:locale)  { [I18n.locale] }
+    register_detail(:formats) { Mime::SET.symbols }
+    register_detail(:handlers, :allow_nil => false) do
+      TemplateHandlers.extensions
+    end
+
     def initialize(options = {})
       @cache  = options[:cache]
       @cached = {}
@@ -11,15 +30,18 @@ module ActionView
 
     # Normalizes the arguments and passes it on to find_template
     def find(*args)
-      find_all_by_parts(*args).first
+      find_all(*args).first
     end
-    
-    def find_all_by_parts(name, details = {}, prefix = nil, partial = nil)
-      details[:locales] = [I18n.locale]
-      name = name.to_s.gsub(handler_matcher, '').split("/")
-      find_templates(name.pop, details, [prefix, *name].compact.join("/"), partial)
+
+    def find_all(name, details = {}, prefix = nil, partial = nil)
+      details = normalize_details(details)
+      name, prefix = normalize_name(name, prefix)
+
+      cached([name, details, prefix, partial]) do
+        find_templates(name, details, prefix, partial)
+      end
     end
-  
+
   private
 
     # This is what child classes implement. No defaults are needed
@@ -28,29 +50,26 @@ module ActionView
     def find_templates(name, details, prefix, partial)
       raise NotImplementedError
     end
-    
-    def valid_handlers
-      @valid_handlers ||= TemplateHandlers.extensions
-    end
 
-    def handler_matcher
-      @handler_matcher ||= begin
-        e = valid_handlers.join('|')
-        /\.(?:#{e})$/
+    def normalize_details(details)
+      details = details.dup
+      # TODO: Refactor this concern out of the resolver
+      details.delete(:formats) if details[:formats] == [:"*/*"]
+      registered_details.each do |k, v|
+        details[k] = v.call(details[k])
       end
+      details
     end
 
-    def handler_glob
-      @handler_glob ||= begin
-        e = TemplateHandlers.extensions.map{|h| ".#{h}"}.join(",")
-        "{#{e}}"
-      end
-    end
-    
-    def formats_glob
-      @formats_glob ||= begin
-        '{' + Mime::SET.symbols.map { |l| ".#{l}," }.join + '}'
-      end
+    # Support legacy foo.erb names even though we now ignore .erb
+    # as well as incorrectly putting part of the path in the template
+    # name instead of the prefix.
+    def normalize_name(name, prefix)
+      handlers = TemplateHandlers.extensions.join('|')
+      name = name.to_s.gsub(/\.(?:#{handlers})$/, '')
+
+      parts = name.split('/')
+      return parts.pop, [prefix, *parts].compact.join("/")
     end
 
     def cached(key)
@@ -60,80 +79,49 @@ module ActionView
     end
   end
 
-  class FileSystemResolver < Resolver
-
-    def self.cached_glob
-      @@cached_glob ||= {}
-    end
-
-    def initialize(path, options = {})
-      raise ArgumentError, "path already is a Resolver class" if path.is_a?(Resolver)
-      super(options)
-      @path = Pathname.new(path).expand_path
-    end
+  class PathResolver < Resolver
 
-    # TODO: This is the currently needed API. Make this suck less
-    # ==== <suck>
-    attr_reader :path
+    EXTENSION_ORDER = [:locale, :formats, :handlers]
 
     def to_s
-      path.to_s
+      @path.to_s
     end
+    alias to_path to_s
 
-    def to_str
-      path.to_s
+    def find_templates(name, details, prefix, partial)
+      path = build_path(name, details, prefix, partial)
+      query(path, EXTENSION_ORDER.map { |ext| details[ext] })
     end
 
-    def ==(path)
-      to_str == path.to_str
-    end
+  private
 
-    def eql?(path)
-      to_str == path.to_str
+    def build_path(name, details, prefix, partial)
+      path = ""
+      path << "#{prefix}/" unless prefix.empty?
+      path << (partial ? "_#{name}" : name)
+      path
     end
-    # ==== </suck>
-
-    def find_templates(name, details, prefix, partial, root = "#{@path}/")
-      if glob = details_to_glob(name, details, prefix, partial, root)
-        cached(glob) do
-          Dir[glob].map do |path|
-            next if File.directory?(path)
-            source = File.read(path)
-            identifier = Pathname.new(path).expand_path.to_s
 
-            Template.new(source, identifier, *path_to_details(path))
-          end.compact
-        end
+    def query(path, exts)
+      query = "#{@path}/#{path}"
+      exts.each do |ext|
+        query << '{' << ext.map {|e| e && ".#{e}" }.join(',') << '}'
       end
-    end
-  
-  private
 
-    # :api: plugin
-    def details_to_glob(name, details, prefix, partial, root)
-      self.class.cached_glob[[name, prefix, partial, details, root]] ||= begin
-        path = ""
-        path << "#{prefix}/" unless prefix.empty?
-        path << (partial ? "_#{name}" : name)
-
-        extensions = ""
-        [:locales, :formats].each do |k|
-          extensions << if exts = details[k]
-            '{' + exts.map {|e| ".#{e},"}.join + '}'
-          else
-            k == :formats ? formats_glob : ''
-          end
-        end
-      
-        "#{root}#{path}#{extensions}#{handler_glob}"
-      end
+      Dir[query].map do |path|
+        next if File.directory?(path)
+        source = File.read(path)
+        identifier = Pathname.new(path).expand_path.to_s
+
+        Template.new(source, identifier, *path_to_details(path))
+      end.compact
     end
 
-    # TODO: fix me
-    # :api: plugin
+    # # TODO: fix me
+    # # :api: plugin
     def path_to_details(path)
       # [:erb, :format => :html, :locale => :en, :partial => true/false]
-      if m = path.match(%r'/(_)?[\w-]+(\.[\w-]+)*\.(\w+)$')
+      if m = path.match(%r'(?:^|/)(_)?[\w-]+(\.[\w-]+)*\.(\w+)$')
         partial = m[1] == '_'
         details = (m[2]||"").split('.').reject { |e| e.empty? }
         handler = Template.handler_class_for_extension(m[3])
@@ -146,13 +134,32 @@ module ActionView
     end
   end
 
-  class FileSystemResolverWithFallback < FileSystemResolver
+  class FileSystemResolver < PathResolver
+    def initialize(path, options = {})
+      raise ArgumentError, "path already is a Resolver class" if path.is_a?(Resolver)
+      super(options)
+      @path = Pathname.new(path).expand_path
+    end
+  end
 
-    def find_templates(name, details, prefix, partial)
-      templates = super
-      return super(name, details, prefix, partial, '') if templates.empty?
-      templates
+  # OMG HAX
+  # TODO: remove hax
+  class FileSystemResolverWithFallback < Resolver
+    def initialize(path, options = {})
+      super(options)
+      @paths = [FileSystemResolver.new(path, options), FileSystemResolver.new("", options), FileSystemResolver.new("/", options)]
     end
 
+    def find_templates(*args)
+      @paths.each do |p|
+        template = p.find_templates(*args)
+        return template unless template.empty?
+      end
+      []
+    end
+
+    def to_s
+      @paths.first.to_s
+    end
   end
 end
\ No newline at end of file