schemacop 3.0.0.rc0 → 3.0.0.rc5

data/schemacop.gemspec

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.0.rc0 ruby lib
+# stub: schemacop 3.0.0.rc5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.0.rc0"
+  s.version = "3.0.0.rc5"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sitrox".freeze]
-  s.date = "2021-01-14"
-  s.files = [".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, ".travis.yml".freeze, ".yardopts".freeze, "CHANGELOG.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "README_V2.md".freeze, "README_V3.md".freeze, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "lib/schemacop.rb".freeze, "lib/schemacop/base_schema.rb".freeze, "lib/schemacop/exceptions.rb".freeze, "lib/schemacop/railtie.rb".freeze, "lib/schemacop/schema.rb".freeze, "lib/schemacop/schema2.rb".freeze, "lib/schemacop/schema3.rb".freeze, "lib/schemacop/scoped_env.rb".freeze, "lib/schemacop/v2.rb".freeze, "lib/schemacop/v2/caster.rb".freeze, "lib/schemacop/v2/collector.rb".freeze, "lib/schemacop/v2/dupper.rb".freeze, "lib/schemacop/v2/field_node.rb".freeze, "lib/schemacop/v2/node.rb".freeze, "lib/schemacop/v2/node_resolver.rb".freeze, "lib/schemacop/v2/node_supporting_field.rb".freeze, "lib/schemacop/v2/node_supporting_type.rb".freeze, "lib/schemacop/v2/node_with_block.rb".freeze, "lib/schemacop/v2/root_node.rb".freeze, "lib/schemacop/v2/validator/array_validator.rb".freeze, "lib/schemacop/v2/validator/boolean_validator.rb".freeze, "lib/schemacop/v2/validator/float_validator.rb".freeze, "lib/schemacop/v2/validator/hash_validator.rb".freeze, "lib/schemacop/v2/validator/integer_validator.rb".freeze, "lib/schemacop/v2/validator/nil_validator.rb".freeze, "lib/schemacop/v2/validator/number_validator.rb".freeze, "lib/schemacop/v2/validator/object_validator.rb".freeze, "lib/schemacop/v2/validator/string_validator.rb".freeze, "lib/schemacop/v2/validator/symbol_validator.rb".freeze, "lib/schemacop/v3.rb".freeze, "lib/schemacop/v3/all_of_node.rb".freeze, "lib/schemacop/v3/any_of_node.rb".freeze, "lib/schemacop/v3/array_node.rb".freeze, "lib/schemacop/v3/boolean_node.rb".freeze, "lib/schemacop/v3/combination_node.rb".freeze, "lib/schemacop/v3/context.rb".freeze, "lib/schemacop/v3/dsl_scope.rb".freeze, "lib/schemacop/v3/global_context.rb".freeze, "lib/schemacop/v3/hash_node.rb".freeze, "lib/schemacop/v3/integer_node.rb".freeze, "lib/schemacop/v3/is_not_node.rb".freeze, "lib/schemacop/v3/node.rb".freeze, "lib/schemacop/v3/node_registry.rb".freeze, "lib/schemacop/v3/number_node.rb".freeze, "lib/schemacop/v3/numeric_node.rb".freeze, "lib/schemacop/v3/object_node.rb".freeze, "lib/schemacop/v3/one_of_node.rb".freeze, "lib/schemacop/v3/reference_node.rb".freeze, "lib/schemacop/v3/result.rb".freeze, "lib/schemacop/v3/string_node.rb".freeze, "lib/schemacop/v3/symbol_node.rb".freeze, "schemacop.gemspec".freeze, "test/lib/test_helper.rb".freeze, "test/schemas/nested/group.rb".freeze, "test/schemas/user.rb".freeze, "test/unit/schemacop/v2/casting_test.rb".freeze, "test/unit/schemacop/v2/collector_test.rb".freeze, "test/unit/schemacop/v2/custom_check_test.rb".freeze, "test/unit/schemacop/v2/custom_if_test.rb".freeze, "test/unit/schemacop/v2/defaults_test.rb".freeze, "test/unit/schemacop/v2/empty_test.rb".freeze, "test/unit/schemacop/v2/nil_dis_allow_test.rb".freeze, "test/unit/schemacop/v2/node_resolver_test.rb".freeze, "test/unit/schemacop/v2/short_forms_test.rb".freeze, "test/unit/schemacop/v2/types_test.rb".freeze, "test/unit/schemacop/v2/validator_array_test.rb".freeze, "test/unit/schemacop/v2/validator_boolean_test.rb".freeze, "test/unit/schemacop/v2/validator_float_test.rb".freeze, "test/unit/schemacop/v2/validator_hash_test.rb".freeze, "test/unit/schemacop/v2/validator_integer_test.rb".freeze, "test/unit/schemacop/v2/validator_nil_test.rb".freeze, "test/unit/schemacop/v2/validator_number_test.rb".freeze, "test/unit/schemacop/v2/validator_object_test.rb".freeze, "test/unit/schemacop/v2/validator_string_test.rb".freeze, "test/unit/schemacop/v2/validator_symbol_test.rb".freeze, "test/unit/schemacop/v3/all_of_node_test.rb".freeze, "test/unit/schemacop/v3/any_of_node_test.rb".freeze, "test/unit/schemacop/v3/array_node_test.rb".freeze, "test/unit/schemacop/v3/boolean_node_test.rb".freeze, "test/unit/schemacop/v3/global_context_test.rb".freeze, "test/unit/schemacop/v3/hash_node_test.rb".freeze, "test/unit/schemacop/v3/integer_node_test.rb".freeze, "test/unit/schemacop/v3/is_not_node_test.rb".freeze, "test/unit/schemacop/v3/node_test.rb".freeze, "test/unit/schemacop/v3/number_node_test.rb".freeze, "test/unit/schemacop/v3/object_node_test.rb".freeze, "test/unit/schemacop/v3/one_of_node_test.rb".freeze, "test/unit/schemacop/v3/reference_node_test.rb".freeze, "test/unit/schemacop/v3/string_node_test.rb".freeze, "test/unit/schemacop/v3/symbol_node_test.rb".freeze]
+  s.date = "2021-02-05"
+  s.files = [".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, ".travis.yml".freeze, ".yardopts".freeze, "CHANGELOG.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "README_V2.md".freeze, "README_V3.md".freeze, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "lib/schemacop.rb".freeze, "lib/schemacop/base_schema.rb".freeze, "lib/schemacop/exceptions.rb".freeze, "lib/schemacop/railtie.rb".freeze, "lib/schemacop/schema.rb".freeze, "lib/schemacop/schema2.rb".freeze, "lib/schemacop/schema3.rb".freeze, "lib/schemacop/scoped_env.rb".freeze, "lib/schemacop/v2.rb".freeze, "lib/schemacop/v2/caster.rb".freeze, "lib/schemacop/v2/collector.rb".freeze, "lib/schemacop/v2/dupper.rb".freeze, "lib/schemacop/v2/field_node.rb".freeze, "lib/schemacop/v2/node.rb".freeze, "lib/schemacop/v2/node_resolver.rb".freeze, "lib/schemacop/v2/node_supporting_field.rb".freeze, "lib/schemacop/v2/node_supporting_type.rb".freeze, "lib/schemacop/v2/node_with_block.rb".freeze, "lib/schemacop/v2/validator/array_validator.rb".freeze, "lib/schemacop/v2/validator/boolean_validator.rb".freeze, "lib/schemacop/v2/validator/float_validator.rb".freeze, "lib/schemacop/v2/validator/hash_validator.rb".freeze, "lib/schemacop/v2/validator/integer_validator.rb".freeze, "lib/schemacop/v2/validator/nil_validator.rb".freeze, "lib/schemacop/v2/validator/number_validator.rb".freeze, "lib/schemacop/v2/validator/object_validator.rb".freeze, "lib/schemacop/v2/validator/string_validator.rb".freeze, "lib/schemacop/v2/validator/symbol_validator.rb".freeze, "lib/schemacop/v3.rb".freeze, "lib/schemacop/v3/all_of_node.rb".freeze, "lib/schemacop/v3/any_of_node.rb".freeze, "lib/schemacop/v3/array_node.rb".freeze, "lib/schemacop/v3/boolean_node.rb".freeze, "lib/schemacop/v3/combination_node.rb".freeze, "lib/schemacop/v3/context.rb".freeze, "lib/schemacop/v3/dsl_scope.rb".freeze, "lib/schemacop/v3/global_context.rb".freeze, "lib/schemacop/v3/hash_node.rb".freeze, "lib/schemacop/v3/integer_node.rb".freeze, "lib/schemacop/v3/is_not_node.rb".freeze, "lib/schemacop/v3/node.rb".freeze, "lib/schemacop/v3/node_registry.rb".freeze, "lib/schemacop/v3/number_node.rb".freeze, "lib/schemacop/v3/numeric_node.rb".freeze, "lib/schemacop/v3/object_node.rb".freeze, "lib/schemacop/v3/one_of_node.rb".freeze, "lib/schemacop/v3/reference_node.rb".freeze, "lib/schemacop/v3/result.rb".freeze, "lib/schemacop/v3/string_node.rb".freeze, "lib/schemacop/v3/symbol_node.rb".freeze, "schemacop.gemspec".freeze, "test/lib/test_helper.rb".freeze, "test/schemas/nested/group.rb".freeze, "test/schemas/user.rb".freeze, "test/unit/schemacop/v2/casting_test.rb".freeze, "test/unit/schemacop/v2/collector_test.rb".freeze, "test/unit/schemacop/v2/custom_check_test.rb".freeze, "test/unit/schemacop/v2/custom_if_test.rb".freeze, "test/unit/schemacop/v2/defaults_test.rb".freeze, "test/unit/schemacop/v2/empty_test.rb".freeze, "test/unit/schemacop/v2/nil_dis_allow_test.rb".freeze, "test/unit/schemacop/v2/node_resolver_test.rb".freeze, "test/unit/schemacop/v2/short_forms_test.rb".freeze, "test/unit/schemacop/v2/types_test.rb".freeze, "test/unit/schemacop/v2/validator_array_test.rb".freeze, "test/unit/schemacop/v2/validator_boolean_test.rb".freeze, "test/unit/schemacop/v2/validator_float_test.rb".freeze, "test/unit/schemacop/v2/validator_hash_test.rb".freeze, "test/unit/schemacop/v2/validator_integer_test.rb".freeze, "test/unit/schemacop/v2/validator_nil_test.rb".freeze, "test/unit/schemacop/v2/validator_number_test.rb".freeze, "test/unit/schemacop/v2/validator_object_test.rb".freeze, "test/unit/schemacop/v2/validator_string_test.rb".freeze, "test/unit/schemacop/v2/validator_symbol_test.rb".freeze, "test/unit/schemacop/v3/all_of_node_test.rb".freeze, "test/unit/schemacop/v3/any_of_node_test.rb".freeze, "test/unit/schemacop/v3/array_node_test.rb".freeze, "test/unit/schemacop/v3/boolean_node_test.rb".freeze, "test/unit/schemacop/v3/global_context_test.rb".freeze, "test/unit/schemacop/v3/hash_node_test.rb".freeze, "test/unit/schemacop/v3/integer_node_test.rb".freeze, "test/unit/schemacop/v3/is_not_node_test.rb".freeze, "test/unit/schemacop/v3/node_test.rb".freeze, "test/unit/schemacop/v3/number_node_test.rb".freeze, "test/unit/schemacop/v3/object_node_test.rb".freeze, "test/unit/schemacop/v3/one_of_node_test.rb".freeze, "test/unit/schemacop/v3/reference_node_test.rb".freeze, "test/unit/schemacop/v3/string_node_test.rb".freeze, "test/unit/schemacop/v3/symbol_node_test.rb".freeze]
   s.homepage = "https://github.com/sitrox/schemacop".freeze
   s.licenses = ["MIT".freeze]
   s.rubygems_version = "3.0.3".freeze
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>.freeze, [">= 4.0"])
+      s.add_runtime_dependency(%q<ruby2_keywords>.freeze, ["= 0.0.4"])
       s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_development_dependency(%q<rake>.freeze, [">= 0"])
       s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
@@ -32,6 +33,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>.freeze, ["= 0.21.2"])
     else
       s.add_dependency(%q<activesupport>.freeze, [">= 4.0"])
+      s.add_dependency(%q<ruby2_keywords>.freeze, ["= 0.0.4"])
       s.add_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_dependency(%q<rake>.freeze, [">= 0"])
       s.add_dependency(%q<minitest>.freeze, [">= 0"])
@@ -44,6 +46,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>.freeze, [">= 4.0"])
+    s.add_dependency(%q<ruby2_keywords>.freeze, ["= 0.0.4"])
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
     s.add_dependency(%q<rake>.freeze, [">= 0"])
     s.add_dependency(%q<minitest>.freeze, [">= 0"])

data/test/lib/test_helper.rb

@@ -1,5 +1,15 @@
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start do
+  add_group 'v3', 'lib/schemacop/v3'
+  add_group 'v2', 'lib/schemacop/v2'
+
+  # We don't care about the test coverage for the
+  # tests themselves
+  add_filter 'test'
+
+  # Also enable branch coverage reporting
+  enable_coverage :branch
+end
 
 # TODO: Move to more sensible location
 def assert_verr(&block)
@@ -141,7 +151,12 @@ class V3Test < SchemacopTest
     input_data_was = Marshal.load(Marshal.dump(input_data))
     result = @schema.validate(input_data)
     assert_empty result.errors
-    assert_equal expected_data, result.data, 'Unexpected result data.'
+
+    if expected_data.nil?
+      assert_nil result.data, 'Unexpected result data.'
+    else
+      assert_equal expected_data, result.data, 'Unexpected result data.'
+    end
 
     if input_data.nil?
       assert_nil input_data_was, 'Expected input_data to stay the same.'

data/test/unit/schemacop/v2/casting_test.rb

@@ -115,6 +115,43 @@ module Schemacop
         assert_equal expected_float, s.validate!(float_field: '')
         assert_equal expected_float, s.validate!(float_field: '     ')
       end
+
+      def test_float_to_integer
+        s = Schema.new do
+          req :foo, :integer, cast: [Float]
+        end
+
+        assert_equal({ foo: 42 }, s.validate!(foo: 42.0))
+        assert_equal({ foo: 42 }, s.validate!(foo: Float(42)))
+      end
+
+      def test_integer_to_float
+        s = Schema.new do
+          req :foo, :float, cast: [Integer]
+        end
+
+        assert_equal({ foo: 42.0 }, s.validate!(foo: 42))
+        assert_equal({ foo: 42.0 }, s.validate!(foo: Integer(42)))
+      end
+
+      def test_invalid_cast_option
+        s = Schema.new do
+          req :foo, :integer, cast: true
+        end
+
+        assert_raises Schemacop::Exceptions::InvalidSchemaError do
+          s.validate!({ foo: '42' })
+        end
+      end
+
+      def test_impossible_cast
+        s = Schema.new do
+          req :foo, :integer, cast: [String]
+        end
+
+        assert_equal({ foo: 42 }, s.validate!(foo: '42'))
+        assert_verr { s.validate!(foo: 'foo') }
+      end
     end
   end
 end

data/test/unit/schemacop/v2/validator_hash_test.rb

@@ -90,6 +90,17 @@ module Schemacop
         assert_verr { s.validate!(o: true) }
         assert_verr { s.validate!(r: nil, r_nil: false, o: true) }
       end
+
+      def test_invalid_hash
+        s = Schema.new do
+          type :hash do
+            req :foo
+          end
+        end
+
+        assert_verr { s.validate!({ foo: 42, 'foo' => 42 }) }
+        assert_nothing_raised { s.validate!({ foo: 42 }.with_indifferent_access) }
+      end
     end
   end
 end

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

@@ -142,8 +142,7 @@ module Schemacop
 
         assert_cast(
           { foo: '42', bar: '2020-01-15' },
-          foo: 42,
-          bar: Date.new(2020, 1, 15)
+          { foo: 42, bar: Date.new(2020, 1, 15) }.with_indifferent_access
         )
       end
 

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

@@ -133,11 +133,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
 
@@ -158,12 +158,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
@@ -175,12 +175,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/array_node_test.rb

@@ -446,8 +446,8 @@ module Schemacop
         end
 
         assert_cast(['foo', 42], ['foo', 42])
-        assert_cast(['foo', 42, { foo: '1990-01-01' }], ['foo', 42, { foo: Date.new(1990, 1, 1) }])
-        assert_cast(['foo', 42, { foo: '1990-01-01', bar: :baz }], ['foo', 42, { foo: Date.new(1990, 1, 1), bar: :baz }])
+        assert_cast(['foo', 42, { foo: '1990-01-01' }], ['foo', 42, { foo: Date.new(1990, 1, 1) }.with_indifferent_access])
+        assert_cast(['foo', 42, { foo: '1990-01-01', bar: :baz }], ['foo', 42, { foo: Date.new(1990, 1, 1), bar: :baz }.with_indifferent_access])
       end
 
       def test_multiple_add_in_schema
@@ -537,7 +537,7 @@ module Schemacop
           additionalItems: false
         )
 
-        assert_cast [{}], [{ name: 'John' }]
+        assert_cast [{}], [{ name: 'John' }.with_indifferent_access]
       end
 
       def test_enum_schema
@@ -800,6 +800,16 @@ module Schemacop
 
         assert_cast(%w[foo 1990-01-01], ['foo', Date.new(1990, 1, 1)])
       end
+
+      def test_contains_multiple_should_fail
+        assert_raises_with_message Exceptions::InvalidSchemaError, 'You can only use "cont" once.' do
+          schema :array do
+            list :string
+            cont :string
+            cont :integer
+          end
+        end
+      end
     end
   end
 end

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({})
@@ -54,6 +65,14 @@ module Schemacop
           type:                 :object,
           additionalProperties: { type: :string }
         )
+
+        assert_nothing_raised do
+          @schema.validate!({ foo: 'foo' })
+        end
+
+        assert_raises_with_message Exceptions::ValidationError, '/bar: Invalid type, expected "string".' do
+          @schema.validate!({ foo: 'foo', bar: :baz })
+        end
       end
 
       def test_property_names
@@ -61,6 +80,7 @@ module Schemacop
         assert_validation({})
         assert_validation(foo: :bar)
         assert_validation('foo' => 'bar')
+        assert_validation(Foo: :bar)
         assert_validation('_foo39sjfdoi 345893(%' => 'bar', 'foo' => 'bar') do
           error '/', 'Property name "_foo39sjfdoi 345893(%" does not match "^[a-zA-Z0-9]+$".'
         end
@@ -70,6 +90,24 @@ module Schemacop
           additionalProperties: true,
           propertyNames:        '^[a-zA-Z0-9]+$'
         )
+
+        assert_cast({ foo: 123 }, { foo: 123 }.with_indifferent_access)
+        assert_cast({ Foo: 123 }, { Foo: 123 }.with_indifferent_access)
+
+        # New schema
+        schema :hash, additional_properties: true, property_names: '^[a-z]+$'
+
+        assert_validation({})
+        assert_validation(foo: :bar)
+        assert_validation('foo' => 'bar')
+        assert_validation(Foo: :bar) do
+          error '/', 'Property name "Foo" does not match "^[a-z]+$".'
+        end
+        assert_validation('_foo39sjfdoi 345893(%' => 'bar', 'foo' => 'bar') do
+          error '/', 'Property name "_foo39sjfdoi 345893(%" does not match "^[a-z]+$".'
+        end
+
+        assert_cast({ foo: 123 }, { foo: 123 }.with_indifferent_access)
       end
 
       def test_required
@@ -254,6 +292,31 @@ module Schemacop
         )
       end
 
+      def test_pattern_properties_casting
+        schema do
+          int?(/^id_.*$/)
+          int?(/^val.*$/)
+        end
+
+        assert_json({
+                      type:                 :object,
+                      patternProperties:    {
+                        '^id_.*$': { type: :integer },
+                        '^val.*$': { type: :integer }
+                      },
+                      additionalProperties: false
+                    })
+
+        assert_validation({})
+        assert_validation({ id_foo: 1 })
+        assert_validation({ id_foo: 1, id_bar: 2 })
+        assert_validation({ id_foo: 1, id_bar: 2, value: 4 })
+
+        assert_cast({ id_foo: 1 }, { id_foo: 1 }.with_indifferent_access)
+        assert_cast({ id_foo: 1, id_bar: 2 }, { id_foo: 1, id_bar: 2 }.with_indifferent_access)
+        assert_cast({ id_foo: 1, id_bar: 2, value: 4 }, { id_foo: 1, id_bar: 2, value: 4 }.with_indifferent_access)
+      end
+
       def test_defaults
         schema do
           str? :first_name, default: 'John'
@@ -267,7 +330,9 @@ module Schemacop
         data = { last_name: 'Doeringer', active: 'true' }
         data_was = data.dup
 
-        assert_equal({ first_name: 'John', last_name: 'Doeringer', active: true, address: { street: 'Example 42' } }, @schema.validate(data).data)
+        expected_data = { first_name: 'John', last_name: 'Doeringer', active: true, address: { street: 'Example 42' } }.with_indifferent_access
+
+        assert_equal(expected_data, @schema.validate(data).data)
         assert_equal data_was, data
 
         schema do
@@ -425,6 +490,13 @@ module Schemacop
         validate_self_should_error((4 + 6i))
         validate_self_should_error('13')
         validate_self_should_error('Lorem ipsum')
+
+        # rubocop:disable Lint/BooleanSymbol
+        assert_raises_with_message Exceptions::InvalidSchemaError,
+                                   'Option "additional_properties" must be a boolean value' do
+          schema :hash, additional_properties: :true
+        end
+        # rubocop:enable Lint/BooleanSymbol
       end
 
       def test_doc_example
@@ -475,7 +547,7 @@ module Schemacop
 
         assert_validation(nil)
         assert_validation(foo: '1')
-        assert_cast({ foo: '1' }, { foo: 1 })
+        assert_cast({ foo: '1' }, { foo: 1 }.with_indifferent_access)
 
         assert_validation(foo: '1', bar: '2') do
           error '/', 'Obsolete property "bar".'
@@ -501,11 +573,11 @@ module Schemacop
 
         assert_validation(nil)
         assert_validation(foo: '1')
-        assert_cast({ foo: '1' }, { foo: 1 })
+        assert_cast({ foo: '1' }, { foo: 1 }.with_indifferent_access)
 
         assert_validation(foo: '1', bar: nil)
         assert_validation(foo: '1', bar: '2')
-        assert_cast({ foo: '1', bar: '2' }, { foo: 1, bar: '2' })
+        assert_cast({ foo: '1', bar: '2' }, { foo: 1, bar: '2' }.with_indifferent_access)
 
         assert_json(
           type:                 'object',
@@ -538,11 +610,11 @@ module Schemacop
 
         assert_validation(nil)
         assert_validation(foo: '1')
-        assert_cast({ foo: '1' }, { foo: 1 })
+        assert_cast({ foo: '1' }, { foo: 1 }.with_indifferent_access)
 
         assert_validation(foo: '1', bar: nil)
         assert_validation(foo: '1', bar: '2')
-        assert_cast({ foo: '1', bar: '2' }, { foo: 1, bar: '2' })
+        assert_cast({ foo: '1', bar: '2' }, { foo: 1, bar: '2' }.with_indifferent_access)
 
         assert_json(
           type:                 'object',
@@ -565,11 +637,11 @@ module Schemacop
 
         assert_validation(nil)
         assert_validation(foo: '1')
-        assert_cast({ foo: '1' }, { foo: 1 })
+        assert_cast({ foo: '1' }, { foo: 1 }.with_indifferent_access)
 
         assert_validation(foo: '1', bar: nil)
         assert_validation(foo: '1', bar: '2')
-        assert_cast({ foo: '1', bar: '2' }, { foo: 1, bar: 2 })
+        assert_cast({ foo: '1', bar: '2' }, { foo: 1, bar: 2 }.with_indifferent_access)
       end
 
       def test_cast_with_additional_any_of
@@ -583,7 +655,7 @@ module Schemacop
 
         assert_validation(nil)
         assert_validation(foo: '1')
-        assert_cast({ foo: '1' }, { foo: 1 })
+        assert_cast({ foo: '1' }, { foo: 1 }.with_indifferent_access)
 
         assert_validation(foo: '1', bar: nil)
         assert_validation(foo: '1', bar: '2')
@@ -592,7 +664,7 @@ module Schemacop
           error '/qux', 'Does not match any anyOf condition.'
         end
 
-        assert_cast({ foo: '1', bar: '2' }, { foo: 1, bar: '2' })
+        assert_cast({ foo: '1', bar: '2' }, { foo: 1, bar: '2' }.with_indifferent_access)
 
         assert_json(
           type:                 'object',
@@ -624,7 +696,7 @@ module Schemacop
 
         assert_validation(nil)
         assert_validation(foo: '1')
-        assert_cast({ foo: '1' }, { foo: 1 })
+        assert_cast({ foo: '1' }, { foo: 1 }.with_indifferent_access)
 
         assert_validation(foo: '1', bar: nil)
         assert_validation(foo: '1', bar: '2')
@@ -633,8 +705,8 @@ module Schemacop
           error '/qux', 'Does not match any anyOf condition.'
         end
 
-        assert_cast({ foo: '1', bar: '2' }, { foo: 1, bar: 2 })
-        assert_cast({ foo: '1', bar: '2', qux: '2020-01-13', asd: 1 }, { foo: 1, bar: 2, qux: Date.new(2020, 1, 13), asd: 1 })
+        assert_cast({ foo: '1', bar: '2' }, { foo: 1, bar: 2 }.with_indifferent_access)
+        assert_cast({ foo: '1', bar: '2', qux: '2020-01-13', asd: 1 }, { foo: 1, bar: 2, qux: Date.new(2020, 1, 13), asd: 1 }.with_indifferent_access)
 
         assert_json(
           type:                 'object',
@@ -770,6 +842,131 @@ module Schemacop
           end
         end
       end
+
+      def test_schema_with_string_keys
+        schema :hash do
+          int! 'foo'
+        end
+
+        assert_validation(nil)
+        assert_validation({ 'foo' => 42 })
+        assert_validation({ foo: 42 })
+
+        assert_cast({ 'foo' => 42 }, { 'foo' => 42 })
+        assert_cast({ foo: 42 }, { foo: 42 }.with_indifferent_access)
+
+        assert_validation({}) do
+          error '/foo', 'Value must be given.'
+        end
+
+        assert_validation({ :foo => 42, 'foo' => 43 }) do
+          error '/', 'Has 1 ambiguous properties: [:foo].'
+        end
+      end
+
+      def test_schema_with_string_keys_in_data
+        schema :hash do
+          int! :foo
+        end
+
+        assert_validation(nil)
+        assert_validation({ 'foo' => 42 })
+        assert_validation({ foo: 42 })
+
+        assert_cast({ 'foo' => 42 }, { 'foo' => 42 })
+        assert_cast({ foo: 42 }, { foo: 42 }.with_indifferent_access)
+
+        assert_validation({}) do
+          error '/foo', 'Value must be given.'
+        end
+
+        assert_validation({ :foo => 42, 'foo' => 43 }) do
+          error '/', 'Has 1 ambiguous properties: [:foo].'
+        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