schemacop 3.0.0.rc0 → 3.0.0.rc5

data/test/unit/schemacop/v3/node_test.rb

@@ -143,6 +143,20 @@ module Schemacop
           error '/[0]', 'Value must be given.'
         end
       end
+
+      def test_not_support_block
+        assert_raises_with_message Schemacop::Exceptions::InvalidSchemaError, 'Node Schemacop::V3::IntegerNode does not support blocks.' do
+          schema :integer do
+            int :foo
+          end
+        end
+      end
+
+      def test_node_no_children
+        @schema = Schemacop::Schema3.new
+
+        assert_equal(@schema.root.children, [])
+      end
     end
   end
 end

data/test/unit/schemacop/v3/one_of_node_test.rb

@@ -102,11 +102,11 @@ module Schemacop
 
         assert_cast(
           { created_at: '2020-01-01' },
-          created_at: Date.new(2020, 1, 1)
+          { created_at: Date.new(2020, 1, 1) }.with_indifferent_access
         )
         assert_cast(
           { created_at: '2020-01-01T17:38:20' },
-          created_at: DateTime.new(2020, 1, 1, 17, 38, 20)
+          { created_at: DateTime.new(2020, 1, 1, 17, 38, 20) }.with_indifferent_access
         )
       end
 
@@ -127,12 +127,12 @@ module Schemacop
 
         assert_cast(
           { foo: { bar: nil } },
-          foo: { bar: nil }
+          { foo: { bar: nil } }.with_indifferent_access
         )
 
         assert_cast(
           { foo: { baz: nil } },
-          foo: { baz: 'Baz' }
+          { foo: { baz: 'Baz' } }.with_indifferent_access
         )
 
         schema do
@@ -144,12 +144,12 @@ module Schemacop
 
         assert_cast(
           { foo: { bar: '1990-01-13' } },
-          foo: { bar: Date.new(1990, 1, 13) }
+          { foo: { bar: Date.new(1990, 1, 13) } }.with_indifferent_access
         )
 
         assert_cast(
           { foo: { bar: '1990-01-13T10:00:00Z' } },
-          foo: { bar: DateTime.new(1990, 1, 13, 10, 0, 0) }
+          { foo: { bar: DateTime.new(1990, 1, 13, 10, 0, 0) } }.with_indifferent_access
         )
       end
 

data/test/unit/schemacop/v3/reference_node_test.rb

@@ -249,6 +249,8 @@ module Schemacop
           ref? :node, :Node
         end
 
+        assert_equal(@schema.root.used_external_schemas, [])
+
         assert_validation({})
         assert_validation(node: { name: '1', children: [{ name: '1' }, { name: '2' }] })
         assert_validation(
@@ -286,66 +288,80 @@ module Schemacop
         end
       end
 
-      # def test_external_schemas
-      #   context = Context.new
-
-      #   context.schema :Person do
-      #     str! :first_name
-      #     str! :last_name
-      #     ref? :info, :PersonInfo
-      #   end
-
-      #   context.schema :PersonInfo do
-      #     str! :born_at, format: :date
-      #   end
-
-      #   schema :reference, path: :Person
-
-      #   with_context context do
-      #     assert_validation(first_name: 'John', last_name: 'Doe')
-      #     assert_validation(first_name: 'John', last_name: 42) do
-      #       error '/last_name', 'Invalid type, expected "string".'
-      #     end
-      #   end
-
-      #   with_context context do
-      #     schema do
-      #       ref! :person, :Person
-      #     end
-
-      #     assert_validation(person: { first_name: 'John', last_name: 'Doe' })
-      #     assert_validation(person: { first_name: 'John', last_name: 'Doe', info: { born_at: '1990-01-13' } })
-      #     assert_validation(person: { first_name_x: 'John', last_name: 'Doe' }) do
-      #       error '/person', 'Obsolete property "first_name_x".'
-      #       error '/person/first_name', 'Value must be given.'
-      #     end
-      #     assert_validation(person: { first_name: 'John', last_name: 'Doe', info: { born_at: 'never' } }) do
-      #       error '/person/info/born_at', 'String does not match format "date".'
-      #     end
-      #   end
-      # end
-
-      # def test_defaults
-      #   schema do
-      #     scm :Person do
-      #       str? :foo, default: 'bar'
-      #     end
-      #     ref? :person, :Person, default: {}
-      #   end
-
-      #   assert_cast({}, person: { foo: 'bar' })
-      # end
-
-      # def test_casting
-      #   schema do
-      #     scm :Person do
-      #       str! :born_at, format: :date
-      #     end
-      #     ref? :person, :Person, default: {}
-      #   end
-
-      #   assert_cast({ person: { born_at: '1990-01-13' } }, person: { born_at: Date.new(1990, 1, 13) })
-      # end
+      def test_external_schemas
+        context = Context.new
+
+        context.schema :Person do
+          str! :first_name
+          str! :last_name
+          ref? :info, :PersonInfo
+        end
+
+        context.schema :PersonInfo do
+          str! :born_at, format: :date
+        end
+
+        schema :reference, path: :Person
+
+        with_context context do
+          assert_validation(first_name: 'John', last_name: 'Doe')
+          assert_validation(first_name: 'John', last_name: 42) do
+            error '/last_name', 'Invalid type, expected "string".'
+          end
+        end
+
+        with_context context do
+          schema do
+            ref! :person, :Person
+          end
+
+          assert_equal(@schema.root.used_external_schemas, %i[Person PersonInfo])
+
+          assert_validation(person: { first_name: 'John', last_name: 'Doe' })
+          assert_validation(person: { first_name: 'John', last_name: 'Doe', info: { born_at: '1990-01-13' } })
+          assert_validation(person: { first_name_x: 'John', last_name: 'Doe' }) do
+            error '/person', 'Obsolete property "first_name_x".'
+            error '/person/first_name', 'Value must be given.'
+          end
+          assert_validation(person: { first_name: 'John', last_name: 'Doe', info: { born_at: 'never' } }) do
+            error '/person/info/born_at', 'String does not match format "date".'
+          end
+        end
+
+        with_context context do
+          schema do
+            scm :PersonNode do
+              ref! :person, :Person
+            end
+
+            ref! :personNode, :PersonNode
+          end
+
+          assert_equal(@schema.root.used_external_schemas, %i[Person PersonInfo])
+        end
+      end
+
+      def test_defaults
+        schema do
+          scm :Person do
+            str? :foo, default: 'bar'
+          end
+          ref? :person, :Person, default: {}
+        end
+
+        assert_cast({}, { person: { foo: 'bar' } }.with_indifferent_access)
+      end
+
+      def test_casting
+        schema do
+          scm :Person do
+            str! :born_at, format: :date
+          end
+          ref? :person, :Person, default: {}
+        end
+
+        assert_cast({ person: { born_at: '1990-01-13' } }, { person: { born_at: Date.new(1990, 1, 13) } }.with_indifferent_access)
+      end
     end
   end
 end

data/test/unit/schemacop/v3/string_node_test.rb

@@ -111,6 +111,9 @@ module Schemacop
         assert_validation 'foo 2020-01-29 bar' do
           error '/', 'String does not match format "date".'
         end
+
+        assert_cast(nil, nil)
+        assert_cast('2020-01-13', Date.new(2020, 1, 13))
       end
 
       def test_format_date_time
@@ -132,6 +135,9 @@ module Schemacop
         assert_validation '2018-11-13T20:20:39Y' do
           error '/', 'String does not match format "date-time".'
         end
+
+        assert_cast(nil, nil)
+        assert_cast('2018-11-13T20:20:39+00:00', DateTime.new(2018, 11, 13, 20, 20, 39))
       end
 
       def test_format_email
@@ -154,6 +160,9 @@ module Schemacop
         assert_validation '@john@example.com' do
           error '/', 'String does not match format "email".'
         end
+
+        assert_cast(nil, nil)
+        assert_cast('john.doe@example.com', 'john.doe@example.com')
       end
 
       def test_enum
@@ -187,18 +196,24 @@ module Schemacop
 
         assert_cast 'true', true
         assert_cast 'false', false
+
+        assert_cast nil, nil
       end
 
       def test_time_casting
         schema :string, format: :time
         assert_json(type: :string, format: :time)
         assert_cast '20:30:39+00:00', Time.strptime('20:30:39+00:00', '%H:%M:%S%z')
+
+        assert_cast nil, nil
       end
 
       def test_date_casting
         schema :string, format: :date
         assert_json(type: :string, format: :date)
         assert_cast '2018-11-13', Date.new(2018, 11, 13)
+
+        assert_cast nil, nil
       end
 
       def test_date_time_casting
@@ -207,12 +222,16 @@ module Schemacop
         assert_cast '2018-11-13T20:20:39+00:00', DateTime.new(2018, 11, 13, 20, 20, 39)
         assert_cast '2018-11-13T20:20:39Z', DateTime.new(2018, 11, 13, 20, 20, 39)
         assert_cast '2018-11-13T20:20:39+01:00', DateTime.new(2018, 11, 13, 20, 20, 39, '+1')
+
+        assert_cast nil, nil
       end
 
       def test_email_casting
         schema :string, format: :email
         assert_json(type: :string, format: :email)
         assert_cast 'support@example.com', 'support@example.com'
+
+        assert_cast nil, nil
       end
 
       def test_default
@@ -233,6 +252,25 @@ module Schemacop
         assert_cast(nil, 'Hello')
       end
 
+      def test_default_casting
+        schema :string, format: :integer, default: '42'
+
+        assert_json(
+          type:    :string,
+          format:  :integer,
+          default: '42'
+        )
+
+        assert_validation(nil)
+        assert_validation('123')
+        assert_validation(5) do
+          error '/', 'Invalid type, expected "string".'
+        end
+
+        assert_cast('123', 123)
+        assert_cast(nil, 42)
+      end
+
       # Helper function that checks for all the options if the option is
       # an integer or something else, in which case it needs to raise
       def validate_self_should_error(value_to_check)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc0
+  version: 3.0.0.rc5
 platform: ruby
 authors:
 - Sitrox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +202,6 @@ files:
 - lib/schemacop/v2/node_supporting_field.rb
 - lib/schemacop/v2/node_supporting_type.rb
 - lib/schemacop/v2/node_with_block.rb
-- lib/schemacop/v2/root_node.rb
 - lib/schemacop/v2/validator/array_validator.rb
 - lib/schemacop/v2/validator/boolean_validator.rb
 - lib/schemacop/v2/validator/float_validator.rb

data/lib/schemacop/v2/root_node.rb

@@ -1,6 +0,0 @@
-module Schemacop
-  module V2
-    class RootNode < NodeSupportingType
-    end
-  end
-end