actionpack 3.2.0.rc2 → 3.2.0

data/CHANGELOG.md

@@ -1,4 +1,27 @@
-## Rails 3.2.0 (unreleased) ##
+## Rails 3.2.0 (January 20, 2012) ##
+
+*   Setting config.assets.logger to false turn off Sprockets logger *Guillermo Iguaran*
+
+*   Add `config.action_dispatch.default_charset` to configure default charset for ActionDispatch::Response. *Carlos Antonio da Silva*
+
+*   Deprecate setting default charset at controller level, use the new `config.action_dispatch.default_charset` instead. *Carlos Antonio da Silva*
+
+*   Deprecate ActionController::UnknownAction in favour of AbstractController::ActionNotFound. *Carlos Antonio da Silva*
+
+*   Deprecate ActionController::DoubleRenderError in favour of AbstractController::DoubleRenderError. *Carlos Antonio da Silva*
+
+*   Deprecate method_missing handling for not found actions, use action_missing instead. *Carlos Antonio da Silva*
+
+*   Deprecate ActionController#rescue_action, ActionController#initialize_template_class, and ActionController#assign_shortcuts.
+    These methods were not being used internally anymore and are going to be removed in Rails 4. *Carlos Antonio da Silva*
+
+*   Add config.assets.logger to configure Sprockets logger *Rafael França*
+
+*   Use a BodyProxy instead of including a Module that responds to
+    close. Closes #4441 if Active Record is disabled assets are delivered
+    correctly *Santiago Pastorino*
+
+*   Rails initialization with initialize_on_precompile = false should set assets_dir *Santiago Pastorino*
 
 *   Add font_path helper method *Santiago Pastorino*
 
@@ -18,7 +41,7 @@
           <%= f.button %>
         <% end %>
 
-*   Date helpers accept a new option, `:use_two_digit_numbers = true`, that renders select boxes for months and days with a leading zero without changing the respective values. 
+*   Date helpers accept a new option, `:use_two_digit_numbers = true`, that renders select boxes for months and days with a leading zero without changing the respective values.
     For example, this is useful for displaying ISO8601-style dates such as '2011-08-01'. *Lennart Fridén and Kim Persson*
 
 *   Make ActiveSupport::Benchmarkable a default module for ActionController::Base, so the #benchmark method is once again available in the controller context like it used to be *DHH*

data/lib/action_controller/base.rb

@@ -121,7 +121,7 @@ module ActionController
   #
   #   def search
   #     @results = Search.find(params[:query])
-  #     case @results
+  #     case @results.count
   #       when 0 then render :action => "no_results"
   #       when 1 then render :action => "show"
   #       when 2..10 then render :action => "show_many"

data/lib/action_controller/metal.rb

@@ -192,6 +192,10 @@ module ActionController
       super body
     end
 
+    def performed?
+      response_body
+    end
+
     def dispatch(name, request) #:nodoc:
       @_request = request
       @_env = request.env

data/lib/action_controller/metal/compatibility.rb

@@ -1,21 +1,22 @@
+require 'active_support/deprecation'
+
 module ActionController
   module Compatibility
     extend ActiveSupport::Concern
 
-    class ::ActionController::ActionControllerError < StandardError #:nodoc:
-    end
-
     # Temporary hax
     included do
-      ::ActionController::UnknownAction = ::AbstractController::ActionNotFound
-      ::ActionController::DoubleRenderError = ::AbstractController::DoubleRenderError
+      ::ActionController::UnknownAction = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActionController::UnknownAction', '::AbstractController::ActionNotFound')
+      ::ActionController::DoubleRenderError = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActionController::DoubleRenderError', '::AbstractController::DoubleRenderError')
 
       # ROUTES TODO: This should be handled by a middleware and route generation
       # should be able to handle SCRIPT_NAME
       self.config.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']
 
-      class << self
-        delegate :default_charset=, :to => "ActionDispatch::Response"
+      def self.default_charset=(new_charset)
+        ActiveSupport::Deprecation.warn "Setting default charset at controller level" \
+          " is deprecated, please use `config.action_dispatch.default_charset` instead", caller
+        ActionDispatch::Response.default_charset = new_charset
       end
 
       self.protected_instance_variables = %w(
@@ -24,13 +25,19 @@ module ActionController
       )
 
       def rescue_action(env)
+        ActiveSupport::Deprecation.warn "Calling `rescue_action` is deprecated and will be removed in Rails 4.0.", caller
         raise env["action_dispatch.rescue.exception"]
       end
     end
 
     # For old tests
-    def initialize_template_class(*) end
-    def assign_shortcuts(*) end
+    def initialize_template_class(*)
+      ActiveSupport::Deprecation.warn "Calling `initialize_template_class` is deprecated and has no effect anymore.", caller
+    end
+
+    def assign_shortcuts(*)
+      ActiveSupport::Deprecation.warn "Calling `assign_shortcuts` is deprecated and has no effect anymore.", caller
+    end
 
     def _normalize_options(options)
       options[:text] = nil if options.delete(:nothing) == true
@@ -44,15 +51,14 @@ module ActionController
     end
 
     def _handle_method_missing
+      ActiveSupport::Deprecation.warn "Using `method_missing` to handle non" \
+        " existing actions is deprecated and will be removed in Rails 4.0, " \
+        " please use `action_missing` instead.", caller
       method_missing(@_action_name.to_sym)
     end
 
     def method_for_action(action_name)
       super || (respond_to?(:method_missing) && "_handle_method_missing")
     end
-
-    def performed?
-      response_body
-    end
   end
 end

data/lib/action_controller/metal/http_authentication.rb

@@ -192,12 +192,15 @@ module ActionController
           return false unless password
 
           method = request.env['rack.methodoverride.original_method'] || request.env['REQUEST_METHOD']
-          uri    = credentials[:uri][0,1] == '/' ? request.fullpath : request.url
+          uri    = credentials[:uri][0,1] == '/' ? request.original_fullpath : request.original_url
 
-         [true, false].any? do |password_is_ha1|
-           expected = expected_response(method, uri, credentials, password, password_is_ha1)
-           expected == credentials[:response]
-         end
+          [true, false].any? do |trailing_question_mark|
+            [true, false].any? do |password_is_ha1|
+              _uri = trailing_question_mark ? uri + "?" : uri
+              expected = expected_response(method, _uri, credentials, password, password_is_ha1)
+              expected == credentials[:response]
+            end
+          end
         end
       end
 

data/lib/action_controller/railtie.rb

@@ -17,11 +17,14 @@ module ActionController
       ActiveSupport.on_load(:action_controller) { self.cache_store ||= RAILS_CACHE }
     end
 
+    initializer "action_controller.assets_config", :group => :all do |app|
+      app.config.action_controller.assets_dir ||= app.config.paths["public"].first
+    end
+
     initializer "action_controller.set_configs" do |app|
       paths   = app.config.paths
       options = app.config.action_controller
 
-      options.assets_dir           ||= paths["public"].first
       options.javascripts_dir      ||= paths["public/javascripts"].first
       options.stylesheets_dir      ||= paths["public/stylesheets"].first
       options.page_cache_directory ||= paths["public"].first

data/lib/action_dispatch/http/request.rb

@@ -122,10 +122,18 @@ module ActionDispatch
       Http::Headers.new(@env)
     end
 
+    def original_fullpath
+      @original_fullpath ||= (env["ORIGINAL_FULLPATH"] || fullpath)
+    end
+
     def fullpath
       @fullpath ||= super
     end
 
+    def original_url
+      base_url + original_fullpath
+    end
+
     def media_type
       content_mime_type.to_s
     end

data/lib/action_dispatch/middleware/body_proxy.rb

@@ -0,0 +1,30 @@
+# Keep this file meanwhile https://github.com/rack/rack/pull/313 is not released
+module ActionDispatch
+  class BodyProxy
+    def initialize(body, &block)
+      @body, @block, @closed = body, block, false
+    end
+
+    def respond_to?(*args)
+      super or @body.respond_to?(*args)
+    end
+
+    def close
+      return if @closed
+      @closed = true
+      begin
+        @body.close if @body.respond_to? :close
+      ensure
+        @block.call
+      end
+    end
+
+    def closed?
+      @closed
+    end
+
+    def method_missing(*args, &block)
+      @body.__send__(*args, &block)
+    end
+  end
+end

data/lib/action_dispatch/middleware/reloader.rb

@@ -1,3 +1,5 @@
+require 'action_dispatch/middleware/body_proxy'
+
 module ActionDispatch
   # ActionDispatch::Reloader provides prepare and cleanup callbacks,
   # intended to assist with code reloading during development.
@@ -61,7 +63,7 @@ module ActionDispatch
       @validated = @condition.call
       prepare!
       response = @app.call(env)
-      response[2].extend(module_hook)
+      response[2] = ActionDispatch::BodyProxy.new(response[2]) { cleanup! }
       response
     rescue Exception
       cleanup!
@@ -83,18 +85,5 @@ module ActionDispatch
     def validated? #:nodoc:
       @validated
     end
-
-    def module_hook #:nodoc:
-      middleware = self
-      Module.new do
-        define_method :close do
-          begin
-            super() if defined?(super)
-          ensure
-            middleware.cleanup!
-          end
-        end
-      end
-    end
   end
 end

data/lib/action_dispatch/railtie.rb

@@ -11,6 +11,7 @@ module ActionDispatch
     config.action_dispatch.ignore_accept_header = false
     config.action_dispatch.rescue_templates = { }
     config.action_dispatch.rescue_responses = { }
+    config.action_dispatch.default_charset = nil
 
     config.action_dispatch.rack_cache = {
       :metastore => "rails:/",
@@ -21,7 +22,7 @@ module ActionDispatch
     initializer "action_dispatch.configure" do |app|
       ActionDispatch::Http::URL.tld_length = app.config.action_dispatch.tld_length
       ActionDispatch::Request.ignore_accept_header = app.config.action_dispatch.ignore_accept_header
-      ActionDispatch::Response.default_charset = app.config.encoding
+      ActionDispatch::Response.default_charset = app.config.action_dispatch.default_charset || app.config.encoding
 
       ActionDispatch::ExceptionWrapper.rescue_responses.merge!(config.action_dispatch.rescue_responses)
       ActionDispatch::ExceptionWrapper.rescue_templates.merge!(config.action_dispatch.rescue_templates)

data/lib/action_pack/version.rb

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

data/lib/action_view/helpers/number_helper.rb

@@ -128,6 +128,7 @@ module ActionView
 
         defaults  = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
         currency  = I18n.translate(:'number.currency.format', :locale => options[:locale], :default => {})
+        currency[:negative_format] ||= "-" + currency[:format] if currency[:format]
 
         defaults  = DEFAULT_CURRENCY_VALUES.merge(defaults).merge!(currency)
         defaults[:negative_format] = "-" + options[:format] if options[:format]

data/lib/action_view/helpers/url_helper.rb

@@ -476,7 +476,7 @@ module ActionView
       #   string given as the value.
       # * <tt>:subject</tt> - Preset the subject line of the email.
       # * <tt>:body</tt> - Preset the body of the email.
-      # * <tt>:cc</tt> - Carbon Copy addition recipients on the email.
+      # * <tt>:cc</tt> - Carbon Copy additional recipients on the email.
       # * <tt>:bcc</tt> - Blind Carbon Copy additional recipients on the email.
       #
       # ==== Examples

data/lib/sprockets/assets.rake

@@ -1,12 +1,12 @@
 require "fileutils"
 
 namespace :assets do
-  def ruby_rake_task(task)
+  def ruby_rake_task(task, fork = true)
     env    = ENV['RAILS_ENV'] || 'production'
     groups = ENV['RAILS_GROUPS'] || 'assets'
     args   = [$0, task,"RAILS_ENV=#{env}","RAILS_GROUPS=#{groups}"]
     args << "--trace" if Rake.application.options.trace
-    ruby(*args)
+    fork ? ruby(*args) : Kernel.exec(FileUtils::RUBY, *args)
   end
 
   # We are currently running with no explicit bundler group
@@ -59,7 +59,7 @@ namespace :assets do
       # required in order to compile digestless assets as the
       # environment has already cached the assets on the primary
       # run.
-      ruby_rake_task "assets:precompile:nondigest" if Rails.application.config.assets.digest
+      ruby_rake_task("assets:precompile:nondigest", false) if Rails.application.config.assets.digest
     end
 
     task :primary => ["assets:environment", "tmp:cache:clear"] do

data/lib/sprockets/railtie.rb

@@ -21,9 +21,12 @@ module Sprockets
       require 'sprockets'
 
       app.assets = Sprockets::Environment.new(app.root.to_s) do |env|
-        env.logger  = ::Rails.logger
         env.version = ::Rails.env + "-#{config.assets.version}"
 
+        if config.assets.logger != false
+          env.logger  = config.assets.logger || ::Rails.logger
+        end
+
         if config.assets.cache_store != false
           env.cache = ActiveSupport::Cache.lookup_store(config.assets.cache_store) || ::Rails.cache
         end

metadata

@@ -1,195 +1,133 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: actionpack
-version: !ruby/object:Gem::Version 
-  hash: 977940591
-  prerelease: true
-  segments: 
-  - 3
-  - 2
-  - 0
-  - rc2
-  version: 3.2.0.rc2
+version: !ruby/object:Gem::Version
+  version: 3.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-04 00:00:00 -02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70360650869680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 977940591
-        segments: 
-        - 3
-        - 2
-        - 0
-        - rc2
-        version: 3.2.0.rc2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70360650869680
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70360650892000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 977940591
-        segments: 
-        - 3
-        - 2
-        - 0
-        - rc2
-        version: 3.2.0.rc2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack-cache
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70360650892000
+- !ruby/object:Gem::Dependency
+  name: rack-cache
+  requirement: &70360650891460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70360650891460
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &70360650890780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70360650890780
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70360650889880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70360650889880
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70360650888600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: journey
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70360650888600
+- !ruby/object:Gem::Dependency
+  name: journey
+  requirement: &70360650888080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 977940574
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc1
-        version: 1.0.0.rc1
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: sprockets
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70360650888080
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: &70360650885700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
+      - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: erubis
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70360650885700
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: &70360650905700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: tzinfo
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70360650905700
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: &70360650904820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 3
-        - 29
+      - !ruby/object:Gem::Version
         version: 0.3.29
   type: :development
-  version_requirements: *id010
-description: Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.
+  prerelease: false
+  version_requirements: *70360650904820
+description: Web apps on Rails. Simple, battle-tested conventions for building and
+  testing MVC web applications. Works with any Rack-compatible server.
 email: david@loudthinking.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - CHANGELOG.md
 - README.rdoc
 - MIT-LICENSE
@@ -270,6 +208,7 @@ files:
 - lib/action_dispatch/http/upload.rb
 - lib/action_dispatch/http/url.rb
 - lib/action_dispatch/middleware/best_standards_support.rb
+- lib/action_dispatch/middleware/body_proxy.rb
 - lib/action_dispatch/middleware/callbacks.rb
 - lib/action_dispatch/middleware/cookies.rb
 - lib/action_dispatch/middleware/debug_exceptions.rb
@@ -380,43 +319,29 @@ files:
 - lib/sprockets/helpers.rb
 - lib/sprockets/railtie.rb
 - lib/sprockets/static_compiler.rb
-has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).
 test_files: []
-