schemacop 3.0.0.rc1 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5caf1b6b11b5c690dc05694cab67e34fb6ecc326381f9d7b63b9c016b5249d9c
-  data.tar.gz: 8b819ad6e32dd2329bd20c0869c216c677b766a5d7374a49f6a9c146d0e743d5
+  metadata.gz: 73279c1805de5438933af200c883a7f6a813878d583c92bf7e597580f392df95
+  data.tar.gz: 2ac5ce2925de12c5df8a4f82086d967c68d31cd9f8c598cff0da9231d221f5ff
 SHA512:
-  metadata.gz: 5db8ca31cdf29cea9744529fec11af70dc1c534dc970639931e3a9c287f3005cc578e2d7e9b0525ceefdbcb17d5f01d46d42c0a5b5868b62cabafe2779464ccc
-  data.tar.gz: a12d18800342da6d1d9fdc39bffbec18877872c0cffb62c9b4a41cbd8954b0915c68afeb0b9e03c7e3bdd21f5803fa57daa7deb9cfd49a14363b67586e4e2fc0
+  metadata.gz: c04434b491dac3c09018969b13293c029347011a58386234ea5dcca6b3aa7ed8ebe3f291b8d819869d79b3c8c80d5a998bbbca0a95d928988367e04efcad4ec2
+  data.tar.gz: 75564dd05800d295f3eb7ebb606f97ea67f2c19512a62193d49651cc77828836cfa95977465692ac85a5738a8407c7a2275a7cbe34db110c8400e70aa5057e95

data/CHANGELOG.md

@@ -10,6 +10,20 @@
 ### Changes
 -->
 
+## 3.0.0.r2
+
+* Represent node names as strings internally
+
+* Update documentation
+
+## 3.0.0.rc1
+
+* Add support for ruby `3.0.0`
+
+* Add `ruby-3.0.0` to travis testing
+
+* Document all `v3` nodes
+
 ## 3.0.0.rc0
 
 * Add `Schemacop::Schema3`

data/README_V3.md

@@ -1,15 +1,11 @@
 # Schemacop schema V3
 
-Please note that Schemacop v3 is still a work in progress, especially the documentation.
+## Table of Contents
 
-Use at your own discretion.
-
-# Table of Contents
-1. [Introduction](#Introduction)
-2. [Validation](#validation)
-3. [Exceptions](#exceptions)
-4. [Generic Keywords](#generic-keywords)
-5. [Nodes](#nodes)
+1. [Validation](#validation)
+2. [Exceptions](#exceptions)
+3. [Generic Keywords](#generic-keywords)
+4. [Nodes](#nodes)
     1. [String](#string)
     2. [Integer](#integer)
     3. [Number](#number)
@@ -23,12 +19,8 @@ Use at your own discretion.
     11. [OneOf](#oneOf)
     12. [IsNot](#isNot)
     13. [Reference](#reference)
-6. [Context](#context)
-7. [External schemas](#external-schemas)
-
-## Introduction
-
-TODO: Write short section about using schemacop V3
+5. [Context](#context)
+6. [External schemas](#external-schemas)
 
 ## Validation
 
@@ -74,19 +66,121 @@ schema.validate!('Foo')         # => Schemacop::Exceptions::ValidationError: /:
 
 ## Exceptions
 
-TODO: Describe the exceptions raised by schemacop
+Schemacop can raise the following exceptions:
 
-`Schemacop::Exceptions::ValidationError`
-`Schemacop::Exceptions::InvalidSchemaError`
+* `Schemacop::Exceptions::ValidationError`: This exception is raised when the `validate!`
+  method is used, and the data that was passed in is invalid. The exception message contains
+  additional informations why the validation failed.
+
+  Example:
+
+  ```ruby
+  schema = Schemacop::Schema3.new :hash do
+    int! :foo
+  end
+
+  schema.validate!(foo: 'bar')
+  # => Schemacop::Exceptions::ValidationError: /foo: Invalid type, expected "integer".
+  ```
+
+* `Schemacop::Exceptions::InvalidSchemaError`: This exception is raised when the schema
+  itself is not valid. The exception message contains additional informations why the
+  validation failed.
+
+  Example:
+
+ ```ruby
+  Schemacop::Schema3.new :hash do
+    int!
+  end
+
+  # => Schemacop::Exceptions::InvalidSchemaError: Child nodes must have a name.
+  ```
 
 ## Generic Keywords
 
-TODO: Complete this
+The nodes in Schemacop v3 also support generic keywords, similar to JSON schema:
+
+* `title`: Short string, should be self-explanatory
+* `description`: Description of the schema
+* `examples`: Here, you can provide examples which will be valid for the schema
+* `enum`: Here, you may enumerate values which will be valid, if the provided
+  value is not in the array, the validation will fail
+* `default`: You may provide a default value for items that will be set if the
+  value is not given
+
+
+The three keywords `title`, `description` and `examples` aren't used for validation,
+but can be used to document the schema. They will be included in the JSON output
+when you use the `as_json` method:
+
+```ruby
+schema = Schemacop::Schema3.new :hash do
+  str! :name, title: 'Name', description: 'Holds the name of the user', examples: ['Joe', 'Anna']
+end
+
+schema.as_json
+
+# => {"properties"=>{"name"=>{"type"=>"string", "title"=>"Name", "examples"=>["Joe", "Anna"], "description"=>"Holds the name of the user"}}, "additionalProperties"=>false, "required"=>["name"], "type"=>"object"}
+```
+
+The `enum` keyword can be used to only allow a subset of values:
+
+```ruby
+schema = Schemacop::Schema3.new :string, enum: ['foo', 'bar']
+
+schema.validate!('foo') # => "foo"
+schema.validate!('bar') # => "bar"
+schema.validate!('baz') # => Schemacop::Exceptions::ValidationError: /: Value not included in enum ["foo", "bar"].
+```
+
+Please note, that you can also specify values in the enum that are not valid for
+the schema. This means that the validation will still fail:
+
+```ruby
+schema = Schemacop::Schema3.new :string, enum: ['foo', 'bar', 42]
+
+schema.validate!('foo') # => "foo"
+schema.validate!('bar') # => "bar"
+schema.validate!(42)    # => Schemacop::Exceptions::ValidationError: /: Invalid type, expected "string".
+```
+
+The enum will also be provided in the json output:
+
+```ruby
+schema = Schemacop::Schema3.new :string, enum: ['foo', 'bar']
+
+schema.as_json
+# => {"type"=>"string", "enum"=>["foo", "bar", 42]}
+```
+
+And finally, the `default` keyword lets you set a default value to use when no
+value is provided:
+
+```ruby
+schema = Schemacop::Schema3.new :string, default: 'Schemacop'
+
+schema.validate!('foo') # => "foo"
+schema.validate!(nil)   # => "Schemacop"
+```
+
+The default value will also be provided in the json output:
 
-* enum
-* title
-* description
-* examples
+```ruby
+schema = Schemacop::Schema3.new :string, default: 'Schemacop'
+
+schema.as_json
+# => {"type"=>"string", "default"=>"Schemacop"}
+```
+
+Note that the default value you use is also validated against the schema:
+
+```ruby
+schema = Schemacop::Schema3.new :string, default: 42
+
+schema.validate!('foo') # => "foo"
+schema.validate!(nil)   # => Schemacop::Exceptions::ValidationError: /: Invalid type, expected "string".
+```
 
 ## Nodes
 
@@ -523,11 +617,61 @@ schema = Schemacop::Schema3.new :hash do
 end
 
 schema.validate!({})                    # => Schemacop::Exceptions::ValidationError: /foo: Value must be given.
-schema.validate!({foo: 'str'})          # => {:foo=>"str"}
-schema.validate!({foo: 'str', bar: 42}) # => {:foo=>"str", :bar=>42}
+schema.validate!({foo: 'str'})          # => {"foo"=>"str"}
+schema.validate!({foo: 'str', bar: 42}) # => {"foo"=>"str", "bar"=>42}
 schema.validate!({bar: 42})             # => Schemacop::Exceptions::ValidationError: /foo: Value must be given.
 ```
 
+The name of the properties may either be a string or a symbol, and you can pass
+in the property either identified by a symbol or a string:
+
+The following two schemas are equal:
+
+```ruby
+schema = Schemacop::Schema3.new :hash do
+  int! :foo
+end
+
+schema.validate!(foo: 42)     # => {"foo"=>42}
+schema.validate!('foo' => 42) # => {"foo"=>42}
+
+schema = Schemacop::Schema3.new :hash do
+  int! 'foo'
+end
+
+schema.validate!(foo: 42)     # => {"foo"=>42}
+schema.validate!('foo' => 42) # => {"foo"=>42}
+```
+
+The result in both cases will be a
+[HashWithIndifferentAccess](https://api.rubyonrails.org/classes/ActiveSupport/HashWithIndifferentAccess.html),
+which means that you can access the data in the hash with the symbol as well
+as the string representation:
+
+```ruby
+schema = Schemacop::Schema3.new :hash do
+  int! :foo
+end
+
+result = schema.validate!(foo: 42)
+
+result.class  # => ActiveSupport::HashWithIndifferentAccess
+result[:foo]  # => 42
+result['foo'] # 42
+```
+
+Please note, that if you specify the value twice in the data you want to validate,
+once with the key being a symbol and once being a string, Schemacop will raise an
+error:
+
+```ruby
+schema = Schemacop::Schema3.new :hash do
+  int! :foo
+end
+
+schema.validate!(foo: 42, 'foo' => 43) # => Schemacop::Exceptions::ValidationError: /: Has 1 ambiguous properties: [:foo].
+```
+
 ##### Pattern properties
 
 In addition to symbols, property keys can also be a regular expression. Here,
@@ -543,8 +687,8 @@ schema = Schemacop::Schema3.new :hash do
 end
 
 schema.validate!({})                      # => {}
-schema.validate!({id_foo: 1})             # => {:id_foo=>1}
-schema.validate!({id_foo: 1, id_bar: 2})  # => {:id_foo=>1, :id_bar=>2}
+schema.validate!({id_foo: 1})             # => {"id_foo"=>1}
+schema.validate!({id_foo: 1, id_bar: 2})  # => {"id_foo"=>1, "id_bar"=>2}
 schema.validate!({foo: 3})                # => Schemacop::Exceptions::ValidationError: /: Obsolete property "foo".
 ```
 
@@ -562,7 +706,7 @@ enable all of them by enabling the option `additional_properties`:
 schema = Schemacop::Schema3.new :hash, additional_properties: true
 
 schema.validate!({}) # => {}
-schema.validate!({foo: :bar, baz: 42}) # => {:foo=>:bar, :baz=>42}
+schema.validate!({foo: :bar, baz: 42}) # => {"foo"=>:bar, "baz"=>42}
 ```
 
 Using the DSL method `add` in the hash-node's body however, you can specify
@@ -578,8 +722,8 @@ Schemacop::Schema3.new :hash do
   add :string
 end
 
-schema.validate!({id: 1})             # => {:id=>1}
-schema.validate!({id: 1, foo: 'bar'}) # => {:foo=>"bar", :id=>1}
+schema.validate!({id: 1})             # => {"id"=>1}
+schema.validate!({id: 1, foo: 'bar'}) # => {"id"=>1, "foo"=>"bar"}
 schema.validate!({id: 1, foo: 42})    # => Schemacop::Exceptions::ValidationError: /foo: Invalid type, expected "string".
 ```
 
@@ -589,12 +733,12 @@ any additional property **keys** must adhere to:
 ```ruby
 # The following schema allows any number of properties, but all keys must
 # consist of downcase letters from a-z.
-schema = Schemacop::Schema3.new :hash, additional_properties: :true, property_names: '^[a-z]+$'
+schema = Schemacop::Schema3.new :hash, additional_properties: true, property_names: '^[a-z]+$'
 
 
 schema.validate!({})            # => {}
-schema.validate!({foo: 123})    # => {:foo=>123}
-schema.validate!({Foo: 'bar'})  # => Schemacop::Exceptions::ValidationError: /: Property name :Foo does not match "^[a-z]+$".
+schema.validate!({foo: 123})    # => {"foo"=>123}
+schema.validate!({Foo: 'bar'})  # => Schemacop::Exceptions::ValidationError: /: Property name "Foo" does not match "^[a-z]+$".
 
 # The following schema allows any number of properties, but all keys must
 # consist of downcase letters from a-z AND the properties must be arrays.
@@ -603,7 +747,7 @@ schema = Schemacop::Schema3.new :hash, additional_properties: true, property_nam
 end
 
 schema.validate!({})                # => {}
-schema.validate!({foo: [1, 2, 3]})  # => {:foo=>[1, 2, 3]}
+schema.validate!({foo: [1, 2, 3]})  # => {"foo"=>[1, 2, 3]}
 schema.validate!({foo: :bar})       # => Schemacop::Exceptions::ValidationError: /foo: Invalid type, expected "array".
 schema.validate!({Foo: :bar})       # => Schemacop::Exceptions::ValidationError: /: Property name :Foo does not match "^[a-z]+$". /Foo: Invalid type, expected "array".
 ```
@@ -627,7 +771,7 @@ schema = Schemacop::Schema3.new :hash do
 end
 
 schema.validate!({}) # => Schemacop::Exceptions::ValidationError: /name: Value must be given.
-schema.validate!({name: 'Joe Doe'}) # => {:name=>"Joe Doe"}
+schema.validate!({name: 'Joe Doe'}) # => {"name"=>"Joe Doe"}
 schema.validate!({
   name: 'Joe Doe',
   billing_address: 'Street 42'
@@ -646,7 +790,7 @@ schema.validate!({
   phone_number: '000-000-00-00',
   credit_card: 'XXXX XXXX XXXX XXXX X'
 })
-# => {:name=>"Joe Doe", :credit_card=>"XXXX XXXX XXXX XXXX X", :billing_address=>"Street 42", :phone_number=>"000-000-00-00"}
+# => {"name"=>"Joe Doe", "credit_card"=>"XXXX XXXX XXXX XXXX X", "billing_address"=>"Street 42", "phone_number"=>"000-000-00-00"}
 ```
 
 ### Object
@@ -654,7 +798,7 @@ schema.validate!({
 Type: `:object`\
 DSL: `obj`
 
-The object type represents a ruby `Object`. Please note that the `as_json?  method
+The object type represents a ruby `Object`. Please note that the `as_json`  method
 on nodes of this type will just return `{}` (an empty JSON object), as there isn't
 a useful way to represent a ruby object without conflicting with the `Hash` type.
 If you want to represent an JSON object, you should use the `Hash` node.
@@ -884,7 +1028,7 @@ schema.validate!({
   }
 })
 
-# => {:shipping_address=>{:street=>"Example Street 42", :zip_code=>"12345", :location=>"London", :country=>"United Kingdom"}, :billing_address=>{:street=>"Main St.", :zip_code=>"54321", :location=>"Washington DC", :country=>"USA"}}
+# => {"shipping_address"=>{"street"=>"Example Street 42", "zip_code"=>"12345", "location"=>"London", "country"=>"United Kingdom"}, "billing_address"=>{"street"=>"Main St.", "zip_code"=>"54321", "location"=>"Washington DC", "country"=>"USA"}}
 ```
 
 Note that if you use the reference node with the long type name `reference`,
@@ -902,7 +1046,7 @@ schema = Schemacop::Schema3.new :array do
 end
 
 schema.validate!([])                                      # => []
-schema.validate!([{first_name: 'Joe', last_name: 'Doe'}]) # => [{:first_name=>"Joe", :last_name=>"Doe"}]
+schema.validate!([{first_name: 'Joe', last_name: 'Doe'}]) # => [{"first_name"=>"Joe", "last_name"=>"Doe"}]
 schema.validate!([id: 42, first_name: 'Joe'])             # => Schemacop::Exceptions::ValidationError: /[0]/last_name: Value must be given. /[0]: Obsolete property "id".
 ```
 
@@ -940,7 +1084,7 @@ schema = Schemacop::Schema3.new :reference, path: :Person
 # of the person.
 Schemacop.with_context context do
   schema.validate!({first_name: 'Joe', last_name: 'Doe', info: { born_at: '1980-01-01'} })
-  # => {:first_name=>"Joe", :last_name=>"Doe", :info=>{:born_at=>Tue, 01 Jan 1980}}
+  # => {"first_name"=>"Joe", "last_name"=>"Doe", "info"=>{"born_at"=>Tue, 01 Jan 1980}}
 end
 
 # Now we might want another context, where the person is more anonymous, and as
@@ -961,7 +1105,7 @@ Schemacop.with_context other_context do
   #    /: Obsolete property "last_name".
   #    /: Obsolete property "info".
 
-  schema.validate!({nickname: 'J.'}) # => {:nickname=>"J."}
+  schema.validate!({nickname: 'J.'}) # => {"nickname"=>"J."}
 end
 ```
 
@@ -1032,13 +1176,13 @@ schema = Schemacop::Schema3.new :hash do
 end
 
 schema.validate!({usr: {first_name: 'Joe', last_name: 'Doe'}})
-  # => {:usr=>{:first_name=>"Joe", :last_name=>"Doe"}}
+  # => {"usr"=>{"first_name"=>"Joe", "last_name"=>"Doe"}}
 
 schema.validate!({usr: {first_name: 'Joe', last_name: 'Doe', groups: []}})
-  # => {:usr=>{:first_name=>"Joe", :last_name=>"Doe", :groups=>[]}}
+  # => {"usr"=>{"first_name"=>"Joe", "last_name"=>"Doe", "groups"=>[]}}
 
 schema.validate!({usr: {first_name: 'Joe', last_name: 'Doe', groups: [{name: 'foo'}, {name: 'bar'}]}})
-  # => {:usr=>{:first_name=>"Joe", :last_name=>"Doe", :groups=>[{:name=>"foo"}, {:name=>"bar"}]}}
+  # => {"usr"=>{"first_name"=>"Joe", "last_name"=>"Doe", "groups"=>[{"name"=>"foo"}, {"name"=>"bar"}]}}
 ```
 
 ### Non-Rails applications

data/VERSION

@@ -1 +1 @@
-3.0.0.rc1
+3.0.0.rc2

data/lib/schemacop/v3/array_node.rb

@@ -172,10 +172,9 @@ module Schemacop
         list_item.present?
       end
 
-      def item_for_data(data, force: true)
+      def item_for_data(data)
         item = children.find { |c| item_matches?(c, data) }
         return item if item
-        return nil unless force
 
         fail "Could not find specification for item #{data.inspect}."
       end

data/lib/schemacop/v3/hash_node.rb

@@ -91,14 +91,23 @@ module Schemacop
         super_data = super
         return if super_data.nil?
 
+        original_data_hash = super_data.dup
+        data_hash = super_data.with_indifferent_access
+
+        if original_data_hash.size != data_hash.size
+          ambiguous_properties = original_data_hash.keys - data_hash.keys
+
+          result.error "Has #{ambiguous_properties.size} ambiguous properties: #{ambiguous_properties}."
+        end
+
         # Validate min_properties #
-        if options[:min_properties] && super_data.size < options[:min_properties]
-          result.error "Has #{super_data.size} properties but needs at least #{options[:min_properties]}."
+        if options[:min_properties] && data_hash.size < options[:min_properties]
+          result.error "Has #{data_hash.size} properties but needs at least #{options[:min_properties]}."
         end
 
         # Validate max_properties #
-        if options[:max_properties] && super_data.size > options[:max_properties]
-          result.error "Has #{super_data.size} properties but needs at most #{options[:max_properties]}."
+        if options[:max_properties] && data_hash.size > options[:max_properties]
+          result.error "Has #{data_hash.size} properties but needs at most #{options[:max_properties]}."
         end
 
         # Validate specified properties #
@@ -106,13 +115,13 @@ module Schemacop
           result.in_path(node.name) do
             next if node.name.is_a?(Regexp)
 
-            node._validate(super_data[node.name], result: result)
+            node._validate(data_hash[node.name], result: result)
           end
         end
 
         # Validate additional properties #
         specified_properties = @properties.keys.to_set
-        additional_properties = super_data.reject { |k, _v| specified_properties.include?(k.to_s.to_sym) }
+        additional_properties = data_hash.reject { |k, _v| specified_properties.include?(k.to_s) }
 
         property_patterns = {}
 
@@ -149,7 +158,7 @@ module Schemacop
         # Validate dependencies #
         options[:dependencies]&.each do |source, targets|
           targets.each do |target|
-            if super_data[source].present? && super_data[target].blank?
+            if data_hash[source].present? && data_hash[target].blank?
               result.error "Missing property #{target.to_s.inspect} because #{source.to_s.inspect} is given."
             end
           end
@@ -161,10 +170,19 @@ module Schemacop
       end
 
       def cast(data)
-        result = {}
+        result = {}.with_indifferent_access
         data ||= default
         return nil if data.nil?
 
+        original_data_hash = data.dup
+        data_hash = data.with_indifferent_access
+
+        if original_data_hash.size != data_hash.size
+          ambiguous_properties = original_data_hash.keys - data_hash.keys
+
+          result.error "Has #{ambiguous_properties.size} ambiguous properties: #{ambiguous_properties}."
+        end
+
         property_patterns = {}
 
         @properties.each_value do |prop|
@@ -173,16 +191,16 @@ module Schemacop
             next
           end
 
-          result[prop.name] = prop.cast(data[prop.name])
+          result[prop.name] = prop.cast(data_hash[prop.name])
 
-          if result[prop.name].nil? && !data.include?(prop.name)
+          if result[prop.name].nil? && !data_hash.include?(prop.name)
             result.delete(prop.name)
           end
         end
 
         # Handle regex properties
         specified_properties = @properties.keys.to_set
-        additional_properties = data.reject { |k, _v| specified_properties.include?(k.to_s.to_sym) }
+        additional_properties = data_hash.reject { |k, _v| specified_properties.include?(k.to_s.to_sym) }
 
         if additional_properties.any? && property_patterns.any?
           additional_properties.each do |name, additional_property|
@@ -194,10 +212,10 @@ module Schemacop
 
         # Handle additional properties
         if options[:additional_properties] == true
-          result = data.merge(result)
+          result = data_hash.merge(result)
         elsif options[:additional_properties].is_a?(Node)
           specified_properties = @properties.keys.to_set
-          additional_properties = data.reject { |k, _v| specified_properties.include?(k.to_s.to_sym) }
+          additional_properties = data_hash.reject { |k, _v| specified_properties.include?(k.to_s.to_sym) }
           if additional_properties.any?
             additional_properties_result = {}
             additional_properties.each do |key, value|

data/lib/schemacop/v3/node.rb

@@ -74,6 +74,7 @@ module Schemacop
 
         # Assign attributes #
         @name = options.delete(:name)
+        @name = @name.to_s unless @name.nil? || @name.is_a?(Regexp)
         @required = !!options.delete(:required)
         @default = options.delete(:default)
         @title = options.delete(:title)

data/schemacop.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.0.rc1 ruby lib
+# stub: schemacop 3.0.0.rc2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.0.rc1"
+  s.version = "3.0.0.rc2"
 
   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-22"
+  s.date = "2021-01-28"
   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.homepage = "https://github.com/sitrox/schemacop".freeze
   s.licenses = ["MIT".freeze]

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/hash_node_test.rb

@@ -54,6 +54,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
@@ -72,8 +80,8 @@ module Schemacop
           propertyNames:        '^[a-zA-Z0-9]+$'
         )
 
-        assert_cast({ foo: 123 }, { foo: 123 })
-        assert_cast({ Foo: 123 }, { Foo: 123 })
+        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]+$'
@@ -82,13 +90,13 @@ module Schemacop
         assert_validation(foo: :bar)
         assert_validation('foo' => 'bar')
         assert_validation(Foo: :bar) do
-          error '/', 'Property name :Foo does not match "^[a-z]+$".'
+          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 })
+        assert_cast({ foo: 123 }, { foo: 123 }.with_indifferent_access)
       end
 
       def test_required
@@ -293,9 +301,9 @@ module Schemacop
         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 })
-        assert_cast({ id_foo: 1, id_bar: 2 }, { id_foo: 1, id_bar: 2 })
-        assert_cast({ id_foo: 1, id_bar: 2, value: 4 }, { 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
@@ -311,7 +319,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
@@ -526,7 +536,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".'
@@ -552,11 +562,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',
@@ -589,11 +599,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',
@@ -616,11 +626,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
@@ -634,7 +644,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')
@@ -643,7 +653,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',
@@ -675,7 +685,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')
@@ -684,8 +694,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',
@@ -821,6 +831,54 @@ 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_key_names
+      #   schema :hash do
+      #     int!
+      #   end
+      # 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

@@ -333,7 +333,7 @@ module Schemacop
           ref? :person, :Person, default: {}
         end
 
-        assert_cast({}, person: { foo: 'bar' })
+        assert_cast({}, { person: { foo: 'bar' } }.with_indifferent_access)
       end
 
       def test_casting
@@ -344,7 +344,7 @@ module Schemacop
           ref? :person, :Person, default: {}
         end
 
-        assert_cast({ person: { born_at: '1990-01-13' } }, person: { born_at: Date.new(1990, 1, 13) })
+        assert_cast({ person: { born_at: '1990-01-13' } }, { person: { born_at: Date.new(1990, 1, 13) } }.with_indifferent_access)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - Sitrox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport