data-validator 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a17797f11cd84b48bd15ac9e12ba2eab7fc0bd0da5ac251f6ed04fb361a75981
-  data.tar.gz: 6498c18fb66ec1908ff054f899e1c8895edc0ebf6755a045152513576b86b050
+SHA1:
+  metadata.gz: be3b60e45735bbc9a89a15f341008b2a4602ebca
+  data.tar.gz: ac9ccdd6eaae3944b0c766ca17af0f329bd8546a
 SHA512:
-  metadata.gz: 34647edb3d7c4f609802a973078be05e6a458cdeb3510cb97ef0d6ace03c946e5e29c103dc829d6ee25bf438d59cb01ce390c42f27c6ca1185a80218a94be3b5
-  data.tar.gz: 775e48023d6083a316e5cefbd3430d35a0ebe543fa18a842992aa3e8839b02d6854f32686501f0d97693158fe55985fceffa8be61cd4ffe5c28145d83a234576
+  metadata.gz: 30ef98f00a118cc7dc5e4b5dc2c034cdc8b0af96b01a451fe43abca520f98259419385ece5057ea5908a165eff9aeb2ae75039d29efd2a9a5b11ca2b0797d46b
+  data.tar.gz: 8ddce94eaf73696f009aaed3307a5467d0e7b4acb750fc5343494ab3c42000192bca6f6ad3b54dbb2d56cd9a205ab83774e7bc14ca2c96307e56c058bec4c107

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.5"
+Data::Validator::VERSION = "1.1.0"

data/lib/data/validator.rb

@@ -20,7 +20,6 @@
 # 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"
 
@@ -129,6 +128,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
@@ -212,6 +221,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/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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data-validator
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Urabe, Shyouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,7 +121,6 @@ files:
 - README.md
 - Rakefile
 - data-validator.gemspec
-- lib/data.rb
 - lib/data/validator.rb
 - lib/data/validator/error.rb
 - lib/data/validator/recursive.rb
@@ -159,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: p5-Data-Validator / p5-Data-Validator-Recursive port
@@ -177,3 +176,4 @@ test_files:
 - test/xaicron/01_new.rb
 - test/xaicron/02_validate.rb
 - test/xaicron/03_arrayref.rb
+has_rdoc: 

data/lib/data.rb

@@ -1,40 +0,0 @@
-#! /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