formwandler 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88fd867f333bb338b58f553689d7d244d4c327ddf9a2317124c9b34111e8bd8b
-  data.tar.gz: b7b4925c4dc382c2de8201bf6d1b4d7b8e4693f284ca7ba89b269629d5d6785a
+  metadata.gz: d83c20395db6d499d42e57b1575f9c3020392221358d7ff1f7c825e667dc6ef5
+  data.tar.gz: 315035887242f76e2f51336f09b58bb376b597932a505c539d4b0da8fdfb8b58
 SHA512:
-  metadata.gz: 497f8c620f1b04ae8789eb6591e9e8689ce0cc44a5fc78762e9895a45befa2b552fac6cd6e97069a7ed3ba268a0dfaf9af3cae628d5862f62ad00d6a1d61c18f
-  data.tar.gz: 640cb7933dd6614c70b8bdb3196ef724a4bec0679e2f62b80207a02c5992da2786861ec4e553d4471bcc1e9e6ea18454bf3726b7e54b2b1b9e0142a2612c5b33
+  metadata.gz: e406427a31ea2cdf5cc8059ff9854e596831bd0ffc0cd9cdd128791ec4624213c3903cb98b403d90bbc88ca147b3bfe21087237c1f11f9fb8ef60b14f378a9b6
+  data.tar.gz: 0216f9859f581c28439d671b90935a0158a2b31e487aa008c92673f2c30a1dcd153af047afebd0485baf97b15e9dff054f582787e179d6ec3b5168f380a69642

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, :readonly, :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
@@ -43,9 +71,15 @@ module Formwandler
       @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)

data/lib/formwandler/version.rb

@@ -1,3 +1,3 @@
 module Formwandler
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: formwandler
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Stefan Bilharz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2019-02-08 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.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -142,8 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Form objects for rails