actionview 4.1.9 → 4.1.10.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d79f805ea337057963332f86f983b377c43f9de0
-  data.tar.gz: 60ddd556932d6f8d4eb261c5f3e27470acd7e8f6
+  metadata.gz: f519bc2fe4ea87f06956ee790b78166b2428c466
+  data.tar.gz: 05d733dde5fe30b217e69f637af9ecaa00f01fc8
 SHA512:
-  metadata.gz: c11edfa72b5ec83e6f8d502dc40bbb153613a5c953d753ecfa1824d5e9341633ddbadca517763928fd6df0cfafdf82468731c80470fb0a9920ac3969d9f86ae1
-  data.tar.gz: f1f625e84ce04682a190ade2bc922f7a9ca1f1ab7118c0ffff8d52189b78fe1289a7cf064417804c632c05a631345d6c79a8a026997c8a59183402db147b5788
+  metadata.gz: 8e61e2bc434ab53eb7bbb1e95b2020cc6a4bfa1b30025e2d3001f2f6fb6b4740e232800a097eb8f02641b90944a52df99c54090285b36c70b84809692e611c97
+  data.tar.gz: acf73d80fc7ab89c36e4999120d6a62f1904fd60c3c41e3cd6d4b5ad52a138bcf123c2fe2763006337a7c6e24121fcab5b766843aeede458a492deefb30c1f77

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+*   Local variable in a partial is now available even if a falsy value is
+    passed to `:object` when rendering a partial.
+
+    Fixes #17373.
+
+    *Agis Anastasopoulos*
+
+*   Default translations that have a lower precidence than an html safe default,
+    but are not themselves safe, should not be marked as html_safe.
+
+    *Justin Coyne*
+
+## Rails 4.1.9 (January 6, 2015) ##
+
 *   Added an explicit error message, in `ActionView::PartialRenderer`
     for partial `rendering`, when the value of option `as` has invalid characters.
 

data/lib/action_view/gem_version.rb

@@ -7,8 +7,8 @@ module ActionView
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 9
-    PRE   = nil
+    TINY  = 10
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_view/helpers/form_helper.rb

@@ -1142,11 +1142,11 @@ module ActionView
             object_name = model_name_from_record_or_class(object).param_key
           end
 
-          builder = options[:builder] || default_form_builder
+          builder = options[:builder] || default_form_builder_class
           builder.new(object_name, object, self, options)
         end
 
-        def default_form_builder
+        def default_form_builder_class
           builder = ActionView::Base.default_form_builder
           builder.respond_to?(:constantize) ? builder.constantize : builder
         end

data/lib/action_view/helpers/translation_helper.rb

@@ -35,14 +35,18 @@ module ActionView
       # naming convention helps to identify translations that include HTML tags so that
       # you know what kind of output to expect when you call translate in a template.
       def translate(key, options = {})
-        options[:default] = wrap_translate_defaults(options[:default]) if options[:default]
+        options = options.dup
+        remaining_defaults = Array(options.delete(:default))
+        options[:default] = remaining_defaults.shift if remaining_defaults.first.kind_of? String
 
-        # If the user has specified rescue_format then pass it all through, otherwise use
-        # raise and do the work ourselves
-        options[:raise] ||= ActionView::Base.raise_on_missing_translations
-
-        raise_error = options[:raise] || options.key?(:rescue_format)
-        unless raise_error
+        # If the user has explicitly decided to NOT raise errors, pass that option to I18n.
+        # Otherwise, tell I18n to raise an exception, which we rescue further in this method.
+        # Note: `raise_error` refers to us re-raising the error in this method. I18n is forced to raise by default.
+        if options[:raise] == false || (options.key?(:rescue_format) && options[:rescue_format].nil?)
+          raise_error = false
+          options[:raise] = false
+        else
+          raise_error = options[:raise] || options[:rescue_format] || ActionView::Base.raise_on_missing_translations
           options[:raise] = true
         end
 
@@ -60,10 +64,14 @@ module ActionView
           I18n.translate(scope_key_by_partial(key), options)
         end
       rescue I18n::MissingTranslationData => e
-        raise e if raise_error
+        if remaining_defaults.present?
+          translate remaining_defaults.shift, options.merge(default: remaining_defaults)
+        else
+          raise e if raise_error
 
-        keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope])
-        content_tag('span', keys.last.to_s.titleize, :class => 'translation_missing', :title => "translation missing: #{keys.join('.')}")
+          keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope])
+          content_tag('span', keys.last.to_s.titleize, :class => 'translation_missing', :title => "translation missing: #{keys.join('.')}")
+        end
       end
       alias :t :translate
 
@@ -92,21 +100,6 @@ module ActionView
         def html_safe_translation_key?(key)
           key.to_s =~ /(\b|_|\.)html$/
         end
-
-        def wrap_translate_defaults(defaults)
-          new_defaults = []
-          defaults     = Array(defaults)
-          while key = defaults.shift
-            if key.is_a?(Symbol)
-              new_defaults << lambda { |_, options| translate key, options.merge(:default => defaults) }
-              break
-            else
-              new_defaults << key
-            end
-          end
-
-          new_defaults
-        end
     end
   end
 end

data/lib/action_view/renderer/partial_renderer.rb

@@ -332,7 +332,7 @@ module ActionView
       prepend_formats(options[:formats])
 
       if String === partial
-        @object     = options[:object]
+        @object     = options[:object] if options.has_key?(:object)
         @path       = partial
         @collection = collection
       else
@@ -466,7 +466,7 @@ module ActionView
 
     def retrieve_template_keys
       keys = @locals.keys
-      keys << @variable         if @object || @collection
+      keys << @variable if defined?(@object) || @collection
       keys << @variable_counter if @collection
       keys
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionview
 version: !ruby/object:Gem::Version
-  version: 4.1.9
+  version: 4.1.10.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
 description: Simple, battle-tested conventions and helpers for building web pages.
 email: david@loudthinking.com
 executables: []
@@ -207,9 +207,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: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: