actionpack 3.2.13 → 3.2.14.rc1

data/lib/action_pack/version.rb

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

data/lib/action_view/asset_paths.rb

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

data/lib/action_view/helpers/date_helper.rb

@@ -112,7 +112,7 @@ module ActionView
               # english it would read better as about 80 years.
               minutes_with_offset         = distance_in_minutes - minute_offset_for_leap_year
               remainder                   = (minutes_with_offset % 525600)
-              distance_in_years           = (minutes_with_offset / 525600)
+              distance_in_years           = (minutes_with_offset.div 525600)
               if remainder < 131400
                 locale.t(:about_x_years,  :count => distance_in_years)
               elsif remainder < 394200

data/lib/action_view/helpers/form_helper.rb

@@ -1196,27 +1196,26 @@ module ActionView
 
         def add_default_name_and_id(options)
           if options.has_key?("index")
-            options["name"] ||= tag_name_with_index(options["index"])
+            options["name"] ||= tag_name_with_index(options["index"], options["multiple"])
             options["id"] = options.fetch("id"){ tag_id_with_index(options["index"]) }
             options.delete("index")
           elsif defined?(@auto_index)
-            options["name"] ||= tag_name_with_index(@auto_index)
+            options["name"] ||= tag_name_with_index(@auto_index, options["multiple"])
             options["id"] = options.fetch("id"){ tag_id_with_index(@auto_index) }
           else
-            options["name"] ||= tag_name
+            options["name"] ||= tag_name(options["multiple"])
             options["id"] = options.fetch("id"){ tag_id }
           end
 
-          options["name"] += "[]" if options["multiple"] && !options["name"].ends_with?("[]")
           options["id"] = [options.delete('namespace'), options["id"]].compact.join("_").presence
         end
 
-        def tag_name
-          "#{@object_name}[#{sanitized_method_name}]"
+        def tag_name(multiple = false)
+          "#{@object_name}[#{sanitized_method_name}]#{"[]" if multiple}"
         end
 
-        def tag_name_with_index(index)
-          "#{@object_name}[#{index}][#{sanitized_method_name}]"
+        def tag_name_with_index(index, multiple = false)
+          "#{@object_name}[#{index}][#{sanitized_method_name}]#{"[]" if multiple}"
         end
 
         def tag_id

data/lib/action_view/helpers/number_helper.rb

@@ -360,7 +360,7 @@ module ActionView
 
       end
 
-      STORAGE_UNITS = [:byte, :kb, :mb, :gb, :tb].freeze
+      STORAGE_UNITS = [:byte, :kb, :mb, :gb, :tb]
 
       # Formats the bytes in +number+ into a more understandable
       # representation (e.g., giving it 1500 yields 1.5 KB). This
@@ -452,7 +452,7 @@ module ActionView
       end
 
       DECIMAL_UNITS = {0 => :unit, 1 => :ten, 2 => :hundred, 3 => :thousand, 6 => :million, 9 => :billion, 12 => :trillion, 15 => :quadrillion,
-        -1 => :deci, -2 => :centi, -3 => :mili, -6 => :micro, -9 => :nano, -12 => :pico, -15 => :femto}.freeze
+        -1 => :deci, -2 => :centi, -3 => :mili, -6 => :micro, -9 => :nano, -12 => :pico, -15 => :femto}
 
       # Pretty prints (formats and approximates) a number in a way it
       # is more readable by humans (eg.: 1200000000 becomes "1.2
@@ -593,7 +593,7 @@ module ActionView
 
         unit = case units
         when Hash
-          units[DECIMAL_UNITS[display_exponent]]
+          units[DECIMAL_UNITS[display_exponent]] || ''
         when String, Symbol
           I18n.translate(:"#{units}.#{DECIMAL_UNITS[display_exponent]}", :locale => options[:locale], :count => number.to_i)
         else

data/lib/action_view/helpers/url_helper.rb

@@ -422,7 +422,7 @@ module ActionView
           if block_given?
             block.arity <= 1 ? capture(name, &block) : capture(name, options, html_options, &block)
           else
-            name
+            ERB::Util.html_escape(name)
           end
         else
           link_to(name, options, html_options)

data/lib/action_view/lookup_context.rb

@@ -44,7 +44,13 @@ module ActionView
     module Accessors #:nodoc:
     end
 
-    register_detail(:locale)  { [I18n.locale, I18n.default_locale].uniq }
+    register_detail(:locale) do
+      locales = [I18n.locale]
+      locales.concat(I18n.fallbacks[I18n.locale]) if I18n.respond_to? :fallbacks
+      locales << I18n.default_locale
+      locales.uniq!
+      locales
+    end
     register_detail(:formats) { Mime::SET.symbols }
     register_detail(:handlers){ Template::Handlers.extensions }
 
@@ -97,7 +103,7 @@ module ActionView
 
     # Helpers related to template lookup using the lookup context information.
     module ViewPaths
-      attr_reader :view_paths
+      attr_reader :view_paths, :html_fallback_for_js
 
       # Whenever setting view paths, makes a copy so we can manipulate then in
       # instance objects as we wish.
@@ -194,7 +200,10 @@ module ActionView
     def formats=(values)
       if values
         values.concat(default_formats) if values.delete "*/*"
-        values << :html if values == [:js]
+        if values == [:js]
+          values << :html
+          @html_fallback_for_js = true
+        end
       end
       super(values)
     end

data/lib/action_view/renderer/abstract_renderer.rb

@@ -37,5 +37,11 @@ module ActionView
     def instrument(name, options={})
       ActiveSupport::Notifications.instrument("render_#{name}.action_view", options){ yield }
     end
+
+    def prepend_formats(formats)
+      formats = Array(formats)
+      return if formats.empty? || @lookup_context.html_fallback_for_js
+      @lookup_context.formats = formats | @lookup_context.formats
+    end
   end
 end

data/lib/action_view/renderer/partial_renderer.rb

@@ -281,6 +281,8 @@ module ActionView
       @block   = block
       @details = extract_details(options)
 
+      prepend_formats(options[:formats])
+
       if String === partial
         @object     = options[:object]
         @path       = partial

data/lib/action_view/renderer/template_renderer.rb

@@ -10,9 +10,10 @@ module ActionView
       template = determine_template(options)
       context  = @lookup_context
 
+      prepend_formats(template.formats)
+
       unless context.rendered_format
-        context.formats = template.formats unless template.formats.empty?
-        context.rendered_format = context.formats.first
+        context.rendered_format = template.formats.first || formats.last
       end
 
       render_template(template, options[:layout], options[:locals])

data/lib/sprockets/helpers/rails_helper.rb

@@ -163,7 +163,7 @@ module Sprockets
             source
           elsif source_ext.blank?
             "#{source}.#{ext}"
-          elsif exact_match_present?(source)
+          elsif File.exists?(source) || exact_match_present?(source)
             source
           else
             "#{source}.#{ext}"

metadata

@@ -1,162 +1,197 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: actionpack
-version: !ruby/object:Gem::Version
-  version: 3.2.13
+version: !ruby/object:Gem::Version 
+  hash: 3856246045
+  prerelease: 7
+  segments: 
+  - 3
+  - 2
+  - 14
+  - rc
+  - 1
+  version: 3.2.14.rc1
 platform: ruby
-authors:
+authors: 
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
+
+date: 2013-07-12 00:00:00 -03:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 3856246045
+        segments: 
+        - 3
+        - 2
+        - 14
+        - rc
+        - 1
+        version: 3.2.14.rc1
   type: :runtime
+  name: activesupport
+  version_requirements: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 3856246045
+        segments: 
+        - 3
+        - 2
+        - 14
+        - rc
+        - 1
+        version: 3.2.14.rc1
   type: :runtime
+  name: activemodel
+  version_requirements: *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: rack-cache
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :runtime
+  name: rack-cache
+  version_requirements: *id003
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
+  name: builder
+  version_requirements: *id004
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 4
+        - 5
         version: 1.4.5
   type: :runtime
+  name: rack
+  version_requirements: *id005
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.5
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
         version: 0.6.1
   type: :runtime
+  name: rack-test
+  version_requirements: *id006
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-- !ruby/object:Gem::Dependency
-  name: journey
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 0
+        - 4
         version: 1.0.4
   type: :runtime
+  name: journey
+  version_requirements: *id007
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 2
+        - 1
         version: 2.2.1
   type: :runtime
+  name: sprockets
+  version_requirements: *id008
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.1
-- !ruby/object:Gem::Dependency
-  name: erubis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
         version: 2.7.0
   type: :runtime
+  name: erubis
+  version_requirements: *id009
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.7.0
-- !ruby/object:Gem::Dependency
-  name: tzinfo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+- !ruby/object:Gem::Dependency 
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 3
+        - 29
         version: 0.3.29
   type: :development
+  name: tzinfo
+  version_requirements: *id010
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.29
-description: Web apps on Rails. Simple, battle-tested conventions for building and
-  testing MVC web applications. Works with any Rack-compatible server.
+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
@@ -215,6 +250,7 @@ files:
 - lib/action_controller/railties/paths.rb
 - lib/action_controller/record_identifier.rb
 - lib/action_controller/test_case.rb
+- lib/action_controller/test_case.rb.orig
 - lib/action_controller/vendor/html-scanner/html/document.rb
 - lib/action_controller/vendor/html-scanner/html/node.rb
 - lib/action_controller/vendor/html-scanner/html/sanitizer.rb
@@ -280,6 +316,7 @@ files:
 - lib/action_dispatch/testing/assertions/tag.rb
 - lib/action_dispatch/testing/assertions.rb
 - lib/action_dispatch/testing/integration.rb
+- lib/action_dispatch/testing/integration.rb.orig
 - lib/action_dispatch/testing/performance_test.rb
 - lib/action_dispatch/testing/test_process.rb
 - lib/action_dispatch/testing/test_request.rb
@@ -348,28 +385,43 @@ files:
 - lib/sprockets/helpers.rb
 - lib/sprockets/railtie.rb
 - lib/sprockets/static_compiler.rb
+has_rdoc: true
 homepage: http://www.rubyonrails.org
-licenses: []
-metadata: {}
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
+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: 
 - none
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).
 test_files: []
+