actionpack 3.1.0.rc6 → 3.1.0.rc8

data/CHANGELOG

@@ -1,5 +1,7 @@
 *Rails 3.1.0 (unreleased)*
 
+* Param values are `paramified` in controller tests. [David Chelimsky]
+
 * x_sendfile_header now defaults to nil and config/environments/production.rb doesn't set a particular value for it. This allows servers to set it through X-Sendfile-Type. [Santiago Pastorino]
 
 * The submit form helper does not generate an id "object_name_id" anymore. [fbrusatti]

data/lib/action_controller/base.rb

@@ -63,7 +63,7 @@ module ActionController
   #
   # == Sessions
   #
-  # Sessions allows you to store objects in between requests. This is useful for objects that are not yet ready to be persisted,
+  # Sessions allow you to store objects in between requests. This is useful for objects that are not yet ready to be persisted,
   # such as a Signup object constructed in a multi-paged process, or objects that don't change much and are needed all the time, such
   # as a User object for a system that requires login. The session should not be used, however, as a cache for objects where it's likely
   # they could be changed unknowingly. It's usually too much work to keep it all synchronized -- something databases already excel at.

data/lib/action_controller/metal/params_wrapper.rb

@@ -9,10 +9,9 @@ module ActionController
   # Wraps parameters hash into nested hash. This will allow client to submit
   # POST request without having to specify a root element in it.
   #
-  # By default this functionality won't be enabled. You can enable
-  # it globally by setting +ActionController::Base.wrap_parameters+:
-  #
-  #     ActionController::Base.wrap_parameters = [:json]
+  # This functionality is enabled in +config/initializers/wrap_parameters.rb+
+  # and can be customized. If you are upgrading to Rails 3.1, this file will
+  # need to be created for the functionality to be enabled.
   #
   # You could also turn it on per controller by setting the format array to
   # non-empty array:

data/lib/action_controller/metal/redirecting.rb

@@ -45,7 +45,7 @@ module ActionController
     # integer, or a symbol representing the downcased, underscored and symbolized description.
     # Note that the status code must be a 3xx HTTP code, or redirection will not occur.
     #
-    # It is also possible to assign a flash message as part of the redirection. There are two special accessors for commonly used the flash names
+    # It is also possible to assign a flash message as part of the redirection. There are two special accessors for the commonly used flash names
     # +alert+ and +notice+ as well as a general purpose +flash+ bucket.
     #
     # Examples:

data/lib/action_controller/metal/url_for.rb

@@ -18,7 +18,7 @@
 #       @url        = root_path # named route from the application.
 #     end
 #   end
-# => 
+# 
 module ActionController
   module UrlFor
     extend ActiveSupport::Concern

data/lib/action_controller/test_case.rb

@@ -184,7 +184,7 @@ module ActionController
       @env.delete_if { |k, v| k =~ /^action_dispatch\.rescue/ }
       @symbolized_path_params = nil
       @method = @request_method = nil
-      @fullpath = @ip = @remote_ip = nil
+      @fullpath = @ip = @remote_ip = @protocol = nil
       @env['action_dispatch.request.query_parameters'] = {}
     end
   end
@@ -398,9 +398,7 @@ module ActionController
       def paramify_values(hash_or_array_or_value)
         case hash_or_array_or_value
         when Hash
-          hash_or_array_or_value.each do |key, value|
-            hash_or_array_or_value[key] = paramify_values(value)
-          end
+          Hash[hash_or_array_or_value.map{|key, value| [key, paramify_values(value)] }]
         when Array
           hash_or_array_or_value.map {|i| paramify_values(i)}
         when Rack::Test::UploadedFile
@@ -413,7 +411,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.
-        paramify_values(parameters)
+        parameters = paramify_values(parameters)
 
         # Sanity check for required instance variables so we can give an
         # understandable error message.
@@ -447,7 +445,7 @@ module ActionController
         @controller.params.merge!(parameters)
         build_request_uri(action, parameters)
         @controller.class.class_eval { include Testing }
-        @controller.recycle! 
+        @controller.recycle!
         @controller.process_with_new_base_test(@request, @response)
         @assigns = @controller.respond_to?(:view_assigns) ? @controller.view_assigns : {}
         @request.session.delete('flash') if @request.session['flash'].blank?

data/lib/action_pack/version.rb

@@ -3,7 +3,7 @@ module ActionPack
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    PRE   = "rc6"
+    PRE   = "rc8"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/lib/action_view/helpers/url_helper.rb

@@ -268,7 +268,7 @@ module ActionView
       # to change the HTTP verb used to submit the form.
       #
       # ==== Options
-      # The +options+ hash accepts the same options as url_for.
+      # The +options+ hash accepts the same options as +url_for+.
       #
       # There are a few special +html_options+:
       # * <tt>:method</tt> - Symbol of HTTP verb. Supported verbs are <tt>:post</tt>, <tt>:get</tt>,

data/lib/action_view/template/resolver.rb

@@ -164,7 +164,7 @@ module ActionView
     end
 
     def escape_entry(entry)
-      entry.gsub(/(\*|\[|\]|\{|\}|\?)/, "\\\\\\1")
+      entry.gsub(/[*?{}\[\]]/, '\\\\\\&')
     end
 
     # Returns the file mtime from the filesystem.

data/lib/sprockets/assets.rake

@@ -13,17 +13,43 @@ namespace :assets do
       # Ensure that action view is loaded and the appropriate sprockets hooks get executed
       ActionView::Base
 
-      assets = Rails.application.config.assets.precompile
       # Always perform caching so that asset_path appends the timestamps to file references.
       Rails.application.config.action_controller.perform_caching = true
-      Rails.application.assets.precompile(*assets)
+
+      config = Rails.application.config
+      env    = Rails.application.assets
+      target = Rails.root.join("public#{config.assets.prefix}")
+
+      if env.respond_to?(:each_logical_path)
+        config.assets.precompile.each do |path|
+          env.each_logical_path do |logical_path|
+            if path.is_a?(Regexp)
+              next unless path.match(logical_path)
+            else
+              next unless File.fnmatch(path.to_s, logical_path)
+            end
+
+            if asset = env.find_asset(logical_path)
+              filename = target.join(asset.digest_path)
+              mkdir_p filename.dirname
+              asset.write_to(filename)
+              asset.write_to("#{filename}.gz") if filename.to_s =~ /\.(css|js)$/
+            end
+          end
+        end
+      else
+        # TODO: Remove this once we're depending on sprockets beta 15
+        assets = config.assets.precompile.dup
+        assets << {:to => target}
+        env.precompile(*assets)
+      end
     end
   end
 
   desc "Remove compiled assets"
   task :clean => [:environment, 'tmp:cache:clear'] do
-    assets = Rails.application.config.assets
-    public_asset_path = Rails.public_path + assets.prefix
+    config = Rails.application.config
+    public_asset_path = File.join(Rails.public_path, config.assets.prefix)
     rm_rf public_asset_path, :secure => true
   end
 end

data/lib/sprockets/helpers/rails_helper.rb

@@ -43,17 +43,18 @@ module Sprockets
         options = sources.extract_options!
         debug = options.key?(:debug) ? options.delete(:debug) : debug_assets?
         body  = options.key?(:body)  ? options.delete(:body)  : false
+        media = options.key?(:media) ? options.delete(:media) : "screen"
 
         sources.collect do |source|
           if debug && asset = asset_paths.asset_for(source, 'css')
             asset.to_a.map { |dep|
-              stylesheet_link_tag(dep, :debug => false, :body => true)
+              stylesheet_link_tag(dep, :media => media, :debug => false, :body => true)
             }.join("\n").html_safe
           else
             tag_options = {
               'rel'   => "stylesheet",
               'type'  => "text/css",
-              'media' => "screen",
+              'media' => media,
               'href'  => asset_path(source, 'css', body, :request)
             }.merge(options.stringify_keys)
 
@@ -70,10 +71,10 @@ module Sprockets
 
     private
       def debug_assets?
-        params[:debug_assets] == '1' ||
-          params[:debug_assets] == 'true'
-      rescue NoMethodError
-        false
+        Rails.application.config.assets.allow_debugging &&
+         (Rails.application.config.assets.debug ||
+          params[:debug_assets] == '1' ||
+          params[:debug_assets] == 'true')
       end
 
       # Override to specify an alternative prefix for asset path generation.
@@ -112,11 +113,22 @@ module Sprockets
           asset_environment[source]
         end
 
+        def digest_for(logical_path)
+          if asset = asset_environment[logical_path]
+            return asset.digest_path
+          end
+
+          logical_path
+        end
+
         def rewrite_asset_path(source, dir)
           if source[0] == ?/
             source
           else
-            asset_environment.path(source, performing_caching?, dir)
+            source = digest_for(source) if performing_caching?
+            source = File.join(dir, source)
+            source = "/#{source}" unless source =~ /^\//
+            source
           end
         end
 

data/lib/sprockets/railtie.rb

@@ -18,9 +18,8 @@ module Sprockets
       require 'sprockets'
 
       app.assets = Sprockets::Environment.new(app.root.to_s) do |env|
-        env.static_root = File.join(app.root.join('public'), config.assets.prefix)
-        env.logger = ::Rails.logger
-        env.version = ::Rails.env + "#{'-' + config.assets.version if config.assets.version.present?}"
+        env.logger  = ::Rails.logger
+        env.version = ::Rails.env + "-#{config.assets.version}"
 
         if config.assets.cache_store != false
           env.cache = ActiveSupport::Cache.lookup_store(config.assets.cache_store) || ::Rails.cache

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  hash: 15424105
-  prerelease: 6
+  hash: 977940593
+  prerelease: true
   segments: 
   - 3
   - 1
   - 0
-  - rc
-  - 6
-  version: 3.1.0.rc6
+  - rc8
+  version: 3.1.0.rc8
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -17,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 Z
+date: 2011-08-29 00:00:00 -03:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -27,14 +27,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424105
+        hash: 977940593
         segments: 
         - 3
         - 1
         - 0
-        - rc
-        - 6
-        version: 3.1.0.rc6
+        - rc8
+        version: 3.1.0.rc8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,14 +44,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424105
+        hash: 977940593
         segments: 
         - 3
         - 1
         - 0
-        - rc
-        - 6
-        version: 3.1.0.rc6
+        - rc8
+        version: 3.1.0.rc8
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -63,12 +61,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 1
         - 0
-        - 2
-        version: 1.0.2
+        - 3
+        version: 1.0.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -126,12 +124,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
         - 6
-        - 0
-        version: 0.6.0
+        - 1
+        version: 0.6.1
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -142,12 +140,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 59
         segments: 
         - 0
         - 8
-        - 1
-        version: 0.8.1
+        - 2
+        version: 0.8.2
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -158,14 +156,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196475
+        hash: 62196477
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 12
-        version: 2.0.0.beta.12
+        - 15
+        version: 2.0.0.beta.15
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -394,6 +392,7 @@ files:
 - lib/sprockets/helpers/rails_helper.rb
 - lib/sprockets/helpers.rb
 - lib/sprockets/railtie.rb
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -427,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).