actionview 5.0.1 → 5.0.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5a7c2ea185d0bea6fadc3a400e63324fd46c51d
-  data.tar.gz: 65238e002ca68c09447e6e21ceb415b5dba45810
+  metadata.gz: 8a61387a3313f4b2f9dac927416bbc8d61106df5
+  data.tar.gz: bb85d75003939de6fd6a13c67d32bdd1f15fcb10
 SHA512:
-  metadata.gz: 5753354ad5d7b3497c26a2d0a86a2921f0c94a9dd085bd2a699689b1e7009d69bc42c7659a3b2249b080d60cff6779038dd27f15f330870a2a1b967252f9019e
-  data.tar.gz: bd55ffd5e58380cf678b1896b8ea1d73e32adeb9458ea8e062c62071cc433d872f585c8868b6568a28ba9481da36588896ae8b0be46a75eb1cab44c3447cbfb0
+  metadata.gz: e90fbda97dcea5cd0e42bf7adb73dfd61739cb989fe3769e380d29db775e1531957759a7456a25e32b116b681be14a6a6aa287978a27e8fcfea73a2cece5baef
+  data.tar.gz: 29ac80b6a84efea6a0487982345c6294a4250a20da23ec56b97919ce2732bb37aea75b358faf3e111d9351054c3d42a830bee396a00051eac54558a3a4b50633

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## Rails 5.0.2.rc1 (February 24, 2017) ##
+
+*   Allow render locals to be assigned to instance variables in a view.
+
+    Fixes #27480.
+
+    *Andrew White*
+
+*   Return correct object name in form helper method after `fields_for`.
+
+    Fixes #26931.
+
+    *Yuji Yaginuma*
+
+
 ## Rails 5.0.1 (December 21, 2016) ##
 
 *   No changes.

data/lib/action_view/gem_version.rb

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

data/lib/action_view/helpers/form_helper.rb

@@ -1565,10 +1565,11 @@ module ActionView
           record_name   = model_name_from_record_or_class(record_object).param_key
         end
 
+        object_name = @object_name
         index = if options.has_key?(:index)
           options[:index]
         elsif defined?(@auto_index)
-          self.object_name = @object_name.to_s.sub(/\[\]$/,"")
+          object_name = object_name.to_s.sub(/\[\]$/, "")
           @auto_index
         end
 

data/lib/action_view/helpers/form_tag_helper.rb

@@ -442,21 +442,9 @@ module ActionView
       #   # => <input name='commit' type='submit' value='Save' data-disable-with="Save" data-confirm="Are you sure?" />
       #
       def submit_tag(value = "Save changes", options = {})
-        options = options.stringify_keys
+        options = options.deep_stringify_keys
         tag_options = { "type" => "submit", "name" => "commit", "value" => value }.update(options)
-
-        if ActionView::Base.automatically_disable_submit_tag
-          unless tag_options["data-disable-with"] == false || (tag_options["data"] && tag_options["data"][:disable_with] == false)
-            disable_with_text = tag_options["data-disable-with"]
-            disable_with_text ||= tag_options["data"][:disable_with] if tag_options["data"]
-            disable_with_text ||= value.to_s.clone
-            tag_options.deep_merge!("data" => { "disable_with" => disable_with_text })
-          else
-            tag_options["data"].delete(:disable_with) if tag_options["data"]
-          end
-          tag_options.delete("data-disable-with")
-        end
-
+        set_default_disable_with value, tag_options
         tag :input, tag_options
       end
 
@@ -897,6 +885,22 @@ module ActionView
         def sanitize_to_id(name)
           name.to_s.delete(']').tr('^-a-zA-Z0-9:.', "_")
         end
+
+        def set_default_disable_with(value, tag_options)
+          return unless ActionView::Base.automatically_disable_submit_tag
+          data = tag_options["data"]
+
+          unless tag_options["data-disable-with"] == false || (data && data["disable_with"] == false)
+            disable_with_text = tag_options["data-disable-with"]
+            disable_with_text ||= data["disable_with"] if data
+            disable_with_text ||= value.to_s.clone
+            tag_options.deep_merge!("data" => { "disable_with" => disable_with_text })
+          else
+            data.delete("disable_with") if data
+          end
+
+          tag_options.delete("data-disable-with")
+        end
     end
   end
 end

data/lib/action_view/helpers/tags/base.rb

@@ -14,7 +14,14 @@ module ActionView
           @object_name.sub!(/\[\]$/,"") || @object_name.sub!(/\[\]\]$/,"]")
           @object = retrieve_object(options.delete(:object))
           @options = options
-          @auto_index = Regexp.last_match ? retrieve_autoindex(Regexp.last_match.pre_match) : nil
+
+          if Regexp.last_match
+            @generate_indexed_names = true
+            @auto_index = retrieve_autoindex(Regexp.last_match.pre_match)
+          else
+            @generate_indexed_names = false
+            @auto_index = nil
+          end
         end
 
         # This is what child classes implement.
@@ -152,7 +159,11 @@ module ActionView
         end
 
         def name_and_id_index(options)
-          options.key?("index") ?  options.delete("index") || "" : @auto_index
+          if options.key?("index")
+            options.delete("index") || ""
+          elsif @generate_indexed_names
+            @auto_index || ""
+          end
         end
       end
     end

data/lib/action_view/renderer/partial_renderer.rb

@@ -457,7 +457,7 @@ module ActionView
         locals[counter]   = index
         locals[iteration] = partial_iteration
 
-        template = (cache[path] ||= find_template(path, keys + [as, counter]))
+        template = (cache[path] ||= find_template(path, keys + [as, counter, iteration]))
         content = template.render(view, locals)
         partial_iteration.iterate!
         content

data/lib/action_view/rendering.rb

@@ -84,7 +84,8 @@ module ActionView
     end
 
     def rendered_format
-      Template::Types[lookup_context.rendered_format]
+      format = lookup_context.rendered_format
+      Template::Types[format] || format
     end
 
     private
@@ -124,7 +125,11 @@ module ActionView
           key = action.include?(?/) ? :template : :action
           options[key] = action
         else
-          options[:partial] = action
+          if action.respond_to?(:permitted?) && action.permitted?
+            options = action
+          else
+            options[:partial] = action
+          end
         end
 
         options

data/lib/action_view/template.rb

@@ -329,7 +329,7 @@ module ActionView
         # Only locals with valid variable names get set directly. Others will
         # still be available in local_assigns.
         locals = @locals - Module::RUBY_RESERVED_KEYWORDS
-        locals = locals.grep(/\A(?![A-Z0-9])(?:[[:alnum:]_]|[^\0-\177])+\z/)
+        locals = locals.grep(/\A@?(?![A-Z0-9])(?:[[:alnum:]_]|[^\0-\177])+\z/)
 
         # Double assign to suppress the dreaded 'assigned but unused variable' warning
         locals.each_with_object("") { |key, code| code << "#{key} = #{key} = local_assigns[:#{key}];" }

data/lib/action_view/template/resolver.rb

@@ -147,8 +147,8 @@ module ActionView
     # This is what child classes implement. No defaults are needed
     # because Resolver guarantees that the arguments are present and
     # normalized.
-    def find_templates(name, prefix, partial, details)
-      raise NotImplementedError, "Subclasses must implement a find_templates(name, prefix, partial, details) method"
+    def find_templates(name, prefix, partial, details, outside_app_allowed = false)
+      raise NotImplementedError, "Subclasses must implement a find_templates(name, prefix, partial, details, outside_app_allowed = false) method"
     end
 
     # Helpers that builds a path. Useful for building virtual paths.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionview
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2.rc1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +61,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: rails-dom-testing
   requirement: !ruby/object:Gem::Requirement
@@ -92,28 +92,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2.rc1
 description: Simple, battle-tested conventions and helpers for building web pages.
 email: david@loudthinking.com
 executables: []
@@ -238,15 +238,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Rendering framework putting the V in MVC (part of Rails).
 test_files: []
-has_rdoc: