rasti-form 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9dd0424409c0c7232782c40cde8dbf7fa84752d3
-  data.tar.gz: a7c8be9e98dcc9e6d52482469486ba643a0ffa33
+SHA256:
+  metadata.gz: d866f9b7a43e27b5a12fbe5044672018066e99d45c2cce45bc7cb80baef095c1
+  data.tar.gz: 9c24281985c31043750f3998c6ddc857c30830abba2a6f6128d0cfe45c5d8432
 SHA512:
-  metadata.gz: a2fb881aec7bca876dd58a3c2bf3e6dcca8ac3f13777437992f4e359d07856c9a7075e4b4c51882f41cb30ffacb8ebf85616632898efbfa02ccd7abea6a7e81c
-  data.tar.gz: c77fed8829801cae565a567f3303b8c4271e5a9b3b79c7ac2f04475e48a9bc6d884e80e2253903a0374a4848d635cf0576a1b191044c850f6cf9aea70a373416
+  metadata.gz: ff8eab55df69a186a42353248bb9218ae79352057642db8ea96af007c3a2717ed908d7b1219e803af11ed87e2d0166557e22ab58c849bdffa1638353f66bc3c7
+  data.tar.gz: 3e102c9dae971bb5482665db5471bbf1420ba35b2c81960bcd02583b119970dd5ba54df79450fe19ab50a3134b619809d1d234a21380725375460b86b59dcd37

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.0
+ruby-2.5.7

data/.travis.yml

@@ -1,15 +1,15 @@
 language: ruby
 
 rvm:
-  - 1.9.3
   - 2.0
   - 2.1
   - 2.2
-  - 2.3.0
-  - 2.4.0
-  - 2.5.0
-  - jruby-1.7.25
-  - jruby-9.1.7.0
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - jruby-9.2.9.0
   - ruby-head
   - jruby-head
 
@@ -17,7 +17,4 @@ matrix:
   fast_finish: true
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
-
-before_install:
-  - gem install bundler
+    - rvm: jruby-head

data/README.md

@@ -4,7 +4,6 @@
 [![Build Status](https://travis-ci.org/gabynaiman/rasti-form.svg?branch=master)](https://travis-ci.org/gabynaiman/rasti-form)
 [![Coverage Status](https://coveralls.io/repos/github/gabynaiman/rasti-form/badge.svg?branch=master)](https://coveralls.io/github/gabynaiman/rasti-form?branch=master)
 [![Code Climate](https://codeclimate.com/github/gabynaiman/rasti-form.svg)](https://codeclimate.com/github/gabynaiman/rasti-form)
-[![Dependency Status](https://gemnasium.com/gabynaiman/rasti-form.svg)](https://gemnasium.com/gabynaiman/rasti-form)
 
 Forms validations and type casting
 

data/lib/rasti/form.rb

@@ -145,7 +145,11 @@ module Rasti
     end
 
     def assert_present(attribute)
-      assert attribute, !fetch(attribute).nil?, 'not present'
+      assert attribute, !fetch(attribute).nil?, 'not present' unless errors.key? attribute
+    end
+
+    def assert_not_present(attribute)
+      assert attribute, fetch(attribute).nil?, 'is present'
     end
 
     def assert_not_empty(attribute)

data/lib/rasti/form/types/string.rb

@@ -2,21 +2,31 @@ module Rasti
   class Form
     module Types
       class String
-
-        include Formatable
-
         class << self
 
           include Castable
 
           def [](format)
-            new format
+            Class.new(self) do
+              @format = format.is_a?(::String) ? ::Regexp.new(format) : format
+            end
+          end
+
+          def to_s
+            name || "#{superclass.name}[#{format.inspect}]"
           end
+          alias_method :inspect, :to_s
 
           private
 
+          attr_reader :format
+
           def valid?(value)
-            !value.nil? && value.respond_to?(:to_s)
+            !value.nil? && value.respond_to?(:to_s) && valid_format?(value)
+          end
+
+          def valid_format?(value)
+            format.nil? || !value.to_s.match(format).nil?
           end
 
           def transform(value)
@@ -24,20 +34,6 @@ module Rasti
           end
 
         end
-
-        def to_s
-          "#{self.class}[#{format.inspect}]"
-        end
-        alias_method :inspect, :to_s
-
-        private
-        
-        attr_reader :format
-
-        def initialize(format)
-          @format = format.is_a?(String) ? ::Regexp.new(format) : format
-        end
-
       end
     end
   end

data/lib/rasti/form/types/uuid.rb

@@ -1,19 +1,7 @@
 module Rasti
   class Form
     module Types
-      class UUID
-        class << self
-
-          include Formatable
-
-          private
-
-          def format
-            /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}+$/
-          end
-
-        end
-      end
+      UUID = String[/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}+$/]
     end
   end
 end

data/lib/rasti/form/validable.rb

@@ -23,6 +23,13 @@ module Rasti
         false
       end
 
+      def assert_not_error(key)
+        yield
+        true
+      rescue => error
+        assert key, false, error.message
+      end
+
     end
   end
 end

data/lib/rasti/form/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   class Form
-    VERSION = '3.0.0'
+    VERSION = '3.1.0'
   end
 end

data/rasti-form.gemspec

@@ -20,8 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'multi_require', '~> 1.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 11.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'minitest', '~> 5.0', '< 5.11'
   spec.add_development_dependency 'minitest-colorin', '~> 0.1'
   spec.add_development_dependency 'minitest-line', '~> 0.6'

data/spec/form_spec.rb

@@ -8,7 +8,7 @@ describe Rasti::Form do
   
   def build_form(&block)
     Class.new(Rasti::Form) do
-      class_eval &block
+      class_eval(&block)
     end
   end
 
@@ -141,6 +141,23 @@ describe Rasti::Form do
 
   describe 'Validations' do
 
+    it 'Not error' do
+      form = build_form do
+        attribute :text, Rasti::Form::Types::String
+
+        def validate
+          assert_not_error :text do
+            raise 'Invalid text' if text.nil?
+          end
+        end
+      end
+
+      proc { form.new text: 'text' }.must_be_silent
+
+      error = proc { form.new }.must_raise Rasti::Form::ValidationError
+      error.message.must_equal 'Validation error: #<Rasti::Form[]> {"text":["Invalid text"]}'
+    end
+
     it 'Required' do
       form = build_form do
         attribute :text, Rasti::Form::Types::String
@@ -150,10 +167,42 @@ describe Rasti::Form do
         end
       end
 
+      proc { form.new text: 'text' }.must_be_silent
+
       error = proc { form.new }.must_raise Rasti::Form::ValidationError
       error.message.must_equal 'Validation error: #<Rasti::Form[]> {"text":["not present"]}'
     end
 
+    it 'Required when cast failed' do
+      form = build_form do
+        attribute :number, Rasti::Form::Types::Integer
+
+        def validate
+          assert_present :number
+        end
+      end
+
+      proc { form.new number: 1 }.must_be_silent
+
+      error = proc { form.new number: 'text' }.must_raise Rasti::Form::ValidationError
+      error.message.must_equal "Validation error: #<Rasti::Form[]> {\"number\":[\"Invalid cast: 'text' -> Rasti::Form::Types::Integer\"]}"
+    end
+
+    it 'Not required' do
+      form = build_form do
+        attribute :text, Rasti::Form::Types::String
+
+        def validate
+          assert_not_present :text
+        end
+      end
+
+      proc { form.new }.must_be_silent
+
+      error = proc { form.new text: 'text' }.must_raise Rasti::Form::ValidationError
+      error.message.must_equal 'Validation error: #<Rasti::Form[text: "text"]> {"text":["is present"]}'
+    end
+
     it 'Not empty string' do
       form = build_form do
         attribute :text, Rasti::Form::Types::String
@@ -163,6 +212,8 @@ describe Rasti::Form do
         end
       end
 
+      proc { form.new text: 'text' }.must_be_silent
+
       error = proc { form.new text: '  ' }.must_raise Rasti::Form::ValidationError
       error.message.must_equal 'Validation error: #<Rasti::Form[text: "  "]> {"text":["is empty"]}'
     end
@@ -176,6 +227,8 @@ describe Rasti::Form do
         end
       end
 
+      proc { form.new array: ['text'] }.must_be_silent
+
       error = proc { form.new array: [] }.must_raise Rasti::Form::ValidationError
       error.message.must_equal 'Validation error: #<Rasti::Form[array: []]> {"array":["is empty"]}'
     end
@@ -189,6 +242,8 @@ describe Rasti::Form do
         end
       end
 
+      proc { form.new text: 'value_1' }.must_be_silent
+
       error = proc { form.new text: 'xyz' }.must_raise Rasti::Form::ValidationError
       error.message.must_equal 'Validation error: #<Rasti::Form[text: "xyz"]> {"text":["not included in \'value_1\', \'value_2\'"]}'
     end
@@ -203,11 +258,13 @@ describe Rasti::Form do
         end
       end
 
-      from = '2018-01-01 15:30:00 +0000'
-      to = '2018-01-01 03:10:00 +0000'
+      from = Time.parse '2018-01-01 03:10:00'
+      to = Time.parse '2018-01-01 15:30:00'
 
-      error = proc { form.new from: from, to: to }.must_raise Rasti::Form::ValidationError
-      error.message.must_equal "Validation error: #<Rasti::Form[from: #{from}, to: #{to}]> {\"from\":[\"invalid time range\"]}"
+      proc { form.new from: from, to: to }.must_be_silent
+
+      error = proc { form.new from: to.to_s, to: from.to_s }.must_raise Rasti::Form::ValidationError
+      error.message.must_equal "Validation error: #<Rasti::Form[from: #{to}, to: #{from}]> {\"from\":[\"invalid time range\"]}"
     end
 
     it 'Nested form' do
@@ -220,6 +277,8 @@ describe Rasti::Form do
         end
       end
 
+      proc { form.new range: {min: 1, max: 2} }.must_be_silent
+
       error = proc { form.new }.must_raise Rasti::Form::ValidationError
       error.message.must_equal 'Validation error: #<Rasti::Form[]> {"range.min":["not present"],"range.max":["not present"]}'
     end
@@ -236,7 +295,9 @@ describe Rasti::Form do
 
       form = build_form do
         attribute :range, Rasti::Form::Types::Form[range]
-      end 
+      end
+
+      proc { form.new range: {min: 1, max: 2} }.must_be_silent
 
       error = proc { form.new range: {min: 2, max: 1} }.must_raise Rasti::Form::ValidationError
       error.message.must_equal 'Validation error: #<Rasti::Form[]> {"range.min":["Min must be less than Max"]}'

data/spec/types/regexp_spec.rb

@@ -4,7 +4,7 @@ describe Rasti::Form::Types::Regexp do
 
   ['[a-z]', /[a-z]/].each do |value|
     it "#{value.inspect} -> #{Regexp.new(value).inspect}" do
-      Rasti::Form::Types::Regexp.cast(value).must_equal Regexp.new(value)
+      Rasti::Form::Types::Regexp.cast(value).must_equal Regexp.new(value).source
     end
   end
 

data/spec/types/string_formatted_spec.rb

@@ -6,7 +6,7 @@ describe Rasti::Form::Types::String, 'Formatted' do
 
   ['user@mail.com'.to_sym, 'user.name-123@mail-test.com.ar'].each do |value|
     it "#{value.inspect} -> #{value.to_s}" do
-      Rasti::Form::Types::String[email_regexp].cast(value).must_equal value
+      Rasti::Form::Types::String[email_regexp].cast(value).must_equal value.to_s
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-form
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_require
@@ -24,34 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +148,6 @@ files:
 - lib/rasti/form.rb
 - lib/rasti/form/castable.rb
 - lib/rasti/form/errors.rb
-- lib/rasti/form/formatable.rb
 - lib/rasti/form/types/array.rb
 - lib/rasti/form/types/boolean.rb
 - lib/rasti/form/types/enum.rb
@@ -215,8 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Forms validations and type casting

data/lib/rasti/form/formatable.rb

@@ -1,19 +0,0 @@
-module Rasti
-  class Form
-    module Formatable
-
-      include Castable
-
-      private
-
-      def valid?(value)
-        (value.is_a?(::String) || value.is_a?(Symbol)) && value.to_s.match(format)
-      end
-
-      def transform(value)
-        value
-      end
-      
-    end
-  end
-end