actionpack 4.0.0.rc2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 797c49ae681c32c478447d8307499c1205688bee
-  data.tar.gz: 34f6871e8a0befed6080b163e032155b436b99e9
+  metadata.gz: 6f4ecbcfd3111cc54096fa65af027af557e6b7e3
+  data.tar.gz: dfdfd55057a638b0c95f434b70ec14864c444f15
 SHA512:
-  metadata.gz: c9a2453f05fa4d50ab68b9398784c6255818b0724616aab9ea8b1fb13fb8901cc3d4b7aef3b4000bf39ce47ee6a73d4e4c8ea4d8b88e87a4af1a8202c8ee9fa4
-  data.tar.gz: 90849b7210e4491f98f51c04d23068a702dd2b1047ff5dbc056a36cb1755a9410d7ad23226bcb32c257b13e0cefd5d461ec8cf491ff88b55e03ac04bf6e7a0ea
+  metadata.gz: 69dbb3d11bbc52495acb69ac846abad0f6263b17c2284837860d56cd2a22a18ee785d9e1f1e3c3fc4bf8a39eb7d9a982168d3bb42392629af75f9c80bcf64f68
+  data.tar.gz: cf4e149fe77d767835201792e56a7744f9ee83dba081b1f807082d4991aba60caf3f54d1f676b10e3dd82cb91438a979aa1499d041af53116f29268b0be47f35

data/CHANGELOG.md

@@ -1,11 +1,38 @@
-## Rails 4.0.0.rc2 (June 11, 2013) ##
+## Rails 4.0.0 (June 25, 2013) ##
 
-*   Fix an issue where partials with a number in the filename weren't being digested for cache dependencies.
+*   Merge `:action` from routing scope and assign endpoint if both `:controller`
+    and `:action` are present. The endpoint assignment only occurs if there is
+    no `:to` present in the options hash so should only affect routes using the
+    shorthand syntax (i.e. endpoint is inferred from the the path).
 
-    *Bryan Ricker*
+    Fixes #9856
+
+    *Yves Senn*, *Andrew White*
+
+*   Use a case insensitive URI Regexp for #asset_path.
+
+    This fix a problem where the same asset path using different case are generating
+    different URIs.
+
+    Before:
+
+        image_tag("HTTP://google.com")
+        # => "<img alt=\"Google\" src=\"/assets/HTTP://google.com\" />"
+        image_tag("http://google.com")
+        # => "<img alt=\"Google\" src=\"http://google.com\" />"
 
+    After:
+
+        image_tag("HTTP://google.com")
+        # => "<img alt=\"Google\" src=\"HTTP://google.com\" />"
+        image_tag("http://google.com")
+        # => "<img alt=\"Google\" src=\"http://google.com\" />"
+
+    *David Celis*
+
+*   Fix an issue where partials with a number in the filename weren't being digested for cache dependencies.
 
-## Rails 4.0.0.rc1 (April 29, 2013) ##
+    *Bryan Ricker*
 
 *   Add support for passing custom url options other than `:host` and custom
     status and flash options to `force_ssl`.
@@ -188,9 +215,6 @@
 
     *Thierry Zires*
 
-
-## Rails 4.0.0.beta1 (February 25, 2013) ##
-
 *   Fix `respond_to` not using formats that have no block if all is present. *Michael Grosser*
 
 *   New applications use an encrypted session store by default.

data/lib/action_dispatch/middleware/cookies.rb

@@ -77,7 +77,7 @@ module ActionDispatch
   #                       domain and subdomains.
   #
   # * <tt>:expires</tt> - The time at which this cookie expires, as a \Time object.
-  # * <tt>:secure</tt> - Whether this cookie is a only transmitted to HTTPS servers.
+  # * <tt>:secure</tt> - Whether this cookie is only transmitted to HTTPS servers.
   #   Default is +false+.
   # * <tt>:httponly</tt> - Whether this cookie is accessible via scripting or
   #   only HTTP. Defaults to +false+.

data/lib/action_dispatch/routing/mapper.rb

@@ -11,8 +11,8 @@ module ActionDispatch
     class Mapper
       URL_OPTIONS = [:protocol, :subdomain, :domain, :host, :port]
       SCOPE_OPTIONS = [:path, :shallow_path, :as, :shallow_prefix, :module,
-                       :controller, :path_names, :constraints, :defaults,
-                       :shallow, :blocks, :options]
+                       :controller, :action, :path_names, :constraints,
+                       :shallow, :blocks, :defaults, :options]
 
       class Constraints #:nodoc:
         def self.new(app, constraints, request = Rack::Request)
@@ -869,6 +869,10 @@ module ActionDispatch
             child
           end
 
+          def merge_action_scope(parent, child) #:nodoc:
+            child
+          end
+
           def merge_path_names_scope(parent, child) #:nodoc:
             merge_options_scope(parent, child)
           end
@@ -1378,6 +1382,10 @@ module ActionDispatch
             raise ArgumentError, "Unknown scope #{on.inspect} given to :on"
           end
 
+          if @scope[:controller] && @scope[:action]
+            options[:to] ||= "#{@scope[:controller]}##{@scope[:action]}"
+          end
+
           paths.each do |_path|
             route_options = options.dup
             route_options[:path] ||= _path if _path.is_a?(String)

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.rc2"
+    Gem::Version.new "4.0.0"
   end
 
   module VERSION #:nodoc:

data/lib/action_view/helpers/asset_url_helper.rb

@@ -105,7 +105,7 @@ module ActionView
     #   )
     #
     module AssetUrlHelper
-      URI_REGEXP = %r{^[-a-z]+://|^(?:cid|data):|^//}
+      URI_REGEXP = %r{^[-a-z]+://|^(?:cid|data):|^//}i
 
       # Computes the path to asset in public directory. If :type
       # options is set, a file extension will be appended and scoped

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionpack
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
+  version: 4.0.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-25 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.rc2
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0
 - !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.rc2
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -374,9 +374,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubyforge_project: