rasti-form 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a47fae2c272d4c2dae64cea207f396aeb10da765
-  data.tar.gz: 6cac32f2aa2372c28647139a5a638fef09b0e975
+  metadata.gz: 26c1c1f5dc1233ecbda35f3e19c0a6b8e286405c
+  data.tar.gz: 465729370df0070a7c536b6fc39c11d92a3b27fc
 SHA512:
-  metadata.gz: 285896f0bcdc9003ea5d11215d1a944a589ef5985228fb8e4910ba4056354cc7c366743ea55ae579010f7eda90909e8c2ba8c592d512a46f63f116e28ef3a7e7
-  data.tar.gz: 8ea5c1447fe95a4a2e5c1650f6c19df68a5abc09e4b9694d63f80dab141b48f1be0c82c7bfa0d5d40c7cab999289230995d373973bacd72c4049ee193d32fcb4
+  metadata.gz: ae1a7c147d82af7c2a3095a682e80899746fcc3b00aa44a0c4fb88842895f01daf577056be8b1eaa06351c0e85c12a03f4d0abe82db0ec910c97f789c98deb58
+  data.tar.gz: 40e2ffc9f4287a1c726c15f469575c5ed14bef3ae8a5f47eef0a49abd97b4ea127e78544cb831c7cf834bac2f1aedb30f717aba5aa1c75374847d388eb715a98

data/lib/rasti/form/castable.rb

@@ -14,7 +14,7 @@ module Rasti
 
       def transform!(value)
         transform value
-      rescue ValidationError => ex
+      rescue MultiCastError, ValidationError => ex
         raise ex
       rescue
         raise CastError.new self, value

data/lib/rasti/form/errors.rb

@@ -23,6 +23,26 @@ module Rasti
     end
 
 
+    class MultiCastError < StandardError
+
+      attr_reader :type, :value, :errors
+      
+      def initialize(type, value, errors)
+        @type = type
+        @value = value
+        @errors = errors
+      end
+
+      def message
+        "Invalid cast: #{display_value} -> #{type} - #{JSON.dump(errors)}"
+      end
+
+      def display_value
+        value.is_a?(::String) ? "'#{value}'" : value.inspect
+      end
+
+    end
+
     class ValidationError < StandardError
 
       attr_reader :scope, :errors

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

@@ -27,7 +27,25 @@ module Rasti
         end
 
         def transform(value)
-          value.map { |e| type.cast e }
+          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

data/lib/rasti/form/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   class Form
-    VERSION = '1.1.1'
+    VERSION = '2.0.0'
   end
 end

data/lib/rasti/form.rb

@@ -98,7 +98,7 @@ module Rasti
         rescue CastError => error
           errors[attr_name] << error.message
         
-        rescue ValidationError => error
+        rescue MultiCastError, ValidationError => error
           error.errors.each do |inner_name, inner_errors| 
             inner_errors.each { |message| errors["#{attr_name}.#{inner_name}"] << message }
           end

data/rasti-form.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 11.0'
-  spec.add_development_dependency 'minitest', '~> 5.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'
   spec.add_development_dependency 'simplecov', '~> 0.12'

data/spec/types/array_spec.rb

@@ -2,21 +2,53 @@ require 'minitest_helper'
 
 describe Rasti::Form::Types::Array do
 
-  array = [1, '2', Time.now]
+  VALID_ARRAY = [1, '2', Time.now]
+  INVALID_ARRAY = [nil, 1, 'text', :symbol, {a: 1, b: 2}, Object.new]
   
-  it "#{array.inspect} -> #{array.map(&:to_i)}" do
-    Rasti::Form::Types::Array[Rasti::Form::Types::Integer].cast(array).must_equal array.map(&:to_i)
+  it "#{VALID_ARRAY.inspect} -> #{VALID_ARRAY.map(&:to_i)}" do
+    Rasti::Form::Types::Array[Rasti::Form::Types::Integer].cast(VALID_ARRAY).must_equal VALID_ARRAY.map(&:to_i)
   end
 
-  it "#{array.inspect} -> #{array.map(&:to_s)}" do
-    Rasti::Form::Types::Array[Rasti::Form::Types::String].cast(array).must_equal array.map(&:to_s)
+  it "#{VALID_ARRAY.inspect} -> #{VALID_ARRAY.map(&:to_s)}" do
+    Rasti::Form::Types::Array[Rasti::Form::Types::String].cast(VALID_ARRAY).must_equal VALID_ARRAY.map(&:to_s)
   end
 
-  [[nil], nil, 1, 'text', :symbol, {a: 1, b: 2}, Object.new].each do |value|
+  INVALID_ARRAY.each do |value|
     it "#{value.inspect} -> CastError" do
       error = proc { Rasti::Form::Types::Array[Rasti::Form::Types::String].cast(value) }.must_raise Rasti::Form::CastError
       error.message.must_equal "Invalid cast: #{as_string(value)} -> Rasti::Form::Types::Array[Rasti::Form::Types::String]"
     end
   end
 
+  describe 'Multi cast errors' do
+
+    it 'Array of integers' do
+      array = [1, 2 , 'a', 3, 'c', 4, nil]
+      error = proc { Rasti::Form::Types::Array[Rasti::Form::Types::Integer].cast(array) }.must_raise Rasti::Form::MultiCastError
+      error.errors.must_equal 3 => ["Invalid cast: 'a' -> Rasti::Form::Types::Integer"], 
+                              5 => ["Invalid cast: 'c' -> Rasti::Form::Types::Integer"],
+                              7 => ["Invalid cast: nil -> Rasti::Form::Types::Integer"]
+      error.message.must_equal "Invalid cast: [1, 2, \"a\", 3, \"c\", 4, nil] -> Rasti::Form::Types::Array[Rasti::Form::Types::Integer] - {\"3\":[\"Invalid cast: 'a' -> Rasti::Form::Types::Integer\"],\"5\":[\"Invalid cast: 'c' -> Rasti::Form::Types::Integer\"],\"7\":[\"Invalid cast: nil -> Rasti::Form::Types::Integer\"]}"
+    end
+
+    it 'Array of forms' do
+      inner_form_class = Rasti::Form::Types::Form[x: Rasti::Form::Types::Integer, y: Rasti::Form::Types::Integer]
+      form_class = Rasti::Form[points: Rasti::Form::Types::Array[inner_form_class]]
+
+      error = proc do
+        form_class.new points: [
+          {x: 1, y: 2},
+          {x: 'a', y: 2},
+          {x: 1, y: 'b'},
+          {x: 3, y: 4}
+        ]
+      end.must_raise Rasti::Form::ValidationError
+
+      error.errors.must_equal 'points.2.x' => ["Invalid cast: 'a' -> Rasti::Form::Types::Integer"], 
+                              'points.3.y' => ["Invalid cast: 'b' -> Rasti::Form::Types::Integer"]
+      error.message.must_equal "Validation error: #<Rasti::Form[]> {\"points.2.x\":[\"Invalid cast: 'a' -> Rasti::Form::Types::Integer\"],\"points.3.y\":[\"Invalid cast: 'b' -> Rasti::Form::Types::Integer\"]}"
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-form
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_require
@@ -59,6 +59,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +69,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: minitest-colorin
   requirement: !ruby/object:Gem::Requirement