kwalify 0.1.0 → 0.2.0

data/test/test.rb

@@ -1,364 +1,25 @@
 ###
-### $Rev: 7 $
-### $Release: 0.1.0 $
+### $Rev: 15 $
+### $Release: 0.2.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
-BASE_DIR = File::dirname($0)
-$: << "#{BASE_DIR}/../lib"
-$: << "#{BASE_DIR}/../../lib"
-
+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'
-require 'pp'
-
-class ValidatorTest < Test::Unit::TestCase
-
-   def _test(flag_print=false)
-      schema   = YAML.load(@schema.gsub(/^\t/, ''))
-      document = YAML.load(@data.gsub(/^\t/, ''))
-      validator = Kwalify::Validator.new(schema)
-      error_list  = validator.validate(document)
-      actual = ""
-      error_list.each do |error|
-         actual << "%-20s: %s\n" % [error.error_symbol.inspect, error.message]
-      end
-      if flag_print
-         print actual
-      else
-         assert_equal_with_diff(@expected.gsub(/^\t/, ''), actual)
-      end
-      return error_list
-   end
-
-
-   def test_validate01
-      @schema = <<-'END'
-	type:        map
-	required:    true
-	mapping:
-	  name:
-	    type:       string
-	    required:   true
-	  email:
-	    type:       string
-	    pattern:    /@/
-	    required:   yes
-	  age:
-	    type:       integer
-	  blood:
-	    type:       string
-	    enum:
-	      - A
-	      - B
-	      - O
-	      - AB
-	  birth:
-	    type:       date
-	END
-      ## correct data
-      @data = <<-'END'
-	name:   foo
-	email:  foo@mail.com
-	age:    20
-	blood:  AB
-	birth:   1985-01-01
-	END
-      @expected = ""
-      errors = _test()
-      ## incorrect data
-      @data = <<-'END'
-	nam:    foo
-	email:  foo(at)mail.com
-	age:    twenty
-	blood:  ab
-	birth:  Jul 01, 1985
-	END
-      @expected = <<-'END'
-	:missing_key        : [/] key 'name' required but not found.
-	:invalid_key        : [/] key 'nam' is not expected.
-	:invalid_enum       : [/blood] 'ab' is invalid enum value.
-	:invalid_type       : [/birth] date type expected but got String.
-	:invalid_type       : [/age] integer type expected but got String.
-	:invalid_pattern    : [/email] 'foo(at)mail.com' is not matched to pattern /@/.
-	END
-      errors = _test()
-   end
-   
-
-
-   def test_validate02
-      @schema = <<-'END'
-	type:        seq
-	required:    true
-	sequence:
-	  - type:       string
-	    required:   true
-	END
-      ## correct data
-      @data = <<-'END'
-	- foo
-	- bar
-	- baz
-	END
-      @expected = ''
-      _test()
-      ## incorrect data
-      @data = <<-'END'
-	- foo
-	- bar
-	- 
-	- baz
-	- 100
-	END
-      @expected = <<-'END'
-	:missing_value      : [/3] value required but not found.
-	:invalid_type       : [/5] string type expected but got Fixnum.
-	END
-      errors = _test()
-   end
-
-
-   def test_validate03
-      @schema = <<-'END'
-	type:        map
-	required:    true
-	mapping:
-	  address-book:
-	    type:       seq
-	    required:   true
-	    sequence:
-	      - type:   map
-	        mapping:
-	          name:
-	            type:       string
-	            required:   yes
-	          email:
-	            type:       string
-	            pattern:    /@/
-	            required:   yes
-	          age:
-	            type:       integer
-	          blood:
-	            type:       string
-	            enum:
-	              - A
-	              - B
-	              - O
-	              - AB
-	          birth:
-	            type:       date
-	END
-      ## correct data
-      @data = <<-'END'
-	address-book:
-	  - name:       foo
-	    email:      foo@mail.com
-	    age:        20
-	    blood:      AB
-	    birth:      1985-01-01
-	  - name:       bar
-	    email:      foo@mail.com
-	END
-      @expected = <<-'END'
-	END
-      errors = _test()
-      ## incorrect data
-      @data = <<-'END'
-	address-book:
-	  - name:       foo
-	    mail:       foo@mail.com
-	    age:        twenty
-	    blood:      ab
-	    birth:      1985/01/01
-	  - name:       bar
-	    email:      bar(at)mail.com
-	END
-      @expected = <<-'END'
-	:missing_key        : [/address-book/1] key 'email' required but not found.
-	:invalid_key        : [/address-book/1] key 'mail' is not expected.
-	:invalid_enum       : [/address-book/1/blood] 'ab' is invalid enum value.
-	:invalid_type       : [/address-book/1/birth] date type expected but got String.
-	:invalid_type       : [/address-book/1/age] integer type expected but got String.
-	:invalid_pattern    : [/address-book/2/email] 'bar(at)mail.com' is not matched to pattern /@/.
-	END
-      errors = _test()
-   end
-
-
-
-   def test_validate11
-      @schema = <<-'END'
-	type:        seq
-	required:    true
-	sequence:
-	  - type:        map
-	    required:    true
-	    mapping:
-	      first-name: &name
-	        type:       string
-	        required:   yes
-	      family-name: *name
-	END
-      ## correct data
-      @data = <<-'END'
-	- first-name:  foo
-	  family-name: Foo
-	- first-name:  bar
-	  family-name: Bar
-	END
-      @expected = <<-'END'
-	END
-      errors = _test()
-      ## incorrect data
-      @data = <<-'END'
-	- first-name:  foo
-	  last-name:   Foo
-	- first-name:  bar
-	  family-name: 100
-	END
-      @expected = <<-'END'
-	:missing_key        : [/1] key 'family-name' required but not found.
-	:invalid_key        : [/1] key 'last-name' is not expected.
-	:invalid_type       : [/2/family-name] string type expected but got Fixnum.
-	END
-      errors = _test()
-   end
-
-
-
-   def test_validate12
-      @schema = <<-'END'
-	type:        map
-	required:    true
-	mapping:
-	  title: &name
-	    type:       string
-	    required:   true
-	  address-book:
-	    type:       seq
-	    required:   true
-	    sequence:
-	      - type:   map
-	        mapping:
-	          name: *name
-	          email:
-	            type:       string
-	            required:   yes
-	END
-      ## correct data
-      @data = <<-'END'
-	title:   my friends
-	address-book:
-	  - name:   foo
-	    email:  foo@mail.com
-	  - name:   bar
-	    email:  bar@mail.com
-	END
-      @expected = ""
-      errors = _test()
-      ## incorrect data
-      @data = <<-'END'
-	title:   my friends
-	address-book:
-	  - name:  100
-	    email: foo@mail.com
-	  - first-name:  bar
-	    email: bar@mail.com
-	END
-      @expected = <<-'END'
-	:invalid_type       : [/address-book/1/name] string type expected but got Fixnum.
-	:missing_key        : [/address-book/2] key 'name' required but not found.
-	:invalid_key        : [/address-book/2] key 'first-name' is not expected.
-	END
-      errors = _test()
-   end
-
-
-
-   def test_validate13
-      @schema = <<-'END'
-	type:        seq
-	sequence:
-	  - &employee
-	    type:    map
-	    mapping:
-	      name:
-	        type:   string
-	      post:
-	        enum:
-	          - exective
-	          - manager
-	          - clerk
-	      supervisor: *employee
-	END
-      ## correct data
-      @data = <<-'END'
-	- &foo
-	  name:  foo
-	  post:  exective
-	- &bar
-	  name:  bar
-	  post:  manager
-	  supervisor: *foo
-	- &baz
-	  name:  baz
-	  post:  clerk
-	  supervisor: *bar
-	- &zak
-	  name:  zak
-	  post:  clerk
-	  supervisor: *bar
-	END
-      @expected = ""
-      errors = _test()
-      ## incorrect data
-      @data = <<-'END'
-	- &foo
-	  name:  100
-	  post:  exective
-	  supervisor: *foo
-	- &bar
-	  name:  foo
-	  post:  worker
-	  supervisor: *foo
-	END
-      @expected = <<-'END'
-	:invalid_type       : [/1/name] string type expected but got Fixnum.
-	:invalid_enum       : [/2/post] 'worker' is invalid enum value.
-	END
-      errors = _test()
-   end
-
-
-
-#   def test_validateXX
-#      @schema = <<-'END'
-#	END
-#      ## correct data
-#      @data = <<-'END'
-#	END
-#      @expected = <<-'END'
-#	END
-#      errors = _test()
-#      ## incorrect data
-#      @data = <<-'END'
-#	END
-#      @expected = <<-'END'
-#	END
-#      errors = _test()
-#   end
 
+require 'test-validator.rb'
+require 'test-metavalidator.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()
-Test::Unit::UI::Console::TestRunner.run(suite)
-

data/todo.txt

@@ -8,9 +8,9 @@
 .- [v] examples
 .- [v] gemspec
 .- [_] 'unique-keys:'
-.- [_] 'not-null:'
-.- [_] 'primary-key:'
-.- [_] 'constraints:'
+.- [-] 'not-null:'
+.- [-] 'primary-key:'
+.- [-] 'constraints:'
 .- [v] meta-validation
 .- [v] use 'sequence'/'mapping' or  'hash-elems'/'list-elems' instead of 'elements'
 .- [X] 'default:'
@@ -18,4 +18,14 @@
 .- [v] type 'Object'
 .- [_] check RelaxNG
 .- [_] check XML Schema type
-.- [_] separate test script
+.- [v] separate test script
+.- [v] 'range:' or 'value:'
+.- [v] 'length:' or 'width:'
+.- [_] range 'max-ex' and 'min-ex' (or 'ceiling' and 'floor')
+.- [_] range 'noteq'
+.- [_] range 'reverse'
+.- [v] type 'scalar'
+.- [_] type 'collection'
+.- [_] 'multiple: yes'
+.- [v] support validator hook method
+.- [_] test for kwalify command

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: kwalify
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2005-08-01
+  version: 0.2.0
+date: 2005-09-25
 summary: a tiny schema validator for YAML document.
 require_paths: 
   - lib
@@ -29,11 +29,13 @@ authors:
 files: 
   - lib/kwalify.rb
   - lib/kwalify
-  - lib/kwalify/error-msg.rb
+  - lib/kwalify/main-program.rb
+  - lib/kwalify/rule.rb
   - lib/kwalify/types.rb
   - lib/kwalify/validator.rb
   - lib/kwalify/errors.rb
   - lib/kwalify/meta-validator.rb
+  - lib/kwalify/messages.rb
   - lib/kwalify/util
   - lib/kwalify/util/yaml-helper.rb
   - lib/kwalify/util/option-parser.rb
@@ -41,13 +43,20 @@ files:
   - bin/kwalify
   - examples/invoice
   - examples/address-book
+  - examples/tapkit
   - examples/invoice/invoice.schema.yaml
   - examples/invoice/invoice.yaml
   - examples/invoice/Makefile
   - examples/address-book/Makefile
   - examples/address-book/address-book.schema.yaml
   - examples/address-book/address-book.yaml
+  - examples/tapkit/tapkit.schema.yaml
+  - examples/tapkit/tapkit.yaml
+  - examples/tapkit/Makefile
   - test/test.rb
+  - test/test-metavalidator.rb
+  - test/test-validator.rb
+  - test/test-metavalidator.rb.error
   - doc/users-guide.html
   - doc/docstyle.css
   - README.txt