schemacop 3.0.0.rc2 → 3.0.1

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.rc2
+3.0.1

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)
+        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.rb

@@ -10,7 +10,6 @@ require 'schemacop/v2/node'
 require 'schemacop/v2/node_with_block'
 require 'schemacop/v2/node_supporting_type'
 require 'schemacop/v2/field_node'
-require 'schemacop/v2/root_node'
 require 'schemacop/v2/node_supporting_field'
 require 'schemacop/v2/caster'
 require 'schemacop/v2/dupper'

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

@@ -11,6 +11,8 @@ module Schemacop
 
       supports_children(name: true)
 
+      attr_reader :properties
+
       def self.allowed_options
         super + ATTRIBUTES - %i[dependencies] + %i[additional_properties]
       end
@@ -19,6 +21,14 @@ module Schemacop
         super + NodeRegistry.dsl_methods(true) + %i[dsl_dep dsl_add]
       end
 
+      def self.sanitize_exp(exp)
+        exp = exp.to_s
+        if exp.start_with?('(?-mix:')
+          exp = exp.to_s.gsub(/^\(\?-mix:/, '').gsub(/\)$/, '')
+        end
+        return exp
+      end
+
       def add_child(node)
         unless node.name
           fail Exceptions::InvalidSchemaError, 'Child nodes must have a name.'
@@ -54,11 +64,11 @@ module Schemacop
 
         json = {}
         json[:properties] = Hash[properties.values.map { |p| [p.name, p.as_json] }] if properties.any?
-        json[:patternProperties] = Hash[pattern_properties.values.map { |p| [sanitize_exp(p.name), p.as_json] }] if pattern_properties.any?
+        json[:patternProperties] = Hash[pattern_properties.values.map { |p| [self.class.sanitize_exp(p.name), p.as_json] }] if pattern_properties.any?
 
         # 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
@@ -75,14 +85,6 @@ module Schemacop
         return process_json(ATTRIBUTES, json)
       end
 
-      def sanitize_exp(exp)
-        exp = exp.to_s
-        if exp.start_with?('(?-mix:')
-          exp = exp.to_s.gsub(/^\(\?-mix:/, '').gsub(/\)$/, '')
-        end
-        return exp
-      end
-
       def allowed_types
         { Hash => :object }
       end
@@ -139,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
@@ -174,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)
@@ -191,10 +189,18 @@ module Schemacop
             next
           end
 
-          result[prop.name] = prop.cast(data_hash[prop.name])
+          as_names << prop.as&.to_s if prop.as.present?
+
+          prop_name = prop.as&.to_s || prop.name
 
-          if result[prop.name].nil? && !data_hash.include?(prop.name)
-            result.delete(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
 
@@ -211,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
@@ -236,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

@@ -2,6 +2,7 @@ module Schemacop
   module V3
     class Node
       attr_reader :name
+      attr_reader :as
       attr_reader :default
       attr_reader :title
       attr_reader :description
@@ -32,8 +33,10 @@ module Schemacop
         if options.delete(:cast_str)
           format = NodeRegistry.name(klass)
           one_of_options = {
-            required: options.delete(:required),
-            name:     options.delete(:name)
+            required:    options.delete(:required),
+            name:        options.delete(:name),
+            as:          options.delete(:as),
+            description: options.delete(:description)
           }
           node = create(:one_of, **one_of_options) do
             self.node node
@@ -45,7 +48,7 @@ module Schemacop
       end
 
       def self.allowed_options
-        %i[name required default description examples enum parent options cast_str title]
+        %i[name required default description examples enum parent options cast_str title as]
       end
 
       def self.dsl_methods
@@ -69,12 +72,13 @@ 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 #
         @name = options.delete(:name)
         @name = @name.to_s unless @name.nil? || @name.is_a?(Regexp)
+        @as = options.delete(:as)
         @required = !!options.delete(:required)
         @default = options.delete(:default)
         @title = options.delete(:title)
@@ -91,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.rc2 ruby lib
+# stub: schemacop 3.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.0.rc2"
+  s.version = "3.0.1"
 
-  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-11"
+  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