rasti-form 5.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c0a64e1d1120b8c55b78a969c8d53f2e01dc152bf7c54da19950024ae593e88
-  data.tar.gz: 3045f978fe98478268719e4d73c76d81b0d4e81ef57cf5559ef9fba6add3b0f7
+  metadata.gz: efb9cfdea85fcce07f977a6bf54a183aface5cce17bfa3f9720f0b60684f48c3
+  data.tar.gz: f1aa1973dad9c2f363bd8f9f030ca48fd158a9897821439ab9e0d93c334a79de
 SHA512:
-  metadata.gz: 75b3b3c7a0e7f0293c8d4d1b345700fb44f925e17567f93d1d699579338ea7f61952181c5b18de59b0f17f09c08fca1655120b9c51799a4e6d36d58e213e17b0
-  data.tar.gz: 906759fe1adec8fb89b55ba07e8d37c0e8f2bfbcef9b8eb693b7552a294ffe6eccae1ab840a7286f2b9113397fd89049f7de597a7df70c041685385cc58ddcda
+  metadata.gz: 38d34d94241efe87628538d8f6e59baf91e4f46ecf4afe72aebaddf69136de15e2cde9713329cb20d3fb80d8bbb9cbcb52c9041972f949051b925b89b3ce42fb
+  data.tar.gz: cd250e2f305c5836e6b70b6d1e3d0a0d964311af5ac68d5b033461d74b9461d8a4b1cc1948cc6c7d3e7b1bd399a980d5c84765aeced72cadee7d51408dc35d45

data/.github/workflows/ci.yml

@@ -0,0 +1,36 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    name: Tests
+    strategy:
+      matrix:
+        ruby-version: ['2.1', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', 'jruby-9.2.9.0']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/README.md

@@ -1,11 +1,11 @@
 # Rasti::Form
 
 [![Gem Version](https://badge.fury.io/rb/rasti-form.svg)](https://rubygems.org/gems/rasti-form)
-[![Build Status](https://travis-ci.org/gabynaiman/rasti-form.svg?branch=master)](https://travis-ci.org/gabynaiman/rasti-form)
+[![CI](https://github.com/gabynaiman/rasti-form/actions/workflows/ci.yml/badge.svg)](https://github.com/gabynaiman/rasti-form/actions/workflows/ci.yml)
 [![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)
 
-Forms validations and type casting
+Forms validations
 
 ## Installation
 
@@ -25,37 +25,18 @@ Or install it yourself as:
 
 ## Usage
 
-```ruby
-T = Rasti::Form::Types
-```
-
-### Type casting
-
-```ruby
-T::Integer.cast '10'   # => 10
-T::Integer.cast '10.5' # => 10
-T::Integer.cast 'text' # => Rasti::Types::CastError: Invalid cast: 'text' -> Rasti::Types::Integer
-
-T::Boolean.cast 'true'  # => true
-T::Boolean.cast 'FALSE' # => false
-T::Boolean.cast 'text'  # => Rasti::Types::CastError: Invalid cast: 'text' -> Rasti::Types::Boolean
-
-T::Time['%Y-%m-%d'].cast '2016-10-22' # => 2016-10-22 00:00:00 -0300
-T::Time['%Y-%m-%d'].cast '2016-10'    # => Rasti::Types::CastError: Invalid cast: '2016-10' -> Rasti::Types::Time['%Y-%m-%d']
-
-T::Array[T::Symbol].cast [1, 'test', :sym] # => [:"1", :test, :sym]
-```
-
 ### Form type coercion
 
 ```ruby
+T = Rasti::Types
+
 PointForm = Rasti::Form[x: T::Integer, y: T::Integer] # => PointForm[:x, :y]
 form = PointForm.new x: '1', y: 2 # => #<PointForm[x: 1, y: 2]>
 form.x # => 1
 form.y # => 2
-form.attributes # => {x: 1, y: 2}
+form.to_h # => {x: 1, y: 2}
 
-PointForm.new x: true # => Validation error: {"x":["Invalid cast: true -> Rasti::Form::Types::Integer"]}
+PointForm.new x: true # => Validation error: {"x":["Invalid cast: true -> Rasti::Types::Integer"]}
 ```
 
 ### Form validations
@@ -84,42 +65,6 @@ form.from # => 2016-10-20 00:00:00 -0300
 form.to   # => 2016-10-28 00:00:00 -0300
 ```
 
-### Built-in types
-
-- Array
-- Boolean
-- Enum
-- Float
-- Form
-- Hash
-- Integer
-- IO
-- Regexp
-- String
-- Symbol
-- Time
-- UUID
-
-### Plugable types
-
-```ruby
-class CustomType
-  class << self
-    extend Castable
-
-    private
-
-    def valid?(value)
-      valid.is_a?(String)
-    end
-
-    def transform(value)
-      value.upcase
-    end
-  end
-end
-```
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/gabynaiman/rasti-form.

data/lib/rasti/form/validable.rb

@@ -10,12 +10,16 @@ module Rasti
 
       def validate!
         validate
-        raise ValidationError.new(self, errors) unless errors.empty?
+        raise_if_errors!
       end
 
       def validate
       end
 
+      def raise_if_errors!
+        raise ValidationError.new(self, errors) unless errors.empty?
+      end
+
       def assert(key, condition, message)
         errors[key] << message unless condition
         condition

data/lib/rasti/form.rb

@@ -10,45 +10,53 @@ module Rasti
 
     include Validable
 
+    alias_method :__initialize__, :initialize
+    private :__initialize__
+
     def initialize(attributes={})
-      begin
-        super attributes
+      assign_attributes! attributes
+      validate_type_casting!
+      validate!
+    end
 
-        cast_attributes!
+    def assigned?(attr_name)
+      assigned_attribute? attr_name.to_sym
+    end
 
-      rescue Rasti::Model::UnexpectedAttributesError => ex
-        ex.attributes.each do |attr_name|
-          errors[attr_name] << 'unexpected attribute'
-        end
+    private
 
-      rescue Rasti::Types::CompoundError => ex
-        ex.errors.each do |key, messages|
-          errors[key] += messages
-        end
+    def assign_attributes!(attributes)
+      __initialize__ attributes
 
+    rescue Rasti::Model::UnexpectedAttributesError => ex
+      ex.attributes.each do |attr_name|
+        errors[attr_name] << 'unexpected attribute'
       end
 
-      validate!
+    ensure
+      raise_if_errors!
     end
 
-    def assigned?(attr_name)
-      assigned_attribute? attr_name.to_sym
-    end
+    def validate_type_casting!
+      cast_attributes!
 
-    private
+    rescue Rasti::Types::CompoundError => ex
+      ex.errors.each do |key, messages|
+        errors[key] += messages
+      end
+
+    ensure
+      raise_if_errors!
+    end
 
     def assert_present(attr_name)
       if !errors.key?(attr_name)
         assert attr_name, assigned?(attr_name) && !public_send(attr_name).nil?, 'not present'
       end
-    rescue Types::Error
-      assert attr_name, false, 'not present'
     end
 
     def assert_not_present(attr_name)
       assert attr_name, !assigned?(attr_name) || public_send(attr_name).nil?, 'is present'
-    rescue Types::Error
-      assert attr_name, false, 'is present'
     end
 
     def assert_not_empty(attr_name)

data/rasti-form.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'rasti-form'
-  spec.version       = '5.0.0'
+  spec.version       = '6.0.0'
   spec.authors       = ['Gabriel Naiman']
   spec.email         = ['gabynaiman@gmail.com']
   spec.summary       = 'Forms validations and type casting'

data/spec/validations_spec.rb

@@ -103,7 +103,7 @@ describe Rasti::Form, 'Validations' do
         end
       end
 
-      assert_validation_error('range.max' => ['not present'], range: ['not present']) do
+      assert_validation_error('range.max' => ['not present']) do
         form.new range: {min: 1}
       end
     end
@@ -162,7 +162,7 @@ describe Rasti::Form, 'Validations' do
     end
 
     it 'Invalid nested cast' do
-      assert_validation_error('range.max' => ['not present'], range: ['is present']) do
+      assert_validation_error('range.max' => ['not present']) do
         form.new range: {min: 1}
       end
     end
@@ -298,4 +298,36 @@ describe Rasti::Form, 'Validations' do
     end
   end
 
+  describe 'Validations Precedence' do
+
+    let(:form) do
+      build_form do
+        attribute :limit, T::Integer
+
+        def validate
+          assert :limit, limit < 10, 'invalid limit'
+        end
+      end
+    end
+
+    it '1) Validate unexpected attributes' do
+      assert_validation_error(id: ["unexpected attribute"]) do
+        form.new id: '123'
+      end
+    end
+
+    it '2) Validate attributes casting' do
+      assert_validation_error(limit: ["Invalid cast: 'pepe' -> Rasti::Types::Integer"]) do
+        form.new limit: 'pepe'
+      end
+    end
+
+    it '3) Run custom validations' do
+      assert_validation_error(limit: ["invalid limit"]) do
+        form.new limit: 500
+      end
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-form
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_require
@@ -150,10 +150,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0
-  - jruby-9.2.9.0
-  - ruby-head
-  - jruby-head
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head