schemacop 3.0.0.rc3 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b93149de6cee935353aba3381d9e1ee76b51bc4b19763d8634566d375208fcac
-  data.tar.gz: cb8e1a8b82104f6482d5017d90e3d5c2094d564ac9ef1001d2336bac137886cb
+  metadata.gz: 90acd1ba976d75dae0019274d843c5d727858655238148a10bd485973e964fba
+  data.tar.gz: 40e63d805b815c61bcf342fc449fa5f0be506f386b7a315df33c9baada0723cd
 SHA512:
-  metadata.gz: 0df1ba4b0c314901d015ca969996ffa9df862c79df0a52129bc3b749add7ff2e60ff52a9fb8a874f82b57017fef821c1e8d5d703093e0fd3bade224e8c84d259
-  data.tar.gz: 1f501b7fdee6cc8347fe1acaf522f268ef5882e595f0c136c68c773b98615b37a05aeeaf1b472c3152546cdd3ae0859dd216eae9850f9f2992c2e970c7111157
+  metadata.gz: ff575cb152372e2cf0685ae1f5ac123c88245a6bb23acbdc7dd0daa27098d245fc90f9e6f5d381d9490d4476109d22c01a86df5744e84b872c6708e4841b7a06
+  data.tar.gz: fda34143fc547221dadfe7cdcb24206185e2b1736ad8e4925e70928fb7d22a5f280f54a70503b5cdf7380f30fcdf250f5663eeae26323dec8dbabd4e686928dc

data/CHANGELOG.md

@@ -10,19 +10,47 @@
 ### Changes
 -->
 
-## 3.0.0.rc3 (2020-01-28)
+## 3.0.2 (2021-02-14)
+
+* Fix #15 Code to ignore Zeitwerk fails when Zeitwerk is disabled
+
+## 3.0.1 (2021-02-11)
+
+* Add format `symbol` to strings
+
+## 3.0.0 (2021-02-08)
+
+* Setup Zeitwerk ignores for Rails applications
+
+* Read previous `3.0.0.rcX` entries for all changes included
+  in this stable release
+
+## 3.0.0.rc5 (2021-02-05)
+
+* Use `ruby2_keywords` for compatibility with ruby `2.6.2`
+
+## 3.0.0.rc4 (2021-02-02)
+
+* Fix some minor bugs
+
+* Improve documentation
+
+* `used_external_schemas` for the `ReferenceNode` is now applied
+  recursively
+
+## 3.0.0.rc3 (2021-01-28)
 
 * Add minor improvements to the documentation
 
 * Internal restructuring, no changes in API
 
-## 3.0.0.rc2 (2020-01-28)
+## 3.0.0.rc2 (2021-01-28)
 
 * Represent node names as strings internally
 
 * Update documentation
 
-## 3.0.0.rc1 (2020-01-22)
+## 3.0.0.rc1 (2021-01-22)
 
 * Add support for ruby `3.0.0`
 
@@ -30,7 +58,7 @@
 
 * Document all `v3` nodes
 
-## 3.0.0.rc0 (2020-01-14)
+## 3.0.0.rc0 (2021-01-14)
 
 * Add `Schemacop::Schema3`
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Sitrox
+Copyright © 2016 - 2021 Sitrox
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -118,4 +118,4 @@ To run tests:
 
 ## Copyright
 
-Copyright (c) 2020 Sitrox. See `LICENSE` for further details.
+Copyright © 2016 - 2021 Sitrox. See `LICENSE` for further details.

data/README_V3.md

@@ -90,7 +90,7 @@ Schemacop can raise the following exceptions:
   Example:
 
   ```ruby
-  Schemacop::Schema3.new do
+  Schemacop::Schema3.new :hash do
     int!
   end
 
@@ -241,6 +241,9 @@ transformed into various types.
 * `number`
   The string must be a number and will be casted to a ruby `Float` object.
 
+* `symbol`
+  The string can be anything and will be casted to a ruby `Symbol` object.
+
 #### Examples
 
 ```ruby
@@ -380,7 +383,7 @@ schema.validate!(1234)    # => Schemacop::Exceptions::ValidationError: /: Invali
 ### Array
 
 Type: `:array`\
-DSL: `arr`
+DSL: `ary`
 
 The array type represents a ruby `Array`.
 It consists of one or multiple values, which can be validated using arbitrary nodes.
@@ -587,8 +590,9 @@ It consists of key-value-pairs that can be validated using arbitrary nodes.
 
 * `additional_properties`
   This option specifies whether additional, unspecified properties are allowed
-  (`true`) or not (`false`). By default, this is `true` if no properties are
-  specified and `false` if you have specified at least one property.
+  (`true`) or not (`false`). By default, this is `false`, i.e. you need to
+  explicitly set it to `true` if you want to allow arbitrary additional properties,
+  or use the `add` DSL method (see below) to specify additional properties.
 
 * `property_names`
   This option allows to specify a regexp pattern (as string) which validates the
@@ -673,6 +677,61 @@ end
 schema.validate!(foo: 42, 'foo' => 43) # => Schemacop::Exceptions::ValidationError: /: Has 1 ambiguous properties: [:foo].
 ```
 
+In addition to the normal node options (which vary from type to type, check
+the respective nodes for details), properties also support the `as` option.
+
+With this, you can "rename" properties in the output:
+
+```ruby
+schema = Schemacop::Schema3.new :hash do
+  int! :foo, as: :bar
+end
+
+schema.validate!({foo: 42}) # => {"bar"=>42}
+```
+
+Please note that if you specify a node with the same property name multiple
+times, or use the `as` option to rename a node to the same name of another
+node, the last specified node will be used:
+
+```ruby
+schema = Schemacop::Schema3.new :hash do
+  int? :foo
+  str? :foo
+end
+
+schema.validate!({foo: 1})      # => Schemacop::Exceptions::ValidationError: /foo: Invalid type, expected "string".
+schema.validate!({foo: 'bar'})  # => {"foo"=>"bar"}
+```
+
+As well as:
+
+```ruby
+schema = Schemacop::Schema3.new :hash do
+  int? :foo
+  int? :bar, as: :foo
+end
+
+schema.validate!({foo: 1})          # => {"foo"=>1}
+schema.validate!({foo: 1, bar: 2})  # => {"foo"=>2}
+schema.validate!({bar: 2})          # => {"foo"=>2}
+```
+
+If you want to specify a node which may be one of multiple types, use the `one_of`
+node (see further down for more details):
+
+```ruby
+schema = Schemacop::Schema3.new :hash do
+  one_of! :foo do
+    int
+    str
+  end
+end
+
+schema.validate!({foo: 1})      # => {"foo"=>1}
+schema.validate!({foo: 'bar'})  # => {"foo"=>"bar"}
+```
+
 ##### Pattern properties
 
 In addition to symbols, property keys can also be a regular expression. Here,
@@ -1135,14 +1194,17 @@ local schemas > context schemas > global schemas
 
 Where:
 
-* local schemas: Defined by using the DSL method? `scm`
+* local schemas: Defined by using the DSL method `scm`
 * context schemas: Defined in the current context using `context.schema`
 * global schemas: Defined in a ruby file in the load path
 
 ### Rails applications
 
-In Rails applications, your schemas are automatically eager-laoded from the load
-path `'app/schemas'` when your application is started.
+In Rails applications, your schemas are automatically eager-loaded from the load
+path `'app/schemas'` when your application is started, unless your application
+is running in the `DEVELOPMENT` environment. In the `DEVELOPMENT` environment,
+schemas are loaded each time when they are used, and as such you can make changes
+to your external schemas without having to restart the server each time.
 
 After starting your application, you can reference them like normally defined
 reference schemas, with the name being relative to the load path.
@@ -1190,8 +1252,12 @@ schema.validate!({usr: {first_name: 'Joe', last_name: 'Doe', groups: [{name: 'fo
 ### Non-Rails applications
 
 Usage in non-Rails applications is the same as with usage in Rails applications,
-however you need to eager load the schemas yourself:
+however you might need to eager load the schemas yourself:
 
 ```ruby
 Schemacop::V3::GlobalContext.eager_load!
 ```
+
+As mentioned before, you can also use the external schemas without having to
+eager-load them, but if you use the schemas multiple times, it might be better
+to eager-load them on start of your application / script.

data/Rakefile

@@ -18,6 +18,7 @@ task :gemspec do
     # needs access to ActiveSupport::HashWithIndifferentAccess and expects
     # behavior of that as in version 5 of ActiveSupport.
     spec.add_dependency 'activesupport', '>= 4.0'
+    spec.add_dependency 'ruby2_keywords', '0.0.4'
     spec.add_development_dependency 'bundler'
     spec.add_development_dependency 'rake'
     spec.add_development_dependency 'minitest'

data/VERSION

@@ -1 +1 @@
-3.0.0.rc3
+3.0.2

data/lib/schemacop.rb

@@ -1,4 +1,5 @@
 # External dependencies
+require 'ruby2_keywords'
 require 'active_support/all'
 require 'set'
 

data/lib/schemacop/railtie.rb

@@ -5,6 +5,13 @@ module Schemacop
       unless Rails.env.development?
         V3::GlobalContext.eager_load!
       end
+
+      # Tell Zeitwerk to ignore the files in our load path
+      if defined?(Rails) && defined?(Zeitwerk) && Rails.autoloaders.zeitwerk_enabled?
+        Schemacop.load_paths.each do |load_path|
+          Rails.autoloaders.main.ignore(Rails.root.join(load_path))
+        end
+      end
     end
   end
 end

data/lib/schemacop/scoped_env.rb

@@ -7,14 +7,14 @@ module Schemacop
       @prefix = prefix
     end
 
-    def method_missing(symbol, *args, **kwargs, &block)
+    ruby2_keywords def method_missing(symbol, *args, &block)
       symbol = :"#{@prefix}#{symbol}" if @prefix
 
       if @methods.include?(symbol)
         if @delegation_object.respond_to?(symbol)
-          @delegation_object.send(symbol, *args, **kwargs, &block)
+          @delegation_object.send(symbol, *args, &block)
         elsif @backup_binding.respond_to?(symbol)
-          @backup_binding.send(symbol, *args, **kwargs, &block)
+          @backup_binding.send(symbol, *args, &block)
         else
           super
         end

data/lib/schemacop/v2/caster.rb

@@ -18,6 +18,7 @@ module Schemacop::V2
       @data = data
       @target_type = target_type
       @caster = nil
+      @value = nil
 
       if casts.is_a?(Array)
         from_types = casts

data/lib/schemacop/v3/hash_node.rb

@@ -68,7 +68,7 @@ module Schemacop
 
         # In schemacop, by default, additional properties are not allowed,
         # the users explicitly need to enable additional properties
-        if options[:additional_properties] == true
+        if options[:additional_properties].is_a?(TrueClass)
           json[:additionalProperties] = true
         elsif options[:additional_properties].is_a?(Node)
           json[:additionalProperties] = options[:additional_properties].as_json
@@ -141,7 +141,9 @@ module Schemacop
             result.error "Property name #{name.inspect} does not match #{options[:property_names].inspect}."
           end
 
-          if options[:additional_properties].blank?
+          if options[:additional_properties].is_a?(TrueClass)
+            next
+          elsif options[:additional_properties].is_a?(FalseClass) || options[:additional_properties].blank?
             match = property_patterns.keys.find { |p| p.match?(name.to_s) }
             if match
               result.in_path(name) do
@@ -176,16 +178,10 @@ module Schemacop
         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
+        data_hash = data.dup.with_indifferent_access
 
         property_patterns = {}
+        as_names = []
 
         @properties.each_value do |prop|
           if prop.name.is_a?(Regexp)
@@ -193,10 +189,18 @@ module Schemacop
             next
           end
 
-          result[prop.as || prop.name] = prop.cast(data_hash[prop.name])
+          as_names << prop.as&.to_s if prop.as.present?
 
-          if result[prop.as || prop.name].nil? && !data_hash.include?(prop.name)
-            result.delete(prop.as || prop.name)
+          prop_name = prop.as&.to_s || prop.name
+
+          casted_data = prop.cast(data_hash[prop.name])
+
+          if casted_data.present? || data_hash.include?(prop.name)
+            result[prop_name] = casted_data
+          end
+
+          if result[prop_name].nil? && !data_hash.include?(prop.name) && !as_names.include?(prop.name)
+            result.delete(prop_name)
           end
         end
 
@@ -213,7 +217,7 @@ module Schemacop
         end
 
         # Handle additional properties
-        if options[:additional_properties] == true
+        if options[:additional_properties].is_a?(TrueClass)
           result = data_hash.merge(result)
         elsif options[:additional_properties].is_a?(Node)
           specified_properties = @properties.keys.to_set
@@ -238,6 +242,11 @@ module Schemacop
         unless @options[:additional_properties].nil? || @options[:additional_properties].is_a?(TrueClass) || @options[:additional_properties].is_a?(FalseClass)
           fail Schemacop::Exceptions::InvalidSchemaError, 'Option "additional_properties" must be a boolean value'
         end
+
+        # Default the additional_properties option to false if it's not given
+        if @options[:additional_properties].nil?
+          @options[:additional_properties] = false
+        end
       end
 
       def validate_self

data/lib/schemacop/v3/node.rb

@@ -72,7 +72,7 @@ module Schemacop
         disallowed_options = options.keys - self.class.allowed_options
 
         if disallowed_options.any?
-          fail "Options #{disallowed_options.inspect} are not allowed for this node."
+          fail Schemacop::Exceptions::InvalidSchemaError, "Options #{disallowed_options.inspect} are not allowed for this node."
         end
 
         # Assign attributes #
@@ -95,7 +95,7 @@ module Schemacop
         # Run DSL block #
         if block_given?
           unless self.class.supports_children_options
-            fail "Node #{self.class} does not support blocks."
+            fail Schemacop::Exceptions::InvalidSchemaError, "Node #{self.class} does not support blocks."
           end
 
           scope = DslScope.new(self)

data/lib/schemacop/v3/node_registry.rb

@@ -40,10 +40,6 @@ module Schemacop
       def self.name(klass)
         @by_class[klass][:name]
       end
-
-      def self.short_name(klass)
-        @by_class[klass][:short_name]
-      end
     end
   end
 end

data/lib/schemacop/v3/reference_node.rb

@@ -36,7 +36,13 @@ module Schemacop
       end
 
       def used_external_schemas
-        schemas.include?(@path) ? [] : [@path]
+        target_children_schema = target.used_external_schemas
+
+        if schemas.include?(@path)
+          return target_children_schema
+        else
+          return [@path] + target_children_schema
+        end
       end
 
       protected

data/lib/schemacop/v3/string_node.rb

@@ -16,6 +16,7 @@ module Schemacop
         email:       URI::MailTo::EMAIL_REGEXP,
         boolean:     /^(true|false)$/,
         binary:      nil,
+        symbol:      nil,
         integer:     /^-?[0-9]+$/,
         number:      /^-?[0-9]+(\.[0-9]+)?$/
       }.freeze
@@ -66,21 +67,31 @@ module Schemacop
       end
 
       def cast(value)
+        if value.present?
+          to_cast = value
+        elsif default.present?
+          to_cast = default
+        else
+          return nil
+        end
+
         case options[:format]
         when :boolean
-          return value == 'true'
+          return to_cast == 'true'
         when :date
-          return Date.parse(value)
+          return Date.parse(to_cast)
         when :'date-time'
-          return DateTime.parse(value)
+          return DateTime.parse(to_cast)
         when :time
-          Time.parse(value)
+          Time.parse(to_cast)
         when :integer
-          return Integer(value)
+          return Integer(to_cast)
         when :number
-          return Float(value)
+          return Float(to_cast)
+        when :symbol
+          return to_cast.to_sym
         else
-          return value || default
+          return to_cast
         end
       end
 

data/schemacop.gemspec

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.0.rc3 ruby lib
+# stub: schemacop 3.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.0.rc3"
+  s.version = "3.0.2"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sitrox".freeze]
-  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.date = "2021-02-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/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/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.rc3
+  version: 3.0.2
 platform: ruby
 authors:
 - Sitrox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-02-14 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
@@ -275,9 +288,9 @@ 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.1.4
 signing_key: