From b50394bf844d0520d5dca485b169bba87f6d009a Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Thu, 15 Sep 2011 19:55:52 -0500
Subject: config.action_controller.asset_host shouldn't set to nil during
 precompile

---
 actionpack/lib/sprockets/assets.rake | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index 9b2f3a3f94..81223b7ead 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -17,9 +17,6 @@ namespace :assets do
       # Always compile files
       Rails.application.config.assets.compile = true
 
-      # Always ignore asset host
-      Rails.application.config.action_controller.asset_host = nil
-
       config = Rails.application.config
       env    = Rails.application.assets
       target = Pathname.new(File.join(Rails.public_path, config.assets.prefix))
-- 
cgit v1.2.3


From 857d20efdab98cf56b777e034e1f150187c5fe9a Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Tue, 20 Sep 2011 02:12:29 -0500
Subject: Move precompile task to Sprockets::StaticCompiler

---
 actionpack/lib/sprockets/assets.rake        | 24 ++-----------
 actionpack/lib/sprockets/railtie.rb         |  1 +
 actionpack/lib/sprockets/static_compiler.rb | 53 +++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 22 deletions(-)
 create mode 100644 actionpack/lib/sprockets/static_compiler.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index 81223b7ead..e38ac6b489 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -20,30 +20,10 @@ namespace :assets do
       config = Rails.application.config
       env    = Rails.application.assets
       target = Pathname.new(File.join(Rails.public_path, config.assets.prefix))
-      manifest = {}
       manifest_path = config.assets.manifest || target
 
-      config.assets.precompile.each do |path|
-        env.each_logical_path do |logical_path|
-          if path.is_a?(Regexp)
-            next unless path.match(logical_path)
-          elsif path.is_a?(Proc)
-            next unless path.call(logical_path)
-          else
-            next unless File.fnmatch(path.to_s, logical_path)
-          end
-
-          if asset = env.find_asset(logical_path)
-            asset_path = config.assets.digest ? asset.digest_path : logical_path
-            manifest[logical_path] = asset_path
-            filename = target.join(asset_path)
-
-            mkdir_p filename.dirname
-            asset.write_to(filename)
-            asset.write_to("#{filename}.gz") if filename.to_s =~ /\.(css|js)$/
-          end
-        end
-      end
+      static_compiler = Sprockets::StaticCompiler.new(env, target, :digest => config.assets.digest)
+      manifest = static_compiler.precompile(config.assets.precompile)
 
       File.open("#{manifest_path}/manifest.yml", 'wb') do |f|
         YAML.dump(manifest, f)
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index f05d835554..9b31604dbe 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -2,6 +2,7 @@ module Sprockets
   autoload :Helpers, "sprockets/helpers"
   autoload :LazyCompressor, "sprockets/compressors"
   autoload :NullCompressor, "sprockets/compressors"
+  autoload :StaticCompiler, "sprockets/static_compiler"
 
   # TODO: Get rid of config.assets.enabled
   class Railtie < ::Rails::Railtie
diff --git a/actionpack/lib/sprockets/static_compiler.rb b/actionpack/lib/sprockets/static_compiler.rb
new file mode 100644
index 0000000000..fa4f9451df
--- /dev/null
+++ b/actionpack/lib/sprockets/static_compiler.rb
@@ -0,0 +1,53 @@
+require 'fileutils'
+require 'pathname'
+
+module Sprockets
+  class StaticCompiler
+    attr_accessor :env, :target, :digest
+
+    def initialize(env, target, options = {})
+      @env = env
+      @target = target
+      @digest = options.key?(:digest) ? options.delete(:digest) : true
+    end
+
+    def precompile(paths)
+      Rails.application.config.assets.digest = digest
+      manifest = {}
+
+      env.each_logical_path do |logical_path|
+        next unless precompile_path?(logical_path, paths)
+        if asset = env.find_asset(logical_path)
+          manifest[logical_path] = compile(asset)
+        end
+      end
+      manifest
+    end
+
+    def compile(asset)
+      asset_path = digest_asset(asset)
+      filename = target.join(asset_path)
+      FileUtils.mkdir_p filename.dirname
+      asset.write_to(filename)
+      asset.write_to("#{filename}.gz") if filename.to_s =~ /\.(css|js)$/
+      asset_path
+    end
+
+    def precompile_path?(logical_path, paths)
+      paths.each do |path|
+        if path.is_a?(Regexp)
+          return true if path.match(logical_path)
+        elsif path.is_a?(Proc)
+          return true if path.call(logical_path)
+        else
+          return true if File.fnmatch(path.to_s, logical_path)
+        end
+      end
+      false
+    end
+
+    def digest_asset(asset)
+      digest ? asset.digest_path : asset.logical_path
+    end
+  end
+end
-- 
cgit v1.2.3


From f373f296d0347f025402049d94901d57987e226c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 21 Sep 2011 15:28:05 -0700
Subject: Slightly reorganize lookup context modules in order to better isolate
 cache responsibilities.

---
 actionpack/lib/action_view/lookup_context.rb | 211 ++++++++++++++-------------
 1 file changed, 111 insertions(+), 100 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 9ec410ac2b..a119df003a 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/module/remove_method'
 
 module ActionView
   # = Action View Lookup Context
@@ -17,12 +18,11 @@ 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}="]
+
+      initialize = registered_details.map { |n| "self.#{n} = details[:#{n}]" }
+      update     = registered_details.map { |n| "self.#{n} = details[:#{n}] if details.key?(:#{n})" }
 
       Accessors.send :define_method, :"_#{name}_defaults", &block
       Accessors.module_eval <<-METHOD, __FILE__, __LINE__ + 1
@@ -34,6 +34,16 @@ module ActionView
           value = Array.wrap(value.presence || _#{name}_defaults)
           _set_detail(:#{name}, value) if value != @details[:#{name}]
         end
+
+        remove_possible_method :initialize_details
+        def initialize_details(details)
+          #{initialize.join("\n")}
+        end
+
+        remove_possible_method :update_details
+        def update_details(details)
+          #{update.join("\n")}
+        end
       METHOD
     end
 
@@ -60,18 +70,53 @@ module ActionView
       end
     end
 
-    def initialize(view_paths, details = {}, prefixes = [])
-      @details, @details_key = { :handlers => default_handlers }, nil
-      @frozen_formats, @skip_default_locale = false, false
-      @cache = true
-      @prefixes = prefixes
+    # Add caching behavior on top of Details.
+    module DetailsCache
+      attr_accessor :cache
 
-      self.view_paths = view_paths
-      self.registered_detail_setters.each do |key, setter|
-        send(setter, details[key])
+      # Calculate the details key. Remove the handlers from calculation to improve performance
+      # since the user cannot modify it explicitly.
+      def details_key #:nodoc:
+        @details_key ||= DetailsKey.get(@details) if @cache
+      end
+
+      # Temporary skip passing the details_key forward.
+      def disable_cache
+        old_value, @cache = @cache, false
+        yield
+      ensure
+        @cache = old_value
+      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)
+        if block_given?
+          old_details = @details.dup
+          super
+
+          begin
+            yield
+          ensure
+            @details_key = nil
+            @details = old_details
+          end
+        else
+          super
+        end
+      end
+
+    protected
+
+      def _set_detail(key, value)
+        @details_key = nil
+        @details = @details.dup if @details.frozen?
+        @details[key] = value.freeze
       end
     end
 
+    # Helpers related to template lookup using the lookup context information.
     module ViewPaths
       attr_reader :view_paths
 
@@ -141,111 +186,77 @@ module ActionView
       end
     end
 
-    module Details
-      attr_accessor :cache
-
-      # Calculate the details key. Remove the handlers from calculation to improve performance
-      # since the user cannot modify it explicitly.
-      def details_key #:nodoc:
-        @details_key ||= DetailsKey.get(@details) if @cache
-      end
-
-      # Temporary skip passing the details_key forward.
-      def disable_cache
-        old_value, @cache = @cache, false
-        yield
-      ensure
-        @cache = old_value
-      end
+    include Accessors
+    include DetailsCache
+    include ViewPaths
 
-      # Freeze the current formats in the lookup context. By freezing them, you are guaranteeing
-      # that next template lookups are not going to modify the formats. The controller can also
-      # use this, to ensure that formats won't be further modified (as it does in respond_to blocks).
-      def freeze_formats(formats, unless_frozen=false) #:nodoc:
-        return if unless_frozen && @frozen_formats
-        self.formats = formats
-        @frozen_formats = true
-      end
+    def initialize(view_paths, details = {}, prefixes = [])
+      @details, @details_key = { :handlers => default_handlers }, nil
+      @frozen_formats, @skip_default_locale = false, false
+      @cache = true
+      @prefixes = prefixes
 
-      # Overload formats= to expand ["*/*"] values and automatically
-      # add :html as fallback to :js.
-      def formats=(values)
-        if values
-          values.concat(_formats_defaults) if values.delete "*/*"
-          values << :html if values == [:js]
-        end
-        super(values)
-      end
+      self.view_paths = view_paths
+      initialize_details(details)
+    end
 
-      # Do not use the default locale on template lookup.
-      def skip_default_locale!
-        @skip_default_locale = true
-        self.locale = nil
-      end
+    # Freeze the current formats in the lookup context. By freezing them, you
+    # that next template lookups are not going to modify the formats. The con
+    # use this, to ensure that formats won't be further modified (as it does
+    def freeze_formats(formats, unless_frozen=false) #:nodoc:
+      return if unless_frozen && @frozen_formats
+      self.formats = formats
+      @frozen_formats = true
+    end
 
-      # Overload locale to return a symbol instead of array.
-      def locale
-        @details[:locale].first
+    # Override formats= to expand ["*/*"] values and automatically
+    # add :html as fallback to :js.
+    def formats=(values)
+      if values
+        values.concat(_formats_defaults) if values.delete "*/*"
+        values << :html if values == [:js]
       end
+      super(values)
+    end
 
-      # Overload locale= to also set the I18n.locale. If the current I18n.config object responds
-      # to original_config, it means that it's has a copy of the original I18n configuration and it's
-      # acting as proxy, which we need to skip.
-      def locale=(value)
-        if value
-          config = I18n.config.respond_to?(:original_config) ? I18n.config.original_config : I18n.config
-          config.locale = value
-        end
-
-        super(@skip_default_locale ? I18n.locale : _locale_defaults)
-      end
+    # Do not use the default locale on template lookup.
+    def skip_default_locale!
+      @skip_default_locale = true
+      self.locale = nil
+    end
 
-      # 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])
+    # Override locale to return a symbol instead of array.
+    def locale
+      @details[:locale].first
+    end
 
-          begin
-            yield
-          ensure
-            _set_detail(:formats, old_formats)
-          end
-        end
+    # Overload locale= to also set the I18n.locale. If the current I18n.config object responds
+    # to original_config, it means that it's has a copy of the original I18n configuration and it's
+    # acting as proxy, which we need to skip.
+    def locale=(value)
+      if value
+        config = I18n.config.respond_to?(:original_config) ? I18n.config.original_config : I18n.config
+        config.locale = value
       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)
-        old_details = @details.dup
+      super(@skip_default_locale ? I18n.locale : _locale_defaults)
+    end
 
-        registered_detail_setters.each do |key, setter|
-          send(setter, new_details[key]) if new_details.key?(key)
-        end
+    # 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
-          @details_key = nil
-          @details = old_details
+          _set_detail(:formats, old_formats)
         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
-    include Details
-    include ViewPaths
   end
 end
-- 
cgit v1.2.3


From 019eea4a388442a004287ad2e73772f3fefc7028 Mon Sep 17 00:00:00 2001
From: Pawel Pierzchala <pawel.pierzchala@llp.pl>
Date: Wed, 21 Sep 2011 18:12:55 +0200
Subject: Fix named routes modifying arguments

---
 actionpack/lib/action_dispatch/routing/route_set.rb |  7 ++++---
 actionpack/test/dispatch/routing_test.rb            | 11 +++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 46a68a32ae..e921269331 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -165,13 +165,14 @@ module ActionDispatch
               remove_possible_method :#{selector}
               def #{selector}(*args)
                 options = args.extract_options!
+                result = #{options.inspect}
 
                 if args.any?
-                  options[:_positional_args] = args
-                  options[:_positional_keys] = #{route.segment_keys.inspect}
+                  result[:_positional_args] = args
+                  result[:_positional_keys] = #{route.segment_keys.inspect}
                 end
 
-                options ? #{options.inspect}.merge(options) : #{options.inspect}
+                result.merge(options)
               end
               protected :#{selector}
             END_EVAL
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 9685b24c1c..c0b74bc9f9 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -863,6 +863,17 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal original_options, options
   end
 
+  # tests the arguments modification free version of define_hash_access
+  def test_named_route_with_no_side_effects
+    original_options = { :host => 'test.host' }
+    options = original_options.dup
+
+    profile_customer_url("customer_model", options)
+
+    # verify that the options passed in have not changed from the original ones
+    assert_equal original_options, options
+  end
+
   def test_projects_status
     with_test_routes do
       assert_equal '/projects/status', url_for(:controller => 'projects', :action => 'status', :only_path => true)
-- 
cgit v1.2.3


From 1ca3fbfbf2dfc9b2bff46ca680a89e005a1fc2d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 22 Sep 2011 12:26:27 +0200
Subject: No need to recalculate the @details_key after update_details.

---
 actionpack/lib/action_view/lookup_context.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index a119df003a..a1fa1c0b6f 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -93,14 +93,13 @@ module ActionView
       # the execution of the block and reverted to the previous value after.
       def update_details(new_details)
         if block_given?
-          old_details = @details.dup
+          old_details, old_key = @details.dup, @details_key
           super
 
           begin
             yield
           ensure
-            @details_key = nil
-            @details = old_details
+            @details, @details_key = old_details, old_key
           end
         else
           super
-- 
cgit v1.2.3


From 41bca5d4667a49666fc5a80bebd91f27099d1674 Mon Sep 17 00:00:00 2001
From: Nick Sutterer <apotonick@gmail.com>
Date: Thu, 22 Sep 2011 13:52:52 +0200
Subject: Add rake test:template.

---
 actionpack/Rakefile | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 66dd88f0c6..d9e3e56fcc 100755
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -26,6 +26,11 @@ namespace :test do
   Rake::TestTask.new(:isolated) do |t|
     t.pattern = 'test/ts_isolated.rb'
   end
+
+  Rake::TestTask.new(:template) do |t|
+    t.libs << 'test'
+    t.pattern = 'test/template/**/*.rb'
+  end
 end
 
 desc 'ActiveRecord Integration Tests'
-- 
cgit v1.2.3


From cbaad674f13067c52fa8c1a24dc498e570db4eed Mon Sep 17 00:00:00 2001
From: Nick Sutterer <apotonick@gmail.com>
Date: Thu, 22 Sep 2011 11:54:13 +0200
Subject: it is now possible to pass details options (:formats, :details,
 :locales, ...) to #render, #find_template and friends. this doesn't change
 anything in global context.

---
 actionpack/lib/action_view/lookup_context.rb       | 24 ++++++++++++++--------
 .../lib/action_view/renderer/template_renderer.rb  |  5 +++--
 actionpack/test/fixtures/comments/empty.html.erb   |  1 +
 actionpack/test/fixtures/comments/empty.xml.erb    |  1 +
 actionpack/test/template/render_test.rb            |  6 ++++++
 5 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 actionpack/test/fixtures/comments/empty.html.erb
 create mode 100644 actionpack/test/fixtures/comments/empty.xml.erb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index a1fa1c0b6f..96ef7da01b 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -125,17 +125,17 @@ module ActionView
         @view_paths = ActionView::PathSet.new(Array.wrap(paths))
       end
 
-      def find(name, prefixes = [], partial = false, keys = [])
-        @view_paths.find(*args_for_lookup(name, prefixes, partial, keys))
+      def find(name, prefixes = [], partial = false, keys = [], options = {})
+        @view_paths.find(*args_for_lookup(name, prefixes, partial, keys, options))
       end
       alias :find_template :find
 
-      def find_all(name, prefixes = [], partial = false, keys = [])
-        @view_paths.find_all(*args_for_lookup(name, prefixes, partial, keys))
+      def find_all(name, prefixes = [], partial = false, keys = [], options = {})
+        @view_paths.find_all(*args_for_lookup(name, prefixes, partial, keys, options))
       end
 
-      def exists?(name, prefixes = [], partial = false, keys = [])
-        @view_paths.exists?(*args_for_lookup(name, prefixes, partial, keys))
+      def exists?(name, prefixes = [], partial = false, keys = [], options = {})
+        @view_paths.exists?(*args_for_lookup(name, prefixes, partial, keys, options))
       end
       alias :template_exists? :exists?
 
@@ -154,9 +154,17 @@ module ActionView
 
     protected
 
-      def args_for_lookup(name, prefixes, partial, keys) #:nodoc:
+      def args_for_lookup(name, prefixes, partial, keys, details_options) #:nodoc:
         name, prefixes = normalize_name(name, prefixes)
-        [name, prefixes, partial || false, @details, details_key, keys]
+        details, details_key = detail_args_for(details_options)
+        [name, prefixes, partial || false, details, details_key, keys]
+      end
+
+      # Compute details hash and key according to user options (e.g. passed from #render).
+      def detail_args_for(options)
+        return @details, details_key if options.empty? # most common path.
+        user_details = @details.merge(options)
+        [user_details, DetailsKey.get(user_details)]
       end
 
       # Support legacy foo.erb names even though we now ignore .erb
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index d04c00fd40..0a5b470a82 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -15,12 +15,13 @@ module ActionView
 
     # Determine the template to be rendered using the given options.
     def determine_template(options) #:nodoc:
-      keys = options[:locals].try(:keys) || []
+      keys    = options[:locals].try(:keys) || []
+      details = options.slice(:formats, :locale, :handlers)
 
       if options.key?(:text)
         Template::Text.new(options[:text], formats.try(:first))
       elsif options.key?(:file)
-        with_fallbacks { find_template(options[:file], nil, false, keys) }
+        with_fallbacks { find_template(options[:file], nil, false, keys, details) }
       elsif options.key?(:inline)
         handler = Template.handler_for_extension(options[:type] || "erb")
         Template.new(options[:inline], "inline template", handler, :locals => keys)
diff --git a/actionpack/test/fixtures/comments/empty.html.erb b/actionpack/test/fixtures/comments/empty.html.erb
new file mode 100644
index 0000000000..827f3861de
--- /dev/null
+++ b/actionpack/test/fixtures/comments/empty.html.erb
@@ -0,0 +1 @@
+<h1>No Comment</h1>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/comments/empty.xml.erb b/actionpack/test/fixtures/comments/empty.xml.erb
new file mode 100644
index 0000000000..db1027cd7d
--- /dev/null
+++ b/actionpack/test/fixtures/comments/empty.xml.erb
@@ -0,0 +1 @@
+<error>No Comment</error>
\ No newline at end of file
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 8a582030f6..525ef0d726 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -32,6 +32,12 @@ module RenderTestCases
     assert_equal "Hello world!", @view.render(:file => "test/hello_world")
   end
 
+  # Test if :formats, :locale etc. options are passed correctly to the resolvers.
+  def test_render_file_with_format
+    assert_equal "<h1>No Comment</h1>", @view.render(:file => "comments/empty", :formats => [:html])
+    assert_equal "<error>No Comment</error>", @view.render(:file => "comments/empty", :formats => [:xml])
+  end
+
   def test_render_file_with_localization
     old_locale, @view.locale = @view.locale, :da
     assert_equal "Hey verden", @view.render(:file => "test/hello_world")
-- 
cgit v1.2.3


From 119e9e2dafb0cdc5b85613b730333679aef534af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 22 Sep 2011 15:03:05 +0200
Subject: Get rid of update_details in favor of passing details to
 find_template.

---
 actionpack/lib/action_view/lookup_context.rb       | 33 +++-------------------
 .../lib/action_view/renderer/abstract_renderer.rb  | 16 ++++-------
 .../lib/action_view/renderer/partial_renderer.rb   | 23 ++++++++-------
 .../lib/action_view/renderer/template_renderer.rb  | 27 ++++++++----------
 .../controller/new_base/render_partial_test.rb     | 10 +++----
 .../controller/new_base/render_template_test.rb    |  6 ++--
 actionpack/test/controller/render_test.rb          |  4 ++-
 actionpack/test/template/lookup_context_test.rb    | 10 -------
 actionpack/test/template/render_test.rb            |  5 ++++
 9 files changed, 49 insertions(+), 85 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 96ef7da01b..8267977830 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -20,18 +20,16 @@ module ActionView
 
     def self.register_detail(name, options = {}, &block)
       self.registered_details << name
-
       initialize = registered_details.map { |n| "self.#{n} = details[:#{n}]" }
-      update     = registered_details.map { |n| "self.#{n} = details[:#{n}] if details.key?(:#{n})" }
 
-      Accessors.send :define_method, :"_#{name}_defaults", &block
+      Accessors.send :define_method, :"default_#{name}", &block
       Accessors.module_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{name}
           @details[:#{name}]
         end
 
         def #{name}=(value)
-          value = Array.wrap(value.presence || _#{name}_defaults)
+          value = Array.wrap(value.presence || default_#{name})
           _set_detail(:#{name}, value) if value != @details[:#{name}]
         end
 
@@ -39,11 +37,6 @@ module ActionView
         def initialize_details(details)
           #{initialize.join("\n")}
         end
-
-        remove_possible_method :update_details
-        def update_details(details)
-          #{update.join("\n")}
-        end
       METHOD
     end
 
@@ -88,24 +81,6 @@ module ActionView
         @cache = old_value
       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)
-        if block_given?
-          old_details, old_key = @details.dup, @details_key
-          super
-
-          begin
-            yield
-          ensure
-            @details, @details_key = old_details, old_key
-          end
-        else
-          super
-        end
-      end
-
     protected
 
       def _set_detail(key, value)
@@ -220,7 +195,7 @@ module ActionView
     # add :html as fallback to :js.
     def formats=(values)
       if values
-        values.concat(_formats_defaults) if values.delete "*/*"
+        values.concat(default_formats) if values.delete "*/*"
         values << :html if values == [:js]
       end
       super(values)
@@ -246,7 +221,7 @@ module ActionView
         config.locale = value
       end
 
-      super(@skip_default_locale ? I18n.locale : _locale_defaults)
+      super(@skip_default_locale ? I18n.locale : default_locale)
     end
 
     # A method which only uses the first format in the formats array for layout lookup.
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb
index 60c527beeb..24bae64ca5 100644
--- a/actionpack/lib/action_view/renderer/abstract_renderer.rb
+++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb
@@ -11,15 +11,13 @@ module ActionView
       raise NotImplementedError
     end
 
-    # Checks if the given path contains a format and if so, change
-    # the lookup context to take this new format into account.
-    def wrap_formats(value)
-      return yield unless value.is_a?(String)
+    protected
 
-      if value.sub!(formats_regexp, "")
-        update_details(:formats => [$1.to_sym]){ yield }
-      else
-        yield
+    def extract_format(value, details)
+      if value.is_a?(String) && value.sub!(formats_regexp, "")
+        ActiveSupport::Deprecation.warn "Passing the format in the template name is deprecated. " \
+          "Please pass render with :formats => #{$1} instead.", caller
+        details[:formats] ||= [$1.to_sym]
       end
     end
 
@@ -27,8 +25,6 @@ module ActionView
       @@formats_regexp ||= /\.(#{Mime::SET.symbols.join('|')})$/
     end
 
-    protected
-
     def instrument(name, options={})
       ActiveSupport::Notifications.instrument("render_#{name}.action_view", options){ yield }
     end
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index cd0f7054a9..fc39ee8498 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -216,18 +216,15 @@ module ActionView
 
     def render(context, options, block)
       setup(context, options, block)
+      identifier = (@template = find_partial) ? @template.identifier : @path
 
-      wrap_formats(@path) do
-        identifier = ((@template = find_partial) ? @template.identifier : @path)
-
-        if @collection
-          instrument(:collection, :identifier => identifier || "collection", :count => @collection.size) do
-            render_collection
-          end
-        else
-          instrument(:partial, :identifier => identifier) do
-            render_partial
-          end
+      if @collection
+        instrument(:collection, :identifier => identifier || "collection", :count => @collection.size) do
+          render_collection
+        end
+      else
+        instrument(:partial, :identifier => identifier) do
+          render_partial
         end
       end
     end
@@ -271,6 +268,7 @@ module ActionView
       @options = options
       @locals  = options[:locals] || {}
       @block   = block
+      @details = options.slice(:formats, :locale, :handlers)
 
       if String === partial
         @object     = options[:object]
@@ -299,6 +297,7 @@ module ActionView
                                 "and is followed by any combinations of letters, numbers, or underscores.")
       end
 
+      extract_format(@path, @details)
       self
     end
 
@@ -326,7 +325,7 @@ module ActionView
 
     def find_template(path=@path, locals=@locals.keys)
       prefixes = path.include?(?/) ? [] : @lookup_context.prefixes
-      @lookup_context.find_template(path, prefixes, true, locals)
+      @lookup_context.find_template(path, prefixes, true, locals, @details)
     end
 
     def collection_with_template
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index 0a5b470a82..f3e7378f2b 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -4,30 +4,28 @@ require 'active_support/core_ext/array/wrap'
 module ActionView
   class TemplateRenderer < AbstractRenderer #:nodoc:
     def render(context, options)
-      @view = context
-
-      wrap_formats(options[:template] || options[:file]) do
-        template = determine_template(options)
-        freeze_formats(template.formats, true)
-        render_template(template, options[:layout], options[:locals])
-      end
+      @view    = context
+      @details = options.slice(:formats, :locale, :handlers)
+      extract_format(options[:file] || options[:template], @details)
+      template = determine_template(options)
+      freeze_formats(template.formats, true)
+      render_template(template, options[:layout], options[:locals])
     end
 
     # Determine the template to be rendered using the given options.
     def determine_template(options) #:nodoc:
-      keys    = options[:locals].try(:keys) || []
-      details = options.slice(:formats, :locale, :handlers)
+      keys = options[:locals].try(:keys) || []
 
       if options.key?(:text)
         Template::Text.new(options[:text], formats.try(:first))
       elsif options.key?(:file)
-        with_fallbacks { find_template(options[:file], nil, false, keys, details) }
+        with_fallbacks { find_template(options[:file], nil, false, keys, @details) }
       elsif options.key?(:inline)
         handler = Template.handler_for_extension(options[:type] || "erb")
         Template.new(options[:inline], "inline template", handler, :locals => keys)
       elsif options.key?(:template)
         options[:template].respond_to?(:render) ?
-          options[:template] : find_template(options[:template], options[:prefixes], false, keys)
+          options[:template] : find_template(options[:template], options[:prefixes], false, keys, @details)
       end
     end
 
@@ -63,12 +61,11 @@ module ActionView
       begin
         with_layout_format do
           layout =~ /^\// ?
-            with_fallbacks { find_template(layout, nil, false, keys) } : find_template(layout, nil, false, keys)
+            with_fallbacks { find_template(layout, nil, false, keys, @details) } : find_template(layout, nil, false, keys, @details)
         end
       rescue ActionView::MissingTemplate
-        update_details(:formats => nil) do
-          raise unless template_exists?(layout)
-        end
+        all_details = @details.merge(:formats => @lookup_context.default_formats)
+        raise unless template_exists?(layout, nil, false, keys, all_details)
       end
     end
   end
diff --git a/actionpack/test/controller/new_base/render_partial_test.rb b/actionpack/test/controller/new_base/render_partial_test.rb
index 83b0d039ad..b4a25c49c9 100644
--- a/actionpack/test/controller/new_base/render_partial_test.rb
+++ b/actionpack/test/controller/new_base/render_partial_test.rb
@@ -7,12 +7,12 @@ module RenderPartial
     self.view_paths = [ActionView::FixtureResolver.new(
       "render_partial/basic/_basic.html.erb"     => "BasicPartial!",
       "render_partial/basic/basic.html.erb"      => "<%= @test_unchanged = 'goodbye' %><%= render :partial => 'basic' %><%= @test_unchanged %>",
-      "render_partial/basic/with_json.html.erb"  => "<%= render 'with_json.json' %>",
-      "render_partial/basic/_with_json.json.erb" => "<%= render 'final' %>",
+      "render_partial/basic/with_json.html.erb"  => "<%= render :partial => 'with_json', :formats => [:json] %>",
+      "render_partial/basic/_with_json.json.erb" => "<%= render :partial => 'final', :formats => [:json] %>",
       "render_partial/basic/_final.json.erb"     => "{ final: json }",
-      "render_partial/basic/overriden.html.erb"    => "<%= @test_unchanged = 'goodbye' %><%= render :partial => 'overriden' %><%= @test_unchanged %>",
-      "render_partial/basic/_overriden.html.erb"    => "ParentPartial!",
-      "render_partial/child/_overriden.html.erb"    => "OverridenPartial!"
+      "render_partial/basic/overriden.html.erb"  => "<%= @test_unchanged = 'goodbye' %><%= render :partial => 'overriden' %><%= @test_unchanged %>",
+      "render_partial/basic/_overriden.html.erb" => "ParentPartial!",
+      "render_partial/child/_overriden.html.erb" => "OverridenPartial!"
     )]
 
     def html_with_json_inside_json
diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb
index 584f2d772c..ba804421da 100644
--- a/actionpack/test/controller/new_base/render_template_test.rb
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -10,8 +10,8 @@ module RenderTemplate
       "xml_template.xml.builder"   => "xml.html do\n  xml.p 'Hello'\nend",
       "with_raw.html.erb"          => "Hello <%=raw '<strong>this is raw</strong>' %>",
       "with_implicit_raw.html.erb" => "Hello <%== '<strong>this is also raw</strong>' %>",
-      "test/with_json.html.erb"    => "<%= render :template => 'test/with_json.json' %>",
-      "test/with_json.json.erb"    => "<%= render :template => 'test/final' %>",
+      "test/with_json.html.erb"    => "<%= render :template => 'test/with_json', :formats => [:json] %>",
+      "test/with_json.json.erb"    => "<%= render :template => 'test/final', :formats => [:json]  %>",
       "test/final.json.erb"        => "{ final: json }",
       "test/with_error.html.erb"   => "<%= idontexist %>"
     )]
@@ -117,7 +117,7 @@ module RenderTemplate
       assert_response "{ final: json }"
     end
 
-    test "rendering a template with error properly exceprts the code" do
+    test "rendering a template with error properly excerts the code" do
       get :with_error
       assert_status 500
       assert_match "undefined local variable or method `idontexist'", response.body
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index c46755417f..719e37799d 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -797,7 +797,9 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_render_file
-    get :hello_world_file
+    assert_deprecated do
+      get :hello_world_file
+    end
     assert_equal "Hello world!", @response.body
   end
 
diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb
index 47b70f05ab..bac2530e3d 100644
--- a/actionpack/test/template/lookup_context_test.rb
+++ b/actionpack/test/template/lookup_context_test.rb
@@ -31,16 +31,6 @@ class LookupContextTest < ActiveSupport::TestCase
     assert @lookup_context.formats.frozen?
   end
 
-  test "allows me to change some details to execute an specific block of code" do
-    formats = Mime::SET
-    @lookup_context.update_details(:locale => :pt) do
-      assert_equal formats, @lookup_context.formats
-      assert_equal :pt, @lookup_context.locale
-    end
-    assert_equal formats, @lookup_context.formats
-    assert_equal :en, @lookup_context.locale
-  end
-
   test "provides getters and setters for formats" do
     @lookup_context.formats = [:html]
     assert_equal [:html], @lookup_context.formats
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 525ef0d726..f3dce0b7f2 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -38,6 +38,11 @@ module RenderTestCases
     assert_equal "<error>No Comment</error>", @view.render(:file => "comments/empty", :formats => [:xml])
   end
 
+  def test_render_template_with_format
+    assert_equal "<h1>No Comment</h1>", @view.render(:template => "comments/empty", :formats => [:html])
+    assert_equal "<error>No Comment</error>", @view.render(:template => "comments/empty", :formats => [:xml])
+  end
+
   def test_render_file_with_localization
     old_locale, @view.locale = @view.locale, :da
     assert_equal "Hey verden", @view.render(:file => "test/hello_world")
-- 
cgit v1.2.3


From c3fa2e9bf89039e90c45336979d17cb0c02a6cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 22 Sep 2011 15:06:04 +0200
Subject: Make handlers a registered detail.

---
 actionpack/lib/action_view/lookup_context.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 8267977830..ef1ef44317 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -44,8 +44,9 @@ module ActionView
     module Accessors #:nodoc:
     end
 
-    register_detail(:formats) { Mime::SET.symbols }
     register_detail(:locale)  { [I18n.locale, I18n.default_locale] }
+    register_detail(:formats) { Mime::SET.symbols }
+    register_detail(:handlers){ Template::Handlers.extensions }
 
     class DetailsKey #:nodoc:
       alias :eql? :equal?
@@ -159,10 +160,6 @@ module ActionView
         return name, prefixes
       end
 
-      def default_handlers #:nodoc:
-        @@default_handlers ||= Template::Handlers.extensions
-      end
-
       def handlers_regexp #:nodoc:
         @@handlers_regexp ||= /\.(?:#{default_handlers.join('|')})$/
       end
@@ -173,7 +170,7 @@ module ActionView
     include ViewPaths
 
     def initialize(view_paths, details = {}, prefixes = [])
-      @details, @details_key = { :handlers => default_handlers }, nil
+      @details, @details_key = {}, nil
       @frozen_formats, @skip_default_locale = false, false
       @cache = true
       @prefixes = prefixes
-- 
cgit v1.2.3


From 43d27e9105b385f64ec195f60d10ab3d64281bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 22 Sep 2011 15:37:38 +0200
Subject: Deprecate passing the template handler in the template name.

For example, calling hello.erb is now deprecated. Since Rails 3.0
passing the handler had no effect whatsover. This commit simply
deprecates such cases so we can clean up the code in later releases.
---
 .../action_dispatch/middleware/show_exceptions.rb  |  4 +--
 actionpack/lib/action_view/lookup_context.rb       |  7 +++-
 .../lib/action_view/renderer/abstract_renderer.rb  |  2 +-
 .../test/abstract/abstract_controller_test.rb      |  6 ++--
 actionpack/test/controller/caching_test.rb         |  2 +-
 actionpack/test/controller/layout_test.rb          |  4 +--
 .../test/controller/new_base/render_file_test.rb   | 10 +++---
 actionpack/test/controller/render_test.rb          | 28 +++++++--------
 .../test/_layout_with_partial_and_yield.html.erb   |  2 +-
 .../test/template/compiled_templates_test.rb       | 16 ++++-----
 actionpack/test/template/log_subscriber_test.rb    |  2 +-
 actionpack/test/template/render_test.rb            | 42 +++++++++++-----------
 actionpack/test/template/streaming_render_test.rb  | 16 ++++-----
 13 files changed, 72 insertions(+), 69 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index a765c23dae..2fa68c64c5 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -86,8 +86,8 @@ module ActionDispatch
           :framework_trace => framework_trace(exception),
           :full_trace => full_trace(exception)
         )
-        file = "rescues/#{@@rescue_templates[exception.class.name]}.erb"
-        body = template.render(:file => file, :layout => 'rescues/layout.erb')
+        file = "rescues/#{@@rescue_templates[exception.class.name]}"
+        body = template.render(:template => file, :layout => 'rescues/layout')
         render(status_code(exception), body)
       end
 
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index ef1ef44317..fa4bf70f77 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -147,7 +147,12 @@ module ActionView
       # as well as incorrectly putting part of the path in the template
       # name instead of the prefix.
       def normalize_name(name, prefixes) #:nodoc:
-        name  = name.to_s.gsub(handlers_regexp, '')
+        name  = name.to_s.sub(handlers_regexp) do |match|
+          ActiveSupport::Deprecation.warn "Passing a template handler in the template name is deprecated. " \
+            "You can simply remove the handler name or pass render :handlers => [:#{match[1..-1]}] instead.", caller
+          ""
+        end
+
         parts = name.split('/')
         name  = parts.pop
 
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb
index 24bae64ca5..1656cf7ec7 100644
--- a/actionpack/lib/action_view/renderer/abstract_renderer.rb
+++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb
@@ -16,7 +16,7 @@ module ActionView
     def extract_format(value, details)
       if value.is_a?(String) && value.sub!(formats_regexp, "")
         ActiveSupport::Deprecation.warn "Passing the format in the template name is deprecated. " \
-          "Please pass render with :formats => #{$1} instead.", caller
+          "Please pass render with :formats => [:#{$1}] instead.", caller
         details[:formats] ||= [$1.to_sym]
       end
     end
diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb
index 5823e64637..bf068aedcd 100644
--- a/actionpack/test/abstract/abstract_controller_test.rb
+++ b/actionpack/test/abstract/abstract_controller_test.rb
@@ -50,7 +50,7 @@ module AbstractController
       end
 
       def index_to_string
-        self.response_body = render_to_string "index.erb"
+        self.response_body = render_to_string "index"
       end
 
       def action_with_ivars
@@ -63,11 +63,11 @@ module AbstractController
       end
 
       def rendering_to_body
-        self.response_body = render_to_body :template => "naked_render.erb"
+        self.response_body = render_to_body :template => "naked_render"
       end
 
       def rendering_to_string
-        self.response_body = render_to_string :template => "naked_render.erb"
+        self.response_body = render_to_string :template => "naked_render"
       end
     end
 
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index da3314fe6d..f3b180283f 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -197,7 +197,7 @@ class ActionCachingTestController < CachingController
   caches_action :layout_false, :layout => false
   caches_action :record_not_found, :four_oh_four, :simple_runtime_error
 
-  layout 'talk_from_action.erb'
+  layout 'talk_from_action'
 
   def index
     @cache_this = MockTime.now.to_f.to_s
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index cafe2b9320..25299eb8b8 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -79,7 +79,7 @@ class DefaultLayoutController < LayoutTest
 end
 
 class AbsolutePathLayoutController < LayoutTest
-  layout File.expand_path(File.expand_path(__FILE__) + '/../../fixtures/layout_tests/layouts/layout_test.erb')
+  layout File.expand_path(File.expand_path(__FILE__) + '/../../fixtures/layout_tests/layouts/layout_test')
 end
 
 class HasOwnLayoutController < LayoutTest
@@ -184,7 +184,7 @@ class RenderWithTemplateOptionController < LayoutTest
 end
 
 class SetsNonExistentLayoutFile < LayoutTest
-  layout "nofile.erb"
+  layout "nofile"
 end
 
 class LayoutExceptionRaised < ActionController::TestCase
diff --git a/actionpack/test/controller/new_base/render_file_test.rb b/actionpack/test/controller/new_base/render_file_test.rb
index 8b2fdf8f96..a961cbf849 100644
--- a/actionpack/test/controller/new_base/render_file_test.rb
+++ b/actionpack/test/controller/new_base/render_file_test.rb
@@ -10,7 +10,7 @@ module RenderFile
 
     def with_instance_variables
       @secret = 'in the sauce'
-      render :file => File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_ivar.erb')
+      render :file => File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_ivar')
     end
 
     def without_file_key
@@ -19,7 +19,7 @@ module RenderFile
 
     def without_file_key_with_instance_variable
       @secret = 'in the sauce'
-      render File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_ivar.erb')
+      render File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_ivar')
     end
 
     def relative_path
@@ -34,16 +34,16 @@ module RenderFile
 
     def pathname
       @secret = 'in the sauce'
-      render :file => Pathname.new(File.dirname(__FILE__)).join(*%w[.. .. fixtures test dot.directory render_file_with_ivar.erb])
+      render :file => Pathname.new(File.dirname(__FILE__)).join(*%w[.. .. fixtures test dot.directory render_file_with_ivar])
     end
 
     def with_locals
-      path = File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_locals.erb')
+      path = File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_locals')
       render :file => path, :locals => {:secret => 'in the sauce'}
     end
 
     def without_file_key_with_locals
-      path = FIXTURES.join('test/render_file_with_locals.erb').to_s
+      path = FIXTURES.join('test/render_file_with_locals').to_s
       render path, :locals => {:secret => 'in the sauce'}
     end
   end
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 719e37799d..aea603b014 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -163,14 +163,14 @@ class TestController < ActionController::Base
   # :ported:
   def render_file_with_instance_variables
     @secret = 'in the sauce'
-    path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.erb')
+    path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar')
     render :file => path
   end
 
   # :ported:
   def render_file_as_string_with_instance_variables
     @secret = 'in the sauce'
-    path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.erb'))
+    path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar'))
     render path
   end
 
@@ -187,21 +187,21 @@ class TestController < ActionController::Base
 
   def render_file_using_pathname
     @secret = 'in the sauce'
-    render :file => Pathname.new(File.dirname(__FILE__)).join('..', 'fixtures', 'test', 'dot.directory', 'render_file_with_ivar.erb')
+    render :file => Pathname.new(File.dirname(__FILE__)).join('..', 'fixtures', 'test', 'dot.directory', 'render_file_with_ivar')
   end
 
   def render_file_from_template
     @secret = 'in the sauce'
-    @path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.erb'))
+    @path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar'))
   end
 
   def render_file_with_locals
-    path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_locals.erb')
+    path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_locals')
     render :file => path, :locals => {:secret => 'in the sauce'}
   end
 
   def render_file_as_string_with_locals
-    path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_locals.erb'))
+    path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_locals'))
     render path, :locals => {:secret => 'in the sauce'}
   end
 
@@ -453,17 +453,13 @@ class TestController < ActionController::Base
     render :action => "potential_conflicts"
   end
 
-  # :deprecated:
-  # Tests being able to pick a .builder template over a .erb
-  # For instance, being able to have hello.xml.builder and hello.xml.erb
-  # and select one via "hello.builder" or "hello.erb"
   def hello_world_from_rxml_using_action
-    render :action => "hello_world_from_rxml.builder"
+    render :action => "hello_world_from_rxml", :handlers => [:builder]
   end
 
   # :deprecated:
   def hello_world_from_rxml_using_template
-    render :template => "test/hello_world_from_rxml.builder"
+    render :template => "test/hello_world_from_rxml", :handlers => [:builder]
   end
 
   def action_talk_to_layout
@@ -525,8 +521,8 @@ class TestController < ActionController::Base
     render :action => "using_layout_around_block", :layout => "layouts/block_with_layout"
   end
 
-  def partial_dot_html
-    render :partial => 'partial.html.erb'
+  def partial_formats_html
+    render :partial => 'partial', :formats => [:html]
   end
 
   def partial
@@ -1235,8 +1231,8 @@ class RenderTest < ActionController::TestCase
     assert_equal 'partial html', @response.body
   end
 
-  def test_should_render_html_partial_with_dot
-    get :partial_dot_html
+  def test_should_render_html_partial_with_formats
+    get :partial_formats_html
     assert_equal 'partial html', @response.body
   end
 
diff --git a/actionpack/test/fixtures/test/_layout_with_partial_and_yield.html.erb b/actionpack/test/fixtures/test/_layout_with_partial_and_yield.html.erb
index 5db0822f07..820e7db789 100644
--- a/actionpack/test/fixtures/test/_layout_with_partial_and_yield.html.erb
+++ b/actionpack/test/fixtures/test/_layout_with_partial_and_yield.html.erb
@@ -1,4 +1,4 @@
 Before
-<%= render :partial => "test/partial.html.erb" %>
+<%= render :partial => "test/partial" %>
 <%= yield %>
 After
diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb
index 8be0f452fb..8fc78283d8 100644
--- a/actionpack/test/template/compiled_templates_test.rb
+++ b/actionpack/test/template/compiled_templates_test.rb
@@ -10,24 +10,24 @@ class CompiledTemplatesTest < Test::Unit::TestCase
   end
 
   def test_template_gets_recompiled_when_using_different_keys_in_local_assigns
-    assert_equal "one", render(:file => "test/render_file_with_locals_and_default.erb")
-    assert_equal "two", render(:file => "test/render_file_with_locals_and_default.erb", :locals => { :secret => "two" })
+    assert_equal "one", render(:file => "test/render_file_with_locals_and_default")
+    assert_equal "two", render(:file => "test/render_file_with_locals_and_default", :locals => { :secret => "two" })
   end
 
   def test_template_changes_are_not_reflected_with_cached_templates
-    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+    assert_equal "Hello world!", render(:file => "test/hello_world")
     modify_template "test/hello_world.erb", "Goodbye world!" do
-      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+      assert_equal "Hello world!", render(:file => "test/hello_world")
     end
-    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+    assert_equal "Hello world!", render(:file => "test/hello_world")
   end
 
   def test_template_changes_are_reflected_with_uncached_templates
-    assert_equal "Hello world!", render_without_cache(:file => "test/hello_world.erb")
+    assert_equal "Hello world!", render_without_cache(:file => "test/hello_world")
     modify_template "test/hello_world.erb", "Goodbye world!" do
-      assert_equal "Goodbye world!", render_without_cache(:file => "test/hello_world.erb")
+      assert_equal "Goodbye world!", render_without_cache(:file => "test/hello_world")
     end
-    assert_equal "Hello world!", render_without_cache(:file => "test/hello_world.erb")
+    assert_equal "Hello world!", render_without_cache(:file => "test/hello_world")
   end
 
   private
diff --git a/actionpack/test/template/log_subscriber_test.rb b/actionpack/test/template/log_subscriber_test.rb
index 50e1cccd3b..752b0f23a8 100644
--- a/actionpack/test/template/log_subscriber_test.rb
+++ b/actionpack/test/template/log_subscriber_test.rb
@@ -27,7 +27,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
   end
 
   def test_render_file_template
-    @view.render(:file => "test/hello_world.erb")
+    @view.render(:file => "test/hello_world")
     wait
 
     assert_equal 1, @logger.logged(:info).size
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index f3dce0b7f2..120f91b0e7 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -21,11 +21,11 @@ module RenderTestCases
   end
 
   def test_render_file
-    assert_equal "Hello world!", @view.render(:file => "test/hello_world.erb")
+    assert_equal "Hello world!", @view.render(:file => "test/hello_world")
   end
 
   def test_render_file_not_using_full_path
-    assert_equal "Hello world!", @view.render(:file => "test/hello_world.erb")
+    assert_equal "Hello world!", @view.render(:file => "test/hello_world")
   end
 
   def test_render_file_without_specific_extension
@@ -62,17 +62,17 @@ module RenderTestCases
   end
 
   def test_render_file_with_full_path
-    template_path = File.join(File.dirname(__FILE__), '../fixtures/test/hello_world.erb')
+    template_path = File.join(File.dirname(__FILE__), '../fixtures/test/hello_world')
     assert_equal "Hello world!", @view.render(:file => template_path)
   end
 
   def test_render_file_with_instance_variables
-    assert_equal "The secret is in the sauce\n", @view.render(:file => "test/render_file_with_ivar.erb")
+    assert_equal "The secret is in the sauce\n", @view.render(:file => "test/render_file_with_ivar")
   end
 
   def test_render_file_with_locals
     locals = { :secret => 'in the sauce' }
-    assert_equal "The secret is in the sauce\n", @view.render(:file => "test/render_file_with_locals.erb", :locals => locals)
+    assert_equal "The secret is in the sauce\n", @view.render(:file => "test/render_file_with_locals", :locals => locals)
   end
 
   def test_render_file_not_using_full_path_with_dot_in_path
@@ -92,12 +92,12 @@ module RenderTestCases
   end
 
   def test_render_partial_at_top_level
-    # file fixtures/_top_level_partial_only.erb (not fixtures/test)
+    # file fixtures/_top_level_partial_only (not fixtures/test)
     assert_equal 'top level partial', @view.render(:partial => '/top_level_partial_only')
   end
 
   def test_render_partial_with_format_at_top_level
-    # file fixtures/_top_level_partial.html.erb (not fixtures/test, with format extension)
+    # file fixtures/_top_level_partial.html (not fixtures/test, with format extension)
     assert_equal 'top level partial html', @view.render(:partial => '/top_level_partial')
   end
 
@@ -256,7 +256,7 @@ module RenderTestCases
   end
 
   def test_render_layout_with_block_and_other_partial_inside
-    render = @view.render(:layout => "test/layout_with_partial_and_yield.html.erb") { "Yield!" }
+    render = @view.render(:layout => "test/layout_with_partial_and_yield") { "Yield!" }
     assert_equal "Before\npartial html\nYield!\nAfter\n", render
   end
 
@@ -293,24 +293,26 @@ module RenderTestCases
   end
 
   def test_render_ignores_templates_with_malformed_template_handlers
-    %w(malformed malformed.erb malformed.html.erb malformed.en.html.erb).each do |name|
-      assert_raise(ActionView::MissingTemplate) { @view.render(:file => "test/malformed/#{name}") }
+    ActiveSupport::Deprecation.silence do
+      %w(malformed malformed.erb malformed.html.erb malformed.en.html.erb).each do |name|
+        assert_raise(ActionView::MissingTemplate) { @view.render(:file => "test/malformed/#{name}") }
+      end
     end
   end
 
   def test_render_with_layout
     assert_equal %(<title></title>\nHello world!\n),
-      @view.render(:file => "test/hello_world.erb", :layout => "layouts/yield")
+      @view.render(:file => "test/hello_world", :layout => "layouts/yield")
   end
 
   def test_render_with_layout_which_has_render_inline
     assert_equal %(welcome\nHello world!\n),
-      @view.render(:file => "test/hello_world.erb", :layout => "layouts/yield_with_render_inline_inside")
+      @view.render(:file => "test/hello_world", :layout => "layouts/yield_with_render_inline_inside")
   end
 
   def test_render_with_layout_which_renders_another_partial
     assert_equal %(partial html\nHello world!\n),
-      @view.render(:file => "test/hello_world.erb", :layout => "layouts/yield_with_render_partial_inside")
+      @view.render(:file => "test/hello_world", :layout => "layouts/yield_with_render_partial_inside")
   end
 
   def test_render_layout_with_block_and_yield
@@ -355,17 +357,17 @@ module RenderTestCases
 
   def test_render_with_nested_layout
     assert_equal %(<title>title</title>\n\n<div id="column">column</div>\n<div id="content">content</div>\n),
-      @view.render(:file => "test/nested_layout.erb", :layout => "layouts/yield")
+      @view.render(:file => "test/nested_layout", :layout => "layouts/yield")
   end
 
   def test_render_with_file_in_layout
     assert_equal %(\n<title>title</title>\n\n),
-      @view.render(:file => "test/layout_render_file.erb")
+      @view.render(:file => "test/layout_render_file")
   end
 
   def test_render_layout_with_object
     assert_equal %(<title>David</title>),
-      @view.render(:file => "test/layout_render_object.erb")
+      @view.render(:file => "test/layout_render_object")
   end
 end
 
@@ -403,7 +405,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase
   if '1.9'.respond_to?(:force_encoding)
     def test_render_utf8_template_with_magic_comment
       with_external_encoding Encoding::ASCII_8BIT do
-        result = @view.render(:file => "test/utf8_magic.html.erb", :layouts => "layouts/yield")
+        result = @view.render(:file => "test/utf8_magic.html", :layouts => "layouts/yield")
         assert_equal Encoding::UTF_8, result.encoding
         assert_equal "\nРусский \nтекст\n\nUTF-8\nUTF-8\nUTF-8\n", result
       end
@@ -411,7 +413,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase
 
     def test_render_utf8_template_with_default_external_encoding
       with_external_encoding Encoding::UTF_8 do
-        result = @view.render(:file => "test/utf8.html.erb", :layouts => "layouts/yield")
+        result = @view.render(:file => "test/utf8.html", :layouts => "layouts/yield")
         assert_equal Encoding::UTF_8, result.encoding
         assert_equal "Русский текст\n\nUTF-8\nUTF-8\nUTF-8\n", result
       end
@@ -420,7 +422,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase
     def test_render_utf8_template_with_incompatible_external_encoding
       with_external_encoding Encoding::SHIFT_JIS do
         begin
-          @view.render(:file => "test/utf8.html.erb", :layouts => "layouts/yield")
+          @view.render(:file => "test/utf8.html", :layouts => "layouts/yield")
           flunk 'Should have raised incompatible encoding error'
         rescue ActionView::Template::Error => error
           assert_match 'Your template was not saved as valid Shift_JIS', error.original_exception.message
@@ -431,7 +433,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase
     def test_render_utf8_template_with_partial_with_incompatible_encoding
       with_external_encoding Encoding::SHIFT_JIS do
         begin
-          @view.render(:file => "test/utf8_magic_with_bare_partial.html.erb", :layouts => "layouts/yield")
+          @view.render(:file => "test/utf8_magic_with_bare_partial.html", :layouts => "layouts/yield")
           flunk 'Should have raised incompatible encoding error'
         rescue ActionView::Template::Error => error
           assert_match 'Your template was not saved as valid Shift_JIS', error.original_exception.message
diff --git a/actionpack/test/template/streaming_render_test.rb b/actionpack/test/template/streaming_render_test.rb
index 023ce723ed..4d01352b43 100644
--- a/actionpack/test/template/streaming_render_test.rb
+++ b/actionpack/test/template/streaming_render_test.rb
@@ -28,7 +28,7 @@ class FiberedTest < ActiveSupport::TestCase
 
   def test_streaming_works
     content = []
-    body = render_body(:template => "test/hello_world.erb", :layout => "layouts/yield")
+    body = render_body(:template => "test/hello_world", :layout => "layouts/yield")
 
     body.each do |piece|
       content << piece
@@ -42,12 +42,12 @@ class FiberedTest < ActiveSupport::TestCase
   end
 
   def test_render_file
-    assert_equal "Hello world!", buffered_render(:file => "test/hello_world.erb")
+    assert_equal "Hello world!", buffered_render(:file => "test/hello_world")
   end
 
   def test_render_file_with_locals
     locals = { :secret => 'in the sauce' }
-    assert_equal "The secret is in the sauce\n", buffered_render(:file => "test/render_file_with_locals.erb", :locals => locals)
+    assert_equal "The secret is in the sauce\n", buffered_render(:file => "test/render_file_with_locals", :locals => locals)
   end
 
   def test_render_partial
@@ -64,27 +64,27 @@ class FiberedTest < ActiveSupport::TestCase
 
   def test_render_with_layout
     assert_equal %(<title></title>\nHello world!\n),
-      buffered_render(:template => "test/hello_world.erb", :layout => "layouts/yield")
+      buffered_render(:template => "test/hello_world", :layout => "layouts/yield")
   end
 
   def test_render_with_layout_which_has_render_inline
     assert_equal %(welcome\nHello world!\n),
-      buffered_render(:template => "test/hello_world.erb", :layout => "layouts/yield_with_render_inline_inside")
+      buffered_render(:template => "test/hello_world", :layout => "layouts/yield_with_render_inline_inside")
   end
 
   def test_render_with_layout_which_renders_another_partial
     assert_equal %(partial html\nHello world!\n),
-      buffered_render(:template => "test/hello_world.erb", :layout => "layouts/yield_with_render_partial_inside")
+      buffered_render(:template => "test/hello_world", :layout => "layouts/yield_with_render_partial_inside")
   end
 
   def test_render_with_nested_layout
     assert_equal %(<title>title</title>\n\n<div id="column">column</div>\n<div id="content">content</div>\n),
-      buffered_render(:template => "test/nested_layout.erb", :layout => "layouts/yield")
+      buffered_render(:template => "test/nested_layout", :layout => "layouts/yield")
   end
 
   def test_render_with_file_in_layout
     assert_equal %(\n<title>title</title>\n\n),
-      buffered_render(:template => "test/layout_render_file.erb")
+      buffered_render(:template => "test/layout_render_file")
   end
 
   def test_render_with_handler_without_streaming_support
-- 
cgit v1.2.3


From c070cc4ab41fd848fc72f19e7f99d75b1e1fd097 Mon Sep 17 00:00:00 2001
From: docunext <albert.lash@docunext.com>
Date: Wed, 21 Sep 2011 13:19:48 -0400
Subject: Fixes #1489 again, with updated code and numerous tests to confirm

---
 actionpack/lib/sprockets/helpers/rails_helper.rb  |  2 +-
 actionpack/test/template/sprockets_helper_test.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index 457ab93ae3..c569124c94 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -57,7 +57,7 @@ module Sprockets
 
       def asset_path(source, options = {})
         source = source.logical_path if source.respond_to?(:logical_path)
-        path = asset_paths.compute_public_path(source, 'assets', options.merge(:body => true))
+        path = asset_paths.compute_public_path(source, asset_prefix, options.merge(:body => true))
         options[:body] ? "#{path}?body=1" : path
       end
 
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index c0fb07a29b..a44a16750f 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -47,6 +47,16 @@ class SprocketsHelperTest < ActionView::TestCase
       asset_path("logo.png", :digest => false)
   end
 
+  test "custom_asset_path" do
+    @config.assets.prefix = '/s'
+    assert_match %r{/s/logo-[0-9a-f]+.png},
+      asset_path("logo.png")
+    assert_match %r{/s/logo-[0-9a-f]+.png},
+      asset_path("logo.png", :digest => true)
+    assert_match %r{/s/logo.png},
+      asset_path("logo.png", :digest => false)
+  end
+
   test "asset_path with root relative assets" do
     assert_equal "/images/logo",
       asset_path("/images/logo")
-- 
cgit v1.2.3


From 9d46823b5d00e78c6ffaaae731a9a7acf6bb2b14 Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Thu, 22 Sep 2011 12:03:59 -0500
Subject: set env to let rails know we're precompiling

---
 actionpack/lib/sprockets/assets.rake | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index e38ac6b489..7241671db0 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -1,6 +1,9 @@
 namespace :assets do
   desc "Compile all the assets named in config.assets.precompile"
   task :precompile do
+    # let rails know we're precompiling assets
+    ENV["RAILS_ASSETS_PRECOMPILE"] = 'true'
+
     # We need to do this dance because RAILS_GROUPS is used
     # too early in the boot process and changing here is already too late.
     if ENV["RAILS_GROUPS"].to_s.empty? || ENV["RAILS_ENV"].to_s.empty?
-- 
cgit v1.2.3


From f8e6664d8647acf11c8f98e00ec5a23326be5d19 Mon Sep 17 00:00:00 2001
From: Nick Sutterer <apotonick@gmail.com>
Date: Thu, 22 Sep 2011 16:02:14 +0200
Subject: added tests for render :file/:template and the
 :formats/:handlers/:locale options.

---
 actionpack/test/fixtures/comments/empty.de.html.erb  |  1 +
 actionpack/test/fixtures/comments/empty.html.builder |  1 +
 actionpack/test/template/render_test.rb              | 18 +++++++++++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 actionpack/test/fixtures/comments/empty.de.html.erb
 create mode 100644 actionpack/test/fixtures/comments/empty.html.builder

(limited to 'actionpack')

diff --git a/actionpack/test/fixtures/comments/empty.de.html.erb b/actionpack/test/fixtures/comments/empty.de.html.erb
new file mode 100644
index 0000000000..cffd90dd26
--- /dev/null
+++ b/actionpack/test/fixtures/comments/empty.de.html.erb
@@ -0,0 +1 @@
+<h1>Kein Kommentar</h1>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/comments/empty.html.builder b/actionpack/test/fixtures/comments/empty.html.builder
new file mode 100644
index 0000000000..2b0c7207a3
--- /dev/null
+++ b/actionpack/test/fixtures/comments/empty.html.builder
@@ -0,0 +1 @@
+xml.h1 'No Comment'
\ No newline at end of file
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 120f91b0e7..634e1cdd9f 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -42,8 +42,24 @@ module RenderTestCases
     assert_equal "<h1>No Comment</h1>", @view.render(:template => "comments/empty", :formats => [:html])
     assert_equal "<error>No Comment</error>", @view.render(:template => "comments/empty", :formats => [:xml])
   end
+  
+  def test_render_file_with_locale
+    assert_equal "<h1>Kein Kommentar</h1>", @view.render(:file => "comments/empty", :locale => [:de])
+  end
+  
+  def test_render_template_with_locale
+    assert_equal "<h1>Kein Kommentar</h1>", @view.render(:template => "comments/empty", :locale => [:de])
+  end
+  
+  def test_render_file_with_handlers
+    assert_equal "<h1>No Comment</h1>\n", @view.render(:file => "comments/empty", :handlers => [:builder])
+  end
+  
+  def test_render_template_with_handlers
+    assert_equal "<h1>No Comment</h1>\n", @view.render(:template => "comments/empty", :handlers => [:builder])
+  end
 
-  def test_render_file_with_localization
+  def test_render_file_with_localization_on_context_level
     old_locale, @view.locale = @view.locale, :da
     assert_equal "Hey verden", @view.render(:file => "test/hello_world")
   ensure
-- 
cgit v1.2.3


From 2e3eb2560b7686a633d6de35c4cd9131504aee38 Mon Sep 17 00:00:00 2001
From: Nick Sutterer <apotonick@gmail.com>
Date: Thu, 22 Sep 2011 23:51:44 +0200
Subject: Allow both sym and array for details options in #render. using
 LC#registered_details to extract options.

---
 actionpack/lib/action_view/renderer/abstract_renderer.rb | 13 ++++++++++++-
 actionpack/lib/action_view/renderer/template_renderer.rb |  2 +-
 actionpack/test/template/render_test.rb                  |  3 +++
 3 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb
index 1656cf7ec7..03feeff16c 100644
--- a/actionpack/lib/action_view/renderer/abstract_renderer.rb
+++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb
@@ -12,7 +12,18 @@ module ActionView
     end
 
     protected
-
+    
+    def extract_details(options)
+      details = {}
+      @lookup_context.registered_details.each do |key|
+        next unless value = options[key]
+        details[key] = Array.wrap(value)
+      end
+      details
+    end
+    
+    
+    
     def extract_format(value, details)
       if value.is_a?(String) && value.sub!(formats_regexp, "")
         ActiveSupport::Deprecation.warn "Passing the format in the template name is deprecated. " \
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index f3e7378f2b..ac91d333ba 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -5,7 +5,7 @@ module ActionView
   class TemplateRenderer < AbstractRenderer #:nodoc:
     def render(context, options)
       @view    = context
-      @details = options.slice(:formats, :locale, :handlers)
+      @details = extract_details(options)
       extract_format(options[:file] || options[:template], @details)
       template = determine_template(options)
       freeze_formats(template.formats, true)
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 634e1cdd9f..5637f3f42e 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -36,6 +36,7 @@ module RenderTestCases
   def test_render_file_with_format
     assert_equal "<h1>No Comment</h1>", @view.render(:file => "comments/empty", :formats => [:html])
     assert_equal "<error>No Comment</error>", @view.render(:file => "comments/empty", :formats => [:xml])
+    assert_equal "<error>No Comment</error>", @view.render(:file => "comments/empty", :formats => :xml)
   end
 
   def test_render_template_with_format
@@ -45,6 +46,7 @@ module RenderTestCases
   
   def test_render_file_with_locale
     assert_equal "<h1>Kein Kommentar</h1>", @view.render(:file => "comments/empty", :locale => [:de])
+    assert_equal "<h1>Kein Kommentar</h1>", @view.render(:file => "comments/empty", :locale => :de)
   end
   
   def test_render_template_with_locale
@@ -53,6 +55,7 @@ module RenderTestCases
   
   def test_render_file_with_handlers
     assert_equal "<h1>No Comment</h1>\n", @view.render(:file => "comments/empty", :handlers => [:builder])
+    assert_equal "<h1>No Comment</h1>\n", @view.render(:file => "comments/empty", :handlers => :builder)
   end
   
   def test_render_template_with_handlers
-- 
cgit v1.2.3


From 552df29cc849500b6e2cbc4186e23c330909ae8e Mon Sep 17 00:00:00 2001
From: Nick Sutterer <apotonick@gmail.com>
Date: Fri, 23 Sep 2011 00:03:48 +0200
Subject: Using #extract_details in PartialRenderer, too!

---
 actionpack/lib/action_view/renderer/abstract_renderer.rb | 2 --
 actionpack/lib/action_view/renderer/partial_renderer.rb  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb
index 03feeff16c..c0936441ac 100644
--- a/actionpack/lib/action_view/renderer/abstract_renderer.rb
+++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb
@@ -22,8 +22,6 @@ module ActionView
       details
     end
     
-    
-    
     def extract_format(value, details)
       if value.is_a?(String) && value.sub!(formats_regexp, "")
         ActiveSupport::Deprecation.warn "Passing the format in the template name is deprecated. " \
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index fc39ee8498..e808fa3415 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -268,7 +268,7 @@ module ActionView
       @options = options
       @locals  = options[:locals] || {}
       @block   = block
-      @details = options.slice(:formats, :locale, :handlers)
+      @details = extract_details(options)
 
       if String === partial
         @object     = options[:object]
-- 
cgit v1.2.3


From 48d27363f2d6f20a7178dc9bd0d664bc4e60212d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 23 Sep 2011 00:42:20 +0200
Subject: Fix failing tests and add tests for :formats on partial.

---
 actionpack/test/template/render_test.rb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 5637f3f42e..0ef3239f83 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -34,14 +34,14 @@ module RenderTestCases
 
   # Test if :formats, :locale etc. options are passed correctly to the resolvers.
   def test_render_file_with_format
-    assert_equal "<h1>No Comment</h1>", @view.render(:file => "comments/empty", :formats => [:html])
-    assert_equal "<error>No Comment</error>", @view.render(:file => "comments/empty", :formats => [:xml])
-    assert_equal "<error>No Comment</error>", @view.render(:file => "comments/empty", :formats => :xml)
+    assert_match "<h1>No Comment</h1>", @view.render(:file => "comments/empty", :formats => [:html])
+    assert_match "<error>No Comment</error>", @view.render(:file => "comments/empty", :formats => [:xml])
+    assert_match "<error>No Comment</error>", @view.render(:file => "comments/empty", :formats => :xml)
   end
 
   def test_render_template_with_format
-    assert_equal "<h1>No Comment</h1>", @view.render(:template => "comments/empty", :formats => [:html])
-    assert_equal "<error>No Comment</error>", @view.render(:template => "comments/empty", :formats => [:xml])
+    assert_match "<h1>No Comment</h1>", @view.render(:template => "comments/empty", :formats => [:html])
+    assert_match "<error>No Comment</error>", @view.render(:template => "comments/empty", :formats => [:xml])
   end
   
   def test_render_file_with_locale
@@ -110,6 +110,11 @@ module RenderTestCases
     assert_equal 'partial html', @view.render(:partial => 'test/partial')
   end
 
+  def test_render_partial_with_selected_format
+    assert_equal 'partial html', @view.render(:partial => 'test/partial', :formats => :html)
+    assert_equal 'partial js', @view.render(:partial => 'test/partial', :formats => [:js])
+  end
+
   def test_render_partial_at_top_level
     # file fixtures/_top_level_partial_only (not fixtures/test)
     assert_equal 'top level partial', @view.render(:partial => '/top_level_partial_only')
-- 
cgit v1.2.3


From d62fc8e0211ca2657899f061888d1756a3c257dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 23 Sep 2011 00:44:55 +0200
Subject: Update CHANGELOG.

---
 actionpack/CHANGELOG | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 5ee14dbdf1..c3ff677529 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,13 @@
 *Rails 3.2.0 (unreleased)*
 
+* Passing formats or handlers to render :template and friends is deprecated. For example: [Nick Sutterer & José Valim]
+
+    render :template => "foo.html.erb"
+
+  Instead, you can provide :handlers and :formats directly as option:
+  
+    render :template => "foo", :formats => [:html, :js], :handlers => :erb
+
 * Changed log level of warning for missing CSRF token from :debug to :warn. [Mike Dillon]
 
 * content_tag_for and div_for can now take the collection of records. It will also yield the record as the first argument if you set a receiving argument in your block [Prem Sichanugrist]
-- 
cgit v1.2.3


From e8987c30d0dc3ae5903a6d3a6e293641759b6fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 23 Sep 2011 16:46:33 +0200
Subject: Use safe_constantize where possible.

---
 actionpack/lib/action_controller/metal/params_wrapper.rb | 9 +++------
 actionpack/lib/action_view/test_case.rb                  | 4 +---
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index 6acbb23907..e0d8e1c992 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -141,19 +141,16 @@ module ActionController
       # try to find Foo::Bar::User, Foo::User and finally User.
       def _default_wrap_model #:nodoc:
         return nil if self.anonymous?
-
         model_name = self.name.sub(/Controller$/, '').singularize
 
         begin
-          model_klass = model_name.constantize
-        rescue NameError, ArgumentError => e
-          if e.message =~ /is not missing constant|uninitialized constant #{model_name}/
+          if model_klass = model_name.safe_constantize
+            model_klass
+          else
             namespaces = model_name.split("::")
             namespaces.delete_at(-2)
             break if namespaces.last == model_name
             model_name = namespaces.join("::")
-          else
-            raise
           end
         end until model_klass
 
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 2cc85a9f69..c4d51d7946 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -54,10 +54,8 @@ module ActionView
         end
 
         def determine_default_helper_class(name)
-          mod = name.sub(/Test$/, '').constantize
+          mod = name.sub(/Test$/, '').safe_constantize
           mod.is_a?(Class) ? nil : mod
-        rescue NameError
-          nil
         end
 
         def helper_method(*methods)
-- 
cgit v1.2.3


From a29c2bfba3cfdfcbb19f809105861b6ca81e72cc Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Fri, 23 Sep 2011 13:34:11 -0500
Subject: Remove Sprockets compute_public_path, AV compute_public_path can be
 used directly

---
 actionpack/lib/sprockets/helpers/rails_helper.rb | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index c569124c94..fe822b338e 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -13,7 +13,6 @@ module Sprockets
           controller = self.controller if respond_to?(:controller)
           paths = RailsHelper::AssetPaths.new(config, controller)
           paths.asset_environment = asset_environment
-          paths.asset_prefix      = asset_prefix
           paths.asset_digests     = asset_digests
           paths.compile_assets    = compile_assets?
           paths.digest_assets     = digest_assets?
@@ -102,10 +101,6 @@ module Sprockets
 
         class AssetNotPrecompiledError < StandardError; end
 
-        def compute_public_path(source, dir, options = {})
-          super(source, asset_prefix, options)
-        end
-
         # Return the filesystem path for the source
         def compute_source_path(source, ext)
           asset_for(source, ext)
-- 
cgit v1.2.3


From eb367afeed2905d1036f46940aa6c91323f7faab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 24 Sep 2011 01:56:49 +0200
Subject: `rake assets:precompile` loads the application but does not
 initialize it.

To the app developer, this means configuration add in
config/initializers/* will not be executed.

Plugins developers need to special case their initializers that are
meant to be run in the assets group by adding :group => :assets.

Conflicts:

	railties/CHANGELOG
	railties/test/application/assets_test.rb
---
 actionpack/lib/sprockets/assets.rake  |  3 +-
 actionpack/lib/sprockets/bootstrap.rb | 65 +++++++++++++++++++++++++++++++++++
 actionpack/lib/sprockets/railtie.rb   | 59 +++----------------------------
 3 files changed, 71 insertions(+), 56 deletions(-)
 create mode 100644 actionpack/lib/sprockets/bootstrap.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index 7241671db0..5dd48fea98 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -11,8 +11,9 @@ namespace :assets do
       ENV["RAILS_ENV"]    ||= "production"
       Kernel.exec $0, *ARGV
     else
-      Rake::Task["environment"].invoke
       Rake::Task["tmp:cache:clear"].invoke
+      Rails.application.initialize!(:assets)
+      Sprockets::Bootstrap.new(Rails.application).run
 
       # Ensure that action view is loaded and the appropriate sprockets hooks get executed
       ActionView::Base
diff --git a/actionpack/lib/sprockets/bootstrap.rb b/actionpack/lib/sprockets/bootstrap.rb
new file mode 100644
index 0000000000..ed1ed09374
--- /dev/null
+++ b/actionpack/lib/sprockets/bootstrap.rb
@@ -0,0 +1,65 @@
+module Sprockets
+  class Bootstrap
+    def initialize(app)
+      @app = app
+    end
+
+    # TODO: Get rid of config.assets.enabled
+    def run
+      app, config = @app, @app.config
+      return unless app.assets
+
+      config.assets.paths.each { |path| app.assets.append_path(path) }
+
+      if config.assets.compress
+        # temporarily hardcode default JS compressor to uglify. Soon, it will work
+        # the same as SCSS, where a default plugin sets the default.
+        unless config.assets.js_compressor == false
+          app.assets.js_compressor = LazyCompressor.new { expand_js_compressor(config.assets.js_compressor || :uglifier) }
+        end
+
+        unless config.assets.css_compressor == false
+          app.assets.css_compressor = LazyCompressor.new { expand_css_compressor(config.assets.css_compressor) }
+        end
+      end
+
+      if config.assets.compile
+        app.routes.prepend do
+          mount app.assets => config.assets.prefix
+        end
+      end
+
+      if config.assets.digest
+        app.assets = app.assets.index
+      end
+    end
+
+    protected
+
+    def expand_js_compressor(sym)
+      case sym
+      when :closure
+        require 'closure-compiler'
+        Closure::Compiler.new
+      when :uglifier
+        require 'uglifier'
+        Uglifier.new
+      when :yui
+        require 'yui/compressor'
+        YUI::JavaScriptCompressor.new
+      else
+        sym
+      end
+    end
+
+    def expand_css_compressor(sym)
+      case sym
+      when :yui
+        require 'yui/compressor'
+        YUI::CssCompressor.new
+      else
+        sym
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index 9b31604dbe..edcd4c1113 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -1,5 +1,6 @@
 module Sprockets
-  autoload :Helpers, "sprockets/helpers"
+  autoload :Bootstrap,      "sprockets/bootstrap"
+  autoload :Helpers,        "sprockets/helpers"
   autoload :LazyCompressor, "sprockets/compressors"
   autoload :NullCompressor, "sprockets/compressors"
   autoload :StaticCompiler, "sprockets/static_compiler"
@@ -12,7 +13,7 @@ module Sprockets
       load "sprockets/assets.rake"
     end
 
-    initializer "sprockets.environment" do |app|
+    initializer "sprockets.environment", :group => :assets do |app|
       config = app.config
       next unless config.assets.enabled
 
@@ -51,59 +52,7 @@ module Sprockets
     # are compiled, and so that other Railties have an opportunity to
     # register compressors.
     config.after_initialize do |app|
-      next unless app.assets
-      config = app.config
-
-      config.assets.paths.each { |path| app.assets.append_path(path) }
-
-      if config.assets.compress
-        # temporarily hardcode default JS compressor to uglify. Soon, it will work
-        # the same as SCSS, where a default plugin sets the default.
-        unless config.assets.js_compressor == false
-          app.assets.js_compressor = LazyCompressor.new { expand_js_compressor(config.assets.js_compressor || :uglifier) }
-        end
-
-        unless config.assets.css_compressor == false
-          app.assets.css_compressor = LazyCompressor.new { expand_css_compressor(config.assets.css_compressor) }
-        end
-      end
-
-      if config.assets.compile
-        app.routes.prepend do
-          mount app.assets => config.assets.prefix
-        end
-      end
-
-      if config.assets.digest
-        app.assets = app.assets.index
-      end
+      Sprockets::Bootstrap.new(app).run
     end
-
-    protected
-      def expand_js_compressor(sym)
-        case sym
-        when :closure
-          require 'closure-compiler'
-          Closure::Compiler.new
-        when :uglifier
-          require 'uglifier'
-          Uglifier.new
-        when :yui
-          require 'yui/compressor'
-          YUI::JavaScriptCompressor.new
-        else
-          sym
-        end
-      end
-
-      def expand_css_compressor(sym)
-        case sym
-        when :yui
-          require 'yui/compressor'
-          YUI::CssCompressor.new
-        else
-          sym
-        end
-      end
   end
 end
-- 
cgit v1.2.3


From 6795a9b30905a6e0b28a8d5458b452cb385d21b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 24 Sep 2011 02:15:18 +0200
Subject: Remove the ENV flag, yagni.

---
 actionpack/lib/sprockets/assets.rake | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index 5dd48fea98..782ea38991 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -1,9 +1,6 @@
 namespace :assets do
   desc "Compile all the assets named in config.assets.precompile"
   task :precompile do
-    # let rails know we're precompiling assets
-    ENV["RAILS_ASSETS_PRECOMPILE"] = 'true'
-
     # We need to do this dance because RAILS_GROUPS is used
     # too early in the boot process and changing here is already too late.
     if ENV["RAILS_GROUPS"].to_s.empty? || ENV["RAILS_ENV"].to_s.empty?
-- 
cgit v1.2.3


From e69011521da0a9d4559436da21ea030465e54d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 24 Sep 2011 03:05:36 +0200
Subject: Avoid using pathnames and automatically create the manifest directory
 if one does not exist yet.

---
 actionpack/lib/sprockets/assets.rake        | 11 +++++++++--
 actionpack/lib/sprockets/static_compiler.rb |  5 ++---
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index 782ea38991..12b954371a 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -8,10 +8,15 @@ namespace :assets do
       ENV["RAILS_ENV"]    ||= "production"
       Kernel.exec $0, *ARGV
     else
+      require "fileutils"
       Rake::Task["tmp:cache:clear"].invoke
       Rails.application.initialize!(:assets)
       Sprockets::Bootstrap.new(Rails.application).run
 
+      unless Rails.application.config.assets.enabled
+        raise "Cannot precompile assets if sprockets is disabled. Please set config.assets.enabled to true"
+      end
+
       # Ensure that action view is loaded and the appropriate sprockets hooks get executed
       ActionView::Base
 
@@ -20,11 +25,13 @@ namespace :assets do
 
       config = Rails.application.config
       env    = Rails.application.assets
-      target = Pathname.new(File.join(Rails.public_path, config.assets.prefix))
-      manifest_path = config.assets.manifest || target
 
+      target = File.join(Rails.public_path, config.assets.prefix)
       static_compiler = Sprockets::StaticCompiler.new(env, target, :digest => config.assets.digest)
+
       manifest = static_compiler.precompile(config.assets.precompile)
+      manifest_path = config.assets.manifest || target
+      FileUtils.mkdir_p(manifest_path)
 
       File.open("#{manifest_path}/manifest.yml", 'wb') do |f|
         YAML.dump(manifest, f)
diff --git a/actionpack/lib/sprockets/static_compiler.rb b/actionpack/lib/sprockets/static_compiler.rb
index fa4f9451df..4a0078be46 100644
--- a/actionpack/lib/sprockets/static_compiler.rb
+++ b/actionpack/lib/sprockets/static_compiler.rb
@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'pathname'
 
 module Sprockets
   class StaticCompiler
@@ -26,8 +25,8 @@ module Sprockets
 
     def compile(asset)
       asset_path = digest_asset(asset)
-      filename = target.join(asset_path)
-      FileUtils.mkdir_p filename.dirname
+      filename = File.join(target, asset_path)
+      FileUtils.mkdir_p File.dirname(filename)
       asset.write_to(filename)
       asset.write_to("#{filename}.gz") if filename.to_s =~ /\.(css|js)$/
       asset_path
-- 
cgit v1.2.3


From 3de95fd9303ea2a2ffa5184f8cf32db63cb7f4ac Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sat, 24 Sep 2011 01:34:49 -0300
Subject: Revert "Make process reuse the env var passed as argument"

This reverts commit 0e4748cd415660eb91e63d50aa15cdd027c612dd.
---
 actionpack/lib/action_dispatch/testing/integration.rb |  8 ++++----
 actionpack/test/controller/integration_test.rb        | 11 +++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index aae5752c93..0f1bb9f260 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -241,8 +241,8 @@ module ActionDispatch
         end
 
         # Performs the actual request.
-        def process(method, path, parameters = nil, env = nil)
-          env ||= {}
+        def process(method, path, parameters = nil, rack_env = nil)
+          rack_env ||= {}
           if path =~ %r{://}
             location = URI.parse(path)
             https! URI::HTTPS === location if location.scheme
@@ -258,7 +258,7 @@ module ActionDispatch
 
           hostname, port = host.split(':')
 
-          default_env = {
+          env = {
             :method => method,
             :params => parameters,
 
@@ -276,7 +276,7 @@ module ActionDispatch
 
           session = Rack::Test::Session.new(_mock_session)
 
-          env.reverse_merge!(default_env)
+          env.merge!(rack_env)
 
           # NOTE: rack-test v0.5 doesn't build a default uri correctly
           # Make sure requested path is always a full uri
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 23709e44e2..2ad95f5c29 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -493,7 +493,7 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
 
   routes.draw do
     match '',    :to => 'application_integration_test/test#index', :as => :empty_string
-    
+
     match 'foo', :to => 'application_integration_test/test#index', :as => :foo
     match 'bar', :to => 'application_integration_test/test#index', :as => :bar
   end
@@ -511,7 +511,7 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
   test "route helpers after controller access" do
     get '/'
     assert_equal '/', empty_string_path
-    
+
     get '/foo'
     assert_equal '/foo', foo_path
 
@@ -528,11 +528,10 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
     assert_raise(NameError) { missing_path }
   end
 
-  test "process reuse the env we pass as argument" do
+  test "process do not modify the env passed as argument" do
     env = { :SERVER_NAME => 'server', 'action_dispatch.custom' => 'custom' }
+    old_env = env.dup
     get '/foo', nil, env
-    assert_equal :get, env[:method]
-    assert_equal 'server', env[:SERVER_NAME]
-    assert_equal 'custom', env['action_dispatch.custom']
+    assert_equal old_env, env
   end
 end
-- 
cgit v1.2.3


From d54ff41f8e0588df0d6e2f48554f62e1176a873e Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sat, 24 Sep 2011 14:18:01 -0700
Subject: Merge pull request #3121 from cablegram/3-1-stable

Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.exec so it works on Windows
---
 actionpack/lib/sprockets/assets.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index 12b954371a..7764bd401a 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -6,7 +6,7 @@ namespace :assets do
     if ENV["RAILS_GROUPS"].to_s.empty? || ENV["RAILS_ENV"].to_s.empty?
       ENV["RAILS_GROUPS"] ||= "assets"
       ENV["RAILS_ENV"]    ||= "production"
-      Kernel.exec $0, *ARGV
+      ruby $0, *ARGV
     else
       require "fileutils"
       Rake::Task["tmp:cache:clear"].invoke
-- 
cgit v1.2.3


From 038808ba1a6927189c4a11b7b77ba9a724dd5532 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sat, 24 Sep 2011 18:01:08 -0500
Subject: Add public API for register new js and css compressors for Sprockets

---
 actionpack/lib/sprockets/bootstrap.rb        | 34 ++------------------
 actionpack/lib/sprockets/compressors.rb      | 46 ++++++++++++++++++++++++++++
 actionpack/lib/sprockets/railtie.rb          |  1 +
 actionpack/test/template/compressors_test.rb | 29 ++++++++++++++++++
 4 files changed, 79 insertions(+), 31 deletions(-)
 create mode 100644 actionpack/test/template/compressors_test.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/bootstrap.rb b/actionpack/lib/sprockets/bootstrap.rb
index ed1ed09374..395b264fe7 100644
--- a/actionpack/lib/sprockets/bootstrap.rb
+++ b/actionpack/lib/sprockets/bootstrap.rb
@@ -15,11 +15,11 @@ module Sprockets
         # temporarily hardcode default JS compressor to uglify. Soon, it will work
         # the same as SCSS, where a default plugin sets the default.
         unless config.assets.js_compressor == false
-          app.assets.js_compressor = LazyCompressor.new { expand_js_compressor(config.assets.js_compressor || :uglifier) }
+          app.assets.js_compressor = LazyCompressor.new { Sprockets::Compressors.registered_js_compressor(config.assets.js_compressor || :uglifier) }
         end
 
         unless config.assets.css_compressor == false
-          app.assets.css_compressor = LazyCompressor.new { expand_css_compressor(config.assets.css_compressor) }
+          app.assets.css_compressor = LazyCompressor.new { Sprockets::Compressors.registered_css_compressor(config.assets.css_compressor) }
         end
       end
 
@@ -33,33 +33,5 @@ module Sprockets
         app.assets = app.assets.index
       end
     end
-
-    protected
-
-    def expand_js_compressor(sym)
-      case sym
-      when :closure
-        require 'closure-compiler'
-        Closure::Compiler.new
-      when :uglifier
-        require 'uglifier'
-        Uglifier.new
-      when :yui
-        require 'yui/compressor'
-        YUI::JavaScriptCompressor.new
-      else
-        sym
-      end
-    end
-
-    def expand_css_compressor(sym)
-      case sym
-      when :yui
-        require 'yui/compressor'
-        YUI::CssCompressor.new
-      else
-        sym
-      end
-    end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/sprockets/compressors.rb b/actionpack/lib/sprockets/compressors.rb
index 351eff1085..cb3e13314b 100644
--- a/actionpack/lib/sprockets/compressors.rb
+++ b/actionpack/lib/sprockets/compressors.rb
@@ -1,4 +1,50 @@
 module Sprockets
+  module Compressors
+    @@css_compressors = {}
+    @@js_compressors = {}
+    @@default_css_compressor = nil
+    @@default_js_compressor = nil
+
+    def self.register_css_compressor(name, klass, options = {})
+      @@default_css_compressor = name.to_sym if options[:default] || @@default_css_compressor.nil?
+      @@css_compressors[name.to_sym] = {:klass => klass.to_s, :require => options[:require]}
+    end
+
+    def self.register_js_compressor(name, klass, options = {})
+      @@default_js_compressor = name.to_sym if options[:default] || @@default_js_compressor.nil?
+      @@js_compressors[name.to_sym] = {:klass => klass.to_s, :require => options[:require]}
+    end
+
+    def self.registered_css_compressor(name)
+      if name.respond_to?(:to_sym)
+        compressor = @@css_compressors[name.to_sym] || @@css_compressors[@@default_css_compressor]
+        require compressor[:require] if compressor[:require]
+        compressor[:klass].constantize.new
+      else
+        name
+      end
+    end
+
+    def self.registered_js_compressor(name)
+      if name.respond_to?(:to_sym)
+        compressor = @@js_compressors[name.to_sym] || @@js_compressors[@@default_js_compressor]
+        require compressor[:require] if compressor[:require]
+        compressor[:klass].constantize.new
+      else
+        name
+      end
+    end
+
+    # The default compressors must be registered in default plugins (ex. Sass-Rails)
+    register_css_compressor(:scss, 'Sass::Rails::Compressor', :require => 'sass/rails/compressor', :default => true)
+    register_js_compressor(:uglifier, 'Uglifier', :require => 'uglifier', :default => true)
+
+    # Automaticaly register some compressors
+    register_css_compressor(:yui, 'YUI::CssCompressor', :require => 'yui/compressor')
+    register_js_compressor(:closure, 'Closure::Compiler', :require => 'closure-compiler')
+    register_js_compressor(:yui, 'YUI::JavaScriptCompressor', :require => 'yui/compressor')
+  end
+
   # An asset compressor which does nothing.
   #
   # This compressor simply returns the asset as-is, without any compression
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index edcd4c1113..6b67fb1d2d 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -1,6 +1,7 @@
 module Sprockets
   autoload :Bootstrap,      "sprockets/bootstrap"
   autoload :Helpers,        "sprockets/helpers"
+  autoload :Compressors,    "sprockets/compressors"
   autoload :LazyCompressor, "sprockets/compressors"
   autoload :NullCompressor, "sprockets/compressors"
   autoload :StaticCompiler, "sprockets/static_compiler"
diff --git a/actionpack/test/template/compressors_test.rb b/actionpack/test/template/compressors_test.rb
new file mode 100644
index 0000000000..583a1455ba
--- /dev/null
+++ b/actionpack/test/template/compressors_test.rb
@@ -0,0 +1,29 @@
+require 'abstract_unit'
+require 'rails/railtie'
+require 'sprockets/railtie'
+
+class CompressorsTest < ActiveSupport::TestCase
+  def test_register_css_compressor
+    Sprockets::Compressors.register_css_compressor(:null, Sprockets::NullCompressor)
+    compressor = Sprockets::Compressors.registered_css_compressor(:null)
+    assert_kind_of Sprockets::NullCompressor, compressor
+  end
+
+  def test_register_js_compressor
+    Sprockets::Compressors.register_js_compressor(:uglifier, 'Uglifier', :require => 'uglifier')
+    compressor = Sprockets::Compressors.registered_js_compressor(:uglifier)
+    assert_kind_of Uglifier, compressor
+  end
+
+  def test_register_default_css_compressor
+    Sprockets::Compressors.register_css_compressor(:null, Sprockets::NullCompressor, :default => true)
+    compressor = Sprockets::Compressors.registered_css_compressor(:default)
+    assert_kind_of Sprockets::NullCompressor, compressor
+  end
+
+  def test_register_default_js_compressor
+    Sprockets::Compressors.register_js_compressor(:null, Sprockets::NullCompressor, :default => true)
+    compressor = Sprockets::Compressors.registered_js_compressor(:default)
+    assert_kind_of Sprockets::NullCompressor, compressor
+  end
+end
-- 
cgit v1.2.3


From 5ffa69793fd3e1d4af41ebc719a6736163eb7433 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Sun, 25 Sep 2011 09:40:49 +0400
Subject: escape options for the stylesheet_link_tag method

---
 .../action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb   | 2 +-
 actionpack/test/template/asset_tag_helper_test.rb                     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
index 2eb3eb31af..343153c8c5 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
@@ -17,7 +17,7 @@ module ActionView
 
         def asset_tag(source, options)
           # We force the :request protocol here to avoid a double-download bug in IE7 and IE8
-          tag("link", { "rel" => "stylesheet", "type" => Mime::CSS, "media" => "screen", "href" => ERB::Util.html_escape(path_to_asset(source, :protocol => :request)) }.merge(options), false, false)
+          tag("link", { "rel" => "stylesheet", "type" => Mime::CSS, "media" => "screen", "href" => path_to_asset(source, :protocol => :request) }.merge(options))
         end
 
         def custom_dir
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index d93433deac..aa7304b3ed 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -366,6 +366,10 @@ class AssetTagHelperTest < ActionView::TestCase
     assert stylesheet_link_tag('dir/other/file', 'dir/file2').html_safe?
   end
 
+  def test_stylesheet_link_tag_escapes_options
+    assert_dom_equal %(<link href="/file.css" media="&lt;script&gt;" rel="stylesheet" type="text/css" />), stylesheet_link_tag('/file', :media => '<script>')
+  end
+
   def test_custom_stylesheet_expansions
     ENV["RAILS_ASSET_ID"] = ''
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :robbery => ["bank", "robber"]
-- 
cgit v1.2.3


From 86cf3fb5faffa38a0337b4396926f53f8501e66f Mon Sep 17 00:00:00 2001
From: Evgeniy Dolzhenko <dolzenko@gmail.com>
Date: Sun, 25 Sep 2011 13:03:01 +0100
Subject: Implement Mime::Type#respond_to? (consistently with #method_missing)

---
 actionpack/lib/action_dispatch/http/mime_type.rb | 4 ++++
 actionpack/test/dispatch/mime_type_test.rb       | 2 ++
 2 files changed, 6 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index fa2948c8db..8a9f9c4315 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -256,6 +256,10 @@ module Mime
       @@html_types.include?(to_sym) || @string =~ /html/
     end
 
+    def respond_to?(method, include_private = false) #:nodoc:
+      super || method.to_s =~ /(\w+)\?$/
+    end
+
     private
       def method_missing(method, *args)
         if method.to_s =~ /(\w+)\?$/
diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index 851fb59d51..08fe2127b9 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -107,8 +107,10 @@ class MimeTypeTest < ActiveSupport::TestCase
     # Remove custom Mime::Type instances set in other tests, like Mime::GIF and Mime::IPHONE
     types.delete_if { |type| !Mime.const_defined?(type.to_s.upcase) }
 
+
     types.each do |type|
       mime = Mime.const_get(type.to_s.upcase)
+      assert mime.respond_to?("#{type}?"), "#{mime.inspect} does not respond to #{type}?"
       assert mime.send("#{type}?"), "#{mime.inspect} is not #{type}?"
       invalid_types = types - [type]
       invalid_types.delete(:html) if Mime::Type.html_types.include?(type)
-- 
cgit v1.2.3


From 541018a07b6467bee5e22709ce7dc46880ea1ff4 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 25 Sep 2011 23:21:31 +0530
Subject: fix deprecation warning in cookie_store_test

The options argument to MessageVerifier#initialize should be a hash.
---
 actionpack/test/dispatch/session/cookie_store_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index 301bf9c6d2..92df6967d6 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -5,7 +5,7 @@ class CookieStoreTest < ActionDispatch::IntegrationTest
   SessionKey = '_myapp_session'
   SessionSecret = 'b3c631c314c0bbca50c1b2843150fe33'
 
-  Verifier = ActiveSupport::MessageVerifier.new(SessionSecret, 'SHA1')
+  Verifier = ActiveSupport::MessageVerifier.new(SessionSecret, :digest => 'SHA1')
   SignedBar = Verifier.generate(:foo => "bar", :session_id => SecureRandom.hex(16))
 
   class TestController < ActionController::Base
-- 
cgit v1.2.3


From 793e9da63d74a082281d41c2bc90e7bd02adcde4 Mon Sep 17 00:00:00 2001
From: Christos Zisopoulos <christos@me.com>
Date: Mon, 26 Sep 2011 14:27:04 +0200
Subject: Give precedence to `config.digest = false` over manifest.yml asset
 digests

---
 actionpack/lib/sprockets/helpers/rails_helper.rb  | 2 +-
 actionpack/test/template/sprockets_helper_test.rb | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index fe822b338e..1e0e9bef77 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -114,7 +114,7 @@ module Sprockets
         end
 
         def digest_for(logical_path)
-          if asset_digests && (digest = asset_digests[logical_path])
+          if digest_assets && asset_digests && (digest = asset_digests[logical_path])
             return digest
           end
 
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index a44a16750f..71768f4f5f 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -262,4 +262,12 @@ class SprocketsHelperTest < ActionView::TestCase
 
     assert_not_equal prod_path, dev_path
   end
+
+  test "precedence of `config.digest = false` over manifest.yml asset digests" do
+    Rails.application.config.assets.digests = {'logo.png' => 'logo-d1g3st.png'}
+    @config.assets.digest = false
+
+    assert_match %r{/assets/logo.png},
+      asset_path("logo.png")
+  end
 end
-- 
cgit v1.2.3


From b8553274439d34568a4c16031ed86ac6d111681d Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 26 Sep 2011 11:20:30 -0300
Subject: image_tag should use /assets if asset pipelining is turned on. Closes
 #3126

---
 actionpack/lib/sprockets/helpers/rails_helper.rb  | 4 ++++
 actionpack/test/template/sprockets_helper_test.rb | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index fe822b338e..62bfcb24dd 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -60,6 +60,10 @@ module Sprockets
         options[:body] ? "#{path}?body=1" : path
       end
 
+      def path_to_image(source)
+        asset_paths.compute_public_path(source, asset_prefix)
+      end
+
     private
       def debug_assets?
         compile_assets? && (Rails.application.config.assets.debug || params[:debug_assets])
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index a44a16750f..cac6adaaa4 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -122,6 +122,10 @@ class SprocketsHelperTest < ActionView::TestCase
     end
   end
 
+  test "image_tag" do
+    assert_dom_equal '<img alt="Xml" src="/assets/xml.png" />', image_tag("xml.png")
+  end
+
   test "stylesheets served without a controller in do not use asset hosts when the default protocol is :request" do
     @controller = nil
     @config.action_controller.asset_host = "assets-%d.example.com"
-- 
cgit v1.2.3


From 5c0e9333c0973123fb1ce2cde68a1c211d422f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 26 Sep 2011 16:26:04 +0200
Subject: Encapsulate assets initialization in its own rake task.

---
 actionpack/lib/sprockets/assets.rake | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index 7764bd401a..65f0ad4cc8 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -10,8 +10,7 @@ namespace :assets do
     else
       require "fileutils"
       Rake::Task["tmp:cache:clear"].invoke
-      Rails.application.initialize!(:assets)
-      Sprockets::Bootstrap.new(Rails.application).run
+      Rake::Task["assets:environment"].invoke
 
       unless Rails.application.config.assets.enabled
         raise "Cannot precompile assets if sprockets is disabled. Please set config.assets.enabled to true"
@@ -40,9 +39,14 @@ namespace :assets do
   end
 
   desc "Remove compiled assets"
-  task :clean => [:environment, 'tmp:cache:clear'] do
+  task :clean => ['assets:environment', 'tmp:cache:clear'] do
     config = Rails.application.config
     public_asset_path = File.join(Rails.public_path, config.assets.prefix)
     rm_rf public_asset_path, :secure => true
   end
+
+  task :environment do
+    Rails.application.initialize!(:assets)
+    Sprockets::Bootstrap.new(Rails.application).run
+  end
 end
-- 
cgit v1.2.3


From d6cff931520d9cd29eeff3c867ef200acaae96ae Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 26 Sep 2011 12:20:52 -0300
Subject: Just assert_equal here

---
 actionpack/test/template/sprockets_helper_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index 55c5bcf1b1..ad57bbd96c 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -271,7 +271,7 @@ class SprocketsHelperTest < ActionView::TestCase
     Rails.application.config.assets.digests = {'logo.png' => 'logo-d1g3st.png'}
     @config.assets.digest = false
 
-    assert_match %r{/assets/logo.png},
+    assert_equal '/assets/logo.png',
       asset_path("logo.png")
   end
 end
-- 
cgit v1.2.3


From b8ea31540a7f3b195a211457a73de7a22b30059b Mon Sep 17 00:00:00 2001
From: Christos Zisopoulos <christos@me.com>
Date: Mon, 26 Sep 2011 18:45:49 +0200
Subject: Correctly override image_path in sprockets rails_helper

---
 actionpack/lib/sprockets/helpers/rails_helper.rb  | 3 ++-
 actionpack/test/template/sprockets_helper_test.rb | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index fe37553fc1..b60165de5b 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -60,9 +60,10 @@ module Sprockets
         options[:body] ? "#{path}?body=1" : path
       end
 
-      def path_to_image(source)
+      def image_path(source)
         asset_paths.compute_public_path(source, asset_prefix)
       end
+      alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
 
     private
       def debug_assets?
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index ad57bbd96c..b1e6db7b34 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -126,6 +126,14 @@ class SprocketsHelperTest < ActionView::TestCase
     assert_dom_equal '<img alt="Xml" src="/assets/xml.png" />', image_tag("xml.png")
   end
 
+  test "image_path" do
+    assert_match %r{/assets/logo-[0-9a-f]+.png},
+      image_path("logo.png")
+
+    assert_match %r{/assets/logo-[0-9a-f]+.png},
+      path_to_image("logo.png")
+  end
+
   test "stylesheets served without a controller in do not use asset hosts when the default protocol is :request" do
     @controller = nil
     @config.action_controller.asset_host = "assets-%d.example.com"
-- 
cgit v1.2.3


From 17882d2a9e8e93a5f6dbe2278deb73269fff30c9 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 26 Sep 2011 13:50:20 -0300
Subject: Copy assets to nondigested filenames too

---
 actionpack/lib/sprockets/assets.rake | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index 65f0ad4cc8..1e72d29ca2 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -19,10 +19,10 @@ namespace :assets do
       # Ensure that action view is loaded and the appropriate sprockets hooks get executed
       ActionView::Base
 
-      # Always compile files
-      Rails.application.config.assets.compile = true
-
       config = Rails.application.config
+      config.assets.compile = true
+      config.assets.digest = false if ENV["RAILS_ASSETS_NONDIGEST"]
+
       env    = Rails.application.assets
 
       target = File.join(Rails.public_path, config.assets.prefix)
@@ -32,8 +32,12 @@ namespace :assets do
       manifest_path = config.assets.manifest || target
       FileUtils.mkdir_p(manifest_path)
 
-      File.open("#{manifest_path}/manifest.yml", 'wb') do |f|
-        YAML.dump(manifest, f)
+      unless ENV["RAILS_ASSETS_NONDIGEST"]
+        File.open("#{manifest_path}/manifest.yml", 'wb') do |f|
+          YAML.dump(manifest, f)
+        end
+        ENV["RAILS_ASSETS_NONDIGEST"] = "true"
+        ruby $0, *ARGV
       end
     end
   end
-- 
cgit v1.2.3


From 1996e93eaa97993e176d2036be7b76d93709b141 Mon Sep 17 00:00:00 2001
From: Christos Zisopoulos <christos@me.com>
Date: Mon, 26 Sep 2011 18:56:30 +0200
Subject: Refactor image_path to use asset_path directly

---
 actionpack/lib/sprockets/helpers/rails_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index b60165de5b..c8c6c3ddd9 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -61,7 +61,7 @@ module Sprockets
       end
 
       def image_path(source)
-        asset_paths.compute_public_path(source, asset_prefix)
+        asset_path(source)
       end
       alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
 
-- 
cgit v1.2.3


From cf90181d8409909803a8325f33e04b5dbdcd6ada Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 26 Sep 2011 09:56:38 -0700
Subject: Merge pull request #3136 from
 guilleiguaran/clear-digests-on-precompile

Avoid use of existing precompiled assets during rake assets:precompile run
---
 actionpack/lib/sprockets/assets.rake | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index 1e72d29ca2..e29661e4e7 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -25,6 +25,10 @@ namespace :assets do
 
       env    = Rails.application.assets
 
+      # Always compile files and avoid use of existing precompiled assets
+      config.assets.compile = true
+      config.assets.digests = {}
+
       target = File.join(Rails.public_path, config.assets.prefix)
       static_compiler = Sprockets::StaticCompiler.new(env, target, :digest => config.assets.digest)
 
-- 
cgit v1.2.3


From 1bd88fdafd9cd0c1c83e8bf41020d0c251cb3108 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Tue, 27 Sep 2011 23:39:52 +0400
Subject: add missing require to html sanitizer

---
 actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
index eaefdc0f15..af06bffa16 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
@@ -1,4 +1,5 @@
 require 'set'
+require 'cgi'
 require 'active_support/core_ext/class/attribute'
 
 module HTML
-- 
cgit v1.2.3


From 3058d13a06d5472d25d89b55960565d6ba57f1ec Mon Sep 17 00:00:00 2001
From: Wen-Tien Chang <ihower@gmail.com>
Date: Thu, 29 Sep 2011 01:40:15 +0800
Subject: Make button_to helper support "form" option which is the form
 attributes.

---
 actionpack/lib/action_view/helpers/url_helper.rb | 20 +++++++++++++++-----
 actionpack/test/template/url_helper_test.rb      |  4 ++++
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index acd5e46e33..0c2e1aa3a9 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -279,6 +279,7 @@ module ActionView
       #   processed normally, otherwise no action is taken.
       # * <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.
+      # * <tt>:form</tt> - This hash will be form attributes
       # * <tt>:form_class</tt> - This controls the class of the form within which the submit button will
       #   be placed
       #
@@ -295,6 +296,12 @@ module ActionView
       #   #    </form>"
       #
       #
+      #   <%= button_to "Create", :action => "create", :remote => true, :form => { "data-type" => "json" } %>
+      #   # => "<form method="post" action="/images/create" class="button_to" data-remote="true" data-type="json">
+      #   #      <div><input value="Create" type="submit" /></div>
+      #   #    </form>"
+      #
+      #      
       #   <%= button_to "Delete Image", { :action => "delete", :id => @image.id },
       #             :confirm => "Are you sure?", :method => :delete %>
       #   # => "<form method="post" action="/images/delete/1" class="button_to">
@@ -324,10 +331,11 @@ module ActionView
         end
 
         form_method = method.to_s == 'get' ? 'get' : 'post'
-        form_class = html_options.delete('form_class') || 'button_to'
-
+        form_options = html_options.delete('form') || {}
+        form_options[:class] ||= html_options.delete('form_class') || 'button_to'
+        
         remote = html_options.delete('remote')
-
+        
         request_token_tag = ''
         if form_method == 'post' && protect_against_forgery?
           request_token_tag = tag(:input, :type => "hidden", :name => request_forgery_protection_token.to_s, :value => form_authenticity_token)
@@ -340,8 +348,10 @@ module ActionView
 
         html_options.merge!("type" => "submit", "value" => name)
 
-        ("<form method=\"#{form_method}\" action=\"#{ERB::Util.html_escape(url)}\" #{"data-remote=\"true\"" if remote} class=\"#{ERB::Util.html_escape(form_class)}\"><div>" +
-          method_tag + tag("input", html_options) + request_token_tag + "</div></form>").html_safe
+        form_options.merge!(:method => form_method, :action => url)
+        form_options.merge!("data-remote" => "true") if remote
+        
+        "#{tag(:form, form_options, true)}<div>#{method_tag}#{tag("input", html_options)}#{request_token_tag}</div></form>".html_safe
       end
 
 
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index dbac2e1fc0..bc45fabf34 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -88,6 +88,10 @@ class UrlHelperTest < ActiveSupport::TestCase
     )
   end
 
+  def test_button_to_with_remote_and_form_options
+    assert_dom_equal "<form method=\"post\" action=\"http://www.example.com\" class=\"custom-class\" data-remote=\"true\" data-type=\"json\"><div><input type=\"submit\" value=\"Hello\" /></div></form>", button_to("Hello", "http://www.example.com", :remote => true, :form => { :class => "custom-class", "data-type" => "json" } )
+  end
+  
   def test_button_to_with_remote_and_javascript_confirm
     assert_dom_equal(
       "<form method=\"post\" action=\"http://www.example.com\" class=\"button_to\" data-remote=\"true\"><div><input data-confirm=\"Are you sure?\" type=\"submit\" value=\"Hello\" /></div></form>",
-- 
cgit v1.2.3


From 64b0c8888b908ede5372e0a70cb4cb8731d372ba Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 28 Sep 2011 20:13:24 -0300
Subject: javascript_path and stylesheet_path should honor the asset pipelining

---
 actionpack/lib/sprockets/helpers/rails_helper.rb  | 10 ++++++++++
 actionpack/test/template/sprockets_helper_test.rb | 20 ++++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index c8c6c3ddd9..e1d8fccf04 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -65,6 +65,16 @@ module Sprockets
       end
       alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
 
+      def javascript_path(source)
+        asset_path(source)
+      end
+      alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with an javascript_path named route
+
+      def stylesheet_path(source)
+        asset_path(source)
+      end
+      alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with an stylesheet_path named route
+
     private
       def debug_assets?
         compile_assets? && (Rails.application.config.assets.debug || params[:debug_assets])
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index b1e6db7b34..fd3e01ec03 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -134,6 +134,22 @@ class SprocketsHelperTest < ActionView::TestCase
       path_to_image("logo.png")
   end
 
+  test "javascript_path" do
+    assert_match %r{/assets/application-[0-9a-f]+.js},
+      javascript_path("application.js")
+
+    assert_match %r{/assets/application-[0-9a-f]+.js},
+      path_to_javascript("application.js")
+  end
+
+  test "stylesheet_path" do
+    assert_match %r{/assets/application-[0-9a-f]+.css},
+      stylesheet_path("application.css")
+
+    assert_match %r{/assets/application-[0-9a-f]+.css},
+      path_to_stylesheet("application.css")
+  end
+
   test "stylesheets served without a controller in do not use asset hosts when the default protocol is :request" do
     @controller = nil
     @config.action_controller.asset_host = "assets-%d.example.com"
@@ -157,7 +173,7 @@ class SprocketsHelperTest < ActionView::TestCase
      asset_path("/images/logo.gif")
   end
 
-  test "javascript path" do
+  test "javascript path through asset_path" do
     assert_match %r{/assets/application-[0-9a-f]+.js},
       asset_path(:application, :ext => "js")
 
@@ -202,7 +218,7 @@ class SprocketsHelperTest < ActionView::TestCase
       javascript_include_tag(:application)
   end
 
-  test "stylesheet path" do
+  test "stylesheet path through asset_path" do
     assert_match %r{/assets/application-[0-9a-f]+.css}, asset_path(:application, :ext => "css")
 
     assert_match %r{/assets/style-[0-9a-f]+.css}, asset_path("style", :ext => "css")
-- 
cgit v1.2.3


From d2888de5985c7018a5be23d44143ec3c6cef9032 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Thu, 29 Sep 2011 16:07:59 -0300
Subject: Add CHANGELOG entries

---
 actionpack/CHANGELOG | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index c3ff677529..e8c619723f 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -56,6 +56,46 @@
 
 *Rails 3.1.1 (unreleased)*
 
+* javascript_path and stylesheet_path now refer to /assets if asset pipelining
+is on. [Santiago Pastorino]
+
+* button_to support form option. Now you're able to pass for example
+'data-type' => 'json'. [ihower]
+
+* image_path and image_tag should use /assets if asset pipelining is turned
+on. Closes #3126 [Santiago Pastorino and christos]
+
+* Avoid use of existing precompiled assets during rake assets:precompile run.
+Closes #3119 [Guillermo Iguaran]
+
+* Copy assets to nondigested filenames too [Santiago Pastorino]
+
+* Give precedence to `config.digest = false` over the existence of
+manifest.yml asset digests [christos]
+
+* escape options for the stylesheet_link_tag method [Alexey Vakhov]
+
+* Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.exec so
+it works on Windows [cablegram]
+
+* env var passed to process shouldn't be modified in process method. [Santiago
+Pastorino]
+
+* `rake assets:precompile` loads the application but does not initialize
+it.
+
+  To the app developer, this means configuration add in
+	config/initializers/* will not be executed.
+
+  Plugins developers need to special case their initializers that are
+  meant to be run in the assets group by adding :group => :assets. [José Valim]
+
+* Sprockets uses config.assets.prefix for asset_path [asee]
+
+* FileStore key_file_path properly limit filenames to 255 characters. [phuibonhoa]
+
+* Fix Hash#to_query edge case with html_safe strings. [brainopia]
+
 * Allow asset tag helper methods to accept :digest => false option in order to completely avoid the digest generation.
 Useful for linking assets from static html files or from emails when the user
 could probably look at an older html email with an older asset. [Santiago Pastorino]
-- 
cgit v1.2.3


From b30ffbbfd6da4547449c5cea81ec7627762259c6 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 1 Oct 2011 14:27:12 +0530
Subject: Use of :: in void context Warning removed

---
 actionpack/lib/sprockets/assets.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index e29661e4e7..bb5cf6740a 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -17,7 +17,7 @@ namespace :assets do
       end
 
       # Ensure that action view is loaded and the appropriate sprockets hooks get executed
-      ActionView::Base
+      _ = ActionView::Base
 
       config = Rails.application.config
       config.assets.compile = true
-- 
cgit v1.2.3