formwandler 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0db28341ef76b8524fd9d0bc11b243667f490f08
-  data.tar.gz: c263b0a3736ed877b25d7648a175b15fd13053c5
+  metadata.gz: 2dd62e45f73ce8f70eb053af48e887d44f3fcc51
+  data.tar.gz: ddebd431d50447fe4306397484d272d5d5263059
 SHA512:
-  metadata.gz: 3bd276f0a797234bdcd978948c6c0036b06b9fbf828671f7c95180935866933caddcc4b08e131e07a8fadc8a38393d5b65d2ac49316c6430c01d7ec717fa74b5
-  data.tar.gz: 4846d5deb2a856e3e6ce63f0020e7dc7876f1fb6bb444c357bc73cc1e237a91b16ee99d27a24effd15247d93126714321394b37274e0a2513f2abc4873f3afb5
+  metadata.gz: cbb4804ab0e18db419b2dce0d889a8ce0517b065a0ccdd5d306e9375ab5d59b50dddeb901b211721de135fb6faf318bc4622a6420ec983809e33690452c405b4
+  data.tar.gz: fe9c5ad5b420b8e760b07c396165b6595b290daf34f3fd2a9029efbf3d9d790659b5eb6c89151c471ba484e285ab1f03895e2dec6832dcff6453beae592695dc

data/lib/formwandler/field.rb

@@ -12,11 +12,7 @@ module Formwandler
     end
 
     def hidden?
-      if field_definition.hidden.respond_to?(:call)
-        form.instance_exec(&field_definition.hidden)
-      else
-        field_definition.hidden
-      end
+      _evaluate_field_definition_value(:hidden)
     end
 
     def visible?
@@ -24,11 +20,7 @@ module Formwandler
     end
 
     def disabled?
-      if field_definition.disabled.respond_to?(:call)
-        form.instance_exec(&field_definition.disabled)
-      else
-        field_definition.disabled
-      end
+      _evaluate_field_definition_value(:disabled)
     end
 
     def options
@@ -40,19 +32,11 @@ module Formwandler
     end
 
     def default
-      if field_definition.default.respond_to?(:call)
-        form.instance_exec(&field_definition.default)
-      else
-        field_definition.default
-      end
+      _evaluate_field_definition_value(:default)
     end
 
     def delocalize
-      if field_definition.delocalize.respond_to?(:call)
-        form.instance_exec(&field_definition.delocalize)
-      else
-        field_definition.delocalize
-      end
+      _evaluate_field_definition_value(:delocalize)
     end
 
     private

data/lib/formwandler/form.rb

@@ -46,15 +46,16 @@ module Formwandler
       attr_reader :model_save_order
     end
 
-    attr_reader :models, :current_user
+    attr_reader :models, :controller
 
-    def initialize(models: {}, current_user: nil)
+    def initialize(models: {}, controller:)
       @models = models.symbolize_keys
-      @current_user = current_user
+      @controller = controller
 
       initialize_fields
       initialize_models
       assign_defaults
+      assign_params
     end
 
     def persisted?
@@ -95,9 +96,7 @@ module Formwandler
       all_valid
     end
 
-    def submit(params)
-      assign_attributes permitted_params(params)
-
+    def submit
       if valid? && models_valid?
         save_models!
         load_results
@@ -106,7 +105,7 @@ module Formwandler
       end
     end
 
-    protected
+    private
 
     def initialize_models
     end
@@ -118,6 +117,11 @@ module Formwandler
       end
     end
 
+    def assign_params
+      return unless form_params?
+      assign_attributes permitted_params
+    end
+
     def save_models!
       models.sort_by do |(name, _model)|
         self.class.model_save_order&.index(name) || self.class.model_save_order&.size
@@ -128,15 +132,16 @@ module Formwandler
       true
     end
 
-    def permitted_params(params)
+    def form_params?
+      controller.params.fetch(model_name.param_key, {}).to_unsafe_h.any?
+    end
+
+    def permitted_params
       visible_fields = fields.reject(&:hidden?).map(&:name)
       delocalizations = fields.map(&:delocalize).compact
-      params = ActionController::Parameters.new(params) if params.is_a?(Hash)
-      params.require(model_name.param_key).permit(*visible_fields).delocalize(delocalizations)
+      controller.params.require(model_name.param_key).permit(*visible_fields).delocalize(delocalizations)
     end
 
-    private
-
     def initialize_fields
       @fields = self.class.field_definitions.transform_values do |field_definition|
         Field.new(form: self, field_definition: field_definition)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formwandler
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Stefan Bilharz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -63,7 +63,7 @@ files:
 - lib/formwandler/field.rb
 - lib/formwandler/field_definition.rb
 - lib/formwandler/form.rb
-homepage: 
+homepage: https://github.com/sbilharz/formwandler
 licenses:
 - MIT
 metadata: {}