kwalify 0.4.1 → 0.5.0

data/lib/kwalify/types.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 25 $
-### $Release: 0.4.1 $
+### $Rev: 42 $
+### $Release: 0.5.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
@@ -79,41 +79,49 @@ end
 
 module Kwalify
 
-   DEFAULT_TYPE = "str"           ## use "str" as default of @type
-
-   @@type_table = {
-      "seq"       => Array,
-      "map"       => Hash,
-      "str"       => String,
-      #"string"    => String,
-      "text"      => Text,
-      "int"       => Integer,
-      #"integer"   => Integer,
-      "float"     => Float,
-      "number"    => Numeric,
-      #"numeric"   => Numeric,
-      "date"      => Date,
-      "time"      => Time,
-      "timestamp" => Time,
-      "bool"      => Boolean,
-      #"boolean"   => Boolean,
-      #"object"    => Object,
-      "any"       => Object,
-      "scalar"    => Scalar,
-   }
-
-   def self.type_table
-      return @@type_table
-   end
 
-   def self.get_type_class(type)
-      klass = @@type_table[type]
-      #assert_error('type=#{type.inspect}') unless klass
-      return klass
-   end
+   module Types
+
+
+      DEFAULT_TYPE = "str"           ## use "str" as default of @type
+
+      @@type_table = {
+         "seq"       => Array,
+         "map"       => Hash,
+         "str"       => String,
+         #"string"    => String,
+         "text"      => Text,
+         "int"       => Integer,
+         #"integer"   => Integer,
+         "float"     => Float,
+         "number"    => Numeric,
+         #"numeric"   => Numeric,
+         "date"      => Date,
+         "time"      => Time,
+         "timestamp" => Time,
+         "bool"      => Boolean,
+         #"boolean"   => Boolean,
+         #"object"    => Object,
+         "any"       => Object,
+         "scalar"    => Scalar,
+      }
+
+      def self.type_table
+         return @@type_table
+      end
+
+      def self.type_class(type)
+         klass = @@type_table[type]
+         #assert_error('type=#{type.inspect}') unless klass
+         return klass
+      end
+      
+      def self.get_type_class(type)
+         return type_class(type)
+      end
+
 
 
-   module TypeHelper
       #--
       #def collection_class?(klass)
       #   return klass.is_a?(Array) || klass.is_a?(Hash)
@@ -130,8 +138,18 @@ module Kwalify
       def scalar?(val)
          return !val.is_a?(Array) && !val.is_a?(Hash) && val.class != Object
       end
+
+      def collection_type?(type)
+         return type == 'seq' || type == 'map'
+      end
+
+      def scalar_type?(type)
+         return type != 'seq' && type != 'map' && type == 'any'
+      end
+
+      module_function 'collection?', 'scalar?', 'collection_type?', 'scalar_type?'
    end
 
-   extend TypeHelper
+   extend Types
 
 end

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

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

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

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

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

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

data/lib/kwalify/validator.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 39 $
-### $Release: 0.4.1 $
+### $Rev: 42 $
+### $Release: 0.5.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
@@ -11,7 +11,6 @@ require 'kwalify/rule'
 
 module Kwalify
 
-
    ##
    ## ex.
    ##   schema = YAML.load_file('schema.yaml')
@@ -54,8 +53,8 @@ module Kwalify
 
 
       def _validate(value, rule, path, errors, done)
-         if Kwalify.collection?(value)
-            return true if done[value.__id__]     # avoid infinite loop
+         if Types.collection?(value)
+            return if done[value.__id__]     # avoid infinite loop
             done[value.__id__] = true
          end
          if rule.required && value == nil
@@ -63,7 +62,7 @@ module Kwalify
             errors << validate_error(:required_novalue, rule, path, value)
             return
          end
-         if rule.klass && value != nil && !value.is_a?(rule.klass)
+         if rule.type_class && value != nil && !value.is_a?(rule.type_class)
             #* key=:type_unmatch  msg="not a %s."
             errors << validate_error(:type_unmatch, rule, path, value, [Kwalify.word(rule.type)])
             return
@@ -108,13 +107,13 @@ module Kwalify
          return if value == nil
          #
          if rule.pattern
-            unless value.to_s =~ rule.pattern
+            unless value.to_s =~ rule.regexp
                #* key=:pattern_unmatch  msg="not matched to pattern %s."
-               errors << validate_error(:pattern_unmatch, rule, path, value, [rule.pattern.inspect])
+               errors << validate_error(:pattern_unmatch, rule, path, value, [rule.pattern])
             end
          end
          if rule.range
-            assert_error("value.class=#{value.class.name}") unless Kwalify.scalar?(value)
+            assert_error("value.class=#{value.class.name}") unless Types.scalar?(value)
             if rule.range['max'] && rule.range['max'] < value
                #* key=:range_toolarge  msg="too large (> max %s)."
                errors << validate_error(:range_toolarge, rule, path, value, [rule.range['max'].to_s])
@@ -223,11 +222,3 @@ module Kwalify
    end
 
 end
-
-if __FILE__ == $0
-   require 'kwalify/parser'
-   parser = Kwalify::Parser.new(File.read(ARGV.shift))
-   schema = parser.parse()
-   validator = Kwalify::Validator.new(schema)
-   YARGF.read()
-end

data/lib/kwalify/{parser.rb → yaml-parser.rb}

@@ -1,6 +1,6 @@
 ###
-### $Rev: 35 $
-### $Release: 0.4.1 $
+### $Rev: 42 $
+### $Release: 0.5.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
@@ -13,15 +13,14 @@ require 'date'
 
 module Kwalify
 
-
    ##
    ## ex.
    ##   str = ARGF.read()
-   ##   parser = Kwalify::PlainParser.new(str)
+   ##   parser = Kwalify::PlainYamlParser.new(str)
    ##   doc = parser.parse()
    ##   p doc
    ##
-   class PlainParser
+   class PlainYamlParser
 
       class Alias
          def initialize(label, linenum)
@@ -51,6 +50,21 @@ module Kwalify
       end
 
 
+      def has_next()
+         return @end_flag != 'EOF'
+      end
+
+
+      def parse_all
+         list = []
+         while has_next()
+            doc = parse()
+            list << doc
+         end
+         return list
+      end
+
+
       protected
 
 
@@ -159,11 +173,11 @@ module Kwalify
       end
 
 
-      def syntax_error(msg, linenum=@linenum)
-         return Kwalify::ParseError.new(msg, linenum)
+      def syntax_error(error_symbol, linenum=@linenum)
+         msg = Kwalify.msg(error_symbol) % [linenum]
+         return Kwalify::YamlSyntaxError.new(msg, linenum,error_symbol)
       end
 
-
       def parse_child(column)
          line = getline()
          return create_scalar(nil) if !line
@@ -225,7 +239,8 @@ module Kwalify
          assert ch == ?] || ch == ?}
          ch = getchar_or_nl()
          unless ch == ?\n || ch == ?# || ch == nil
-            raise syntax_error("flow style sequence is closed but got '#{ch.chr}'.")
+            #* key=:flow_hastail  msg="flow style sequence is closed but got '%s'."
+            raise syntax_error(:flow_hastail, [ch.chr])
          end
          getline() if ch != nil
          return data
@@ -235,7 +250,8 @@ module Kwalify
          ch = current_char()
          #ch = getchar()
          if ch == nil
-            rase syntax_error("found EOF when parsing flow style.")
+            #* key=:flow_eof  msg="found EOF when parsing flow style."
+            rase syntax_error(:flow_eof)
          end
          if ch == ?[
             data = parse_flow_seq(depth)
@@ -258,7 +274,8 @@ module Kwalify
             while (ch = current_char()) == ?,
                ch = getchar()
                if ch == ?]
-                  raise syntax_error("sequence item required (or last comma is extra).")
+                  #* key=:flow_noseqitem  msg="sequence item required (or last comma is extra)."
+                  raise syntax_error(:flow_noseqitem)
                end
                #break if ch == ?]
                linenum = current_linenum()
@@ -267,7 +284,8 @@ module Kwalify
             end
          end
          unless current_char() == ?]
-            raise syntax_error("flow style sequence requires ']'.")
+            #* key=:flow_seqnotclosed  msg="flow style sequence requires ']'."
+            raise syntax_error(:flow_seqnotclosed)
          end
          getchar() if depth > 0
          return seq
@@ -289,7 +307,8 @@ module Kwalify
             while (ch = current_char()) == ?,
                ch = getchar()
                if ch == ?}
-                  raise syntax_error("mapping item required (or last comma is extra).")
+                  #* key=:flow_mapnoitem  msg="mapping item required (or last comma is extra)."
+                  raise syntax_error(:flow_mapnoitem)
                end
                #break if ch == ?}
                linenum = current_linenum()
@@ -299,7 +318,8 @@ module Kwalify
             end
          end
          unless current_char() == ?}
-            raise syntax_error("flow style mapping requires '}'.")
+            #* key=:flow_mapnotclosed  msg="flow style mapping requires '}'."
+            raise syntax_error(:flow_mapnotclosed)
          end
          getchar() if depth > 0
          return map
@@ -309,7 +329,8 @@ module Kwalify
          key = parse_flow(depth)
          unless (ch = current_char()) == ?:
             s = ch ? "'#{ch.chr}'" : "EOF"
-            raise syntax_error("':' expected but got #{s}.")
+            #* key=:flow_nocolon  msg="':' expected but got '%s'."
+            raise syntax_error(:flow_nocolon)
          end
          getchar()
          value = parse_flow(depth)
@@ -374,7 +395,8 @@ module Kwalify
 
       def register_anchor(label, data)
          if @anchors[label]
-            raise syntax_error("anchor '#{label}' is already used.")
+            #* key=:anchor_duplicated  msg="anchor '%s' is already used."
+            raise syntax_error(:anchor_duplicated, [label])
          end
          @anchors[label] = data
       end
@@ -385,7 +407,8 @@ module Kwalify
          space  = $3
          value2 = $4
          if value2 && !value2.empty? && value2[0] != ?\#
-            raise syntax_error("alias cannot take any data.")
+            #* key=:alias_extradata  msg="alias cannot take any data."
+            raise syntax_error(:alias_extradata)
          end
          data = @anchors[label]
          unless data
@@ -417,7 +440,8 @@ module Kwalify
                      #seq[i] = @anchors[anchor.label]
                      set_seq_at(seq, i, @anchors[anchor.label], anchor.linenum)
                   else
-                     raise syntax_error("anchor '#{val.label}' not found", val.linenum)
+                     #* key=:anchor_notfound  msg="anchor '%s' not found"
+                     raise syntax_error(:anchor_notfound, [val.linenum])
                   end
                elsif val.is_a?(Array) || val.is_a?(Hash)
                   resolve_aliases(val)
@@ -432,7 +456,8 @@ module Kwalify
                      #map[key] = @anchors[anchor.label]
                      set_map_with(map, key, @anchors[anchor.label], anchor.linenum)
                   else
-                     raise syntax_error("anchor '#{val.label}' not found", val.linenum)
+                     ## :anchor_notfound is already defined on above
+                     raise syntax_error(:anchor_notfound, [val.linenum])
                   end
                elsif val.is_a?(Array) || val.is_a?(Hash)
                   resolve_aliases(val)
@@ -488,7 +513,8 @@ module Kwalify
          seq = create_sequence()  # []
          while true
             unless value =~ /^-(( +)(.*))?$/
-               raise syntax_error("sequence item is expected.")
+               #* key=:sequence_noitem  msg="sequence item is expected."
+               raise syntax_error(:sequence_noitem)
             end
             value2 = $3
             space  = $2
@@ -510,7 +536,8 @@ module Kwalify
             if    indent < column
                break
             elsif indent > column
-               raise syntax_error("invalid indent of sequence.")
+               #* key=:sequence_badindent  msg="illegal indent of sequence."
+               raise syntax_error(:sequence_badindent)
             end
             value = $2
          end
@@ -525,7 +552,8 @@ module Kwalify
          while true
             #unless value =~ /^(:?["']?[-.\w]+["']? *):(( +)(.*))?$/      #'
             unless value =~ /^((?::?[-.\w]+|'.*?'|".*?"|=|<<) *):(( +)(.*))?$/
-               raise syntax_error("mapping item is expected.")
+               #* key=:mapping_noitem  msg="mapping item is expected."
+               raise syntax_error(:mapping_noitem)
             end
             v = $1.strip
             key = to_scalar(v)
@@ -555,7 +583,8 @@ module Kwalify
             if    indent < column
                break
             elsif indent > column
-               raise syntax_error("invalid indent of mapping.")
+               #* key=:mapping_badindent  msg="illegal indent of mapping."
+               raise syntax_error(:mapping_badindent)
             end
             value = $2
          end
@@ -621,9 +650,9 @@ module Kwalify
 
    ##
    ## ex.
-   ##  # load document with Parser
+   ##  # load document with YamlParser
    ##  str = ARGF.read()
-   ##  parser = Kwalify::Parser.new(str)
+   ##  parser = Kwalify::YamlParser.new(str)
    ##  document = parser.parse()
    ##
    ##  # validate document
@@ -633,13 +662,13 @@ module Kwalify
    ##
    ##  # print validation result
    ##  if errors && !errors.empty?
-   ##    parser.set_error_linenums(errors)
-   ##    errors.sort { |e1, e2| e1.linenum <=> e2.linenum }.each do |error|
+   ##    parser.set_errors_linenum(errors)
+   ##    errors.sort.each do |error|
    ##      print "line %d: path %s: %s" % [error.linenum, error.path, error.message]
    ##    end
    ##  end
    ##
-   class Parser < PlainParser
+   class YamlParser < PlainYamlParser
 
       def initialize(*args)
          super
@@ -675,12 +704,17 @@ module Kwalify
          return linenum
       end
 
-      def set_error_linenums(errors)
+      def set_errors_linenum(errors)
          errors.each do |error|
             error.linenum = path_linenum(error.path)
          end
       end
 
+      def set_error_linenums(errors)
+         $stderr.puts "*** Kwalify::YamlParser#set_error_linenums() is obsolete. You should use set_errors_linenum() instead."
+         set_errors_linenum(errors)
+      end
+
       protected
 
       def create_sequence(linenum=current_linenum())
@@ -742,18 +776,13 @@ module Kwalify
 
    end
 
-end
 
-
-if __FILE__ == $0
-   require 'yaml'
-   require 'pp'
-   if $plain
-      parser = Kwalify::PlainParser.new(ARGF.read())
-   else
-      parser = Kwalify::Parser.new(ARGF.read())
+   ## obsolete
+   class Parser < YamlParser
+      def initialize(yaml_str)
+         super(yaml_str)
+         $stderr.puts "*** class Kwalify::Parser is obsolete. Please use Kwalify::YamlParser instead."
+      end
    end
-   doc = parser.parse()
-   pp doc
-   #y doc
+
 end