kwalify 0.3.0 → 0.4.0

data/test/test-validator.rb

@@ -1,20 +1,21 @@
 ###
-### $Rev: 21 $
-### $Release: 0.3.0 $
+### $Rev: 35 $
+### $Release: 0.4.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
-if $0 == __FILE__
-   testdir = File.dirname(__FILE__)
-   libdir  = File.dirname(testdir) + "/lib"
-   $LOAD_PATH << libdir << testdir
-   require 'test/unit'
-   require 'test/unit/ui/console/testrunner'
-   require 'kwalify'
-   require 'kwalify/util/assert-diff'
-   require 'yaml'
+unless defined?(TESTDIR)
+   TESTDIR = File.dirname(__FILE__)
+   libdir  = File.dirname(TESTDIR) + "/lib"
+   $LOAD_PATH << libdir << TESTDIR
 end
 
+require 'test/unit'
+require 'test/unit/ui/console/testrunner'
+require 'kwalify'
+require 'kwalify/util/assert-diff'
+require 'yaml'
+
 
 class ValidatorTest < Test::Unit::TestCase
 
@@ -39,37 +40,52 @@ class ValidatorTest < Test::Unit::TestCase
       eval s
    end
 
+
    ## execute test
    def _test()
       return if $target && $target != @name
+      # Syck parser
       schema = YAML.load(@schema)
       validator = Kwalify::Validator.new(schema)
-      _test_body(validator, @valid,  '')
-      _test_body(validator, @invalid, @error)
+      error2 = @error.gsub(/\(line \d+\)/, '')
+      _test_body(validator, @valid,   ''    , false)
+      _test_body(validator, @invalid, error2, false)
+      # Kwalify::Parser
+      schema = Kwalify::Parser.new(@schema).parse()
+      validator = Kwalify::Validator.new(schema)
+      _test_body(validator, @valid,   ''    , true)
+      _test_body(validator, @invalid, @error, true)
    end
 
-   def _test_body(validator, input, expected)
-      document = YAML.load(input)
+   def _test_body(validator, input, expected, flag_parser)
+      if flag_parser
+         parser = Kwalify::Parser.new(input)
+         document = parser.parse()
+      else
+         document = YAML.load(input)
+      end
       error_list  = validator.validate(document)
       actual = ""
       error_list.each do |error|
-         actual << "%-20s: [%s] %s\n" % [error.error_symbol.inspect, error.path, error.message]
+         errsym = error.error_symbol.inspect
+         if flag_parser
+            linenum = parser.path_linenum(error.path)
+            actual << "%-20s: (line %d)[%s] %s\n" % [errsym, linenum, error.path, error.message]
+         else
+            actual << "%-20s: [%s] %s\n" % [errsym, error.path, error.message]
+         end
       end
-      if $flag_print
+      if $print
          print actual
       else
          assert_equal_with_diff(expected, actual)
       end
-      #return error_list
    end
 
 end
 
-
 #if $0 == __FILE__
-#   suite = Test::Unit::TestSuite.new()
-#   suite << ValidatorTest.suite()
-#   Test::Unit::UI::Console::TestRunner.run(suite)
+#   Test::Unit::UI::Console::TestRunner.run(ValidatorTest)
 #end
 
 __END__
@@ -115,12 +131,12 @@ invalid: |
   birth:  Jul 01, 1985
 #
 error: |
-  :required_nokey     : [/] key 'name:' is required.
-  :key_undefined      : [/] key 'nam:' is undefined.
-  :enum_notexist      : [/blood] 'ab': invalid blood value.
-  :type_unmatch       : [/birth] 'Jul 01, 1985': not a date.
-  :type_unmatch       : [/age] 'twenty': not a integer.
-  :pattern_unmatch    : [/email] 'foo(at)mail.com': not matched to pattern /@/.
+  :required_nokey     : (line 1)[/] key 'name:' is required.
+  :key_undefined      : (line 1)[/] key 'nam:' is undefined.
+  :enum_notexist      : (line 4)[/blood] 'ab': invalid blood value.
+  :type_unmatch       : (line 5)[/birth] 'Jul 01, 1985': not a date.
+  :type_unmatch       : (line 3)[/age] 'twenty': not a integer.
+  :pattern_unmatch    : (line 2)[/email] 'foo(at)mail.com': not matched to pattern /@/.
 #
 ---
 name:  sequence1
@@ -146,8 +162,8 @@ invalid: |
   - 100
 #
 error: |
-  :required_novalue   : [/2] value required but none.
-  :type_unmatch       : [/4] '100': not a string.
+  :required_novalue   : (line 3)[/2] value required but none.
+  :type_unmatch       : (line 5)[/4] '100': not a string.
 #
 ---
 name:  nested1
@@ -203,12 +219,12 @@ invalid: |
       email:      bar(at)mail.com
 #
 error: |
-  :required_nokey     : [/address-book/0] key 'email:' is required.
-  :key_undefined      : [/address-book/0] key 'mail:' is undefined.
-  :enum_notexist      : [/address-book/0/blood] 'ab': invalid blood value.
-  :type_unmatch       : [/address-book/0/birth] '1985/01/01': not a date.
-  :type_unmatch       : [/address-book/0/age] 'twenty': not a integer.
-  :pattern_unmatch    : [/address-book/1/email] 'bar(at)mail.com': not matched to pattern /@/.
+  :required_nokey     : (line 2)[/address-book/0] key 'email:' is required.
+  :key_undefined      : (line 2)[/address-book/0] key 'mail:' is undefined.
+  :enum_notexist      : (line 5)[/address-book/0/blood] 'ab': invalid blood value.
+  :type_unmatch       : (line 6)[/address-book/0/birth] '1985/01/01': not a date.
+  :type_unmatch       : (line 4)[/address-book/0/age] 'twenty': not a integer.
+  :pattern_unmatch    : (line 8)[/address-book/1/email] 'bar(at)mail.com': not matched to pattern /@/.
 #
 ---
 name:  anchor1
@@ -239,9 +255,9 @@ invalid: |
     family-name: 100
 #
 error: |
-  :required_nokey     : [/0] key 'family-name:' is required.
-  :key_undefined      : [/0] key 'last-name:' is undefined.
-  :type_unmatch       : [/1/family-name] '100': not a string.
+  :required_nokey     : (line 1)[/0] key 'family-name:' is required.
+  :key_undefined      : (line 1)[/0] key 'last-name:' is undefined.
+  :type_unmatch       : (line 4)[/1/family-name] '100': not a string.
 #
 ---
 name:  anchor2
@@ -282,9 +298,9 @@ invalid: |
       email: bar@mail.com
 #
 error: |
-  :type_unmatch       : [/address-book/0/name] '100': not a string.
-  :required_nokey     : [/address-book/1] key 'name:' is required.
-  :key_undefined      : [/address-book/1] key 'first-name:' is undefined.
+  :type_unmatch       : (line 3)[/address-book/0/name] '100': not a string.
+  :required_nokey     : (line 5)[/address-book/1] key 'name:' is required.
+  :key_undefined      : (line 5)[/address-book/1] key 'first-name:' is undefined.
 #
 ---
 name:  anchor3
@@ -334,8 +350,8 @@ invalid: |
     supervisor: *foo
 #
 error: |
-  :type_unmatch       : [/0/name] '100': not a string.
-  :enum_notexist      : [/1/post] 'worker': invalid post value.
+  :type_unmatch       : (line 2)[/0/name] '100': not a string.
+  :enum_notexist      : (line 7)[/1/post] 'worker': invalid post value.
 #
 ---
 name:  range1
@@ -390,14 +406,14 @@ invalid: |
     - 9.99
 #
 error: |
-  :range_toosmall     : [/min-only/0] '9': too small (< min 10.0).
-  :range_toosmall     : [/min-only/1] '9.99': too small (< min 10.0).
-  :range_toolarge     : [/max-and-min/0] '101': too large (> max 100.0).
-  :range_toolarge     : [/max-and-min/1] '100.1': too large (> max 100.0).
-  :range_toosmall     : [/max-and-min/2] '9': too small (< min 10.0).
-  :range_toosmall     : [/max-and-min/3] '9.99': too small (< min 10.0).
-  :range_toolarge     : [/max-only/0] '101': too large (> max 100).
-  :range_toolarge     : [/max-only/1] '100.1': too large (> max 100).
+  :range_toosmall     : (line 5)[/min-only/0] '9': too small (< min 10.0).
+  :range_toosmall     : (line 6)[/min-only/1] '9.99': too small (< min 10.0).
+  :range_toolarge     : (line 8)[/max-and-min/0] '101': too large (> max 100.0).
+  :range_toolarge     : (line 9)[/max-and-min/1] '100.1': too large (> max 100.0).
+  :range_toosmall     : (line 10)[/max-and-min/2] '9': too small (< min 10.0).
+  :range_toosmall     : (line 11)[/max-and-min/3] '9.99': too small (< min 10.0).
+  :range_toolarge     : (line 2)[/max-only/0] '101': too large (> max 100).
+  :range_toolarge     : (line 3)[/max-only/1] '100.1': too large (> max 100).
 #
 ---
 name:  range2
@@ -452,14 +468,14 @@ invalid: |
     - 10.0
 #
 error: |
-  :range_toosmallex   : [/min-ex-only/0] '10': too small (<= min 10.0).
-  :range_toosmallex   : [/min-ex-only/1] '10.0': too small (<= min 10.0).
-  :range_toolargeex   : [/max-ex-only/0] '100': too large (>= max 100).
-  :range_toolargeex   : [/max-ex-only/1] '100.0': too large (>= max 100).
-  :range_toolargeex   : [/max-ex-and-min-ex/0] '100': too large (>= max 100.0).
-  :range_toolargeex   : [/max-ex-and-min-ex/1] '100.0': too large (>= max 100.0).
-  :range_toosmallex   : [/max-ex-and-min-ex/2] '10': too small (<= min 10.0).
-  :range_toosmallex   : [/max-ex-and-min-ex/3] '10.0': too small (<= min 10.0).
+  :range_toosmallex   : (line 5)[/min-ex-only/0] '10': too small (<= min 10.0).
+  :range_toosmallex   : (line 6)[/min-ex-only/1] '10.0': too small (<= min 10.0).
+  :range_toolargeex   : (line 2)[/max-ex-only/0] '100': too large (>= max 100).
+  :range_toolargeex   : (line 3)[/max-ex-only/1] '100.0': too large (>= max 100).
+  :range_toolargeex   : (line 8)[/max-ex-and-min-ex/0] '100': too large (>= max 100.0).
+  :range_toolargeex   : (line 9)[/max-ex-and-min-ex/1] '100.0': too large (>= max 100.0).
+  :range_toosmallex   : (line 10)[/max-ex-and-min-ex/2] '10': too small (<= min 10.0).
+  :range_toosmallex   : (line 11)[/max-ex-and-min-ex/3] '10.0': too small (<= min 10.0).
 #
 ---
 name:  range3
@@ -498,10 +514,10 @@ invalid: |
     - 100.0
 #
 error: |
-  :range_toolarge     : [/A/0] '100.00001': too large (> max 100).
-  :range_toosmallex   : [/A/1] '10.0': too small (<= min 10.0).
-  :range_toosmall     : [/B/0] '9.99999': too small (< min 10).
-  :range_toolargeex   : [/B/1] '100.0': too large (>= max 100.0).
+  :range_toolarge     : (line 2)[/A/0] '100.00001': too large (> max 100).
+  :range_toosmallex   : (line 3)[/A/1] '10.0': too small (<= min 10.0).
+  :range_toosmall     : (line 5)[/B/0] '9.99999': too small (< min 10).
+  :range_toolargeex   : (line 6)[/B/1] '100.0': too large (>= max 100.0).
 #
 ---
 name:  length1
@@ -553,10 +569,10 @@ invalid: |
     - foo
 #
 error: |
-  :length_tooshort    : [/min-only/0] 'foo': too short (length 3 < min 4).
-  :length_toolong     : [/max-and-min/0] 'foobarbaz': too long (length 9 > max 8).
-  :length_tooshort    : [/max-and-min/1] 'foo': too short (length 3 < min 4).
-  :length_toolong     : [/max-only/0] 'hogehoge!': too long (length 9 > max 8).
+  :length_tooshort    : (line 4)[/min-only/0] 'foo': too short (length 3 < min 4).
+  :length_toolong     : (line 7)[/max-and-min/0] 'foobarbaz': too long (length 9 > max 8).
+  :length_tooshort    : (line 8)[/max-and-min/1] 'foo': too short (length 3 < min 4).
+  :length_toolong     : (line 2)[/max-only/0] 'hogehoge!': too long (length 9 > max 8).
 #
 ---
 name:  length2
@@ -608,10 +624,10 @@ invalid: |
     - foo!
 #
 error: |
-  :length_tooshortex  : [/min-ex-only/0] 'foo!': too short (length 4 <= min 4).
-  :length_toolongex   : [/max-ex-only/0] 'hogehoge': too long (length 8 >= max 8).
-  :length_toolongex   : [/max-ex-and-min-ex/0] 'foobarba': too long (length 8 >= max 8).
-  :length_tooshortex  : [/max-ex-and-min-ex/1] 'foo!': too short (length 4 <= min 4).
+  :length_tooshortex  : (line 4)[/min-ex-only/0] 'foo!': too short (length 4 <= min 4).
+  :length_toolongex   : (line 2)[/max-ex-only/0] 'hogehoge': too long (length 8 >= max 8).
+  :length_toolongex   : (line 7)[/max-ex-and-min-ex/0] 'foobarba': too long (length 8 >= max 8).
+  :length_tooshortex  : (line 8)[/max-ex-and-min-ex/1] 'foo!': too short (length 4 <= min 4).
 #
 ---
 name:  length3
@@ -648,10 +664,10 @@ invalid: |
     - 123
 #
 error: |
-  :length_toolong     : [/A/0] 'hogehoge!': too long (length 9 > max 8).
-  :length_tooshortex  : [/A/1] '1234': too short (length 4 <= min 4).
-  :length_toolongex   : [/B/0] 'hogehoge': too long (length 8 >= max 8).
-  :length_tooshort    : [/B/1] '123': too short (length 3 < min 4).
+  :length_toolong     : (line 2)[/A/0] 'hogehoge!': too long (length 9 > max 8).
+  :length_tooshortex  : (line 3)[/A/1] '1234': too short (length 4 <= min 4).
+  :length_toolongex   : (line 5)[/B/0] 'hogehoge': too long (length 8 >= max 8).
+  :length_tooshort    : (line 6)[/B/1] '123': too short (length 3 < min 4).
 #
 ---
 name:  assert1
@@ -688,10 +704,10 @@ invalid: |
   - except: 3.1
 #
 error: |
-  :assert_failed      : [/0/less-than] '8': assertion expression failed (val < 8).
-  :assert_failed      : [/1/more-than] '3': assertion expression failed (3 < val).
-  :assert_failed      : [/2/between] '2.9': assertion expression failed (3 < val && val < 8).
-  :assert_failed      : [/3/except] '3.1': assertion expression failed (val < 3 || 8 < val).
+  :assert_failed      : (line 1)[/0/less-than] '8': assertion expression failed (val < 8).
+  :assert_failed      : (line 2)[/1/more-than] '3': assertion expression failed (3 < val).
+  :assert_failed      : (line 3)[/2/between] '2.9': assertion expression failed (3 < val && val < 8).
+  :assert_failed      : (line 4)[/3/except] '3.1': assertion expression failed (val < 3 || 8 < val).
 #
 ---
 name:  deftype1
@@ -718,10 +734,10 @@ invalid: |
   - email: 2004-01-01
 #
 error: |
-  :type_unmatch       : [/0/name] '123': not a string.
-  :type_unmatch       : [/0/email] 'true': not a string.
-  :type_unmatch       : [/1/name] '3.14': not a string.
-  :type_unmatch       : [/2/email] '2004-01-01': not a string.
+  :type_unmatch       : (line 1)[/0/name] '123': not a string.
+  :type_unmatch       : (line 2)[/0/email] 'true': not a string.
+  :type_unmatch       : (line 3)[/1/name] '3.14': not a string.
+  :type_unmatch       : (line 4)[/2/email] '2004-01-01': not a string.
 #
 ---
 name:  ident1
@@ -754,7 +770,7 @@ invalid: |
     age:  10
 #
 error: |
-  :value_notunique    : [/2/name] 'bar': is already used at '/1/name'.
+  :value_notunique    : (line 5)[/2/name] 'bar': is already used at '/1/name'.
 #
 ---
 name:  unique1
@@ -787,7 +803,7 @@ invalid: |
     age:  10
 #
 error: |
-  :value_notunique    : [/2/name] 'bar': is already used at '/1/name'.
+  :value_notunique    : (line 5)[/2/name] 'bar': is already used at '/1/name'.
 #
 ---
 name:  unique2
@@ -814,5 +830,74 @@ invalid: |
   - bar
 #
 error: |
-  :value_notunique    : [/4] 'bar': is already used at '/2'.
+  :value_notunique    : (line 5)[/4] 'bar': is already used at '/2'.
+#
+---
+name:  default1
+desc:  default value of map
+#
+schema: |
+  type: map
+  mapping:
+    =:
+      type: number
+      range: { min: -10, max: 10 }
+#
+valid: |
+  value1: 0
+  value2: 10
+  value3: -10
+#
+invalid: |
+  value1: 0
+  value2: 20
+  value3: -20
+error: |
+  :range_toolarge     : (line 2)[/value2] '20': too large (> max 10).
+  :range_toosmall     : (line 3)[/value3] '-20': too small (< min -10).
+---
+name:  merge1
+desc:  merge maps
+#
+schema: |
+  type: map
+  mapping:
+   "group":
+      type: map
+      mapping:
+       "name": &name
+          type: str
+          required: yes
+       "email": &email
+          type: str
+          pattern: /@/
+          required: no
+   "user":
+      type: map
+      mapping:
+       "name":
+          <<: *name             # merge
+          length: { max: 16 }   # add
+       "email":
+          <<: *email            # merge
+          required: yes         # override
+#
+valid: |
+  group:
+    name: foo
+    email: foo@mail.com
+  user:
+    name:  bar
+    email: bar@mail.com
+#
+invalid: |
+  group:
+    name: foo
+    email: foo@mail.com
+  user:
+    name: toooooo-looooong-naaaame
+#
+error: |
+  :required_nokey     : (line 4)[/user] key 'email:' is required.
+  :length_toolong     : (line 5)[/user/name] 'toooooo-looooong-naaaame': too long (length 24 > max 16).
 #

data/test/test.rb

@@ -1,25 +1,22 @@
 ###
-### $Rev: 15 $
-### $Release: 0.3.0 $
+### $Rev: 31 $
+### $Release: 0.4.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
-testdir = File.dirname(__FILE__)
-libdir  = File.dirname(testdir) + "/lib"
-$LOAD_PATH << libdir << testdir
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-require 'kwalify'
-require 'kwalify/util/assert-diff'
-require 'yaml'
+unless defined?(TESTDIR)
+   TESTDIR = File.dirname(__FILE__)
+   libdir  = File.dirname(TESTDIR) + "/lib"
+   $LOAD_PATH << libdir << TESTDIR
+end
 
 require 'test-validator.rb'
 require 'test-metavalidator.rb'
+require 'test-parser.rb'
 
-if $0 == __FILE__
-   suite = Test::Unit::TestSuite.new()
-   suite << ValidatorTest.suite()
-   suite << MetaValidatorTest.suite()
-   Test::Unit::UI::Console::TestRunner.run(suite)
-end
+#suite = Test::Unit::TestSuite.new()
+#suite << ValidatorTest.suite()
+#suite << MetaValidatorTest.suite()
+#suite << ParserTest.suite()
+#Test::Unit::UI::Console::TestRunner.run(suite)
 

data/todo.txt

@@ -21,7 +21,7 @@
 .- [v] separate test script
 .- [v] 'range:' or 'value:'
 .- [v] 'length:' or 'width:'
-.- [_] range 'max-ex' and 'min-ex' (or 'ceiling' and 'floor')
+.- [v] range 'max-ex' and 'min-ex' (or 'ceiling' and 'floor')
 .- [_] range 'noteq'
 .- [_] range 'reverse' or 'complement'
 .- [v] type 'scalar'