on_form 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da2ced30fe04b528a602ad17e4b6ba170c08c02e
-  data.tar.gz: 757f860fa9c1b41c575f6ea5c0a7a4920d32c240
+  metadata.gz: '09af61b2205c485d1694caedb95103adf309cd07'
+  data.tar.gz: 77f92d293295cd1395e64cdbc0e943871bde564e
 SHA512:
-  metadata.gz: d85b8d09675bb0edbd414bb4ed3ddbc44b14bc17a571e6259928099f2e611c56607d2f541c99067653f7f79deeab60a7aee1884d249e70c36a24204f26543733
-  data.tar.gz: cd09754e7fe9a5a686911a577aa2e2e85edd478c7f79107b4d7c2601a46d9b9b3158f2d43bb3d0c776074e61fa752ac825498a02af3cbeb9ffc80cc09c40975a
+  metadata.gz: c0900e4396e325f37f1cf91f687b39835be6576a6f6aeb8a357f5dabfa1c05645ff95b456c3c6fd8d76173ac9225fd441c0847c99b140e20458ddb09cafff277
+  data.tar.gz: 3aa596b415f0a8a321ddcac36e8786fa029e6b5f98a63e907f15c979f0506043009fb72941b1a681c974611ba9dcd17ff2698caf919cec17dc7145ce8789d238

data/CHANGES.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+3.1.0
+-----
+* Support `reject_if` option on `expose_collection_of`.  Thanks @Dhamsoft.
+
 3.0.0
 -----
 * Support `save(validate: false)` and `save!(validate: false)`.

data/lib/on_form/collection_wrapper.rb

@@ -1,18 +1,18 @@
 module OnForm
   class CollectionWrapper
     include ::Enumerable
-
-    attr_reader :parent, :association_name, :collection_form_class, :allow_insert, :allow_update, :allow_destroy
+    attr_reader :parent, :association_name, :collection_form_class,
+                :allow_insert, :allow_update, :allow_destroy, :reject_if
 
     delegate :each, :first, :last, :[], to: :to_a
 
-    def initialize(parent, association_name, collection_form_class, allow_insert, allow_update, allow_destroy)
+    def initialize(parent, association_name, collection_form_class, allow_insert: true, allow_update: true, allow_destroy: false, reject_if: nil)
       @parent = parent
       @association_name = association_name
       @association = parent.association(association_name)
       @association_proxy = parent.send(association_name)
       @collection_form_class = collection_form_class
-      @allow_insert, @allow_update, @allow_destroy = allow_insert, allow_update, allow_destroy
+      @allow_insert, @allow_update, @allow_destroy, @reject_if = allow_insert, allow_update, allow_destroy, reject_if
       @wrapped_records = {}
       @wrapped_new_records = []
       @loaded_forms = []
@@ -66,11 +66,11 @@ module OnForm
         if id = attributes['id'] || attributes[:id]
           if destroy
             records_to_destroy << id.to_i if allow_destroy
-          else
-            records_to_update[id.to_i] = attributes.except('id', :id, '_destroy', :destroy) if allow_update
+          elsif allow_update && !call_reject_if(attributes)
+            records_to_update[id.to_i] = attributes.except('id', :id, '_destroy', :destroy)
           end
-        elsif !destroy
-          records_to_insert << attributes.except('_destroy', :destroy) if allow_insert
+        elsif !destroy && allow_insert && !call_reject_if(attributes)
+          records_to_insert << attributes.except('_destroy', :destroy)
         end
       end
 
@@ -117,5 +117,19 @@ module OnForm
     def wrapped_record(record)
       @wrapped_records[record] ||= @collection_form_class.new(record).tap { |form| @loaded_forms << form }
     end
+
+    # Determines if a record with the particular +attributes+ should be
+    # rejected by calling the reject_if Symbol or Proc (if defined).
+    # The reject_if option is defined by +expose_collection_of+.
+    def call_reject_if(attributes)
+      case reject_if
+      when Symbol
+        @collection_form_class.method(reject_if).arity == 0 ? @collection_form_class.send(reject_if) : @collection_form_class.send(reject_if, attributes)
+      when Proc
+        reject_if.call(attributes)
+      else
+        false
+      end
+    end
   end
 end

data/lib/on_form/form.rb

@@ -76,7 +76,9 @@ module OnForm
       delegate :to_model, to: backing_model_name if convert_to_model
     end
 
-    def self.expose_collection_of(association_name, on: nil, prefix: nil, suffix: nil, as: nil, allow_insert: true, allow_update: true, allow_destroy: false, &block)
+    def self.expose_collection_of(association_name, on: nil, prefix: nil, suffix: nil, as: nil,
+                                  allow_insert: true, allow_update: true, allow_destroy: false, reject_if: nil, &block)
+
       exposed_name = as || "#{prefix}#{association_name}#{suffix}"
       singular_name = exposed_name.to_s.singularize
       association_name = association_name.to_sym
@@ -92,7 +94,14 @@ module OnForm
       collection_form_class.take_identity_from singular_name, convert_to_model: false
       collection_form_class.class_eval(&block)
 
-      define_method(exposed_name) { collection_wrappers[association_name] ||= CollectionWrapper.new(backing_model_instance(on), association_name, collection_form_class, allow_insert, allow_update, allow_destroy) } # used by action_view's fields_for, and by the following lines
+      # used by action_view's fields_for, and by the following lines
+      define_method(exposed_name) do
+        collection_wrappers[association_name] ||= CollectionWrapper.new(
+          backing_model_instance(on), association_name, collection_form_class,
+          allow_insert: allow_insert, allow_update: allow_update,
+          allow_destroy: allow_destroy, reject_if: reject_if
+        )
+      end
       define_method("#{exposed_name}_attributes=") { |params| send(exposed_name).parse_collection_attributes(params) }
 
       collection_form_class

data/lib/on_form/version.rb

@@ -1,3 +1,3 @@
 module OnForm
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: on_form
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-22 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel