formulario 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43e7e8ebe1194dd3fa79eff4b7e39912f5317449fb32b5ed295702a4a97c1d4e
-  data.tar.gz: f7ca81de7f65724ec3fda76f7fe065a55b364fb58bd97f25a3aee7c5a0616198
+  metadata.gz: 657eaba8043eef7c26eac89b91abb56d349f59999047792c0e9757039f1475c2
+  data.tar.gz: 87ce867672a70a3cdf0b429f848ff48d76157033932afc9086dcbaf9a5abf01b
 SHA512:
-  metadata.gz: 3f080136b212a227067d474c84f0b5b5ade318115b66ad950822a3c2c7da9e65a330b2141c4999cb569d65130de70d968ef2161a2eb68a1dd953ab7cea0b3aea
-  data.tar.gz: 815b0224ea87ced887e7b916f598dd9bbabe344f307076874de2748684133bd5328cd83fa666c52dd5da8ea3faf696c18a633cdfc054280862cd4c65b135bb6f
+  metadata.gz: 6f629959e95b64de4dd4082856660b525b845864577253bfd7acc25a7905372b65803e3851e4f8f4d0057dcb43255d064cdf3263559b95fc03c560aa49e634dd
+  data.tar.gz: a408b9e91a9be3c29047ce3fb50b17693f4fa62087f874a4e739641d1e9cb57f027fefbe5716e1695f770be32e703a665a08c979482cb9c4f59de2d17b27e492

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    formulario (0.1.3)
+    formulario (0.1.4)
 
 GEM
   remote: https://rubygems.org/
@@ -19,21 +19,21 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rake (13.0.0)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    simplecov (0.17.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
@@ -43,13 +43,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  awesome_print
-  bundler (~> 2.0)
+  awesome_print (~> 1.8.0)
+  bundler
   formulario!
-  pry-byebug
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  simplecov
+  pry-byebug (~> 3.7.0)
+  rake (~> 13.0.0)
+  rspec (~> 3.9.0)
+  simplecov (~> 0.17.1)
 
 BUNDLED WITH
    2.0.2

data/formulario.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "awesome_print" 
-  spec.add_development_dependency "pry-byebug" 
-  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake", "~> 13.0.0"
+  spec.add_development_dependency "rspec", "~> 3.9.0"
+  spec.add_development_dependency "awesome_print", "~> 1.8.0"
+  spec.add_development_dependency "pry-byebug", "~> 3.7.0"
+  spec.add_development_dependency "simplecov", "~> 0.17.1"
 end

data/lib/formulario/fields.rb

@@ -18,4 +18,6 @@ require "formulario/fields/form_field"
 
 require "formulario/fields/id"
 
+require "formulario/fields/unvalidated_field"
+
 require "formulario/fields/field"

data/lib/formulario/fields/field.rb

@@ -29,11 +29,11 @@ module Formulario
     end
 
     def self.type_for(field_type)
-      type_for = TYPES.fetch(field_type) { field_type }
-      if type_for < ::Formulario::Form
-        FormField[type_for]
+      type = TYPES.fetch(field_type) { field_type }
+      if type < ::Formulario::Form
+        FormField[type]
       else
-        type_for
+        type
       end
     end
 
@@ -77,13 +77,5 @@ module Formulario
       @raw_value = raw_value
       freeze
     end
-
-    # TODO: Extract field types
-    # TODO: Add
-    #       Date
-    #       Time
-    #       DateTime
-    #       Boolean
-    #       Boolean
   end
 end

data/lib/formulario/fields/integer.rb

@@ -8,6 +8,7 @@ module Formulario
       rescue ArgumentError, TypeError => e
         ExceptionalValue.new(raw_value, reasons: ['needs to represent an integer'])
       end
+
     end
   end
 end

data/lib/formulario/fields/unvalidated_field.rb

@@ -0,0 +1,79 @@
+module Formulario
+  class Field
+    class UnvalidatedField
+      attr_accessor :field_name
+
+      attr_accessor :value
+      attr_accessor :field_type
+      attr_accessor :default
+      attr_accessor :validators
+
+      attr_accessor :form
+
+      def initialize(
+            field_name: ,
+
+            value:      nil,
+            field_type: Field,
+            default:    Field.type_for(field_type).default,
+            validators: []
+          )
+
+
+        @field_name = field_name
+
+        @field_type = field_type
+        @default    = default
+        @validators = validators
+
+      end
+
+      def validate(validator=Undefined,
+                   message: Undefined, &validation_block)
+
+        validation_function = case
+                              when block_given?
+                                validation_block
+                              when validator.is_a?(Symbol)
+                                validator
+                              when validator.is_a?(::Formulario::Validator)
+                                validator
+                              end
+
+        validators << {
+          validator: validation_function,
+          message:   message,
+        }
+      end
+
+      def validate!(form)
+        self.form = form
+
+        validators.inject(field_type.for(value.value)) do |current_value, validator_hash|
+          validator_block = case validator_hash[:validator]
+                            when ::Formulario::Validator
+                              validator_hash[:validator]
+                            when Symbol
+                              ::Formulario::Validator.new(&value.method(validator_hash[:validator]))
+                            when Proc
+                              ::Formulario::Validator.new(&validator_hash[:validator])
+                            end
+
+          if instance_exec(value: value.value, object: self, field_name: field_name, &validator_block.to_proc).valid?
+            current_value
+          else
+            message = if validator_hash[:validator].is_a?(::Formulario::Validator)
+                        validator_hash[:validator].message
+                      end
+
+            ::Formulario::Field::ExceptionalValue
+              .new(current_value,
+                   reasons: message || validator_hash[:message])
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/formulario/form.rb

@@ -14,7 +14,7 @@ module Formulario
 
     def self.default
       params = __fields.each_with_object({}) { |field, res|
-        default_value    = field.last[:default]
+        default_value    = field.last.default
         res[field.first] = default_value.is_a?(Proc) ? nil : default_value
       }
 
@@ -30,18 +30,18 @@ module Formulario
         field_name = field_info.first
         options    = field_info.last
 
-        res[field_name] = options[:value].value
+        res[field_name] = options.value.value
       }
     end
 
     def fields
       @fields ||= __fields.each_with_object({}) { |field, result|
-        result[field.first] = field.last[:value]
+        result[field.first] = field.last.value
       }
     end
 
     def valid?
-      __fields.none? { |_, value:, **options| value.exceptional? }
+      __fields.none? { |_, field| field.value.exceptional? }
     end
 
     def error_fields
@@ -76,13 +76,15 @@ module Formulario
                    field_type=Field,
                    default: Field.type_for(field_type).default)
 
-      __fields[field_name.to_sym] = {
-        default:     default,
+      __fields[field_name.to_sym] = Field::UnvalidatedField.new(
+        field_name: field_name,
+        field_type:  Field.type_for(field_type),
+        default:    default,
         validators: [],
-      }
+      )
 
       define_method(field_name) do
-        __fields.dig(field_name.to_sym, :value)
+        __fields[field_name.to_sym].value
       end
 
       define_method("set_#{field_name}") do |raw_value|
@@ -92,7 +94,7 @@ module Formulario
       end
 
       define_method("#{field_name}=") do |raw_value|
-        __fields[field_name.to_sym][:value] =  Field.type_for(field_type).for(
+        __fields[field_name.to_sym].value =  Field.type_for(field_type).for(
           send("set_#{field_name}", raw_value)
         )
       end
@@ -100,48 +102,13 @@ module Formulario
 
     def self.validate(field_name, validator=Undefined,
                       message: Undefined, &validation_block)
-
-      validation_function = case
-                            when block_given?
-                              validation_block
-                            when validator.is_a?(Symbol)
-                              validator
-                            when validator.is_a?(::Formulario::Validator)
-                              validator
-                            end
-
-      __fields[field_name][:validators] << {
-        validator: validation_function,
-        message:   message,
-      }
+      __fields[field_name]
+        .validate(validator, message: message, &validation_block)
     end
 
     def __validate!
-      __fields.each do |field_name, validators:, value:, **options|
-        __fields[field_name][:value] =
-          validators.inject(value) do |current_value, validator_hash|
-
-          validator_block = case validator_hash[:validator]
-                            when ::Formulario::Validator
-                              validator_hash[:validator]
-                            when Symbol
-                              ::Formulario::Validator.new(&method(validator_hash[:validator]))
-                            when Proc
-                              ::Formulario::Validator.new(&validator_hash[:validator])
-                            end
-
-          if instance_exec(value: value.value, object: self, field_name: field_name, &validator_block.to_proc).valid?
-            current_value
-          else
-            message = if validator_hash[:validator].is_a?(::Formulario::Validator)
-                        validator_hash[:validator].message
-                      end
-
-            ::Formulario::Field::ExceptionalValue
-              .new(current_value,
-                   reasons: message || validator_hash[:message])
-          end
-        end
+      __fields.each do |field_name, unvalidated_field|
+        __fields[field_name].value = unvalidated_field.validate!(self)
       end
     end
   end

data/lib/formulario/version.rb

@@ -1,3 +1,3 @@
 module Formulario
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: formulario
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Federico Iachetti
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
 description: Create form objects for your project. This forms are framework agnostic.
 email:
 - iachetti.federico@gmail.com
@@ -128,6 +128,7 @@ files:
 - lib/formulario/fields/integer.rb
 - lib/formulario/fields/string.rb
 - lib/formulario/fields/time.rb
+- lib/formulario/fields/unvalidated_field.rb
 - lib/formulario/form.rb
 - lib/formulario/utils.rb
 - lib/formulario/validator.rb