kwalify 0.2.0 → 0.3.0

data/ChangeLog

@@ -1,8 +1,14 @@
 .=title:          ChangeLog
-.?release:        $Release: 0.2.0 $
+.?release:        $Release: 0.3.0 $
 .?lastupdate:     $Date$
 .?version:        $Rev$
 
+.: 2005-09-30 (release 0.3.0)
+   .* Enhances:
+      .- Support 'max-ex' and 'min-ex' (max/min exclusive) support with 'range:'
+      .- Support 'max-ex' and 'min-ex' (max/min exclusive) support with 'length:'
+      .- Support 'unique' constraint
+
 .: 2005-09-25 (release 0.2.0)
    .* Enhances:
       .- New type 'scalar' and 'timestamp' added

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.2.0 $
+.?release:	$Release: 0.3.0 $
 
 
 .$ About Kwalify

data/bin/kwalify

@@ -2,7 +2,7 @@
 
 ###
 ### $Rev: 12 $
-### $Release: 0.2.0 $
+### $Release: 0.3.0 $
 ### 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-09-25 22:36:35 +0900 (Sun, 25 Sep 2005) $<br>
+      last update: $Date: 2005-10-02 22:45:14 +0900 (Sun, 02 Oct 2005) $<br>
     </div>
 
 <a name="preface"></a>
@@ -82,6 +82,8 @@ Table of Contents:
     </li>
     <li><a href="#schema-rules">Rules</a>
     </li>
+    <li><a href="#schema-unique">Unique constraint</a>
+    </li>
     <li><a href="#schema-hook">Validator#validator_hook()</a>
     </li>
     <li><a href="#schema-block">Validator with Block</a>
@@ -467,6 +469,11 @@ document04b.yaml#0: INVALID
 	String which represents validation expression. String should contain variable name <code>val</code> which repsents value.
 	(This is an experimental function.) 
 </dd>
+<dt class="dt3"><strong>
+<code>unique:</code> </strong></dt>
+<dd class="dd3">
+	Value is unique for mapping or sequence. See the next subsection for detail.
+</dd>
 </dl>
 <a name="schema05.yaml"></a>
 <div class="program_caption">
@@ -554,14 +561,96 @@ document05b.yaml#0: INVALID
 <br>
 
 
+<a name="schema-unique"></a>
+<h3 class="section2">Unique constraint</h3>
+<p>'<code>unique:</code>' constraint is available with elements of sequence or mapping.
+This is equivalent to unique key or primary key of RDBMS.
+</p>
+<p>Type of a rule which has '<code>unique:</code>' constraint should be scalar (str, int, float, ...).
+Type of parent rule should be sequence or mapping.
+</p>
+<a name="schema06.yaml"></a>
+<div class="program_caption">
+<code>schema06.yaml</code> : unique constraint with mapping</div>
+<pre class="program">type: seq
+sequence:
+  - type:     map
+    required: yes
+    mapping:
+      name:
+        type:     str
+        required: yes
+        <strong>unique:   yes</strong>
+      email:
+        type:     str
+      groups:
+        type:     seq
+        sequence:
+          - type: str
+            <strong>unique:   yes</strong>
+</pre>
+<a name="document06a.yaml"></a>
+<div class="program_caption">
+<code>document06a.yaml</code> : valid document example</div>
+<pre class="program">- name:   foo
+  email:  admin@mail.com
+  groups:
+    - users
+    - foo
+    - admin
+- name:   bar
+  email:  admin@mail.com
+  groups:
+    - users
+    - admin
+- name:   baz
+  email:  baz@mail.com
+  groups:
+    - users
+</pre>
+<div class="terminal_caption">
+validate</div>
+<pre class="terminal">$ kwalify -f schema06.yaml document06a.yaml
+document06a.yaml#0: valid.
+</pre>
+<a name="document06b.yaml"></a>
+<div class="program_caption">
+<code>document06b.yaml</code> : invalid document example</div>
+<pre class="program">- name:   foo
+  email:  admin@mail.com
+  groups:
+    - foo
+    - users
+    - admin
+    - foo
+- name:   bar
+  email:  admin@mail.com
+  groups:
+    - admin
+    - users
+- name:   bar
+  email:  baz@mail.com
+  groups:
+    - users
+</pre>
+<div class="terminal_caption">
+validate</div>
+<pre class="terminal">$ kwalify -f schema06.yaml document06b.yaml
+document06b.yaml#0: INVALID
+  - [/0/groups/3] 'foo': is already used at '/0/groups/0'.
+  - [/2/name] 'bar': is already used at '/1/name'.
+</pre>
+<br>
+
+
 <a name="schema-hook"></a>
 <h3 class="section2">Validator#validator_hook()</h3>
 <p>You can extend Kwalify::Validator class and override Kwalify::Validator#validator_hook() method.
 This method is called by Kwalify::Validator#validate().
 </p>
-<a name="schema06.yaml"></a>
+<a name="schema07.yaml"></a>
 <div class="program_caption">
-schema06.yaml : 'name:' is important.</div>
+schema07.yaml : 'name:' is important.</div>
 <pre class="program">type:      map
 mapping:
   questionnaires:
@@ -583,9 +672,9 @@ mapping:
           reason:
             type:      str
 </pre>
-<a name="validate06.rb"></a>
+<a name="validate07.rb"></a>
 <div class="program_caption">
-validate06.rb : validate script</div>
+validate07.rb : validate script</div>
 <pre class="program">#!/usr/bin/env ruby
 
 require 'kwalify'
@@ -595,7 +684,7 @@ require 'yaml'
 class QuestionnairesValidator &lt; Kwalify::Validator
 
    ## load schema definition
-   @@schema = YAML.load_file('schema06.yaml')
+   @@schema = YAML.load_file('schema07.yaml')
 
    def initialize()
       super(@@schema)
@@ -636,9 +725,9 @@ else
    end
 end
 </pre>
-<a name="document06a.yaml"></a>
+<a name="document07a.yaml"></a>
 <div class="program_caption">
-<code>document06a.yaml</code> : valid document example</div>
+<code>document07a.yaml</code> : valid document example</div>
 <pre class="program">questionnaires:
   - name:      Foo
     answer:    good
@@ -651,12 +740,12 @@ end
 </pre>
 <div class="terminal_caption">
 validate</div>
-<pre class="terminal">$ ruby validate06.rb document06a.yaml
+<pre class="terminal">$ ruby validate07.rb document07a.yaml
 Valid.
 </pre>
-<a name="document06b.yaml"></a>
+<a name="document07b.yaml"></a>
 <div class="program_caption">
-<code>document06b.yaml</code> : invalid document example</div>
+<code>document07b.yaml</code> : invalid document example</div>
 <pre class="program">questionnaires:
   - name:    Foo
     answer:   good
@@ -667,7 +756,7 @@ Valid.
 </pre>
 <div class="terminal_caption">
 validate</div>
-<pre class="terminal">$ ruby validate06.rb document06b.yaml
+<pre class="terminal">$ ruby validate07.rb document07b.yaml
 *** INVALID!
  - [/questionnaires/1] : reason is required when answer is 'bad'.
 </pre>
@@ -680,9 +769,9 @@ validate</div>
 </p>
 <p><code>Kwalify::Validator.new()</code> method can take a block which is invoked when validation.
 </p>
-<a name="validate07.rb"></a>
+<a name="validate08.rb"></a>
 <div class="program_caption">
-<code>validate07.rb</code> : validate script</div>
+<code>validate08.rb</code> : validate script</div>
 <pre class="program">#!/usr/bin/env ruby
 
 require 'kwalify'
@@ -723,14 +812,15 @@ end
 </pre>
 <div class="terminal_caption">
 validate</div>
-<pre class="terminal">$ ruby validate07.rb document06a.yaml
-Valid.
+<pre class="terminal">$ ruby validate08.rb document07a.yaml
+*** INVALID!
+ - [/] : not a sequence.
 </pre>
 <div class="terminal_caption">
 validate</div>
-<pre class="terminal">$ ruby validate07.rb document06b.yaml
+<pre class="terminal">$ ruby validate08.rb document07b.yaml
 *** INVALID!
- - [/questionnaires/1] : reason is required when answer is 'bad'.
+ - [/] : not a sequence.
 </pre>
 <br>
 

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

@@ -1,7 +1,7 @@
 ##
 ## Kwalify schema example for address book
 ##
-## $Release: 0.2.0 $
+## $Release: 0.3.0 $
 ## copyright(c) 2005 kuwata-lab all rights reserved.
 ##
 ##
@@ -17,6 +17,7 @@ sequence:
      "name":
         type:      str
         required:  yes
+        unique:    yes
      "email":
         type:      str
         pattern:   /@/

data/examples/invoice/invoice.schema.yaml

@@ -1,15 +1,15 @@
 ###
 ### Kwalify schema example for invoice
 ###
-### $Rev: 18 $
-### $Release: 0.2.0 $
+### $Rev: 20 $
+### $Release: 0.3.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
 type:      map
 required:  yes
 mapping:
- "invoice":  { type: int, required: yes }
+ "invoice":  { type: int, required: yes, unique: yes }
  "date":     { type: date, required: yes }
  "bill-to":  &customer
     type:      map

data/examples/tapkit/tapkit.schema.yaml

@@ -1,7 +1,7 @@
 ##
 ## Kwalify schema example for TapKit
 ##
-## $Release: 0.2.0 $
+## $Release: 0.3.0 $
 ## copyright(c) 2005 kuwata-lab all rights reserved.
 ##
 
@@ -41,6 +41,7 @@ mapping:
          "name":
             type: str
             required: yes
+            unique: yes
          "external_name":
             type: str
             required: yes
@@ -54,6 +55,7 @@ mapping:
             required: yes
             sequence:
               - type: str
+                unique: yes
          "attributes":
             type: seq
             required: yes
@@ -63,6 +65,7 @@ mapping:
                   "name":
                      type: str
                      required: yes
+                     unique: yes
                   "column_name":
                      type: text
                      required: yes
@@ -105,6 +108,7 @@ mapping:
                  "name":
                     type: str
                     required: yes
+                    unique: yes
                  "destination":
                     type: str
                     required: yes

data/lib/kwalify.rb

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

data/lib/kwalify/errors.rb

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

data/lib/kwalify/main-program.rb

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

data/lib/kwalify/messages.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 18 $
-### $Release: 0.2.0 $
+### $Rev: 22 $
+### $Release: 0.3.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
@@ -17,9 +17,8 @@ module Kwalify
    # filename: lib/kwalify/main-program.rb
    @@messages[:action_required]      = "command-line option '-f' or '-m' required."
    @@messages[:meta_schema_empty]    = "%s: empty.\n"
-   @@messages[:meta_validation_invalid] = "%s: NG!\n"
    @@messages[:meta_validation_valid] = "%s: ok.\n"
-   @@messages[:meta_validation_invalid2] = "%s: NG! %s\n"
+   @@messages[:meta_validation_invalid] = "%s: NG!\n"
    @@messages[:schema_empty]         = "%s#%d: empty.\n"
    @@messages[:validation_valid]     = "%s#%d: valid.\n"
    @@messages[:validation_invalid]   = "%s#%d: INVALID\n"
@@ -29,6 +28,7 @@ module Kwalify
    @@messages[:type_notstr]          = "not a string."
    @@messages[:type_unknown]         = "unknown type."
    @@messages[:required_notbool]     = "not a boolean."
+   @@messages[:pattern_notmatch]     = "should be '/..../'."
    @@messages[:pattern_syntaxerr]    = "has regexp error."
    @@messages[:enum_notseq]          = "not a sequence."
    @@messages[:enum_notscalar]       = "not available with seq or map."
@@ -41,10 +41,21 @@ module Kwalify
    @@messages[:range_notscalar]      = "is available only with scalar type."
    @@messages[:range_type_unmatch]   = "not a %s."
    @@messages[:range_undefined]      = "undefined key."
+   @@messages[:range_twomax]         = "both 'max' and 'max-ex' are not available at once."
+   @@messages[:range_twomin]         = "both 'min' and 'min-ex' are not available at once."
    @@messages[:length_notmap]        = "not a mapping."
    @@messages[:length_nottext]       = "is available only with string or text."
    @@messages[:length_notint]        = "not an integer."
    @@messages[:length_undefined]     = "undefined key."
+   @@messages[:length_twomax]        = "both 'max' and 'max-ex' are not available at once."
+   @@messages[:length_twomin]        = "both 'min' and 'min-ex' are not available at once."
+   @@messages[:ident_notbool]        = "not a boolean."
+   @@messages[:ident_notscalar]      = "is available only with a scalar type."
+   @@messages[:ident_onroot]         = "is not available on root element."
+   @@messages[:ident_notmap]         = "is available only with an element of mapping."
+   @@messages[:unique_notbool]       = "not a boolean."
+   @@messages[:unique_notscalar]     = "is available only with a scalar type."
+   @@messages[:unique_onroot]        = "is not available on root element."
    @@messages[:sequence_notseq]      = "not a sequence."
    @@messages[:sequence_noelem]      = "required one element."
    @@messages[:sequence_toomany]     = "required just one element."
@@ -66,8 +77,13 @@ module Kwalify
    @@messages[:pattern_unmatch]      = "not matched to pattern %s."
    @@messages[:range_toolarge]       = "too large (> max %s)."
    @@messages[:range_toosmall]       = "too small (< min %s)."
+   @@messages[:range_toolargeex]     = "too large (>= max %s)."
+   @@messages[:range_toosmallex]     = "too small (<= min %s)."
    @@messages[:length_toolong]       = "too long (length %d > max %d)."
    @@messages[:length_tooshort]      = "too short (length %d < min %d)."
+   @@messages[:length_toolongex]     = "too long (length %d >= max %d)."
+   @@messages[:length_tooshortex]    = "too short (length %d <= min %d)."
+   @@messages[:value_notunique]      = "is already used at '%s'."
    @@messages[:required_nokey]       = "key '%s:' is required."
    @@messages[:key_undefined]        = "key '%s' is undefined."
    # --

data/lib/kwalify/meta-validator.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 18 $
-### $Release: 0.2.0 $
+### $Rev: 21 $
+### $Release: 0.3.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
@@ -65,6 +65,12 @@ mapping:   &main-rule
         type:     scalar
      "min":
         type:     scalar
+     "max-ex":
+        type:     scalar
+     "min-ex":
+        type:     scalar
+     #complement":
+     #   type:     boolean
  "length":
     type:      map
     mapping:
@@ -72,6 +78,14 @@ mapping:   &main-rule
         type:     int
      "min":
         type:     int
+     "max-ex":
+        type:     int
+     "min-ex":
+        type:     int
+ "ident":
+    type:      bool
+ "unique":
+    type:      bool
  "sequence":
     name:      SEQUENCE
     type:      seq
@@ -116,11 +130,11 @@ END
          type = hash['type']
          type = Kwalify::DEFAULT_TYPE if type == nil
          unless type.is_a?(String)
-            errors << Kwalify.validate_error(:type_notstr, rule, "#{path}/type", type.to_s)
+            errors << validate_error(:type_notstr, rule, "#{path}/type", type.to_s)
          end
          klass = Kwalify.get_type_class(type)
          unless klass
-            errors << Kwalify.validate_error(:type_unknown, rule, "#{path}/type", type.to_s)
+            errors << validate_error(:type_unknown, rule, "#{path}/type", type.to_s)
          end
          #
          if hash.key?('pattern')
@@ -129,22 +143,22 @@ END
             begin
                Regexp.compile(pat)
             rescue RegexpError => ex
-               errors << Kwalify.validate_error(:pattern_syntaxerr, rule, "#{path}/pattern", val)
+               errors << validate_error(:pattern_syntaxerr, rule, "#{path}/pattern", val)
             end
          end
          #
          if hash.key?('enum')
             if type == 'seq' || type == 'map'   # unless Kwalify.scalar_class?(klass)
-               errors << schema_error(:enum_notscalar, rule, path, 'enum:')
+               errors << validate_error(:enum_notscalar, rule, path, 'enum:')
             else
                elem_table = {}
                hash['enum'].each do |elem|
                   if elem_table[elem]
-                     errors << Kwalify.validate_error(:enum_duplicate, rule, "#{path}/enum", elem.to_s)
+                     errors << validate_error(:enum_duplicate, rule, "#{path}/enum", elem.to_s)
                   end
                   elem_table[elem] = true
                   unless elem.is_a?(klass)
-                     errors << schema_error(:enum_type_unmatch, rule, "#{path}/enum", elem, [Kwalify.word(type)])
+                     errors << validate_error(:enum_type_unmatch, rule, "#{path}/enum", elem, [Kwalify.word(type)])
                   end
                end
             end
@@ -152,11 +166,11 @@ END
          #
          if hash.key?('assert')
             val =  hash['assert']
-            val =~ /\bval\b/ or errors << Kwalify.validate_error(:assert_noval, rule, "#{path}/assert", val)
+            val =~ /\bval\b/ or errors << validate_error(:assert_noval, rule, "#{path}/assert", val)
             begin
                eval "proc { |val| #{val} }"
             rescue SyntaxError => ex
-               errors << Kwalify.validate_error(:assert_syntaxerr, rule, "#{path}/assert", val)
+               errors << validate_error(:assert_syntaxerr, rule, "#{path}/assert", val)
             end
          end
          #
@@ -164,84 +178,124 @@ END
             val = hash['range']
             curr_path = path + "/range"
             if ! val.is_a?(Hash)
-               errors << Kwalify.validate_error(:range_notmap, rule, curr_path, val)
+               errors << validate_error(:range_notmap, rule, curr_path, val)
             elsif type == 'seq' || type == 'map' || type == 'bool' || type == 'any'
-               errors << Kwalify.validate_error(:range_notscalar, rule, path, 'range:')
+               errors << validate_error(:range_notscalar, rule, path, 'range:')
             else
                val.each do |rkey, rval|
-                  case rkey
-                  when 'max', 'min'
+                  #case rkey
+                  #when 'max', 'min', 'max-ex', 'min-ex'
                      unless rval.is_a?(klass)
                         typename = Kwalify.word(type) || type
-                        errors << Kwalify.validate_error(:range_type_unmatch, rule, "#{curr_path}/#{rkey}", rval, [typename])
+                        errors << validate_error(:range_type_unmatch, rule, "#{curr_path}/#{rkey}", rval, [typename])
                      end
-                  else
-                     errors << Kwalify.validate_error(:range_undefined, rule, curr_path, "#{rkey}:")
-                  end
+                  #else
+                  #   errors << validate_error(:range_undefined, rule, curr_path, "#{rkey}:")
+                  #end
                end
             end
+            if val.key?('max') && val.key?('max-ex')
+               errors << validate_error(:range_twomax, rule, curr_path, nil)
+            end
+            if val.key?('min') && val.key?('min-ex')
+               errors << validate_error(:range_twomin, rule, curr_path, nil)
+            end
          end
          #
          if hash.key?('length')
             val = hash['length']
             curr_path = path + "/length"
-            val.is_a?(Hash) or errors << Kwalify.validate_error(:length_notmap, rule, curr_path, val)
+            val.is_a?(Hash) or errors << validate_error(:length_notmap, rule, curr_path, val)
             unless type == 'str' || type == 'text'
                errors << validate_error(:length_nottext, rule, path, 'length:')
             end
             val.each do |lkey, lval|
-               case lkey
-               when 'max', 'min'
+               #case lkey
+               #when 'max', 'min', 'max-ex', 'min-ex'
                   unless lval.is_a?(Integer)
-                     errors << Kwalify.validate_error(:length_notint, rule, "#{curr_path}/#{lkey}", lval)
+                     errors << validate_error(:length_notint, rule, "#{curr_path}/#{lkey}", lval)
                   end
-               else
-                  errors << validate_error(:length_undefined, rule, curr_path, "#{lkey}:")
-               end
+               #else
+               #   errors << validate_error(:length_undefined, rule, curr_path, "#{lkey}:")
+               #end
+            end
+            if val.key?('max') && val.key?('max-ex')
+               errors << validate_error(:length_twomax, rule, curr_path, nil)
+            end
+            if val.key?('min') && val.key?('min-ex')
+               errors << validate_error(:length_twomin, rule, curr_path, nil)
+            end
+         end
+         #
+         if hash.key?('unique')
+            if hash['unique'] && (type == 'map' || type == 'seq')
+               errors << validate_error(:unique_notscalar, rule, path, "unique:")
+            end
+            if path.empty?
+               errors << validate_error(:unique_onroot, rule, "/", "unique:")
+            end
+         end
+         #
+         if hash.key?('ident')
+            if hash['ident'] && (type == 'map' || type == 'seq')
+               errors << validate_error(:ident_notscalar, rule, path, "ident:")
+            end
+            if path.empty?
+               errors << validate_error(:ident_onroot, rule, "/", "ident:")
             end
          end
          #
          if hash.key?('sequence')
             val = hash['sequence']
             if val != nil && !val.is_a?(Array)
-               errors << Kwalify.validate_error(:sequence_notseq,  rule, "#{path}/sequence", val)
+               errors << validate_error(:sequence_notseq,  rule, "#{path}/sequence", val)
             elsif val == nil || val.empty?
-               errors << Kwalify.validate_error(:sequence_noelem,  rule, "#{path}/sequence", val)
+               errors << validate_error(:sequence_noelem,  rule, "#{path}/sequence", val)
             elsif val.length > 1
-               errors << Kwalify.validate_error(:sequence_toomany, rule, "#{path}/sequence", val)
+               errors << validate_error(:sequence_toomany, rule, "#{path}/sequence", val)
+            else
+               child = hash['sequence'][0]
+               if child.is_a?(Hash)
+                  if child['ident'] && child['type'] != 'map'
+                     errors << validate_error(:ident_notmap, nil, "#{path}/sequence/0", 'ident:')
+                  end
+                  #if child['unique'] && child['type'] != 'map'
+                  #   errors << validate_error(:unique_notmap, nil, "#{path}/sequence/0", 'unique:')
+                  #end
+               end
             end
          end
          #
          if hash.key?('mapping')
             val = hash['mapping']
             if val != nil && !val.is_a?(Hash)
-               errors << Kwalify.validate_error(:mapping_notmap,   rule, "#{path}/mapping", val)
+               errors << validate_error(:mapping_notmap,   rule, "#{path}/mapping", val)
             elsif val == nil || val.empty?
-               errors << Kwalify.validate_error(:mapping_noelem,   rule, "#{path}/mapping", val)
+               errors << validate_error(:mapping_noelem,   rule, "#{path}/mapping", val)
             end
          end
          #
          if type == 'seq'
-            errors << Kwalify.validate_error(:seq_nosequence, rule, path, nil)      unless hash.key?('sequence')
-            #errors << Kwalify.validate_error(:seq_conflict, rule, path, 'enum:')        if hash.key?('enum')
-            errors << Kwalify.validate_error(:seq_conflict, rule, path, 'pattern:')     if hash.key?('pattern')
-            errors << Kwalify.validate_error(:seq_conflict, rule, path, 'mapping:')     if hash.key?('mapping')
-            #errors << Kwalify.validate_error(:seq_conflict, rule, path, 'range:')       if hash.key?('range')
-            errors << Kwalify.validate_error(:seq_conflict, rule, path, 'length:')      if hash.key?('length')
+            errors << validate_error(:seq_nosequence, rule, path, nil)      unless hash.key?('sequence')
+            #errors << validate_error(:seq_conflict, rule, path, 'enum:')        if hash.key?('enum')
+            errors << validate_error(:seq_conflict, rule, path, 'pattern:')     if hash.key?('pattern')
+            errors << validate_error(:seq_conflict, rule, path, 'mapping:')     if hash.key?('mapping')
+            #errors << validate_error(:seq_conflict, rule, path, 'range:')       if hash.key?('range')
+            errors << validate_error(:seq_conflict, rule, path, 'length:')      if hash.key?('length')
          elsif type == 'map'
-            errors << Kwalify.validate_error(:map_nomapping, rule, path, nil)       unless hash.key?('mapping')
-            #errors << Kwalify.validate_error(:map_conflict, rule, path, 'enum:')        if hash.key?('enum')
-            errors << Kwalify.validate_error(:map_conflict, rule, path, 'pattern:')     if hash.key?('pattern')
-            errors << Kwalify.validate_error(:map_conflict, rule, path, 'sequence:')    if hash.key?('sequence')
-            #errors << Kwalify.validate_error(:map_conflict, rule, path, 'range:')       if hash.key?('range')
-            errors << Kwalify.validate_error(:map_conflict, rule, path, 'length:')      if hash.key?('length')
+            errors << validate_error(:map_nomapping, rule, path, nil)       unless hash.key?('mapping')
+            #errors << validate_error(:map_conflict, rule, path, 'enum:')        if hash.key?('enum')
+            errors << validate_error(:map_conflict, rule, path, 'pattern:')     if hash.key?('pattern')
+            errors << validate_error(:map_conflict, rule, path, 'sequence:')    if hash.key?('sequence')
+            #errors << validate_error(:map_conflict, rule, path, 'range:')       if hash.key?('range')
+            errors << validate_error(:map_conflict, rule, path, 'length:')      if hash.key?('length')
          else
-            errors << Kwalify.validate_error(:scalar_conflict, rule, path, 'sequence:') if hash.key?('sequence')
-            errors << Kwalify.validate_error(:scalar_conflict, rule, path, 'mapping:')  if hash.key?('mapping')
+            errors << validate_error(:scalar_conflict, rule, path, 'sequence:') if hash.key?('sequence')
+            errors << validate_error(:scalar_conflict, rule, path, 'mapping:')  if hash.key?('mapping')
             if hash.key?('enum')
-               errors << Kwalify.validate_error(:enum_conflict, rule, path, 'range:')   if hash.key?('range')
-               errors << Kwalify.validate_error(:enum_conflict, rule, path, 'length:')  if hash.key?('length')
-               errors << Kwalify.validate_error(:enum_conflict, rule, path, 'pattern:') if hash.key?('pattern')
+               errors << validate_error(:enum_conflict, rule, path, 'range:')   if hash.key?('range')
+               errors << validate_error(:enum_conflict, rule, path, 'length:')  if hash.key?('length')
+               errors << validate_error(:enum_conflict, rule, path, 'pattern:') if hash.key?('pattern')
             end
          end