kwalify 0.4.0 → 0.4.1

data/ChangeLog

@@ -1,8 +1,13 @@
 .=title:          ChangeLog
-.?release:        $Release: 0.4.0 $
+.?release:        $Release: 0.4.1 $
 .?lastupdate:     $Date$
 .?version:        $Rev$
 
+.: 2005-10-26 (release 0.4.1)
+   .* Bugfix:
+      .- Support Ruby 1.8.3 (around YAML::Syck::DomainType)
+      .- Show correct error line number when key is undefined or unknown.
+
 .: 2005-10-25 (release 0.4.0)
    .* Enhances:
       .- New command-line option '-l' prints error line numbers.

data/README.txt

@@ -1,7 +1,7 @@
 .=title:	README
 .?version:	$Rev: 18 $
 .?lastupdate:	$Date: 2005-09-25 22:36:35 +0900 (Sun, 25 Sep 2005) $
-.?release:	$Release: 0.4.0 $
+.?release:	$Release: 0.4.1 $
 
 
 .$ About Kwalify

data/bin/kwalify

@@ -2,7 +2,7 @@
 
 ###
 ### $Rev: 12 $
-### $Release: 0.4.0 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 

data/doc/users-guide.html

@@ -15,7 +15,7 @@
     <div align="left"><h1>Kwalify Users' Guide</h1></div>
     <div align="left">
       makoto kuwata &lt;kwa(at)kuwata-lab.com&gt;<br>
-      last update: $Date: 2005-10-25 08:01:14 +0900 (Tue, 25 Oct 2005) $<br>
+      last update: $Date: 2005-10-26 11:38:26 +0900 (Wed, 26 Oct 2005) $<br>
     </div>
 
 <a name="preface"></a>
@@ -356,8 +356,8 @@ validate</div>
 <pre class="terminal">$ kwalify -lf schema03.yaml document03b.yaml
 document03b.yaml#0: INVALID
   - (line 3) [/1] key 'name:' is required.
-  - (line 3) [/1] key 'naem:' is undefined.
-  - (line 5) [/2] key 'mail:' is undefined.
+  - (line 3) [/1/naem] key 'naem:' is undefined.
+  - (line 6) [/2/mail] key 'mail:' is undefined.
 </pre>
 <br>
 
@@ -424,7 +424,7 @@ validate</div>
 <pre class="terminal">$ kwalify -lf schema04.yaml document04b.yaml
 document04b.yaml#0: INVALID
   - (line 4) [/employees/0/code] 'A101': not a integer.
-  - (line 7) [/employees/1] key 'mail:' is undefined.
+  - (line 9) [/employees/1/mail] key 'mail:' is undefined.
 </pre>
 <br>
 
@@ -604,9 +604,9 @@ document05b.yaml#0: INVALID
   - (line 3) [/0/password] 'xxx123': too short (length 6 &lt; min 8).
   - (line 4) [/0/age] 'twenty': not a integer.
   - (line 5) [/0/blood] 'a': invalid blood value.
-  - (line 7) [/1] key 'given-name:' is undefined.
-  - (line 7) [/1] key 'family-name:' is undefined.
+  - (line 7) [/1/given-name] key 'given-name:' is undefined.
   - (line 7) [/1] key 'name:' is required.
+  - (line 8) [/1/family-name] key 'family-name:' is undefined.
   - (line 10) [/1/age] '15': too small (&lt; min 18).
   - (line 12) [/1/birth] '1980/01/01': not a date.
 </pre>
@@ -986,7 +986,7 @@ validate</div>
 <pre class="terminal">$ kwalify -lf schema12.yaml document12b.yaml
 document12b.yaml#0: INVALID
   - (line 1) [/] key 'name:' is required.
-  - (line 1) [/] key 'mail:' is undefined.
+  - (line 2) [/mail] key 'mail:' is undefined.
   - (line 3) [/age] 'twenty': not a integer.
   - (line 4) [/gender] 'X': invalid gender value.
   - (line 5) [/favorite/0] '123': not a string.

data/examples/address-book/address-book.schema.yaml

@@ -1,7 +1,7 @@
 ##
 ## Kwalify schema example for address book
 ##
-## $Release: 0.4.0 $
+## $Release: 0.4.1 $
 ## copyright(c) 2005 kuwata-lab all rights reserved.
 ##
 ##

data/examples/invoice/invoice.schema.yaml

@@ -2,7 +2,7 @@
 ### Kwalify schema example for invoice
 ###
 ### $Rev: 20 $
-### $Release: 0.4.0 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 

data/examples/tapkit/tapkit.schema.yaml

@@ -1,7 +1,7 @@
 ##
 ## Kwalify schema example for TapKit
 ##
-## $Release: 0.4.0 $
+## $Release: 0.4.1 $
 ## copyright(c) 2005 kuwata-lab all rights reserved.
 ##
 

data/lib/kwalify.rb

@@ -1,13 +1,13 @@
 ###
 ### $Rev: 26 $
-### $Release: 0.4.0 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
 
 module Kwalify
 
-   RELEASE = ("$Release: 0.4.0 $" =~ /[.\d]+/) && $&
+   RELEASE = ("$Release: 0.4.1 $" =~ /[.\d]+/) && $&
 
 end
 

data/lib/kwalify/errors.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 27 $
-### $Release: 0.4.0 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 

data/lib/kwalify/main-program.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 26 $
-### $Release: 0.4.0 $
+### $Rev: 39 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
@@ -69,7 +69,7 @@ module Kwalify
             doc = @parser.parse()
          else
             doc = YAML.load(str)
-            doc = doc.value if doc.is_a?(YAML::Syck::DomainType)
+            doc = doc.value if _domain_type?(doc)
          end
          return doc
       end
@@ -185,7 +185,7 @@ module Kwalify
             yield(doc)
          else
             YAML::load_documents(str) do |doc|
-               doc = doc.value if doc.is_a?(YAML::Syck::DomainType)
+               doc = doc.value if _domain_type?(doc)
                yield(doc)
             end
          end
@@ -247,6 +247,11 @@ module Kwalify
          options[:debug]    = opts[?D]
          return options, properties
       end
+      
+      def _domain_type?(doc)
+         klass = defined?(YAML::DomainType) ? YAML::DomainType : YAML::Syck::DomainType
+         return doc.is_a?(klass)
+      end
 
    end
 

data/lib/kwalify/messages.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 22 $
-### $Release: 0.4.0 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 

data/lib/kwalify/meta-validator.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 35 $
-### $Release: 0.4.0 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 

data/lib/kwalify/parser.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 35 $
-### $Release: 0.4.0 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 

data/lib/kwalify/rule.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 35 $
-### $Release: 0.4.0 $
+### $Rev: 39 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
@@ -145,7 +145,7 @@ module Kwalify
                      end
                   else
                      #* key=:range_undefined  msg="undefined key."
-                     raise schema_error(:range_undefined, rule, curr_path, "#{rkey}:")
+                     raise schema_error(:range_undefined, rule, "#{curr_path}/#{rkey}", "#{rkey}:")
                   end
                end
                if val.key?('max') && val.key?('max-ex')
@@ -176,7 +176,7 @@ module Kwalify
                      end
                   else
                      #* key=:length_undefined  msg="undefined key."
-                     raise schema_error(:length_undefined, rule, curr_path, "#{lkey}:")
+                     raise schema_error(:length_undefined, rule, "#{curr_path}/#{lkey}", "#{lkey}:")
                   end
                end
                if val.key?('max') && val.key?('max-ex')
@@ -277,7 +277,7 @@ module Kwalify
 
             else
                #* key=:key_unknown  msg="unknown key."
-               raise schema_error(:key_unknown, rule, path, "#{key}:")
+               raise schema_error(:key_unknown, rule, curr_path, "#{key}:")
             end
          end
 

data/lib/kwalify/types.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 25 $
-### $Release: 0.4.0 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 

data/lib/kwalify/util/assert-diff.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 5 $
-### $Release: 0.4.0 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 

data/lib/kwalify/util/option-parser.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 6 $
-### $Release: 0.4.0 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 

data/lib/kwalify/util/yaml-helper.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 10 $
-### $Release: 0.4.0 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 

data/lib/kwalify/validator.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 32 $
-### $Release: 0.4.0 $
+### $Rev: 39 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
@@ -211,9 +211,9 @@ module Kwalify
             rule = map_rule.mapping[key]
             unless rule
                #* key=:key_undefined  msg="key '%s' is undefined."
-               errors << validate_error(:key_undefined, rule, path, hash, ["#{key}:"])
+               errors << validate_error(:key_undefined, rule, "#{path}/#{key}", hash, ["#{key}:"])
                ##* key=:key_undefined  msg="undefined key."
-               #errors << validate_error(:key_undefined, rule, path, "#{key}:")
+               #errors << validate_error(:key_undefined, rule, "#{path}/#{key}", "#{key}:")
             else
                _validate(val, rule, "#{path}/#{key}", errors, done)   ## validate recursively
             end

data/test/test-metavalidator.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 31 $
-### $Release: 0.4.0 $
+### $Rev: 39 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
@@ -335,12 +335,12 @@ schema: |
   range: { max: 10, mim: 1 }
 #
 meta-msg: |
-  :key_undefined      : [/range] key 'mim:' is undefined.
-#  :key_undefined      : [/range] 'mim:': undefined key.
+  :key_undefined      : [/range/mim] key 'mim:' is undefined.
+#  :key_undefined      : [/range/mim] 'mim:': undefined key.
 #
 rule-msg: |
-  :range_undefined    : [/range] 'mim:': undefined key.
-#  :range_undefined    : [/range] key 'mim:' undefined key.
+  :range_undefined    : [/range/mim] 'mim:': undefined key.
+#  :range_undefined    : [/range/mim] key 'mim:' undefined key.
 #
 ---
 name:   range_twomax
@@ -407,12 +407,12 @@ schema: |
   length: { maximum: 10 }
 #
 meta-msg: |
-  :key_undefined      : [/length] key 'maximum:' is undefined.
-#  :key_undefined      : [/length] 'maximum:': undefined key.
+  :key_undefined      : [/length/maximum] key 'maximum:' is undefined.
+#  :key_undefined      : [/length/maximum] 'maximum:': undefined key.
 #
 rule-msg: |
-  :length_undefined   : [/length] 'maximum:': undefined key.
-#  :length_undefined   : [/length] key 'maximum:' is undefined.
+  :length_undefined   : [/length/maximum] 'maximum:': undefined key.
+#  :length_undefined   : [/length/maximum] key 'maximum:' is undefined.
 #
 ---
 name:   length_twomax
@@ -515,12 +515,12 @@ schema: |
     - two
 #
 meta-msg: |
-  :key_undefined      : [/] key 'values:' is undefined.
-#  :key_undefined      : [/] 'values:': undefined key.
+  :key_undefined      : [/values] key 'values:' is undefined.
+#  :key_undefined      : [/values] 'values:': undefined key.
 #
 rule-msg: |
-  :key_unknown        : [/] 'values:': unknown key.
-#  :key_unknown        : [/] key 'values:' is unknown.
+  :key_unknown        : [/values] 'values:': unknown key.
+#  :key_unknown        : [/values] key 'values:' is unknown.
 #
 ---
 name:  seq_nosequence

data/test/test-parser.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 35 $
-### $Release: 0.4.0 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 

data/test/test-validator.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 35 $
-### $Release: 0.4.0 $
+### $Rev: 39 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
@@ -132,7 +132,7 @@ invalid: |
 #
 error: |
   :required_nokey     : (line 1)[/] key 'name:' is required.
-  :key_undefined      : (line 1)[/] key 'nam:' is undefined.
+  :key_undefined      : (line 1)[/nam] 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.
@@ -220,7 +220,7 @@ invalid: |
 #
 error: |
   :required_nokey     : (line 2)[/address-book/0] key 'email:' is required.
-  :key_undefined      : (line 2)[/address-book/0] key 'mail:' is undefined.
+  :key_undefined      : (line 3)[/address-book/0/mail] 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.
@@ -256,7 +256,7 @@ invalid: |
 #
 error: |
   :required_nokey     : (line 1)[/0] key 'family-name:' is required.
-  :key_undefined      : (line 1)[/0] key 'last-name:' is undefined.
+  :key_undefined      : (line 2)[/0/last-name] key 'last-name:' is undefined.
   :type_unmatch       : (line 4)[/1/family-name] '100': not a string.
 #
 ---
@@ -300,7 +300,7 @@ invalid: |
 error: |
   :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.
+  :key_undefined      : (line 5)[/address-book/1/first-name] key 'first-name:' is undefined.
 #
 ---
 name:  anchor3

data/test/test.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 31 $
-### $Release: 0.4.0 $
+### $Release: 0.4.1 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: kwalify
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
-date: 2005-10-25 00:00:00 +09:00
+  version: 0.4.1
+date: 2005-10-26 00:00:00 +09:00
 summary: a tiny schema validator for YAML document.
 require_paths: 
 - lib