rasti-form 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d866f9b7a43e27b5a12fbe5044672018066e99d45c2cce45bc7cb80baef095c1
-  data.tar.gz: 9c24281985c31043750f3998c6ddc857c30830abba2a6f6128d0cfe45c5d8432
+  metadata.gz: 30eebb17e0a18f1c4ea84fb4dc617742325e38876cb03f6b85af4a29b2a6bcd6
+  data.tar.gz: 2e3ebc2338f62e608cec51a596db988b3f59751be11572a92216542f37fbb23f
 SHA512:
-  metadata.gz: ff8eab55df69a186a42353248bb9218ae79352057642db8ea96af007c3a2717ed908d7b1219e803af11ed87e2d0166557e22ab58c849bdffa1638353f66bc3c7
-  data.tar.gz: 3e102c9dae971bb5482665db5471bbf1420ba35b2c81960bcd02583b119970dd5ba54df79450fe19ab50a3134b619809d1d234a21380725375460b86b59dcd37
+  metadata.gz: dc4a4484961c15e7b054d5aabadcacf61a4ec2e9d40973ee8f226dc3bcb62bd2c46a07e710c84bfb97bfe31fd78bef256009ec34b554f789ea1e4f6c3ea7d57b
+  data.tar.gz: 5e46bfdfdd2a5cf657f30e901cd68dd43f8aefada51c1fbfd52a9eee09bf1bb232c0f86f07a4bf67430dbbc48e8043d9b1e50157a0cc620fa37d249675ac3bc4

data/lib/rasti/form.rb

@@ -18,13 +18,13 @@ module Rasti
           attributes.each do |name, type, options={}|
             attribute name, type, options
           end
-
-          def self.inherited(subclass)
-            subclass.instance_variable_set :@attributes, attributes.dup
-          end
         end
       end
 
+      def inherited(subclass)
+        subclass.instance_variable_set :@attributes, attributes.dup
+      end
+
       def attribute(name, type, options={})
         attributes[name.to_sym] = options.merge(type: type)
         attr_reader name

data/lib/rasti/form/errors.rb

@@ -53,7 +53,15 @@ module Rasti
       end
 
       def message
-        "Validation error: #{scope} #{JSON.dump(errors)}"
+        lines = ['Validation errors:']
+
+        errors.each do |key, value|
+          lines << "- #{key}: #{value}"
+        end
+
+        lines << scope.inspect
+
+        lines.join("\n")
       end
 
     end

data/lib/rasti/form/version.rb

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

data/spec/form_spec.rb

@@ -40,7 +40,7 @@ describe Rasti::Form do
 
     it 'Invalid attributes' do
       error = proc { point_class.new z: 3 }.must_raise Rasti::Form::ValidationError
-      error.message.must_equal 'Validation error: #<Rasti::Form[]> {"z":["unexpected attribute"]}'
+      error.message.must_equal "Validation errors:\n- z: [\"unexpected attribute\"]\n#<Rasti::Form[]>"
     end
 
     describe 'Casting' do
@@ -86,7 +86,7 @@ describe Rasti::Form do
         end
 
         error = proc { form.new boolean: 'x', number: 'y' }.must_raise Rasti::Form::ValidationError
-        error.message.must_equal 'Validation error: #<Rasti::Form[]> {"boolean":["Invalid cast: \'x\' -> Rasti::Form::Types::Boolean"],"number":["Invalid cast: \'y\' -> Rasti::Form::Types::Integer"]}'
+        error.message.must_equal "Validation errors:\n- boolean: [\"Invalid cast: \'x\' -> Rasti::Form::Types::Boolean\"]\n- number: [\"Invalid cast: \'y\' -> Rasti::Form::Types::Integer\"]\n#<Rasti::Form[]>"
       end
 
       it 'Invalid nested attributes' do
@@ -95,7 +95,7 @@ describe Rasti::Form do
         end
 
         error = proc { form.new range: {min: 'x', max: 'y'} }.must_raise Rasti::Form::ValidationError
-        error.message.must_equal "Validation error: #<Rasti::Form[]> {\"range.min\":[\"Invalid cast: 'x' -> Rasti::Form::Types::Integer\"],\"range.max\":[\"Invalid cast: 'y' -> Rasti::Form::Types::Integer\"]}"
+        error.message.must_equal "Validation errors:\n- range.min: [\"Invalid cast: 'x' -> Rasti::Form::Types::Integer\"]\n- range.max: [\"Invalid cast: 'y' -> Rasti::Form::Types::Integer\"]\n#<Rasti::Form[]>"
       end
 
       it 'Invalid form attributes' do
@@ -109,7 +109,7 @@ describe Rasti::Form do
         end
 
         error = proc { form.new range: {min: 'x', max: 'y'} }.must_raise Rasti::Form::ValidationError
-        error.message.must_equal "Validation error: #<Rasti::Form[]> {\"range.min\":[\"Invalid cast: 'x' -> Rasti::Form::Types::Integer\"],\"range.max\":[\"Invalid cast: 'y' -> Rasti::Form::Types::Integer\"]}"
+        error.message.must_equal "Validation errors:\n- range.min: [\"Invalid cast: 'x' -> Rasti::Form::Types::Integer\"]\n- range.max: [\"Invalid cast: 'y' -> Rasti::Form::Types::Integer\"]\n#<Rasti::Form[]>"
       end
 
     end
@@ -155,7 +155,7 @@ describe Rasti::Form do
       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"]}'
+      error.message.must_equal "Validation errors:\n- text: [\"Invalid text\"]\n#<Rasti::Form[]>"
     end
 
     it 'Required' do
@@ -170,7 +170,7 @@ describe Rasti::Form do
       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"]}'
+      error.message.must_equal "Validation errors:\n- text: [\"not present\"]\n#<Rasti::Form[]>"
     end
 
     it 'Required when cast failed' do
@@ -185,7 +185,7 @@ describe Rasti::Form do
       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\"]}"
+      error.message.must_equal "Validation errors:\n- number: [\"Invalid cast: 'text' -> Rasti::Form::Types::Integer\"]\n#<Rasti::Form[]>"
     end
 
     it 'Not required' do
@@ -200,7 +200,7 @@ describe Rasti::Form do
       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"]}'
+      error.message.must_equal "Validation errors:\n- text: [\"is present\"]\n#<Rasti::Form[text: \"text\"]>"
     end
 
     it 'Not empty string' do
@@ -215,7 +215,7 @@ describe Rasti::Form do
       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"]}'
+      error.message.must_equal "Validation errors:\n- text: [\"is empty\"]\n#<Rasti::Form[text: \"  \"]>"
     end
 
     it 'Not empty array' do
@@ -230,7 +230,7 @@ describe Rasti::Form do
       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"]}'
+      error.message.must_equal "Validation errors:\n- array: [\"is empty\"]\n#<Rasti::Form[array: []]>"
     end
 
     it 'Included in values list' do
@@ -245,7 +245,7 @@ describe Rasti::Form do
       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\'"]}'
+      error.message.must_equal "Validation errors:\n- text: [\"not included in \'value_1\', \'value_2\'\"]\n#<Rasti::Form[text: \"xyz\"]>"
     end
 
     it 'Time range' do
@@ -264,7 +264,7 @@ describe Rasti::Form do
       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\"]}"
+      error.message.must_equal "Validation errors:\n- from: [\"invalid time range\"]\n#<Rasti::Form[from: #{to}, to: #{from}]>"
     end
 
     it 'Nested form' do
@@ -280,7 +280,7 @@ describe Rasti::Form do
       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"]}'
+      error.message.must_equal "Validation errors:\n- range.min: [\"not present\"]\n- range.max: [\"not present\"]\n#<Rasti::Form[]>"
     end
 
     it 'Nested validation' do
@@ -300,7 +300,7 @@ describe Rasti::Form do
       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"]}'
+      error.message.must_equal "Validation errors:\n- range.min: [\"Min must be less than Max\"]\n#<Rasti::Form[]>"
     end
 
   end

data/spec/types/array_spec.rb

@@ -46,7 +46,7 @@ describe Rasti::Form::Types::Array do
 
       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\"]}"
+      error.message.must_equal "Validation errors:\n- points.2.x: [\"Invalid cast: 'a' -> Rasti::Form::Types::Integer\"]\n- points.3.y: [\"Invalid cast: 'b' -> Rasti::Form::Types::Integer\"]\n#<Rasti::Form[]>"
     end
 
   end

data/spec/types/form_spec.rb

@@ -35,7 +35,7 @@ describe Rasti::Form::Types::Form do
 
   it '{x: "text"} -> ValidationError' do
     error = proc { Rasti::Form::Types::Form[form].cast x: 'test' }.must_raise Rasti::Form::ValidationError
-    error.message.must_equal "Validation error: #<Rasti::Form[]> {\"x\":[\"Invalid cast: 'test' -> Rasti::Form::Types::Integer\"]}"
+    error.message.must_equal "Validation errors:\n- x: [\"Invalid cast: 'test' -> Rasti::Form::Types::Integer\"]\n#<Rasti::Form[]>"
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-form
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_require