schemacop 3.0.0.rc2 → 3.0.1

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

@@ -25,8 +25,10 @@ module Schemacop
 
       def test_schemas
         assert_equal({}, GlobalContext.instance.schemas)
+        assert_equal({}, GlobalContext.schemas)
         GlobalContext.instance.eager_load!
         assert_equal(%i[nested/group user], GlobalContext.instance.schemas.keys)
+        assert_equal(%i[nested/group user], GlobalContext.schemas.keys)
         assert_is_a Node, GlobalContext.instance.schemas.values.first
       end
 

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

@@ -16,7 +16,7 @@ module Schemacop
         assert_json(type: :object, additionalProperties: false)
       end
 
-      def test_additional_properties_false
+      def test_additional_properties_false_by_default
         schema
         assert_validation({})
         assert_validation(foo: :bar, bar: :baz) do
@@ -26,6 +26,17 @@ module Schemacop
         assert_json(type: :object, additionalProperties: false)
       end
 
+      def test_additional_properties_false
+        schema :hash, additional_properties: false
+
+        assert_validation({})
+        assert_validation(foo: :bar, bar: :baz) do
+          error '/', 'Obsolete property "foo".'
+          error '/', 'Obsolete property "bar".'
+        end
+        assert_json(type: :object, additionalProperties: false)
+      end
+
       def test_additional_properties_true
         schema :hash, additional_properties: true
         assert_validation({})
@@ -874,11 +885,88 @@ module Schemacop
         end
       end
 
-      # def test_invalid_key_names
-      #   schema :hash do
-      #     int!
-      #   end
-      # end
+      def test_invalid_options
+        assert_raises_with_message Schemacop::Exceptions::InvalidSchemaError, 'Options [:foo] are not allowed for this node.' do
+          schema :hash, foo: 'bar' do
+            int! :id
+          end
+        end
+      end
+
+      def test_casting_optional
+        schema :hash do
+          str? :foo, format: :integer
+        end
+
+        assert_validation(nil)
+        assert_validation({})
+
+        assert_cast(nil, nil)
+        assert_cast({}, {}.with_indifferent_access)
+      end
+
+      def test_as_option
+        schema :hash do
+          int! :foo, as: :bar
+        end
+
+        assert_validation(nil)
+        assert_validation({ foo: 42 })
+        assert_validation({ bar: 13 }) do
+          error '/', 'Obsolete property "bar".'
+          error '/foo', 'Value must be given.'
+        end
+
+        assert_validation({ foo: '13' }) do
+          error '/foo', 'Invalid type, expected "integer".'
+        end
+
+        assert_cast(nil, nil)
+        assert_cast({ foo: 42 }, { bar: 42 }.with_indifferent_access)
+      end
+
+      def test_as_option_overriding
+        schema :hash do
+          int? :foo, as: :bar
+          int? :bar
+        end
+
+        assert_validation(nil)
+        assert_validation({})
+        assert_validation({ foo: 42 })
+        assert_validation({ foo: 42, bar: 13 })
+
+        assert_validation({ foo: '13' }) do
+          error '/foo', 'Invalid type, expected "integer".'
+        end
+
+        # assert_cast(nil, nil)
+        assert_cast({ foo: 42 }, { bar: 42 }.with_indifferent_access)
+        assert_cast({ foo: 42, bar: 13 }, { bar: 13 }.with_indifferent_access)
+        assert_cast({ bar: 13, foo: 42 }, { bar: 13 }.with_indifferent_access)
+
+        # Swap order
+        schema :hash do
+          int? :bar
+          int! :foo, as: :bar
+        end
+
+        assert_validation(nil)
+        assert_validation({ foo: 42 })
+        assert_validation({ foo: 42, bar: 13 })
+        assert_validation({ bar: 13 }) do
+          error '/foo', 'Value must be given.'
+        end
+
+        assert_validation({ foo: '13' }) do
+          error '/foo', 'Invalid type, expected "integer".'
+        end
+
+        assert_cast(nil, nil)
+        assert_cast({ foo: 42 }, { bar: 42 }.with_indifferent_access)
+        assert_cast({ foo: 42, bar: 13 }, { bar: 42 }.with_indifferent_access)
+        assert_cast({ bar: 13, foo: 42 }, { bar: 42 }.with_indifferent_access)
+      end
     end
   end
 end

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/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(
@@ -313,6 +315,8 @@ module Schemacop
             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
@@ -323,6 +327,18 @@ module Schemacop
             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

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,26 @@ 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_format_symbol
+        schema :string, format: :symbol
+
+        assert_json(type: :string, format: :symbol)
+
+        assert_validation 'foobar'
+        assert_validation ''
+
+        assert_validation 234 do
+          error '/', 'Invalid type, expected "string".'
+        end
+
+        assert_cast(nil, nil)
+        assert_cast('foobar', :foobar)
+        assert_cast('039n23$g- sfk3/', :'039n23$g- sfk3/')
       end
 
       def test_enum
@@ -187,18 +213,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 +239,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 +269,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.rc2
+  version: 3.0.1
 platform: ruby
 authors:
 - Sitrox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-02-11 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
@@ -150,8 +164,8 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.21.2
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -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
@@ -264,7 +277,7 @@ homepage: https://github.com/sitrox/schemacop
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -275,12 +288,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Schemacop validates ruby structures consisting of nested hashes and arrays
   against simple schema definitions.

data/lib/schemacop/v2/root_node.rb

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