rasti-form 3.1.2 → 6.0.0

data/spec/validations_spec.rb

@@ -0,0 +1,333 @@
+require 'minitest_helper'
+
+describe Rasti::Form, 'Validations' do
+
+  def build_form(&block)
+    Class.new(Rasti::Form) do
+      class_eval(&block)
+    end
+  end
+
+  def assert_validation_error(expected_errors, &block)
+    error = proc { block.call }.must_raise Rasti::Form::ValidationError
+    error.errors.must_equal expected_errors
+  end
+
+  it 'Validation error message' do
+    scope = Object.new
+    errors = {
+      x: ['not present'],
+      y: ['error 1', 'error 2']
+    }
+
+    error = Rasti::Form::ValidationError.new scope, errors
+
+    error.scope.must_equal scope
+    error.errors.must_equal errors
+    error.message.must_equal "Validation errors:\n- x: [\"not present\"]\n- y: [\"error 1\", \"error 2\"]"
+  end
+
+  it 'Invalid attributes' do
+    assert_validation_error(z: ['unexpected attribute']) do
+      Rasti::Form[:x, :y].new z: 3
+    end
+  end
+
+  it 'Not error' do
+    form = build_form do
+      attribute :text, T::String
+
+      def validate
+        assert_not_error :text do
+          raise 'invalid text' unless assigned? :text
+        end
+      end
+    end
+
+    proc { form.new text: 'text' }.must_be_silent
+
+    assert_validation_error(text: ['invalid text']) do
+      form.new
+    end
+  end
+
+  describe 'Present' do
+
+    let :form do
+      build_form do
+        attribute :number, T::Integer
+
+        def validate
+          assert_present :number
+        end
+      end
+    end
+
+    it 'Success' do
+      proc { form.new number: 1 }.must_be_silent
+    end
+
+    it 'Not assigned' do
+      assert_validation_error(number: ['not present']) do
+        form.new
+      end
+    end
+
+    it 'Nil' do
+      assert_validation_error(number: ['not present']) do
+        form.new number: nil
+      end
+    end
+
+    it 'Invalid cast' do
+      assert_validation_error(number: ['Invalid cast: true -> Rasti::Types::Integer']) do
+        form.new number: true
+      end
+    end
+
+    it 'Invalid nested cast' do
+      range = build_form do
+        attribute :min, T::Integer
+        attribute :max, T::Integer
+
+        def validate
+          assert_range :min, :max
+        end
+      end
+
+      form = build_form do
+        attribute :range, T::Model[range]
+
+        def validate
+          assert_present :range
+        end
+      end
+
+      assert_validation_error('range.max' => ['not present']) do
+        form.new range: {min: 1}
+      end
+    end
+
+    it 'With default' do
+      form = build_form do
+        attribute :number, T::Integer, default: 1
+
+        def validate
+          assert_present :number
+        end
+      end
+
+      proc { form.new }.must_be_silent
+
+      assert_validation_error(number: ['not present']) do
+        form.new number: nil
+      end
+    end
+
+  end
+
+  describe 'Not present' do
+
+    let :form do
+      range = build_form do
+        attribute :min, T::Integer
+        attribute :max, T::Integer
+
+        def validate
+          assert_range :min, :max
+        end
+      end
+
+      build_form do
+        attribute :range, T::Model[range]
+
+        def validate
+          assert_not_present :range
+        end
+      end
+    end
+
+    it 'Success not assigned' do
+      proc { form.new }.must_be_silent
+    end
+
+    it 'Success with nil' do
+      proc { form.new range: nil }.must_be_silent
+    end
+
+    it 'Assigned' do
+      assert_validation_error(range: ['is present']) do
+        form.new range: {min: 1, max: 2}
+      end
+    end
+
+    it 'Invalid nested cast' do
+      assert_validation_error('range.max' => ['not present']) do
+        form.new range: {min: 1}
+      end
+    end
+
+  end
+
+  describe 'Not empty' do
+
+    it 'Must be present' do
+      form = build_form do
+        attribute :text, T::String
+
+        def validate
+          assert_not_empty :text
+        end
+      end
+
+      proc { form.new text: 'text' }.must_be_silent
+
+      assert_validation_error(text: ['not present']) do
+        form.new text: nil
+      end
+
+      assert_validation_error(text: ['not present']) do
+        form.new
+      end
+    end
+
+    it 'String' do
+      form = build_form do
+        attribute :text, T::String
+
+        def validate
+          assert_not_empty :text
+        end
+      end
+
+      proc { form.new text: 'text' }.must_be_silent
+
+      assert_validation_error(text: ['is empty']) do
+        form.new text: ' '
+      end
+    end
+
+    it 'Array' do
+      form = build_form do
+        attribute :array, T::Array[T::String]
+
+        def validate
+          assert_not_empty :array
+        end
+      end
+
+      proc { form.new array: ['text'] }.must_be_silent
+
+      assert_validation_error(array: ['is empty']) do
+        form.new array: []
+      end
+    end
+
+    it 'Hash' do
+      form = build_form do
+        attribute :hash, T::Hash[T::String, T::String]
+
+        def validate
+          assert_not_empty :hash
+        end
+      end
+
+      proc { form.new hash: {key: 'value'} }.must_be_silent
+
+      assert_validation_error(hash: ['is empty']) do
+        form.new hash: {}
+      end
+    end
+
+  end
+
+  it 'Included in values list' do
+    form = build_form do
+      attribute :text, T::String
+
+      def validate
+        assert_included_in :text, %w(value_1 value_2)
+      end
+    end
+
+    proc { form.new text: 'value_1' }.must_be_silent
+
+    assert_validation_error(text: ['not included in "value_1", "value_2"']) do
+      form.new text: 'xyz'
+    end
+  end
+
+  it 'Time range' do
+    form = build_form do
+      attribute :from, T::Time['%Y-%m-%d %H:%M:%S']
+      attribute :to,   T::Time['%Y-%m-%d %H:%M:%S']
+
+      def validate
+        assert_range :from, :to
+      end
+    end
+
+    from = '2018-01-01 03:10:00'
+    to = '2018-01-01 15:30:00'
+
+    proc { form.new from: from, to: to }.must_be_silent
+
+    assert_validation_error(from: ['invalid range']) do
+      form.new from: to, to: from
+    end
+  end
+
+  it 'Nested validation' do
+    range = build_form do
+      attribute :min, T::Integer
+      attribute :max, T::Integer
+
+      def validate
+        assert_range :min, :max
+      end
+    end
+
+    form = build_form do
+      attribute :range, T::Model[range]
+    end
+
+    proc { form.new range: {min: 1, max: 2} }.must_be_silent
+
+    assert_validation_error('range.min' => ['invalid range']) do
+      form.new range: {min: 2, max: 1}
+    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: 3.1.2
+  version: 6.0.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_require
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rasti-model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,51 +150,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/rasti-form.rb
 - lib/rasti/form.rb
-- lib/rasti/form/castable.rb
 - lib/rasti/form/errors.rb
-- lib/rasti/form/types/array.rb
-- lib/rasti/form/types/boolean.rb
-- lib/rasti/form/types/enum.rb
-- lib/rasti/form/types/float.rb
-- lib/rasti/form/types/form.rb
-- lib/rasti/form/types/hash.rb
-- lib/rasti/form/types/integer.rb
-- lib/rasti/form/types/io.rb
-- lib/rasti/form/types/regexp.rb
-- lib/rasti/form/types/string.rb
-- lib/rasti/form/types/symbol.rb
-- lib/rasti/form/types/time.rb
-- lib/rasti/form/types/uuid.rb
 - lib/rasti/form/validable.rb
-- lib/rasti/form/version.rb
 - rasti-form.gemspec
 - spec/coverage_helper.rb
-- spec/form_spec.rb
 - spec/minitest_helper.rb
-- spec/types/array_spec.rb
-- spec/types/boolean_spec.rb
-- spec/types/enum_spec.rb
-- spec/types/float_spec.rb
-- spec/types/form_spec.rb
-- spec/types/hash_spec.rb
-- spec/types/integer_spec.rb
-- spec/types/io_spec.rb
-- spec/types/regexp_spec.rb
-- spec/types/string_formatted_spec.rb
-- spec/types/string_spec.rb
-- spec/types/symbol_spec.rb
-- spec/types/time_spec.rb
-- spec/types/uuid_spec.rb
+- spec/validations_spec.rb
 homepage: https://github.com/gabynaiman/rasti-form
 licenses:
 - MIT
@@ -206,19 +191,5 @@ specification_version: 4
 summary: Forms validations and type casting
 test_files:
 - spec/coverage_helper.rb
-- spec/form_spec.rb
 - spec/minitest_helper.rb
-- spec/types/array_spec.rb
-- spec/types/boolean_spec.rb
-- spec/types/enum_spec.rb
-- spec/types/float_spec.rb
-- spec/types/form_spec.rb
-- spec/types/hash_spec.rb
-- spec/types/integer_spec.rb
-- spec/types/io_spec.rb
-- spec/types/regexp_spec.rb
-- spec/types/string_formatted_spec.rb
-- spec/types/string_spec.rb
-- spec/types/symbol_spec.rb
-- spec/types/time_spec.rb
-- spec/types/uuid_spec.rb
+- spec/validations_spec.rb

data/.travis.yml

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

data/lib/rasti/form/castable.rb

@@ -1,25 +0,0 @@
-module Rasti
-  class Form
-    module Castable
-
-      def cast(value)
-        if valid? value
-          transform! value
-        else
-          raise CastError.new self, value
-        end
-      end
-
-      private
-
-      def transform!(value)
-        transform value
-      rescue MultiCastError, ValidationError => ex
-        raise ex
-      rescue
-        raise CastError.new self, value
-      end
-
-    end
-  end
-end

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

@@ -1,54 +0,0 @@
-module Rasti
-  class Form
-    module Types
-      class Array
-
-        include Castable
-
-        attr_reader :type
-
-        def self.[](type)
-          new type
-        end
-
-        def to_s
-          "#{self.class}[#{type}]"
-        end
-        alias_method :inspect, :to_s
-
-        private
-
-        def initialize(type)
-          @type = type
-        end
-
-        def valid?(value)
-          value.is_a? ::Array
-        end
-
-        def transform(value)
-          result = []
-          errors = {}
-
-          value.each_with_index do |e,i|
-            index = i + 1
-            begin
-              result << type.cast(e)
-            rescue ValidationError => error
-              error.errors.each do |k,v|
-                errors["#{index}.#{k}"] = v
-              end
-            rescue => error
-              errors[index] = [error.message]
-            end
-          end
-
-          raise MultiCastError.new(self, value, errors) unless errors.empty?
-
-          result
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,42 +0,0 @@
-module Rasti
-  class Form
-    module Types
-      class Boolean
-        class << self
-
-          include Castable
-
-          TRUE_FORMAT  = /^t(rue)?$/i
-          FALSE_FORMAT = /^f(alse)?$/i
-        
-          private
-
-          def valid?(value)
-            boolean?(value) || valid_string?(value)
-          end
-
-          def transform(value)
-            boolean?(value) ? value : true_string?(value)
-          end
-
-          def boolean?(value)
-            value == true || value == false
-          end
-
-          def valid_string?(value)
-            value.is_a?(::String) && (true_string?(value) || false_string?(value))
-          end
-
-          def true_string?(value)
-            !!value.match(TRUE_FORMAT)
-          end
-
-          def false_string?(value)
-            !!value.match(FALSE_FORMAT)
-          end
-
-        end
-      end
-    end
-  end
-end

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

@@ -1,48 +0,0 @@
-module Rasti
-  class Form
-    module Types
-      class Enum
-
-        include Castable
-
-        attr_reader :values
-
-        def self.[](*values)
-          new values
-        end
-
-        def to_s
-          "#{self.class}[#{values.map(&:inspect).join(', ')}]"
-        end
-        alias_method :inspect, :to_s
-
-        private
-
-        def initialize(values)
-          @values = values.map(&:to_s)
-          define_getters
-        end
-
-        def valid?(value)
-          values.include? String.cast(value)
-        rescue
-          false
-        end
-
-        def transform(value)
-          String.cast value
-        end
-
-        def define_getters
-          values.each do |value|
-            getter_name = value.gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').gsub(/([a-z])([A-Z])/, '\1_\2').downcase
-            define_singleton_method getter_name do
-              value
-            end
-          end
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,33 +0,0 @@
-module Rasti
-  class Form
-    module Types
-      class Float
-        class << self
-
-          include Castable
-
-          FORMAT = /^(\d+\.)?\d+$/
-        
-          private
-
-          def valid?(value)
-            !value.nil? && (valid_string?(value) || transformable?(value))
-          end
-
-          def transform(value)
-            value.to_f
-          end
-
-          def valid_string?(value)
-            value.is_a?(::String) && value.match(FORMAT)
-          end
-
-          def transformable?(value)
-            !value.is_a?(::String) && value.respond_to?(:to_f)
-          end
-
-        end
-      end
-    end
-  end
-end

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

@@ -1,40 +0,0 @@
-module Rasti
-  class Form
-    module Types
-      class Form
-
-        include Castable
-
-        attr_reader :form_class
-
-        def self.[](*args)
-          new *args
-        end
-
-        def to_s
-          "#{self.class}[#{form_class}]"
-        end
-        alias_method :inspect, :to_s
-
-        private
-
-        def initialize(form)
-          @form_class = case
-            when form.is_a?(::Hash) then Rasti::Form[form]
-            when form.is_a?(Class) && form.ancestors.include?(Rasti::Form) then form
-            else raise ArgumentError, "Invalid form specification: #{form.inspect}"
-          end
-        end
-
-        def valid?(value)
-          value.is_a? ::Hash
-        end
-
-        def transform(value)
-          form_class.new value
-        end
-
-      end
-    end
-  end
-end