schemacop 2.2.0 → 2.3.0

data/lib/schemacop/collector.rb

@@ -1,21 +1,31 @@
 module Schemacop
   class Collector
     attr_reader :current_path
+    attr_reader :exceptions
 
     def initialize
       @exceptions = []
       @current_path = []
+      @ignore_next_segment = false
     end
 
     def valid?
       @exceptions.empty?
     end
 
+    # Construct the current path
     def path(segment)
-      @current_path << segment
+      ignore_this_segment = false
+      if @ignore_next_segment
+        ignore_this_segment = true
+        @ignore_next_segment = false
+      end
+
+      @current_path << segment unless ignore_this_segment
+
       yield
     ensure
-      @current_path.pop
+      @current_path.pop unless ignore_this_segment
     end
 
     def exception_message
@@ -30,5 +40,14 @@ module Schemacop
         message: error_msg
       }
     end
+
+    # Does not include the path segment next time {Schemacop::Collector.path} is
+    # called.
+    #
+    # @return [Schemacop::Collector]
+    def ignore_next_segment
+      @ignore_next_segment = true
+      return self
+    end
   end
 end

data/lib/schemacop/node_supporting_field.rb

@@ -38,8 +38,6 @@ module Schemacop
     protected
 
     def field(*args, required:, allow_nil:, &block)
-      # name = args.shift
-      # options = args.last.is_a?(Hash) ? args.pop : {}
       name = args.shift
 
       if @fields[name]

data/lib/schemacop/schema.rb

@@ -38,7 +38,7 @@ module Schemacop
     #   throughout the validation.
     def validate(data)
       collector = Collector.new
-      @root.fields[:root].validate({ root: data }, collector)
+      @root.fields[:root].validate({ root: data }, collector.ignore_next_segment)
       return collector
     end
 

data/lib/schemacop/validator/object_validator.rb

@@ -3,13 +3,19 @@ module Schemacop
     register symbols: :object, klasses: Object
 
     option :classes
+    option :strict
 
     def type_label
       "#{super} (#{classes.join(', ')})"
     end
 
     def type_matches?(data)
-      super && (classes.empty? || classes.include?(data.class)) && !data.nil?
+      if option(:strict).is_a?(FalseClass)
+        sub_or_class = classes.map { |klass| data.class <= klass }.include?(true)
+        super && (classes.empty? || sub_or_class) && !data.nil?
+      else
+        super && (classes.empty? || classes.include?(data.class)) && !data.nil?
+      end
     end
 
     private

data/schemacop.gemspec

@@ -1,20 +1,20 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 2.2.0 ruby lib
+# stub: schemacop 2.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "2.2.0"
+  s.version = "2.3.0"
 
   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 = "2017-05-17"
-  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, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "doc/Schemacop.html".freeze, "doc/Schemacop/ArrayValidator.html".freeze, "doc/Schemacop/BooleanValidator.html".freeze, "doc/Schemacop/Collector.html".freeze, "doc/Schemacop/Exceptions.html".freeze, "doc/Schemacop/Exceptions/InvalidSchemaError.html".freeze, "doc/Schemacop/Exceptions/ValidationError.html".freeze, "doc/Schemacop/FieldNode.html".freeze, "doc/Schemacop/FloatValidator.html".freeze, "doc/Schemacop/HashValidator.html".freeze, "doc/Schemacop/IntegerValidator.html".freeze, "doc/Schemacop/NilValidator.html".freeze, "doc/Schemacop/Node.html".freeze, "doc/Schemacop/NodeResolver.html".freeze, "doc/Schemacop/NodeSupportingField.html".freeze, "doc/Schemacop/NodeSupportingType.html".freeze, "doc/Schemacop/NodeWithBlock.html".freeze, "doc/Schemacop/NumberValidator.html".freeze, "doc/Schemacop/ObjectValidator.html".freeze, "doc/Schemacop/RootNode.html".freeze, "doc/Schemacop/Schema.html".freeze, "doc/Schemacop/StringValidator.html".freeze, "doc/Schemacop/SymbolValidator.html".freeze, "doc/ScopedEnv.html".freeze, "doc/_index.html".freeze, "doc/class_list.html".freeze, "doc/css/common.css".freeze, "doc/css/full_list.css".freeze, "doc/css/style.css".freeze, "doc/file.README.html".freeze, "doc/file_list.html".freeze, "doc/frames.html".freeze, "doc/index.html".freeze, "doc/inheritance.graphml".freeze, "doc/inheritance.pdf".freeze, "doc/js/app.js".freeze, "doc/js/full_list.js".freeze, "doc/js/jquery.js".freeze, "doc/method_list.html".freeze, "doc/top-level-namespace.html".freeze, "lib/schemacop.rb".freeze, "lib/schemacop/collector.rb".freeze, "lib/schemacop/exceptions.rb".freeze, "lib/schemacop/field_node.rb".freeze, "lib/schemacop/node.rb".freeze, "lib/schemacop/node_resolver.rb".freeze, "lib/schemacop/node_supporting_field.rb".freeze, "lib/schemacop/node_supporting_type.rb".freeze, "lib/schemacop/node_with_block.rb".freeze, "lib/schemacop/root_node.rb".freeze, "lib/schemacop/schema.rb".freeze, "lib/schemacop/scoped_env.rb".freeze, "lib/schemacop/validator/array_validator.rb".freeze, "lib/schemacop/validator/boolean_validator.rb".freeze, "lib/schemacop/validator/float_validator.rb".freeze, "lib/schemacop/validator/hash_validator.rb".freeze, "lib/schemacop/validator/integer_validator.rb".freeze, "lib/schemacop/validator/nil_validator.rb".freeze, "lib/schemacop/validator/number_validator.rb".freeze, "lib/schemacop/validator/object_validator.rb".freeze, "lib/schemacop/validator/string_validator.rb".freeze, "lib/schemacop/validator/symbol_validator.rb".freeze, "schemacop.gemspec".freeze, "test/custom_check_test.rb".freeze, "test/custom_if_test.rb".freeze, "test/nil_dis_allow_test.rb".freeze, "test/short_forms_test.rb".freeze, "test/test_helper.rb".freeze, "test/types_test.rb".freeze, "test/validator_array_test.rb".freeze, "test/validator_boolean_test.rb".freeze, "test/validator_float_test.rb".freeze, "test/validator_hash_test.rb".freeze, "test/validator_integer_test.rb".freeze, "test/validator_nil_test.rb".freeze, "test/validator_number_test.rb".freeze, "test/validator_object_test.rb".freeze, "test/validator_string_test.rb".freeze, "test/validator_symbol_test.rb".freeze]
+  s.date = "2017-05-18"
+  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, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "doc/Schemacop.html".freeze, "doc/Schemacop/ArrayValidator.html".freeze, "doc/Schemacop/BooleanValidator.html".freeze, "doc/Schemacop/Collector.html".freeze, "doc/Schemacop/Exceptions.html".freeze, "doc/Schemacop/Exceptions/InvalidSchemaError.html".freeze, "doc/Schemacop/Exceptions/ValidationError.html".freeze, "doc/Schemacop/FieldNode.html".freeze, "doc/Schemacop/FloatValidator.html".freeze, "doc/Schemacop/HashValidator.html".freeze, "doc/Schemacop/IntegerValidator.html".freeze, "doc/Schemacop/NilValidator.html".freeze, "doc/Schemacop/Node.html".freeze, "doc/Schemacop/NodeResolver.html".freeze, "doc/Schemacop/NodeSupportingField.html".freeze, "doc/Schemacop/NodeSupportingType.html".freeze, "doc/Schemacop/NodeWithBlock.html".freeze, "doc/Schemacop/NumberValidator.html".freeze, "doc/Schemacop/ObjectValidator.html".freeze, "doc/Schemacop/RootNode.html".freeze, "doc/Schemacop/Schema.html".freeze, "doc/Schemacop/StringValidator.html".freeze, "doc/Schemacop/SymbolValidator.html".freeze, "doc/ScopedEnv.html".freeze, "doc/_index.html".freeze, "doc/class_list.html".freeze, "doc/css/common.css".freeze, "doc/css/full_list.css".freeze, "doc/css/style.css".freeze, "doc/file.README.html".freeze, "doc/file_list.html".freeze, "doc/frames.html".freeze, "doc/index.html".freeze, "doc/inheritance.graphml".freeze, "doc/inheritance.pdf".freeze, "doc/js/app.js".freeze, "doc/js/full_list.js".freeze, "doc/js/jquery.js".freeze, "doc/method_list.html".freeze, "doc/top-level-namespace.html".freeze, "lib/schemacop.rb".freeze, "lib/schemacop/collector.rb".freeze, "lib/schemacop/exceptions.rb".freeze, "lib/schemacop/field_node.rb".freeze, "lib/schemacop/node.rb".freeze, "lib/schemacop/node_resolver.rb".freeze, "lib/schemacop/node_supporting_field.rb".freeze, "lib/schemacop/node_supporting_type.rb".freeze, "lib/schemacop/node_with_block.rb".freeze, "lib/schemacop/root_node.rb".freeze, "lib/schemacop/schema.rb".freeze, "lib/schemacop/scoped_env.rb".freeze, "lib/schemacop/validator/array_validator.rb".freeze, "lib/schemacop/validator/boolean_validator.rb".freeze, "lib/schemacop/validator/float_validator.rb".freeze, "lib/schemacop/validator/hash_validator.rb".freeze, "lib/schemacop/validator/integer_validator.rb".freeze, "lib/schemacop/validator/nil_validator.rb".freeze, "lib/schemacop/validator/number_validator.rb".freeze, "lib/schemacop/validator/object_validator.rb".freeze, "lib/schemacop/validator/string_validator.rb".freeze, "lib/schemacop/validator/symbol_validator.rb".freeze, "schemacop.gemspec".freeze, "test/collector_test.rb".freeze, "test/custom_check_test.rb".freeze, "test/custom_if_test.rb".freeze, "test/nil_dis_allow_test.rb".freeze, "test/short_forms_test.rb".freeze, "test/test_helper.rb".freeze, "test/types_test.rb".freeze, "test/validator_array_test.rb".freeze, "test/validator_boolean_test.rb".freeze, "test/validator_float_test.rb".freeze, "test/validator_hash_test.rb".freeze, "test/validator_integer_test.rb".freeze, "test/validator_nil_test.rb".freeze, "test/validator_number_test.rb".freeze, "test/validator_object_test.rb".freeze, "test/validator_string_test.rb".freeze, "test/validator_symbol_test.rb".freeze]
   s.homepage = "https://github.com/sitrox/schemacop".freeze
   s.licenses = ["MIT".freeze]
   s.rubygems_version = "2.6.6".freeze
   s.summary = "Schemacop validates ruby structures consisting of nested hashes and arrays against simple schema definitions.".freeze
-  s.test_files = ["test/custom_check_test.rb".freeze, "test/custom_if_test.rb".freeze, "test/nil_dis_allow_test.rb".freeze, "test/short_forms_test.rb".freeze, "test/test_helper.rb".freeze, "test/types_test.rb".freeze, "test/validator_array_test.rb".freeze, "test/validator_boolean_test.rb".freeze, "test/validator_float_test.rb".freeze, "test/validator_hash_test.rb".freeze, "test/validator_integer_test.rb".freeze, "test/validator_nil_test.rb".freeze, "test/validator_number_test.rb".freeze, "test/validator_object_test.rb".freeze, "test/validator_string_test.rb".freeze, "test/validator_symbol_test.rb".freeze]
+  s.test_files = ["test/collector_test.rb".freeze, "test/custom_check_test.rb".freeze, "test/custom_if_test.rb".freeze, "test/nil_dis_allow_test.rb".freeze, "test/short_forms_test.rb".freeze, "test/test_helper.rb".freeze, "test/types_test.rb".freeze, "test/validator_array_test.rb".freeze, "test/validator_boolean_test.rb".freeze, "test/validator_float_test.rb".freeze, "test/validator_hash_test.rb".freeze, "test/validator_integer_test.rb".freeze, "test/validator_nil_test.rb".freeze, "test/validator_number_test.rb".freeze, "test/validator_object_test.rb".freeze, "test/validator_string_test.rb".freeze, "test/validator_symbol_test.rb".freeze]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

data/test/collector_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+module Schemacop
+  class CollectorTest < Minitest::Test
+    def test_no_root_node
+      s = Schema.new do
+        req :a, :string
+      end
+
+      col = s.validate(a: 0)
+      assert col.exceptions.first[:path].first !~ %r{^/root}, 'Root node is present in the path.'
+    end
+
+    def test_correct_path
+      s = Schema.new do
+        req :long_symbol, :string
+        req 'long_string', :string
+        req 123, :string
+      end
+
+      col = s.validate('long_string' => 0, long_symbol: 0, 123 => 0)
+
+      symbol = col.exceptions[0]
+      string = col.exceptions[1]
+      number = col.exceptions[2]
+
+      assert symbol[:path].first =~ %r{^/long_symbol}
+      assert string[:path].first =~ %r{^/long_string}
+      assert number[:path].first =~ %r{^/123}
+    end
+
+    def test_nested_paths
+      s = Schema.new do
+        req :one do
+          req :two, :string
+        end
+        req :three, :string
+      end
+
+      col = s.validate(one: { two: 0 }, three: 0)
+      assert_equal 2, col.exceptions[0][:path].length
+      assert_equal 1, col.exceptions[1][:path].length
+    end
+  end
+end

data/test/short_forms_test.rb

@@ -2,6 +2,9 @@ require 'test_helper'
 
 module Schemacop
   class ShortFormsTest < Minitest::Test
+    class User; end
+    class Group; end
+
     def test_constructor_defaults_to_hash
       s = Schema.new do
         req! :r do
@@ -142,6 +145,7 @@ module Schemacop
         end
         req :name, :integer, min: 5, max: 7
         req :id, [:integer, :string]
+        req :callback, :symbol
         req :attrs do
           req :color do
             type :integer
@@ -161,6 +165,7 @@ module Schemacop
         foo: { bar: nil },
         attrs: { color: 5 },
         id: 'hallo',
+        callback: :funky_function,
         colors: [5, 'sdf'],
         cars: [
           {
@@ -312,5 +317,15 @@ module Schemacop
       assert_verr { s.validate!('123') }
       assert_verr { s.validate!(string: '1234') }
     end
+
+    def test_inline_objects
+      s = Schema.new do
+        req :user, User
+        req :group, Group
+      end
+
+      assert_nil s.validate!(user: User.new, group: Group.new)
+      assert_verr { s.validate!(user: Group.new, group: User.new) }
+    end
   end
 end

data/test/validator_object_test.rb

@@ -83,5 +83,23 @@ module Schemacop
       assert_verr { s.validate!(fld: nil) }
       assert_verr { s.validate!({}) }
     end
+
+    def test_strict_option
+      s = Schema.new do
+        req :o_strict do
+          type :object, classes: User, strict: true
+        end
+        opt :o_ns do
+          type :object, classes: User, strict: false
+        end
+      end
+
+      assert_nil s.validate!(o_strict: User.new, o_ns: User.new)
+      assert_nil s.validate!(o_strict: User.new, o_ns: SubUser.new)
+      assert_nil s.validate!(o_strict: User.new)
+      assert_verr { s.validate!(o_strict: SubUser.new) }
+      assert_verr { s.validate!(o_strict: User.new, o_ns: AdminUser.new) }
+      assert_verr { s.validate!(o_strict: SubUser.new, o_ns: User.new) }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Sitrox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -223,6 +223,7 @@ files:
 - lib/schemacop/validator/string_validator.rb
 - lib/schemacop/validator/symbol_validator.rb
 - schemacop.gemspec
+- test/collector_test.rb
 - test/custom_check_test.rb
 - test/custom_if_test.rb
 - test/nil_dis_allow_test.rb
@@ -259,12 +260,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Schemacop validates ruby structures consisting of nested hashes and arrays
   against simple schema definitions.
 test_files:
+- test/collector_test.rb
 - test/custom_check_test.rb
 - test/custom_if_test.rb
 - test/nil_dis_allow_test.rb