formwandler 0.6.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a45d189660c8aace9e7271c8d9dc110962a75954c538b8e0ffc29c882f0cde4
-  data.tar.gz: 85d1558cfd2507a7bbf57cb4c21f5c41f205df3230a49e408d4333e2c9fa40ed
+  metadata.gz: c58985c9314b2ee1dbeb4372f7c0554eb16322c27767daaf227ae6be46b8b61e
+  data.tar.gz: cc39146f7953edc67dc131ec87e48d54b6631882f2457b565744ebabb602ab92
 SHA512:
-  metadata.gz: 136d046b2a96878ecdc22c39a8e1c4ff400a8e211d063397ad8e1d38aed2ddcf30e342e50c21292f6fbfbbefc809569be90fcd13c897d0c9bb5b05b1bdf280bc
-  data.tar.gz: f9fdf3e938ec7476755097233005a173c8b6ef68f4d8ec2ff24cd33edc1b300885f9a36392a09ba86de0516d38c7caa102bf2381cbd96b98886ad145906ca2f8
+  metadata.gz: 55eeb2ca00dcf309f9eaa60a57326fb5feb3f684a5ddf2fcaf889e551b03048f60863570a97f4fa6b886b13bc9a27b01839d1ef751506158a010569d6f7b4cf4
+  data.tar.gz: 593380319ef6ac9e31a74ac204aa0ac9f88b402ff077a23caa0b67c3a4ae0d526814f6c18b15057953858c5db0fc4bcecd3434c4f0bec201359a6b09b67ac723

data/lib/formwandler/field.rb

@@ -14,7 +14,7 @@ module Formwandler
     def value=(new_value)
       new_value = transform_value(new_value, field_definition.in_transformation)
       if model_instance
-        model_instance.public_send("#{field_definition.source}=", new_value)
+        model_instance.public_send("#{source}=", new_value)
       else
         @value = new_value
       end
@@ -25,7 +25,7 @@ module Formwandler
     end
 
     def raw_value
-      model_instance ? model_instance.public_send(field_definition.source) : @value
+      model_instance ? model_instance.public_send(source) : @value
     end
 
     def hidden?
@@ -40,6 +40,10 @@ module Formwandler
       _evaluate_field_definition_value(:disabled)
     end
 
+    def readonly?
+      _evaluate_field_definition_value(:readonly)
+    end
+
     def options
       all_options - hidden_options
     end

data/lib/formwandler/field_definition.rb

@@ -5,13 +5,41 @@ require_relative 'field_value_transformer'
 module Formwandler
   class FieldDefinition
     attr_reader :name
-    attr_accessor :hidden, :disabled, :default, :delocalize, :model, :source, :options, :array
+    attr_accessor :hidden, :disabled, :readonly, :default, :delocalize, :model, :model_class, :source, :options, :array
 
     def initialize(name)
       @name = name
       set_defaults
     end
 
+    def model=(model)
+      set_model model, model
+    end
+
+    def model_class=(symbol_or_class)
+      @model_class =
+        if symbol_or_class.nil?
+          nil
+        elsif symbol_or_class.is_a?(Symbol)
+          symbol_or_class.to_s.classify.constantize rescue nil
+        elsif symbol_or_class < ActiveRecord::Base || symbol_or_class < ActiveModel::Model
+          symbol_or_class
+        else
+          fail 'The model class must be nil, a symbol or a descendant of ActiveModel::Model or ActiveRecord::Base.'
+        end
+    end
+
+    def configure(opts)
+      model = opts[:model]
+      model_class = opts[:model_class] || model
+      set_model model, model_class
+      opts.except(:model, :model_class).each do |key, value|
+        send("#{key}=", value)
+      rescue NoMethodError
+        raise ArgumentError, "Invalid option #{key}"
+      end
+    end
+
     def hide_option(name, value = true)
       hidden_options[name.to_s] = value
     end
@@ -39,12 +67,19 @@ module Formwandler
     def set_defaults
       @hidden = false
       @disabled = false
+      @readonly = false
       @default = nil
       @delocalize = nil
       @model = nil
+      @model_class = nil
       @source = name
       @options = nil
       @array = false
     end
+
+    def set_model(model, model_class)
+      @model = model
+      self.model_class = model_class
+    end
   end
 end

data/lib/formwandler/form.rb

@@ -14,17 +14,23 @@ module Formwandler
         ActiveModel::Name.new(self, nil, name.chomp('Form').underscore)
       end
 
+      def human_attribute_name(attr, options = {})
+        field_definition = @field_definitions.fetch(attr) { nil }
+        if options[:default].nil? && field_definition && field_definition.model_class
+          not_found = '__formwandler_not_found__'
+          model_translation = field_definition.model_class.human_attribute_name(field_definition.source, default: not_found)
+          options[:default] = model_translation unless model_translation == not_found
+        end
+        super(attr, options)
+      end
+
       def field_definitions
         @field_definitions ||= {}
       end
 
       def field(name, opts = {}, &block)
         field_definition = field_definitions[name] ||= FieldDefinition.new(name)
-        opts.each do |key, value|
-          field_definition.public_send("#{key}=", value)
-        rescue NoMethodError
-          raise ArgumentError, "Invalid option #{key}"
-        end
+        field_definition.configure(opts)
         field_definition.instance_exec(&block) if block_given?
 
         attribute_accessor(name)
@@ -83,22 +89,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 +123,21 @@ module Formwandler
       assign_attributes permitted_params
     end
 
+    def models_valid?
+      all_valid = true
+      models.each do |name, model|
+        next if model.valid?
+
+        all_valid = false
+        fields_for_model(name).each do |field|
+          model.errors[field.source].each do |error_message|
+            errors.add(field.name, error_message) unless errors.messages[field.source].include? 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 +153,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/form_loader.rb

@@ -6,22 +6,18 @@ module Formwandler
 
     class_methods do
       def load_form(opts = {})
-        before_action :_formwandler_load_form, opts
-      end
-
-      def skip_load_form(opts = {})
-        skip_before_action :_formwandler_load_form, opts
+        before_action(opts.except(:models)) do
+          if opts.fetch(:models, true)
+            models = {inferred_resource_name.to_sym => instance_variable_get("@#{inferred_resource_name}")}.compact
+          end
+          form_instance = form_class.new(models: models || {}, controller: self)
+          instance_variable_set("@#{form_instance_name}", form_instance)
+        end
       end
     end
 
     private
 
-    def _formwandler_load_form
-      models = {inferred_resource_name.to_sym => instance_variable_get("@#{inferred_resource_name}")}.compact
-      form_instance = form_class.new(models: models, controller: self)
-      instance_variable_set("@#{form_instance_name}", form_instance)
-    end
-
     def form_class_name
       "#{namespace}::#{inferred_resource_name.camelize}Form"
     end

data/lib/formwandler/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: formwandler
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Stefan Bilharz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: delocalize
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ homepage: https://github.com/sbilharz/formwandler
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -142,9 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Form objects for rails
 test_files: []