data-validator 1.0.4 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4db89bd57d2ff864036a732c664de3567c7a0484
-  data.tar.gz: 5180ae2f97bd74c61fdc086f6be9b18975fb1069
+SHA256:
+  metadata.gz: 50f3566cc5d434fa1877142a1ce9e993277f3a0d617d2030be78ae801c96113c
+  data.tar.gz: 18949992ca7ee9ced52cf8fc13db55c8689c37f59655f1ae10af4ee88ea52196
 SHA512:
-  metadata.gz: 30ba9963cd4153cafea0f395e93002c3ef23496538033950514132017492c35d8226110f792c2224ba22184534b560ef53aeb2660f24a0d56423209c69f185a4
-  data.tar.gz: 4c8a6e91abd7ae018cbbc891d387ed1da263deae4e5094b60c9af32ee911176efe1fa848fe6a9b15e5cf698deabf9dd095915b802e2d7b10e2ec03fe7da56b08
+  metadata.gz: e872ba1fb97cd0ed444735cb5f2d53b21f25c6673b51e31adc630dd5a47d93d0d2a457d0b8190042b5d8daa6999abff29cd066b203f3705c108cdc7446bf8822
+  data.tar.gz: e90c0de40e03bcf5937cba724f322f99f66f0e8dd3d9a721aa7e3719008f923402fcba83fb59cccfb0a41f1bbfb5e0e32476e5778a317a0621efa9496041e689

data/data-validator.gemspec

@@ -45,12 +45,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version                          = '>= 1.9.3'
-  spec.add_development_dependency 'bundler',            '~> 1.5'
-  spec.add_development_dependency 'rake',               '~> 10.3'
-  spec.add_development_dependency 'rdoc',               '~> 4.0'
-  spec.add_development_dependency 'yard',               '~> 0.8'
-  spec.add_development_dependency 'test-unit',          '~> 3.0'
-  spec.add_development_dependency 'simplecov',          '>= 0'
-  spec.add_development_dependency 'pry',                '~> 0.10'
+  spec.required_ruby_version = '>= 1.9.3'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rdoc'
+  spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'pry'
 end

data/lib/data.rb

@@ -0,0 +1,40 @@
+#! /your/favourite/path/to/ruby
+# -*- mode: ruby; coding: utf-8; indent-tabs-mode: nil; ruby-indent-level 2 -*-
+
+# Copyright (c) 2018 Urabe, Shyouhei
+#
+# Permission is hereby granted, free of  charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction,  including without limitation the rights
+# to use,  copy, modify,  merge, publish,  distribute, sublicense,  and/or sell
+# copies  of the  Software,  and to  permit  persons to  whom  the Software  is
+# furnished to do so, subject to the following conditions:
+#
+#         The above copyright notice and this permission notice shall be
+#         included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE  IS PROVIDED "AS IS",  WITHOUT WARRANTY OF ANY  KIND, EXPRESS OR
+# IMPLIED,  INCLUDING BUT  NOT LIMITED  TO THE  WARRANTIES OF  MERCHANTABILITY,
+# FITNESS FOR A  PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO  EVENT SHALL THE
+# AUTHORS  OR COPYRIGHT  HOLDERS  BE LIABLE  FOR ANY  CLAIM,  DAMAGES OR  OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# Toplevel namespace `::Data` got deprecated, and will eventually be disappear.
+# However we are using it because p5-Data-Validator is in this namespace.  This
+# has nothing to do with the deprecation of Ruby's `::Data`.
+if !defined? ::Data then
+  Data = Class.new # create one here
+elsif defined? ::Warning then
+  # We have to shut up the deprecation warning.
+  class << Warning
+    prepend Module.new {
+      def warn str
+        super unless /::Data is deprecated/ =~ str
+      end
+    }
+  end
+else
+  # This ruby is very old.  We don't have to do anything.
+end

data/lib/data/validator.rb

@@ -20,6 +20,7 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
+require_relative '../data'
 Data::Validator = Class.new  # @!parse class Data::Validator; end
 require_relative "validator/version"
 
@@ -128,6 +129,16 @@ class Data::Validator
     case extension
     when 'AllowExtra' then
       @rule[:allow_extra] = true
+      if @rule.has_key? :rule
+        case
+        when @isa == Hash  then
+          @rule[:rule].each_value do |rule|
+            rule.with extension if rule.is_a? self.class
+          end
+        else
+          @rule[:rule].with extension if @rule[:rule].is_a? self.class
+        end
+      end
     else
       raise ArgumentError, "unsupported extension #{extension}"
     end
@@ -166,6 +177,8 @@ class Data::Validator
         fillin << key
       elsif rule[:optional] then
         # ok
+      elsif @isa then
+        missing << key
       elsif @rule[:allow_extra] then
         # ok
       else
@@ -211,6 +224,12 @@ class Data::Validator
         raise Error, "#{x} or #{y} missing"
       end
     end
+    unless @rule[:allow_extra] then
+      extra = (actual.keys - @rule[:rule].keys)
+      unless extra.empty? then
+        raise Error, "extra key(s): #{extra.inspect}"
+      end
+    end
     return actual
   end
 

data/lib/data/validator/version.rb

@@ -20,4 +20,4 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-Data::Validator::VERSION = "1.0.4"
+Data::Validator::VERSION = "1.1.3"

data/test/02_validate_requires_allowextra.rb

@@ -0,0 +1,30 @@
+require 'test-unit'
+require 'data/validator'
+
+class Test02Validate < Test::Unit::TestCase
+  test 'requires with AllowExtra' do
+    rule = Data::Validator::Recursive.new(
+      'foo' => String,
+      'bar' => { isa: Integer, default: 1 },
+      'baz' => {
+        isa: Hash,
+        with: 'AllowExtra',
+        rule: {
+          'hoge' => { isa: String }, # requires
+          'fuga' => Integer,
+        },
+      },
+    ).with('AllowExtra')
+
+    input = {
+      'foo' => 'xxx',
+      'baz' => {
+        'fuga' => 123,
+        'extra_param_in_baz' => 1,
+      },
+      'extra_param' => 1,
+    }
+
+    assert_raise_message(/missing/) { rule.validate(input) }
+  end
+end

data/test/gfx/001_basic.rb

@@ -22,5 +22,8 @@ class Test001Basic < Test::Unit::TestCase
 
     assert_raise_message(/foo/) { v.validate() }
     assert_raise_message(/foo/) { v.validate({'foo' => 'bar'}) }
+    assert_raise_message(/baz|qux/) {
+      v.validate({'foo' => 0, 'baz' => 42, 'qux' => 100 })
+    }
   end
 end

data/test/gfx/104_extra_args.rb

@@ -6,7 +6,7 @@ class Test104ExtraArgs < Test::Unit::TestCase
   def test_test
     v = Data::Validator.new(
       'foo' => { },
-    )
+    ).with('AllowExtra')
 
     args = v.validate('foo' => 42, 'bar' => 15)
     assert { args == {'foo' => 42, 'bar' => 15} }

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: data-validator
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.3
 platform: ruby
 authors:
 - Urabe, Shyouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 description: for gfx fan and xaicron fan
 email:
 - shyouhei@ruby-lang.org
@@ -121,11 +121,13 @@ files:
 - README.md
 - Rakefile
 - data-validator.gemspec
+- lib/data.rb
 - lib/data/validator.rb
 - lib/data/validator/error.rb
 - lib/data/validator/recursive.rb
 - lib/data/validator/version.rb
 - test/01_orclass.rb
+- test/02_validate_requires_allowextra.rb
 - test/gfx/000_load.rb
 - test/gfx/001_basic.rb
 - test/gfx/002_isa.rb
@@ -157,13 +159,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: p5-Data-Validator / p5-Data-Validator-Recursive port
 test_files:
 - test/01_orclass.rb
+- test/02_validate_requires_allowextra.rb
 - test/gfx/000_load.rb
 - test/gfx/001_basic.rb
 - test/gfx/002_isa.rb
@@ -176,4 +178,3 @@ test_files:
 - test/xaicron/01_new.rb
 - test/xaicron/02_validate.rb
 - test/xaicron/03_arrayref.rb
-has_rdoc: