actionpack 3.0.11 → 3.0.12.rc1

data/CHANGELOG

@@ -1,3 +1,10 @@
+*Rails 3.0.12 (unreleased)*
+
+* Fix using `tranlate` helper with a html translation which uses the `:count` option for
+  pluralization.
+
+  *Jon Leighton*
+
 *Rails 3.0.11 (unreleased)*
 
 * Fix XSS security vulnerability in the `translate` helper method. When using interpolation

data/lib/action_pack/version.rb

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

data/lib/action_view/helpers/translation_helper.rb

@@ -48,7 +48,9 @@ module ActionView
         if html_safe_translation_key?(key)
           html_safe_options = options.dup
           options.except(*I18n::RESERVED_KEYS).each do |name, value|
-            html_safe_options[name] = ERB::Util.html_escape(value.to_s)
+            unless name == :count && value.is_a?(Numeric)
+              html_safe_options[name] = ERB::Util.html_escape(value.to_s)
+            end
           end
           translation = I18n.translate(scope_key_by_partial(key), html_safe_options)
 

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  hash: 15424023
+  prerelease: 7
   segments: 
   - 3
   - 0
-  - 11
-  version: 3.0.11
+  - 12
+  - rc
+  - 1
+  version: 3.0.12.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,45 +17,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 Z
+date: 2012-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15424023
         segments: 
         - 3
         - 0
-        - 11
-        version: 3.0.11
-  requirement: *id001
+        - 12
+        - rc
+        - 1
+        version: 3.0.12.rc1
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15424023
         segments: 
         - 3
         - 0
-        - 11
-        version: 3.0.11
-  requirement: *id002
+        - 12
+        - rc
+        - 1
+        version: 3.0.12.rc1
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :runtime
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,12 +69,12 @@ dependencies:
         - 1
         - 2
         version: 2.1.2
-  requirement: *id003
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: i18n
-  type: :runtime
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,28 +85,28 @@ dependencies:
         - 5
         - 0
         version: 0.5.0
-  requirement: *id004
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 21
         segments: 
         - 1
         - 2
-        - 1
-        version: 1.2.1
-  requirement: *id005
+        - 5
+        version: 1.2.5
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :runtime
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,12 +117,12 @@ dependencies:
         - 5
         - 7
         version: 0.5.7
-  requirement: *id006
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rack-mount
-  type: :runtime
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,12 +133,12 @@ dependencies:
         - 6
         - 14
         version: 0.6.14
-  requirement: *id007
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: tzinfo
-  type: :runtime
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,12 +149,12 @@ dependencies:
         - 3
         - 23
         version: 0.3.23
-  requirement: *id008
+  type: :runtime
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: erubis
-  type: :runtime
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -160,7 +165,8 @@ dependencies:
         - 6
         - 6
         version: 2.6.6
-  requirement: *id009
+  type: :runtime
+  version_requirements: *id009
 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: []
@@ -173,167 +179,167 @@ files:
 - CHANGELOG
 - README.rdoc
 - MIT-LICENSE
-- lib/action_view/locale/en.yml
-- lib/action_view/template.rb
-- lib/action_view/render/partials.rb
-- lib/action_view/render/rendering.rb
-- lib/action_view/render/layouts.rb
-- lib/action_view/test_case.rb
-- lib/action_view/lookup_context.rb
-- lib/action_view/log_subscriber.rb
-- lib/action_view/context.rb
-- lib/action_view/helpers/raw_output_helper.rb
-- lib/action_view/helpers/text_helper.rb
-- lib/action_view/helpers/date_helper.rb
-- lib/action_view/helpers/sanitize_helper.rb
-- lib/action_view/helpers/translation_helper.rb
-- lib/action_view/helpers/scriptaculous_helper.rb
-- lib/action_view/helpers/number_helper.rb
-- lib/action_view/helpers/atom_feed_helper.rb
-- lib/action_view/helpers/form_helper.rb
-- lib/action_view/helpers/tag_helper.rb
-- lib/action_view/helpers/capture_helper.rb
-- lib/action_view/helpers/debug_helper.rb
-- lib/action_view/helpers/record_tag_helper.rb
-- lib/action_view/helpers/form_tag_helper.rb
-- lib/action_view/helpers/javascript_helper.rb
-- lib/action_view/helpers/csrf_helper.rb
-- lib/action_view/helpers/active_model_helper.rb
-- lib/action_view/helpers/cache_helper.rb
-- lib/action_view/helpers/url_helper.rb
-- lib/action_view/helpers/prototype_helper.rb
-- lib/action_view/helpers/form_options_helper.rb
-- lib/action_view/helpers/asset_tag_helper.rb
-- lib/action_view/data/encoding_conversions.txt
-- lib/action_view/railtie.rb
-- lib/action_view/template/handlers.rb
-- lib/action_view/template/handlers/builder.rb
-- lib/action_view/template/handlers/rjs.rb
-- lib/action_view/template/handlers/erb.rb
-- lib/action_view/template/handler.rb
-- lib/action_view/template/error.rb
-- lib/action_view/template/text.rb
-- lib/action_view/template/resolver.rb
-- lib/action_view/base.rb
-- lib/action_view/testing/resolvers.rb
-- lib/action_view/helpers.rb
-- lib/action_view/paths.rb
-- lib/action_dispatch.rb
-- lib/action_pack.rb
+- lib/abstract_controller/asset_paths.rb
+- lib/abstract_controller/base.rb
+- lib/abstract_controller/callbacks.rb
+- lib/abstract_controller/collector.rb
+- lib/abstract_controller/helpers.rb
+- lib/abstract_controller/layouts.rb
+- lib/abstract_controller/logger.rb
+- lib/abstract_controller/rendering.rb
+- lib/abstract_controller/translation.rb
+- lib/abstract_controller/view_paths.rb
+- lib/abstract_controller.rb
+- lib/action_controller/base.rb
+- lib/action_controller/caching/actions.rb
+- lib/action_controller/caching/fragments.rb
+- lib/action_controller/caching/pages.rb
+- lib/action_controller/caching/sweeping.rb
 - lib/action_controller/caching.rb
-- lib/action_controller/deprecated/url_writer.rb
-- lib/action_controller/deprecated/dispatcher.rb
 - lib/action_controller/deprecated/base.rb
-- lib/action_controller/deprecated/performance_test.rb
+- lib/action_controller/deprecated/dispatcher.rb
 - lib/action_controller/deprecated/integration_test.rb
-- lib/action_controller/metal.rb
-- lib/action_controller/metal/url_for.rb
-- lib/action_controller/metal/streaming.rb
-- lib/action_controller/metal/head.rb
+- lib/action_controller/deprecated/performance_test.rb
+- lib/action_controller/deprecated/url_writer.rb
+- lib/action_controller/deprecated.rb
+- lib/action_controller/log_subscriber.rb
+- lib/action_controller/metal/compatibility.rb
 - lib/action_controller/metal/conditional_get.rb
-- lib/action_controller/metal/flash.rb
-- lib/action_controller/metal/http_authentication.rb
-- lib/action_controller/metal/renderers.rb
-- lib/action_controller/metal/request_forgery_protection.rb
+- lib/action_controller/metal/cookies.rb
 - lib/action_controller/metal/exceptions.rb
+- lib/action_controller/metal/flash.rb
+- lib/action_controller/metal/head.rb
+- lib/action_controller/metal/helpers.rb
 - lib/action_controller/metal/hide_actions.rb
-- lib/action_controller/metal/compatibility.rb
-- lib/action_controller/metal/mime_responds.rb
-- lib/action_controller/metal/testing.rb
+- lib/action_controller/metal/http_authentication.rb
 - lib/action_controller/metal/implicit_render.rb
-- lib/action_controller/metal/cookies.rb
 - lib/action_controller/metal/instrumentation.rb
+- lib/action_controller/metal/mime_responds.rb
+- lib/action_controller/metal/rack_delegation.rb
+- lib/action_controller/metal/redirecting.rb
+- lib/action_controller/metal/renderers.rb
 - lib/action_controller/metal/rendering.rb
-- lib/action_controller/metal/responder.rb
+- lib/action_controller/metal/request_forgery_protection.rb
 - lib/action_controller/metal/rescue.rb
+- lib/action_controller/metal/responder.rb
 - lib/action_controller/metal/session_management.rb
-- lib/action_controller/metal/helpers.rb
-- lib/action_controller/metal/redirecting.rb
-- lib/action_controller/metal/rack_delegation.rb
-- lib/action_controller/deprecated.rb
-- lib/action_controller/test_case.rb
-- lib/action_controller/log_subscriber.rb
-- lib/action_controller/record_identifier.rb
-- lib/action_controller/railtie.rb
+- lib/action_controller/metal/streaming.rb
+- lib/action_controller/metal/testing.rb
+- lib/action_controller/metal/url_for.rb
+- lib/action_controller/metal.rb
 - lib/action_controller/middleware.rb
-- lib/action_controller/base.rb
-- lib/action_controller/vendor/html-scanner.rb
-- lib/action_controller/vendor/html-scanner/html/tokenizer.rb
-- lib/action_controller/vendor/html-scanner/html/version.rb
-- lib/action_controller/vendor/html-scanner/html/sanitizer.rb
-- lib/action_controller/vendor/html-scanner/html/selector.rb
+- lib/action_controller/railtie.rb
+- lib/action_controller/record_identifier.rb
+- lib/action_controller/test_case.rb
 - lib/action_controller/vendor/html-scanner/html/document.rb
 - lib/action_controller/vendor/html-scanner/html/node.rb
-- lib/action_controller/caching/sweeping.rb
-- lib/action_controller/caching/fragments.rb
-- lib/action_controller/caching/actions.rb
-- lib/action_controller/caching/pages.rb
-- lib/abstract_controller.rb
-- lib/action_dispatch/routing.rb
-- lib/action_dispatch/http/mime_negotiation.rb
-- lib/action_dispatch/http/parameter_filter.rb
+- lib/action_controller/vendor/html-scanner/html/sanitizer.rb
+- lib/action_controller/vendor/html-scanner/html/selector.rb
+- lib/action_controller/vendor/html-scanner/html/tokenizer.rb
+- lib/action_controller/vendor/html-scanner/html/version.rb
+- lib/action_controller/vendor/html-scanner.rb
+- lib/action_controller.rb
 - lib/action_dispatch/http/cache.rb
-- lib/action_dispatch/http/mime_types.rb
-- lib/action_dispatch/http/upload.rb
-- lib/action_dispatch/http/request.rb
 - lib/action_dispatch/http/filter_parameters.rb
+- lib/action_dispatch/http/headers.rb
+- lib/action_dispatch/http/mime_negotiation.rb
 - lib/action_dispatch/http/mime_type.rb
+- lib/action_dispatch/http/mime_types.rb
+- lib/action_dispatch/http/parameter_filter.rb
 - lib/action_dispatch/http/parameters.rb
+- lib/action_dispatch/http/request.rb
 - lib/action_dispatch/http/response.rb
+- lib/action_dispatch/http/upload.rb
 - lib/action_dispatch/http/url.rb
-- lib/action_dispatch/http/headers.rb
-- lib/action_dispatch/middleware/static.rb
+- lib/action_dispatch/middleware/best_standards_support.rb
+- lib/action_dispatch/middleware/callbacks.rb
+- lib/action_dispatch/middleware/cookies.rb
+- lib/action_dispatch/middleware/flash.rb
+- lib/action_dispatch/middleware/head.rb
+- lib/action_dispatch/middleware/params_parser.rb
 - lib/action_dispatch/middleware/remote_ip.rb
-- lib/action_dispatch/middleware/show_exceptions.rb
+- lib/action_dispatch/middleware/rescue.rb
 - lib/action_dispatch/middleware/session/abstract_store.rb
 - lib/action_dispatch/middleware/session/cookie_store.rb
 - lib/action_dispatch/middleware/session/mem_cache_store.rb
-- lib/action_dispatch/middleware/head.rb
-- lib/action_dispatch/middleware/flash.rb
-- lib/action_dispatch/middleware/cookies.rb
-- lib/action_dispatch/middleware/templates/rescues/unknown_action.erb
-- lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
-- lib/action_dispatch/middleware/templates/rescues/template_error.erb
-- lib/action_dispatch/middleware/templates/rescues/_trace.erb
+- lib/action_dispatch/middleware/show_exceptions.rb
+- lib/action_dispatch/middleware/stack.rb
+- lib/action_dispatch/middleware/static.rb
 - lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
+- lib/action_dispatch/middleware/templates/rescues/_trace.erb
+- lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
 - lib/action_dispatch/middleware/templates/rescues/layout.erb
-- lib/action_dispatch/middleware/templates/rescues/routing_error.erb
 - lib/action_dispatch/middleware/templates/rescues/missing_template.erb
-- lib/action_dispatch/middleware/stack.rb
-- lib/action_dispatch/middleware/rescue.rb
-- lib/action_dispatch/middleware/best_standards_support.rb
-- lib/action_dispatch/middleware/callbacks.rb
-- lib/action_dispatch/middleware/params_parser.rb
-- lib/action_dispatch/routing/url_for.rb
-- lib/action_dispatch/routing/route.rb
+- lib/action_dispatch/middleware/templates/rescues/routing_error.erb
+- lib/action_dispatch/middleware/templates/rescues/template_error.erb
+- lib/action_dispatch/middleware/templates/rescues/unknown_action.erb
+- lib/action_dispatch/railtie.rb
 - lib/action_dispatch/routing/deprecated_mapper.rb
+- lib/action_dispatch/routing/mapper.rb
 - lib/action_dispatch/routing/polymorphic_routes.rb
+- lib/action_dispatch/routing/route.rb
 - lib/action_dispatch/routing/route_set.rb
-- lib/action_dispatch/routing/mapper.rb
-- lib/action_dispatch/railtie.rb
-- lib/action_dispatch/testing/test_request.rb
-- lib/action_dispatch/testing/test_process.rb
+- lib/action_dispatch/routing/url_for.rb
+- lib/action_dispatch/routing.rb
+- lib/action_dispatch/testing/assertions/dom.rb
+- lib/action_dispatch/testing/assertions/response.rb
+- lib/action_dispatch/testing/assertions/routing.rb
+- lib/action_dispatch/testing/assertions/selector.rb
+- lib/action_dispatch/testing/assertions/tag.rb
 - lib/action_dispatch/testing/assertions.rb
 - lib/action_dispatch/testing/integration.rb
 - lib/action_dispatch/testing/performance_test.rb
+- lib/action_dispatch/testing/test_process.rb
+- lib/action_dispatch/testing/test_request.rb
 - lib/action_dispatch/testing/test_response.rb
-- lib/action_dispatch/testing/assertions/routing.rb
-- lib/action_dispatch/testing/assertions/tag.rb
-- lib/action_dispatch/testing/assertions/selector.rb
-- lib/action_dispatch/testing/assertions/dom.rb
-- lib/action_dispatch/testing/assertions/response.rb
+- lib/action_dispatch.rb
 - lib/action_pack/version.rb
-- lib/abstract_controller/asset_paths.rb
-- lib/abstract_controller/logger.rb
-- lib/abstract_controller/rendering.rb
-- lib/abstract_controller/translation.rb
-- lib/abstract_controller/collector.rb
-- lib/abstract_controller/callbacks.rb
-- lib/abstract_controller/base.rb
-- lib/abstract_controller/layouts.rb
-- lib/abstract_controller/view_paths.rb
-- lib/abstract_controller/helpers.rb
-- lib/action_controller.rb
+- lib/action_pack.rb
+- lib/action_view/base.rb
+- lib/action_view/context.rb
+- lib/action_view/data/encoding_conversions.txt
+- lib/action_view/helpers/active_model_helper.rb
+- lib/action_view/helpers/asset_tag_helper.rb
+- lib/action_view/helpers/atom_feed_helper.rb
+- lib/action_view/helpers/cache_helper.rb
+- lib/action_view/helpers/capture_helper.rb
+- lib/action_view/helpers/csrf_helper.rb
+- lib/action_view/helpers/date_helper.rb
+- lib/action_view/helpers/debug_helper.rb
+- lib/action_view/helpers/form_helper.rb
+- lib/action_view/helpers/form_options_helper.rb
+- lib/action_view/helpers/form_tag_helper.rb
+- lib/action_view/helpers/javascript_helper.rb
+- lib/action_view/helpers/number_helper.rb
+- lib/action_view/helpers/prototype_helper.rb
+- lib/action_view/helpers/raw_output_helper.rb
+- lib/action_view/helpers/record_tag_helper.rb
+- lib/action_view/helpers/sanitize_helper.rb
+- lib/action_view/helpers/scriptaculous_helper.rb
+- lib/action_view/helpers/tag_helper.rb
+- lib/action_view/helpers/text_helper.rb
+- lib/action_view/helpers/translation_helper.rb
+- lib/action_view/helpers/url_helper.rb
+- lib/action_view/helpers.rb
+- lib/action_view/locale/en.yml
+- lib/action_view/log_subscriber.rb
+- lib/action_view/lookup_context.rb
+- lib/action_view/paths.rb
+- lib/action_view/railtie.rb
+- lib/action_view/render/layouts.rb
+- lib/action_view/render/partials.rb
+- lib/action_view/render/rendering.rb
+- lib/action_view/template/error.rb
+- lib/action_view/template/handler.rb
+- lib/action_view/template/handlers/builder.rb
+- lib/action_view/template/handlers/erb.rb
+- lib/action_view/template/handlers/rjs.rb
+- lib/action_view/template/handlers.rb
+- lib/action_view/template/resolver.rb
+- lib/action_view/template/text.rb
+- lib/action_view/template.rb
+- lib/action_view/test_case.rb
+- lib/action_view/testing/resolvers.rb
 - lib/action_view.rb
 homepage: http://www.rubyonrails.org
 licenses: []
@@ -357,16 +363,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - none
 rubyforge_project: actionpack
-rubygems_version: 1.8.6
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).