formwandler 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a45d189660c8aace9e7271c8d9dc110962a75954c538b8e0ffc29c882f0cde4
-  data.tar.gz: 85d1558cfd2507a7bbf57cb4c21f5c41f205df3230a49e408d4333e2c9fa40ed
+  metadata.gz: 2baf488a4d1a35a90e7a53d588c8d843fccab4cc8ce9de5cda36920d4d9b22aa
+  data.tar.gz: a00ac15d3663ea1e7c313170681bd3d949c30024862a98c44afc891e2d611ca1
 SHA512:
-  metadata.gz: 136d046b2a96878ecdc22c39a8e1c4ff400a8e211d063397ad8e1d38aed2ddcf30e342e50c21292f6fbfbbefc809569be90fcd13c897d0c9bb5b05b1bdf280bc
-  data.tar.gz: f9fdf3e938ec7476755097233005a173c8b6ef68f4d8ec2ff24cd33edc1b300885f9a36392a09ba86de0516d38c7caa102bf2381cbd96b98886ad145906ca2f8
+  metadata.gz: 4d91c842de66da094997e6e270349af7fcc76ef66ab32a597fd444e857ee97b3990c0ab3e99539534e8b43dc1478573a41f8c707533805b63ea1c704b0f87dc1
+  data.tar.gz: 297b12e919ba35ac50d90ae3e73b8d87ff211cdc401bbdcc02cf20457502a63efed0b18b871f165fabc278f3e21b4b231075de9ba87ea316302f68dd9390e45b

data/lib/formwandler/form.rb

@@ -83,22 +83,14 @@ module Formwandler
       fields.select { |field| field.model == model }
     end
 
-    def models_valid?
-      all_valid = true
-      models.each do |name, model|
-        all_valid = false if model.invalid?
-        next if model.valid?
-        fields_for_model(name).each do |field|
-          model.errors[field.source].each do |error_message|
-            errors.add(field.name, error_message)
-          end
-        end
-      end
-      all_valid
+    def valid?
+      form_valid = super
+      models_valid = models_valid?
+      form_valid && models_valid
     end
 
     def submit
-      if valid? && models_valid?
+      if valid?
         ActiveRecord::Base.transaction do
           save_models!
         end
@@ -125,6 +117,20 @@ module Formwandler
       assign_attributes permitted_params
     end
 
+    def models_valid?
+      all_valid = true
+      models.each do |name, model|
+        all_valid = false if model.invalid?
+        next if model.valid?
+        fields_for_model(name).each do |field|
+          model.errors[field.source].each do |error_message|
+            errors.add(field.name, error_message)
+          end
+        end
+      end
+      all_valid
+    end
+
     def save_models!
       models.sort_by do |(name, _model)|
         self.class.model_save_order&.index(name) || self.class.model_save_order&.size
@@ -140,11 +146,11 @@ module Formwandler
     end
 
     def permitted_params
-      controller.params.require(model_name.param_key).permit(*visible_fields).delocalize(delocalizations)
+      controller.params.require(model_name.param_key).permit(*permitted_fields).delocalize(delocalizations)
     end
 
-    def visible_fields
-      fields.reject(&:hidden?).map do |field|
+    def permitted_fields
+      fields.reject(&:disabled?).map do |field|
         field.array? ? {field.name => []} : field.name
       end
     end

data/lib/formwandler/version.rb

@@ -1,3 +1,3 @@
 module Formwandler
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formwandler
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Stefan Bilharz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails