strong_form 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a30f0f44d553fb9d707018abd5d9d55aa03ec1dd
-  data.tar.gz: b8ce403abbfdf3a12aeb68872b3ef7773db66ec5
+  metadata.gz: ff15586ac89816f64ef1c81905617927482828df
+  data.tar.gz: b481ed6c8aaff01a061bc8651398312a32d84ce3
 SHA512:
-  metadata.gz: 8a2a3ec614c3b8e1aef6703421a7ae931e2180d922db010318a12c5e494a754bf8b8b76baea275d15b95825651271105b63a0d45ab5bddb7c0165910064d755a
-  data.tar.gz: b5a489bc2673f013f1d93aa63872c473e26ddc912c5286f2bc1cf289a8e4c6b367297e1d9d6844c82c0488185356d8fc0b04368ca46a6c9ef22a61f57083846d
+  metadata.gz: 8acb2392c4bb78f8030d19ffa40233a437f92390ad4cac10ca56bfa8ef7fbbfb6ce31cfcb8efc13322c5952a5c8971eda2dea2636de4032d3baeb6db0079fd2a
+  data.tar.gz: 02061d6d903847ff2bcd1c4a5ba64ea96af25264116408e4fb79f21f5f7ce0188614fc33e44ce4d7f14a1d0819d0d3b240fca39fcd84138707271996d1486631

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## master
 
+## 0.0.8
+
+### Bugs fixed
+
+* Fix typo `respond_to` --> `respond_to?`
+
+## 0.0.7
+
+### Bugs fixed
+
+* Fix disabling of child attributes if only `fields_for` has permitted_attributes
+
+* Simplify code
+
 ## 0.0.6
 
 ### Bugs fixed

data/lib/strong_form/form.rb

@@ -3,18 +3,11 @@ module ActionView
     module FormHelper
       alias_method :orig_form_for, :form_for
 
-      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)
-          object.permitted_attributes =
-            _strong_form_permitted_attributes if object.respond_to?(:permitted_attributes=)
-        # assigned to object
-        elsif object.respond_to?(:permitted_attributes)
-          self._strong_form_permitted_attributes = object.permitted_attributes
+
+        if options.key?(:permitted_attributes) && object.respond_to?(:permitted_attributes=)
+          object.permitted_attributes = options.delete(:permitted_attributes)
         end
 
         orig_form_for(record, options, &block)
@@ -45,14 +38,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)
-        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]
+        if record_object.respond_to?(:permitted_attributes=)
+          if options.key?(:permitted_attributes)
+            record_object.permitted_attributes = options[:permitted_attributes]
+          elsif options[:parent_builder].object.try(:permitted_attributes) &&
+                record_object.permitted_attributes.nil?
+            assign_child_permitted_attributes!(
+              record_name, record_object, options[:parent_builder].object.permitted_attributes
+            )
+          end
         end
 
         builder = instantiate_builder(record_name, record_object, options)

data/lib/strong_form/version.rb

@@ -1,3 +1,3 @@
 module StrongForm
-  VERSION = '0.0.6'
+  VERSION = '0.0.8'
 end

data/spec/dummy/app/models/address.rb

@@ -3,4 +3,5 @@ class Address < ActiveRecord::Base
 
   has_many :tags, as: :taggable
   accepts_nested_attributes_for :tags
+  accepts_nested_attributes_for :user
 end

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

@@ -1,8 +1,11 @@
 = form_for @user, url: '/somewhere' do |f|
   = render 'user_fields', f: f
 
-  = f.fields_for :addresses, permitted_attributes: %i(street) do |af|
+  = f.fields_for :addresses, permitted_attributes: [:street, user_attributes: [:last_name]] do |af|
     = render 'address_fields', f: af
 
+    = af.fields_for :user, User.new do |uf|
+      = render 'user_fields', f: uf
+
   = f.fields_for :tag do |tf|
     = render 'tag_fields', f: tf

data/spec/dummy/config/application.rb

@@ -22,6 +22,6 @@ module Dummy
     # config.i18n.default_locale = :de
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
+    # config.active_record.raise_in_transactional_callbacks = true
   end
 end