formwandler 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2baf488a4d1a35a90e7a53d588c8d843fccab4cc8ce9de5cda36920d4d9b22aa
-  data.tar.gz: a00ac15d3663ea1e7c313170681bd3d949c30024862a98c44afc891e2d611ca1
+  metadata.gz: 9ffd1df3fd9bd73b09841ad5f2ea2179f4a9366fd11f65723948e0e43b217ff4
+  data.tar.gz: 5981014ba28b9dee2ecd47650d701ea8bc5d8de47c0094d96ed367e5d9eb332f
 SHA512:
-  metadata.gz: 4d91c842de66da094997e6e270349af7fcc76ef66ab32a597fd444e857ee97b3990c0ab3e99539534e8b43dc1478573a41f8c707533805b63ea1c704b0f87dc1
-  data.tar.gz: 297b12e919ba35ac50d90ae3e73b8d87ff211cdc401bbdcc02cf20457502a63efed0b18b871f165fabc278f3e21b4b231075de9ba87ea316302f68dd9390e45b
+  metadata.gz: 15d5c19992dda87e2e26c7cde5c38ce6040b4f9074f78639860f2c896ff04734f25dc0bf97d325ee49c3a52ac3de3b23f68a3d87dbd56b070e8066df5d23960e
+  data.tar.gz: dc25518420cd974025447a7bb824f09d99d583e006e5d8795e4ea860843243985577012afd2d8676b4b98a1010bda7b1794da44a8575043d4369198d9c468d6e

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
@@ -63,7 +67,7 @@ module Formwandler
     private
 
     def transform_value(value, transformation)
-      return value if value.nil? || value == ''
+      return value if !field_definition.transform_blank && (value.nil? || value == '')
       if transformation.respond_to?(:call)
         form.instance_exec(value, &transformation)
       else

data/lib/formwandler/field_definition.rb

@@ -4,14 +4,43 @@ require_relative 'field_value_transformer'
 
 module Formwandler
   class FieldDefinition
-    attr_reader :name
-    attr_accessor :hidden, :disabled, :default, :delocalize, :model, :source, :options, :array
+    attr_reader :name, :transform_blank
+    attr_accessor :hidden, :disabled, :readonly, :default, :delocalize, :model, :model_class, :source, :options, :array
 
     def initialize(name)
       @name = name
+      @transform_blank = false
       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
@@ -20,7 +49,8 @@ module Formwandler
       @hidden_options ||= {}
     end
 
-    def transform(&block)
+    def transform(allow_blank: false, &block)
+      @transform_blank = allow_blank
       @value_transformer = FieldValueTransformer.new(&block)
     end
 
@@ -39,12 +69,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)
@@ -120,11 +126,12 @@ module Formwandler
     def models_valid?
       all_valid = true
       models.each do |name, model|
-        all_valid = false if model.invalid?
         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)
+            errors.add(field.name, error_message) unless errors.messages[field.source].include? error_message
           end
         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.7.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: formwandler
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Stefan Bilharz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2021-06-09 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.4
+signing_key:
 specification_version: 4
 summary: Form objects for rails
 test_files: []