strong_form 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f53b420bc975c8584fb569a392689859becd54
-  data.tar.gz: b31cbffcc7c257df3a7a7a9186b611577889394c
+  metadata.gz: 6626016366a5ba97f7bcaa7fac2477926c1a7375
+  data.tar.gz: 5fcc3a6cbbcb4cd8a1c935fb2c7f1a501d6442b9
 SHA512:
-  metadata.gz: 7abaa1c497d56fd47477830e5a8f592fc16567e040440e0983c57c08ddc5e9bc180b620d53a4d58b78c5b8f2b5510099d6fd696365f99530a715e822591762e4
-  data.tar.gz: 73773f063fef71ad8145bb700a169cd376042452bd0c5993daf2d7ab34e7329fa5e6d58c4ddee1ea90ebcbf7ba6eb13ed60fa615961801731502b6ca4d928712
+  metadata.gz: ba49e910f1db4bae7ca1a0441e6c39aad3e4d7829419a3f489000ed8e70d588cf09f624a7d91140d1000f26db89937c3fd91dd94068e0f8c9682edcdaf931c07
+  data.tar.gz: ac81fb50f77cf8c4cd05d28e17dd305908e89411cd4ba2a60a615a0aa4fe9b0b63d51c8d8ab6e746bb3cff7aa59075b9aa6d8fe2399ccfe2e7fcb7e30ef45d31

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## master
 
+## 0.0.5
+
+### Bugs fixed
+
+* Make `fields_for` work with `permitted_attributes` even if parent form was not
+  initialized with them.
+
 ## 0.0.4
 
 ### Bugs fixed

data/lib/strong_form/form.rb

@@ -6,14 +6,15 @@ module ActionView
       attr_accessor :_strong_form_permitted_attributes
 
       def form_for(record, options = {}, &block)
+        object = record.is_a?(Array) ? record.last : record
         # explicilty passed
         if options.key?(:permitted_attributes)
           self._strong_form_permitted_attributes = options.delete(:permitted_attributes)
-          record.permitted_attributes =
-            _strong_form_permitted_attributes if record.respond_to?(:permitted_attributes=)
+          object.permitted_attributes =
+            _strong_form_permitted_attributes if object.respond_to?(:permitted_attributes=)
         # assigned to object
-        elsif record.respond_to?(:permitted_attributes)
-          self._strong_form_permitted_attributes = record.permitted_attributes
+        elsif object.respond_to?(:permitted_attributes)
+          self._strong_form_permitted_attributes = object.permitted_attributes
         end
 
         orig_form_for(record, options, &block)
@@ -44,9 +45,15 @@ module ActionView
 
       # https://github.com/rails/rails/blob/4-2-stable/actionview/lib/action_view/helpers/form_helper.rb#L712
       def fields_for(record_name, record_object = nil, options = {}, &block)
-        assign_child_permitted_attributes!(
-          record_name, record_object, options[:parent_builder].object.permitted_attributes
-        ) if _strong_form_permitted_attributes && record_object.respond_to?(:permitted_attributes=) && record_object.permitted_attributes.nil?
+        if _strong_form_permitted_attributes &&
+           record_object.respond_to?(:permitted_attributes=) &&
+           record_object.permitted_attributes.nil?
+          assign_child_permitted_attributes!(
+            record_name, record_object, options[:parent_builder].object.permitted_attributes
+          )
+        elsif options.key?(:permitted_attributes) && record_object.respond_to?(:permitted_attributes=)
+          record_object.permitted_attributes = options[:permitted_attributes]
+        end
 
         builder = instantiate_builder(record_name, record_object, options)
         capture(builder, &block)

data/lib/strong_form/version.rb

@@ -1,3 +1,3 @@
 module StrongForm
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/dummy/app/controllers/base_controller.rb

@@ -11,6 +11,12 @@ class BaseController < ApplicationController
     @user.build_tag
   end
 
+  def fields_for_explicit
+    @user = User.new
+    @user.addresses.build
+    @user.build_tag
+  end
+
   def deep_fields_for
     @user = User.new
     (@user.addresses.build).tags.build

data/spec/dummy/app/views/base/fields_for_explicit.html.haml

@@ -0,0 +1,8 @@
+= form_for @user, url: '/somewhere' do |f|
+  = render 'user_fields', f: f
+
+  = f.fields_for :addresses, permitted_attributes: %i(street) do |af|
+    = render 'address_fields', f: af
+
+  = f.fields_for :tag do |tf|
+    = render 'tag_fields', f: tf