actionpack 4.0.0.rc1 → 4.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2f9e896fa0aab306404dfec0ba34305704d5680
-  data.tar.gz: d36ac14f59dea1d6607b462c3df3c3103c19e3ad
+  metadata.gz: 797c49ae681c32c478447d8307499c1205688bee
+  data.tar.gz: 34f6871e8a0befed6080b163e032155b436b99e9
 SHA512:
-  metadata.gz: 61f6cfcae3aa384acba259c7185dc1f2cb4580973f525c4b98303c0bab0f5a9100fd7b73c2adbaa4fadf9f41defc525135306788e4859f40209bb80b92e315d4
-  data.tar.gz: 347a2469a9f69a56a36cf2d96059088b1f34ae3fb74c6d80f909b0cde9f165c647c1399535e794b5d5daebaa23d0fcabd82491caab5230e820fff03a05391fac
+  metadata.gz: c9a2453f05fa4d50ab68b9398784c6255818b0724616aab9ea8b1fb13fb8901cc3d4b7aef3b4000bf39ce47ee6a73d4e4c8ea4d8b88e87a4af1a8202c8ee9fa4
+  data.tar.gz: 90849b7210e4491f98f51c04d23068a702dd2b1047ff5dbc056a36cb1755a9410d7ad23226bcb32c257b13e0cefd5d461ec8cf491ff88b55e03ac04bf6e7a0ea

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## Rails 4.0.0 (unreleased) ##
+## Rails 4.0.0.rc2 (June 11, 2013) ##
+
+*   Fix an issue where partials with a number in the filename weren't being digested for cache dependencies.
+
+    *Bryan Ricker*
+
+
+## Rails 4.0.0.rc1 (April 29, 2013) ##
 
 *   Add support for passing custom url options other than `:host` and custom
     status and flash options to `force_ssl`.
@@ -1058,6 +1065,14 @@
 
     *Andrew White*
 
+*   In the routes DSL the `:via` option of `match` is now mandatory.
+
+    For routes that respond to one single verb it is recommended to use the more specific
+    macros `get`, `post`, etc. instead. You can still map all HTTP verbs to one action
+    with `match`, but it has to be explictly configured using `:via => :all`.
+
+    *José Valim and Yehuda Katz*
+
 *   Add `index` method to FormBuilder class. *Jorge Bejar*
 
 *   Remove the leading \n added by textarea on `assert_select`. *Santiago Pastorino*
@@ -1106,8 +1121,6 @@
 
     *dlee*
 
-*   Integration tests support the `OPTIONS` method. *Jeremy Kemper*
-
 *   `expires_in` accepts a `must_revalidate` flag. If true, "must-revalidate"
     is added to the Cache-Control header. *fxn*
 

data/lib/action_controller/metal/url_for.rb

@@ -32,7 +32,8 @@ module ActionController
 
       if (same_origin = _routes.equal?(env["action_dispatch.routes"])) ||
          (script_name = env["ROUTES_#{_routes.object_id}_SCRIPT_NAME"]) ||
-         (original_script_name = env['SCRIPT_NAME'])
+         (original_script_name = env['ORIGINAL_SCRIPT_NAME'])
+
         @_url_options.dup.tap do |options|
           if original_script_name
             options[:original_script_name] = original_script_name

data/lib/action_controller/test_case.rb

@@ -499,12 +499,6 @@ module ActionController
         process(action, "HEAD", *args)
       end
 
-      # Simulate a OPTIONS request with the given parameters and set/volley the response.
-      # See +get+ for more details.
-      def options(action, *args)
-        process(action, "OPTIONS", *args)
-      end
-
       def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil)
         @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
         @request.env['HTTP_ACCEPT'] ||=  [Mime::JS, Mime::HTML, Mime::XML, 'text/xml', Mime::ALL].join(', ')

data/lib/action_dispatch/http/parameters.rb

@@ -65,7 +65,7 @@ module ActionDispatch
 
         new_hash = {}
         params.each do |k, v|
-          new_key = k.is_a?(String) ? k.dup.force_encoding("UTF-8").encode! : k
+          new_key = k.is_a?(String) ? k.dup.force_encoding(Encoding::UTF_8).encode! : k
           new_hash[new_key] =
             case v
             when Hash

data/lib/action_dispatch/middleware/exception_wrapper.rb

@@ -13,6 +13,7 @@ module ActionDispatch
       'ActionController::NotImplemented'           => :not_implemented,
       'ActionController::UnknownFormat'            => :not_acceptable,
       'ActionController::InvalidAuthenticityToken' => :unprocessable_entity,
+      'ActionDispatch::ParamsParser::ParseError'   => :bad_request,
       'ActionController::BadRequest'               => :bad_request,
       'ActionController::ParameterMissing'         => :bad_request
     )

data/lib/action_dispatch/middleware/public_exceptions.rb

@@ -7,11 +7,10 @@ module ActionDispatch
     end
 
     def call(env)
-      exception    = env["action_dispatch.exception"]
       status       = env["PATH_INFO"][1..-1]
       request      = ActionDispatch::Request.new(env)
       content_type = request.formats.first
-      body         = { :status => status, :error => exception.message }
+      body         = { :status => status, :error => Rack::Utils::HTTP_STATUS_CODES.fetch(status.to_i, Rack::Utils::HTTP_STATUS_CODES[500]) }
 
       render(status, content_type, body)
     end
@@ -19,7 +18,7 @@ module ActionDispatch
     private
 
     def render(status, content_type, body)
-      format = content_type && "to_#{content_type.to_sym}"
+      format = "to_#{content_type.to_sym}" if content_type
       if format && body.respond_to?(format)
         render_format(status, content_type, body.public_send(format))
       else

data/lib/action_dispatch/middleware/templates/rescues/layout.erb

@@ -34,6 +34,12 @@
       padding: 0.5em 1.5em;
     }
 
+    h1 {
+      margin: 0.2em 0;
+      line-height: 1.1em;
+      font-size: 2em;
+    }
+
     h2 {
       color: #C52F24;
       line-height: 25px;

data/lib/action_dispatch/routing/inspector.rb

@@ -69,7 +69,7 @@ module ActionDispatch
       end
 
       def internal?
-        controller =~ %r{\Arails/(info|welcome)} || path =~ %r{\A#{Rails.application.config.assets.prefix}}
+        controller.to_s =~ %r{\Arails/(info|welcome)} || path =~ %r{\A#{Rails.application.config.assets.prefix}}
       end
 
       def engine?

data/lib/action_dispatch/routing/mapper.rb

@@ -299,7 +299,7 @@ module ActionDispatch
           end
       end
 
-      # Invokes Rack::Mount::Utils.normalize path and ensure that
+      # Invokes Journey::Router::Utils.normalize_path and ensure that
       # (:locale) becomes (/:locale) instead of /(:locale). Except
       # for root cases, where the latter is the correct one.
       def self.normalize_path(path)

data/lib/action_dispatch/routing/route_set.rb

@@ -218,6 +218,7 @@ module ActionDispatch
                 keys -= t.url_options.keys if t.respond_to?(:url_options)
                 keys -= options.keys
               end
+              keys -= inner_options.keys
               result.merge!(Hash[keys.zip(args)])
             end
 

data/lib/action_dispatch/testing/integration.rb

@@ -62,12 +62,6 @@ module ActionDispatch
         process :head, path, parameters, headers_or_env
       end
 
-      # Performs a OPTIONS request with the given parameters. See +#get+ for
-      # more details.
-      def options(path, parameters = nil, headers_or_env = nil)
-        process :options, path, parameters, headers_or_env
-      end
-
       # Performs an XMLHttpRequest request with the given parameters, mirroring
       # a request from the Prototype library.
       #
@@ -342,7 +336,7 @@ module ActionDispatch
         @integration_session = Integration::Session.new(app)
       end
 
-      %w(get post patch put head delete options cookies assigns
+      %w(get post patch put head delete cookies assigns
          xml_http_request xhr get_via_redirect post_via_redirect).each do |method|
         define_method(method) do |*args|
           reset! unless integration_session

data/lib/action_pack/version.rb

@@ -1,7 +1,7 @@
 module ActionPack
   # Returns the version of the currently loaded ActionPack as a Gem::Version
   def self.version
-    Gem::Version.new "4.0.0.rc1"
+    Gem::Version.new "4.0.0.rc2"
   end
 
   module VERSION #:nodoc:

data/lib/action_view/dependency_tracker.rb

@@ -39,7 +39,7 @@ module ActionView
         render\s*                     # render, followed by optional whitespace
         \(?                           # start an optional parenthesis for the render call
         (partial:|:partial\s+=>)?\s*  # naming the partial, used with collection -- 1st capture
-        ([@a-z"'][@a-z_\/\."']+)      # the template name itself -- 2nd capture
+        ([@a-z"'][@\w\/\."']+)        # the template name itself -- 2nd capture
       /x
 
       def self.call(name, template)

data/lib/action_view/helpers/asset_url_helper.rb

@@ -193,7 +193,6 @@ module ActionView
         request = self.request if respond_to?(:request)
         host = config.asset_host if defined? config.asset_host
         host ||= request.base_url if request && options[:protocol] == :request
-        return unless host
 
         if host.respond_to?(:call)
           arity = host.respond_to?(:arity) ? host.arity : host.method(:call).arity
@@ -204,6 +203,8 @@ module ActionView
           host = host % (Zlib.crc32(source) % 4)
         end
 
+        return unless host
+
         if host =~ URI_REGEXP
           host
         else

data/lib/action_view/helpers/form_tag_helper.rb

@@ -81,7 +81,7 @@ module ActionView
       # ==== Options
       # * <tt>:multiple</tt> - If set to true the selection will allow multiple choices.
       # * <tt>:disabled</tt> - If set to true, the user will not be able to use this input.
-      # * <tt>:include_blank</tt> - If set to true, an empty option will be create
+      # * <tt>:include_blank</tt> - If set to true, an empty option will be created.
       # * <tt>:prompt</tt> - Create a prompt option with blank value and the text asking user to select something
       # * Any other key creates standard HTML attributes for the tag.
       #

data/lib/action_view/lookup_context.rb

@@ -1,5 +1,6 @@
 require 'thread_safe'
 require 'active_support/core_ext/module/remove_method'
+require 'active_support/core_ext/module/attribute_accessors'
 
 module ActionView
   # = Action View Lookup Context

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionpack
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -380,7 +380,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).