actionpack 3.2.5 → 3.2.6

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## Rails 3.2.6 (Jun 12, 2012) ##
+
+*   nil is removed from array parameter values
+
+    CVE-2012-2694
+
+*   Deprecate `:confirm` in favor of `':data => { :confirm => "Text" }'` option for `button_to`, `button_tag`, `image_submit_tag`, `link_to` and `submit_tag` helpers.
+
+    *Carlos Galdino*
+
+*   Allow to use mounted_helpers (helpers for accessing mounted engines) in ActionView::TestCase. *Piotr Sarnacki*
+
+*   Include mounted_helpers (helpers for accessing mounted engines) in ActionDispatch::IntegrationTest by default. *Piotr Sarnacki*
+
+
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+*   No changes.
+
+
 ## Rails 3.2.4 (May 31, 2012) ##
 
 *   Deprecate old APIs for highlight, excerpt and word_wrap *Jeremy Walker*
@@ -24,6 +44,7 @@
 *   Strip [nil] from parameters hash. Thanks to Ben Murphy for
     reporting this! CVE-2012-2660
 
+
 ## Rails 3.2.3 (March 30, 2012) ##
 
 *   Allow to lazy load `default_form_builder` by passing a `String` instead of a constant. *Piotr Sarnacki*

data/lib/action_controller/test_case.rb

@@ -460,6 +460,7 @@ module ActionController
 
         @request.session = ActionController::TestSession.new(session) if session
         @request.session["flash"] = @request.flash.update(flash || {})
+        @request.session["flash"].sweep
 
         @controller.request = @request
         build_request_uri(action, parameters)

data/lib/action_dispatch/http/request.rb

@@ -251,17 +251,19 @@ module ActionDispatch
 
     # Remove nils from the params hash
     def deep_munge(hash)
+      keys = hash.keys.find_all { |k| hash[k] == [nil] }
+      keys.each { |k| hash[k] = nil }
+
       hash.each_value do |v|
         case v
         when Array
           v.grep(Hash) { |x| deep_munge(x) }
+          v.compact!
         when Hash
           deep_munge(v)
         end
       end
 
-      keys = hash.keys.find_all { |k| hash[k] == [nil] }
-      keys.each { |k| hash[k] = nil }
       hash
     end
 

data/lib/action_dispatch/middleware/flash.rb

@@ -4,7 +4,7 @@ module ActionDispatch
     # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
     # to put a new one.
     def flash
-      @env[Flash::KEY] ||= (session["flash"] || Flash::FlashHash.new).tap(&:sweep)
+      @env[Flash::KEY] ||= (session["flash"] || Flash::FlashHash.new)
     end
   end
 
@@ -235,6 +235,10 @@ module ActionDispatch
     end
 
     def call(env)
+      if (session = env['rack.session']) && (flash = session['flash'])
+        flash.sweep
+      end
+
       @app.call(env)
     ensure
       session    = env['rack.session'] || {}
@@ -251,8 +255,7 @@ module ActionDispatch
         env[KEY] = new_hash
       end
 
-      if (!session.respond_to?(:loaded?) || session.loaded?) && # (reset_session uses {}, which doesn't implement #loaded?)
-         session.key?('flash') && session['flash'].empty?
+      if session.key?('flash') && session['flash'].empty?
         session.delete('flash')
       end
     end

data/lib/action_dispatch/routing/polymorphic_routes.rb

@@ -97,7 +97,7 @@ module ActionDispatch
         end
 
         record = extract_record(record_or_hash_or_array)
-        record = record.to_model if record.respond_to?(:to_model)
+        record = convert_to_model(record)
 
         args = Array === record_or_hash_or_array ?
           record_or_hash_or_array.dup :
@@ -124,6 +124,8 @@ module ActionDispatch
           args.last.kind_of?(Hash) ? args.last.merge!(url_options) : args << url_options
         end
 
+        args.collect! { |a| convert_to_model(a) }
+
         (proxy || self).send(named_route, *args)
       end
 
@@ -154,6 +156,10 @@ module ActionDispatch
           options[:action] ? "#{options[:action]}_" : ''
         end
 
+        def convert_to_model(object)
+          object.respond_to?(:to_model) ? object.to_model : object
+        end
+
         def routing_type(options)
           options[:routing_type] || :url
         end

data/lib/action_dispatch/testing/integration.rb

@@ -177,8 +177,11 @@ module ActionDispatch
 
         # If the app is a Rails app, make url_helpers available on the session
         # This makes app.url_for and app.foo_path available in the console
-        if app.respond_to?(:routes) && app.routes.respond_to?(:url_helpers)
-          singleton_class.class_eval { include app.routes.url_helpers }
+        if app.respond_to?(:routes)
+          singleton_class.class_eval do
+            include app.routes.url_helpers if app.routes.respond_to?(:url_helpers)
+            include app.routes.mounted_helpers if app.routes.respond_to?(:mounted_helpers)
+          end
         end
 
         reset!

data/lib/action_pack/version.rb

@@ -2,7 +2,7 @@ module ActionPack
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/action_view/helpers/form_tag_helper.rb

@@ -423,6 +423,8 @@ module ActionView
         end
 
         if confirm = options.delete("confirm")
+          ActiveSupport::Deprecation.warn ":confirm option is deprecated and will be removed from Rails 4.0. Use ':data => { :confirm => \'Text\' }' instead"
+
           options["data-confirm"] = confirm
         end
 
@@ -475,6 +477,8 @@ module ActionView
         end
 
         if confirm = options.delete("confirm")
+          ActiveSupport::Deprecation.warn ":confirm option is deprecated and will be removed from Rails 4.0. Use ':data => { :confirm => \'Text\' }' instead"
+
           options["data-confirm"] = confirm
         end
 
@@ -510,6 +514,8 @@ module ActionView
         options = options.stringify_keys
 
         if confirm = options.delete("confirm")
+          ActiveSupport::Deprecation.warn ":confirm option is deprecated and will be removed from Rails 4.0. Use ':data => { :confirm => \'Text\' }' instead"
+
           options["data-confirm"] = confirm
         end
 

data/lib/action_view/helpers/url_helper.rb

@@ -628,8 +628,13 @@ module ActionView
               html_options["data-disable-with"] = disable_with
             end
 
-            html_options["data-confirm"] = confirm if confirm
-            add_method_to_attributes!(html_options, method)   if method
+            if confirm
+              ActiveSupport::Deprecation.warn ":confirm option is deprecated and will be removed from Rails 4.0. Use ':data => { :confirm => \'Text\' }' instead"
+
+              html_options["data-confirm"] = confirm
+            end
+
+            add_method_to_attributes!(html_options, method) if method
 
             html_options
           else

data/lib/action_view/test_case.rb

@@ -229,7 +229,8 @@ module ActionView
 
       def method_missing(selector, *args)
         if @controller.respond_to?(:_routes) &&
-          @controller._routes.named_routes.helpers.include?(selector)
+          ( @controller._routes.named_routes.helpers.include?(selector) ||
+            @controller._routes.mounted_helpers.method_defined?(selector) )
           @controller.__send__(selector, *args)
         else
           super

data/lib/sprockets/helpers/rails_helper.rb

@@ -157,7 +157,8 @@ module Sprockets
         def rewrite_extension(source, dir, ext)
           source_ext = File.extname(source)
           if ext && source_ext != ".#{ext}"
-            if !source_ext.empty? && asset_environment[source]
+            if !source_ext.empty? && (asset = asset_environment[source]) &&
+                  asset.pathname.to_s =~ /#{source}\Z/
               source
             else
               "#{source}.#{ext}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 3
   - 2
-  - 5
-  version: 3.2.5
+  - 6
+  version: 3.2.6
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-01 00:00:00 Z
+date: 2012-06-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 3
         - 2
-        - 5
-        version: 3.2.5
+        - 6
+        version: 3.2.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 3
         - 2
-        - 5
-        version: 3.2.5
+        - 6
+        version: 3.2.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency