actionpack 3.1.4 → 3.1.5.rc1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Rails 3.1.4 (unreleased) ##
 
+*   :subdomain can now be specified with a value of false in url_for, 
+    allowing for subdomain(s) removal from the host during link generation. GH #4083
+
+    *Arun Agrawal*
+
 *   Skip assets group in Gemfile and all assets configurations options
     when the application is generated with --skip-sprockets option.
 

data/lib/action_controller/metal/redirecting.rb

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

data/lib/action_controller/test_case.rb

@@ -145,17 +145,23 @@ module ActionController
       extra_keys = routes.extra_keys(parameters)
       non_path_parameters = get? ? query_parameters : request_parameters
       parameters.each do |key, value|
-        if value.is_a? Fixnum
-          value = value.to_s
-        elsif value.is_a? Array
-          value = Result.new(value.map { |v| v.is_a?(String) ? v.dup : v })
-        elsif value.is_a? String
+        if value.is_a?(Array) && (value.frozen? || value.any?(&:frozen?))
+          value = value.map{ |v| v.duplicable? ? v.dup : v }
+        elsif value.is_a?(Hash) && (value.frozen? || value.any?{ |k,v| v.frozen? })
+          value = Hash[value.map{ |k,v| [k, v.duplicable? ? v.dup : v] }]
+        elsif value.frozen? && value.duplicable?
           value = value.dup
         end
 
         if extra_keys.include?(key.to_sym)
           non_path_parameters[key] = value
         else
+          if value.is_a?(Array)
+            value = Result.new(value.map(&:to_param))
+          else
+            value = value.to_param
+          end
+
           path_parameters[key.to_s] = value
         end
       end
@@ -411,7 +417,7 @@ module ActionController
       def process(action, parameters = nil, session = nil, flash = nil, http_method = 'GET')
         # Ensure that numbers and symbols passed as params are converted to
         # proper params, as is the case when engaging rack.
-        parameters = paramify_values(parameters)
+        parameters = paramify_values(parameters) if html_format?(parameters)
 
         # Sanity check for required instance variables so we can give an
         # understandable error message.
@@ -439,10 +445,8 @@ module ActionController
 
         @request.session = ActionController::TestSession.new(session) if session
         @request.session["flash"] = @request.flash.update(flash || {})
-        @request.session["flash"].sweep
 
         @controller.request = @request
-        @controller.params.merge!(parameters)
         build_request_uri(action, parameters)
         @controller.class.class_eval { include Testing }
         @controller.recycle!
@@ -499,6 +503,12 @@ module ActionController
           @request.env["QUERY_STRING"] = query_string || ""
         end
       end
+
+      def html_format?(parameters)
+        return true unless parameters.is_a?(Hash)
+        format = Mime[parameters[:format]]
+        format.nil? || format.html?
+      end
     end
 
     # When the request.remote_addr remains the default for testing, which is 0.0.0.0, the exception is simply raised inline

data/lib/action_dispatch/http/parameters.rb

@@ -35,6 +35,10 @@ module ActionDispatch
         @env["action_dispatch.request.path_parameters"] ||= {}
       end
 
+      def reset_parameters #:nodoc:
+        @env.delete("action_dispatch.request.parameters")
+      end
+
     private
 
       # TODO: Validate that the characters are UTF-8. If they aren't,

data/lib/action_dispatch/http/url.rb

@@ -64,14 +64,16 @@ module ActionDispatch
         end
 
         def host_or_subdomain_and_domain(options)
-          return options[:host] unless (options[:subdomain] || options[:domain]) && named_host?(options[:host])
+          return options[:host] if !named_host?(options[:host]) || (options[:subdomain].nil? && options[:domain].nil?)
 
           tld_length = options[:tld_length] || @@tld_length
 
           host = ""
-          host << (options[:subdomain] || extract_subdomain(options[:host], tld_length))
-          host << "."
-          host << (options[:domain]    || extract_domain(options[:host], tld_length))
+          unless options[:subdomain] == false
+            host << (options[:subdomain] || extract_subdomain(options[:host], tld_length)).to_param
+            host << "."
+          end
+          host << (options[:domain] || extract_domain(options[:host], tld_length))
           host
         end
       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)
+      @env[Flash::KEY] ||= (session["flash"] || Flash::FlashHash.new).tap(&:sweep)
     end
   end
 
@@ -240,10 +240,6 @@ 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'] || {}
@@ -261,7 +257,8 @@ module ActionDispatch
         new_hash.close!
       end
 
-      if session.key?('flash') && session['flash'].empty?
+      if (!session.respond_to?(:loaded?) || session.loaded?) && # (reset_session uses {}, which doesn't implement #loaded?)
+         session.key?('flash') && session['flash'].empty?
         session.delete('flash')
       end
     end

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

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

data/lib/action_dispatch/routing/mapper.rb

@@ -35,6 +35,8 @@ module ActionDispatch
           }
 
           return true
+        ensure
+          req.reset_parameters
         end
 
         def call(env)
@@ -107,7 +109,7 @@ module ActionDispatch
 
             # Add a constraint for wildcard route to make it non-greedy and match the
             # optional format part of the route by default
-            if path.match(/\*([^\/]+)$/) && @options[:format] != false
+            if path.match(%r{\*([^/\)]+)\)?$}) && @options[:format] != false
               @options.reverse_merge!(:"#{$1}" => /.+?/)
             end
 
@@ -331,7 +333,7 @@ module ActionDispatch
         #   +call+ or a string representing a controller's action.
         #
         #      match 'path', :to => 'controller#action'
-        #      match 'path', :to => lambda { [200, {}, "Success!"] }
+        #      match 'path', :to => lambda { |env| [200, {}, "Success!"] }
         #      match 'path', :to => RackApp
         #
         # [:on]

data/lib/action_dispatch/routing/redirection.rb

@@ -1,4 +1,6 @@
 require 'action_dispatch/http/request'
+require 'active_support/core_ext/uri'
+require 'rack/utils'
 
 module ActionDispatch
   module Routing
@@ -43,7 +45,7 @@ module ActionDispatch
         path = args.shift
 
         path_proc = if path.is_a?(String)
-          proc { |params| (params.empty? || !path.match(/%\{\w*\}/)) ? path : (path % params) }
+          proc { |params| (params.empty? || !path.match(/%\{\w*\}/)) ? path : (path % escape(params)) }
         elsif options.any?
           options_proc(options)
         elsif path.respond_to?(:call)
@@ -66,7 +68,7 @@ module ActionDispatch
             elsif params.empty? || !options[:path].match(/%\{\w*\}/)
               options.delete(:path)
             else
-              (options.delete(:path) % params)
+              (options.delete(:path) % escape_path(params))
             end
 
             default_options = {
@@ -105,6 +107,14 @@ module ActionDispatch
           end
         end
 
+        def escape(params)
+          Hash[params.map{ |k,v| [k, Rack::Utils.escape(v)] }]
+        end
+
+        def escape_path(params)
+          Hash[params.map{ |k,v| [k, URI.parser.escape(v)] }]
+        end
+
     end
   end
 end

data/lib/action_dispatch/routing/route_set.rb

@@ -8,6 +8,12 @@ require 'active_support/core_ext/module/remove_method'
 module ActionDispatch
   module Routing
     class RouteSet #:nodoc:
+      # Since the router holds references to many parts of the system
+      # like engines, controllers and the application itself, inspecting
+      # the route set can actually be really slow, therefore we default
+      # alias inspect to to_s.
+      alias inspect to_s
+
       PARAMETERS_KEY = 'action_dispatch.request.path_parameters'
 
       class Dispatcher #:nodoc:
@@ -166,7 +172,7 @@ module ActionDispatch
                 options = args.extract_options!
                 result = #{options.inspect}
 
-                if args.any?
+                if args.size > 0
                   result[:_positional_args] = args
                   result[:_positional_keys] = #{route.segment_keys.inspect}
                 end

data/lib/action_dispatch/routing/url_for.rb

@@ -116,9 +116,10 @@ module ActionDispatch
       #   If <tt>:only_path</tt> is false, this option must be
       #   provided either explicitly, or via +default_url_options+.
       # * <tt>:subdomain</tt> - Specifies the subdomain of the link, using the +tld_length+
-      #   to split the domain from the host.
-      # * <tt>:domain</tt> - Specifies the domain of the link, using the +tld_length+
       #   to split the subdomain from the host.
+      #   If false, removes all subdomains from the host part of the link.
+      # * <tt>:domain</tt> - Specifies the domain of the link, using the +tld_length+
+      #   to split the domain from the host.
       # * <tt>:tld_length</tt> - Number of labels the TLD id composed of, only used if
       #   <tt>:subdomain</tt> or <tt>:domain</tt> are supplied. Defaults to
       #   <tt>ActionDispatch::Http::URL.tld_length</tt>, which in turn defaults to 1.

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

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

data/lib/action_dispatch/testing/integration.rb

@@ -184,9 +184,16 @@ module ActionDispatch
         reset!
       end
 
-      remove_method :default_url_options
-      def default_url_options
-        { :host => host, :protocol => https? ? "https" : "http" }
+      def url_options
+        @url_options ||= default_url_options.dup.tap do |url_options|
+          url_options.reverse_merge!(controller.url_options) if controller
+
+          if @app.respond_to?(:routes) && @app.routes.respond_to?(:default_url_options)
+            url_options.reverse_merge!(@app.routes.default_url_options)
+          end
+
+          url_options.reverse_merge!(:host => host, :protocol => https? ? "https" : "http")
+        end
       end
 
       # Resets the instance. This can be used to reset the state information
@@ -199,6 +206,7 @@ module ActionDispatch
         @controller = @request = @response = nil
         @_mock_session = nil
         @request_count = 0
+        @url_options = nil
 
         self.host        = DEFAULT_HOST
         self.remote_addr = "127.0.0.1"
@@ -296,6 +304,7 @@ module ActionDispatch
           response = _mock_session.last_response
           @response = ActionDispatch::TestResponse.new(response.status, response.headers, response.body)
           @html_document = nil
+          @url_options = nil
 
           @controller = session.last_request.env['action_controller.instance']
 
@@ -353,12 +362,14 @@ module ActionDispatch
         end
       end
 
-      extend ActiveSupport::Concern
-      include ActionDispatch::Routing::UrlFor
+      def default_url_options
+        reset! unless integration_session
+        integration_session.default_url_options
+      end
 
-      def url_options
+      def default_url_options=(options)
         reset! unless integration_session
-        integration_session.url_options
+        integration_session.default_url_options = options
       end
 
       def respond_to?(method, include_private = false)
@@ -462,6 +473,7 @@ module ActionDispatch
   class IntegrationTest < ActiveSupport::TestCase
     include Integration::Runner
     include ActionController::TemplateAssertions
+    include ActionDispatch::Routing::UrlFor
 
     @@app = nil
 
@@ -478,5 +490,10 @@ module ActionDispatch
     def app
       super || self.class.app
     end
+
+    def url_options
+      reset! unless integration_session
+      integration_session.url_options
+    end
   end
 end

data/lib/action_pack/version.rb

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

data/lib/action_view/asset_paths.rb

@@ -37,7 +37,7 @@ module ActionView
     end
 
     def is_uri?(path)
-      path =~ %r{^[-a-z]+://|^cid:|^//}
+      path =~ %r{^[-a-z]+://|^(?:cid|data):|^//}
     end
 
   private

data/lib/action_view/helpers/asset_tag_helper.rb

@@ -348,7 +348,7 @@ module ActionView
 
         src = options[:src] = path_to_image(source)
 
-        unless src =~ /^cid:/
+        unless src =~ /^(?:cid|data):/
           options[:alt] = options.fetch(:alt){ image_alt(src) }
         end
 

data/lib/sprockets/static_compiler.rb

@@ -16,6 +16,9 @@ module Sprockets
     def compile
       manifest = {}
       env.each_logical_path do |logical_path|
+        if File.basename(logical_path)[/[^\.]+/, 0] == 'index'
+          logical_path.sub!(/\/index\./, '.')
+        end
         next unless compile_path?(logical_path)
         if asset = env.find_asset(logical_path)
           manifest[logical_path] = write_asset(asset)

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
+  hash: 4225350523
+  prerelease: 6
   segments: 
   - 3
   - 1
-  - 4
-  version: 3.1.4
+  - 5
+  - rc
+  - 1
+  version: 3.1.5.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-01 00:00:00 Z
+date: 2012-05-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -25,12 +27,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 4225350523
         segments: 
         - 3
         - 1
-        - 4
-        version: 3.1.4
+        - 5
+        - rc
+        - 1
+        version: 3.1.5.rc1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,12 +45,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 4225350523
         segments: 
         - 3
         - 1
-        - 4
-        version: 3.1.4
+        - 5
+        - rc
+        - 1
+        version: 3.1.5.rc1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,11 +63,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 1
-        - 1
-        version: "1.1"
+        - 2
+        version: "1.2"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -151,12 +157,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
         - 2
         - 0
-        - 3
-        version: 2.0.3
+        - 4
+        version: 2.0.4
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -410,16 +416,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).