formulario 0.1.6 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 273d0e050429479bb6a1a170ea7e0e86adf0fb445be85cbab978c4d0d6c7fc6f
-  data.tar.gz: 80dbac663baaf27f6f0f7611b32b7c2b2aa70cb80f8eca8d79bb07f61c2cff9e
+  metadata.gz: 63bcd983db7081db6f273df3552b2a3c303a3ad523645ce708845261a9083eb2
+  data.tar.gz: c61c2edec3d80f0a63b379fff002a0466ff1fe1905c283375970da3c6b0fe338
 SHA512:
-  metadata.gz: 41e50dd9124f6f809d6a2e1d6b513bf4b65795292e75a61ab7c3357d4da099e8a0b152359b967df803f7b9791b4a2bb71799fa713dd568d6c47c842415ad602e
-  data.tar.gz: afaded423accd97236478ac2d490330c3d9dbb4178b010049aa6f9b99babd0f244ff98c8c5f19dd889a4ce2f4b3f6b4463dc9097196236f771c6d700ec33ee4c
+  metadata.gz: '09e7e4a46761f274b6f7666367e727a32af5dabe85c4d4ab7da4449b33c5bdfe226cb09aaa71c0750a30c227d3dec0afc00fce99be4270b7751df58ea0da4a0f'
+  data.tar.gz: f7ba1d511605f3fd4bb3cc993148729dab7d9d5dba54de53a853a016fe40b2ef2527c576ccf38fd28f3f624ce0f89c2340a22b037d2f104260fb1fa7a5f7e6b8

data/Gemfile.lock

@@ -1,38 +1,38 @@
 PATH
   remote: .
   specs:
-    formulario (0.1.6)
+    formulario (0.1.12)
 
 GEM
   remote: https://rubygems.org/
   specs:
     awesome_print (1.8.0)
-    byebug (11.0.1)
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    json (2.2.0)
-    method_source (0.9.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
+    json (2.5.1)
+    method_source (1.0.0)
+    pry (0.14.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    rake (13.0.1)
+    rake (13.0.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.4)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -52,4 +52,4 @@ DEPENDENCIES
   simplecov (~> 0.17.1)
 
 BUNDLED WITH
-   2.0.2
+   2.2.3

data/lib/formulario/fields.rb

@@ -7,6 +7,7 @@ require "formulario/fields/blank"
 require "formulario/fields/exceptional_value"
 require "formulario/fields/string"
 require "formulario/fields/integer"
+require "formulario/fields/float"
 require "formulario/fields/boolean"
 
 require "formulario/fields/default_time_field"

data/lib/formulario/fields/collection.rb

@@ -3,21 +3,16 @@ module Formulario
     class Collection < Field
       include Enumerable
 
-      def fields
-        raw_value
-      end
-
-      def values
-        fields.map(&:value)
-      end
-      alias :value :values
-
       def self.[](type)
         Class.new(self).tap { |typed_class|
-          typed_class.field_types = TYPES.fetch(type)
+          typed_class.fields_type = type
         }
       end
 
+      def fields
+        raw_value
+      end
+
       def exceptional?
         fields.any?(&:exceptional?)
       end
@@ -26,20 +21,25 @@ module Formulario
         fields.each(&block)
       end
 
+      def values
+        map(&:value)
+      end
+
       private
 
-      def self.build(raw_value)
-        new Array(raw_value).map { |value|
-          field_types.for(value)
-        }
+      def self.build(raw_values)
+        new( Array(raw_values).map { |raw_value|
+               fields_type.for(raw_value)
+             }
+           )
       end
 
-      def self.field_types
-        @field_types ||= Field
+      def self.fields_type
+        @fields_type ||= Field
       end
 
-      def self.field_types=(type)
-        @field_types = type
+      def self.fields_type=(type)
+        @fields_type = type_for(type)
       end
     end
   end

data/lib/formulario/fields/exceptional_value.rb

@@ -9,7 +9,6 @@ module Formulario
         new(raw_value, reasons: reasons)
       end
 
-
       def exceptional?
         true
       end
@@ -26,6 +25,10 @@ module Formulario
         reasons.each(&block)
       end
 
+      def exceptional_class
+        self.class
+      end
+
       private
 
       def initialize(raw_value, reasons: Undefined)
@@ -43,7 +46,6 @@ module Formulario
 
         super(value)
       end
-
     end
   end
 end

data/lib/formulario/fields/field.rb

@@ -16,6 +16,10 @@ module Formulario
       :array      => Formulario::Field::Collection,
     }
 
+    def self.type_for(type)
+      TYPES.fetch(type)
+    end
+
     attr_reader :raw_value
 
     def self.for(raw_value)
@@ -67,6 +71,10 @@ module Formulario
       value == new_other.value
     end
 
+    def exceptional_class
+      ::Formulario::Field::ExceptionalValue
+    end
+
     private
 
     def self.build(raw_value)

data/lib/formulario/fields/float.rb

@@ -0,0 +1,14 @@
+module Formulario
+  class Field
+    class Float < Field
+      private
+
+      def self.build(raw_value)
+        new Float(raw_value)
+      rescue ArgumentError, TypeError => e
+        ExceptionalValue.new(raw_value, reasons: ['needs to represent a float'])
+      end
+
+    end
+  end
+end

data/lib/formulario/fields/unvalidated_field.rb

@@ -66,7 +66,7 @@ module Formulario
                         validator_hash[:validator].message
                       end
 
-            ::Formulario::Field::ExceptionalValue
+            value.exceptional_class
               .new(current_value,
                    reasons: message || validator_hash[:message])
           end

data/lib/formulario/form.rb

@@ -3,23 +3,29 @@ module Formulario
     attr_accessor :model
 
     def initialize(skip_validations: false, **params)
-      __fields.each do |field_name, **options|
+      self.class.__fields.each do |field_name, **options|
         send("#{field_name}=", params.delete(field_name))
       end
 
       params.each do |k, v|
-        send("#{k}=", v)
+        if self.respond_to?("#{k}=")
+          send("#{k}=", v)
+        end
       end
 
       __validate! unless skip_validations
     end
 
     def self.for(model, **rest)
-      fields = __fields.keys.each_with_object({}) { |field_name, res|
-        res[field_name] = model.send(field_name)
-      }
-
-      new(**fields.merge({model: model, **rest}))
+      if model
+        fields = __fields.keys.each_with_object({}) { |field_name, res|
+          res[field_name] = model.send(field_name)
+        }
+
+        new(**fields.merge({model: model, **rest}))
+      else
+        new(**rest)
+      end
     end
 
     def self.default
@@ -31,10 +37,6 @@ module Formulario
       new(skip_validations: true, **params)
     end
 
-    def __fields
-      @__fields ||= {}
-    end
-
     def params
       __fields.each_with_object({}) { |field_info, res|
         field_name = field_info.first
@@ -74,12 +76,12 @@ module Formulario
 
     private
 
-    def self.__fields
-      @field ||= {}
+    def __fields
+      @__fields ||= {}
     end
 
-    def __fields
-      @__fields ||= self.class.__fields
+    def self.__fields
+      @field ||= {}
     end
 
     def self.field(field_name,
@@ -93,7 +95,12 @@ module Formulario
         validators: [],
       )
 
+      define_method("__set_field_#{field_name}") do
+        __fields[field_name.to_sym] ||= self.class.__fields[field_name.to_sym].dup
+      end
+      
       define_method(field_name) do
+        send("__set_field_#{field_name}")
         __fields[field_name.to_sym].value
       end
 
@@ -104,6 +111,7 @@ module Formulario
       end
 
       define_method("#{field_name}=") do |raw_value|
+        send("__set_field_#{field_name}")
         __fields[field_name.to_sym].value =  Field.type_for(field_type).for(
           send("set_#{field_name}", raw_value)
         )

data/lib/formulario/version.rb

@@ -1,3 +1,3 @@
 module Formulario
-  VERSION = "0.1.6"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formulario
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.12
 platform: ruby
 authors:
 - Federico Iachetti
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,6 +123,7 @@ files:
 - lib/formulario/fields/default_time_field.rb
 - lib/formulario/fields/exceptional_value.rb
 - lib/formulario/fields/field.rb
+- lib/formulario/fields/float.rb
 - lib/formulario/fields/form_field.rb
 - lib/formulario/fields/id.rb
 - lib/formulario/fields/integer.rb
@@ -140,7 +141,7 @@ metadata:
   homepage_uri: https://gitlab.com/fiachetti/formulario
   source_code_uri: https://gitlab.com/fiachetti/formulario
   changelog_uri: https://gitlab.com/fiachetti/formulario/blob/d46f675a18c4fbf1d16634a5da343a648af7cf0c/CHANGELOG.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -155,8 +156,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Form objects for your project
 test_files: []