kwalify 0.6.1 → 0.7.0

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

@@ -1,8 +1,8 @@
 ##
 ## Kwalify schema example for address book
 ##
-## $Release: 0.6.1 $
-## copyright(c) 2005 kuwata-lab all rights reserved.
+## $Release: 0.7.0 $
+## copyright(c) 2005-2008 kuwata-lab all rights reserved.
 ##
 ##
 ## NOTE: 'type:  str' is omitted in this example because 'str' is default type.

data/examples/data-binding/BABEL.data.yaml

@@ -0,0 +1,63 @@
+teams:
+  - &thechildren
+    name:   The Children
+    desc:   Level 7 ESPers
+    chief:  *minamoto                  # preceding alias
+    members: [*kaoru, *aoi, *shiho]    # preceding alias
+  - &thewildcat
+    name:   The WildCat
+    desc:   Level 6 Esper
+    chief:  *tanizaki                  # preceding alias
+    members: [*naomi]                  # preceding alias
+  - &thehounds
+    name:   The Hounds
+    desc:   Hatsune & Akira
+    chief:  *kojika                    # preceding alias
+    members: [*hatsune, *akira]        # preceding alias
+
+members:
+  - &minamoto
+    name:   Kohichi Minamoto
+    desc:   Scientist
+    team:   *thechildren
+    kind:   normal
+  - &kaoru
+    name:   Kaoru Akashi
+    desc:   Psychokino
+    team:   *thechildren
+    kind:   esper
+  - &aoi
+    name:   Aoi Nogami
+    desc:   Teleporter
+    team:   *thechildren
+    kind:   esper
+  - &shiho
+    name:   Shiho Sannomiya
+    desc:   Psycometrer
+    team:   *thechildren
+    kind:   esper
+  - &tanizaki
+    name:   Ichiro Tanizaki
+    desc:   Hentai Oyaji
+    team:   *thewildcat
+    kind:   normal
+  - &naomi
+    name:   Naomi Umegae
+    desc:   Psychokino
+    team:   *thewildcat
+    kind:   esper
+  - &kojika
+    name:   Keiko Kojika
+    desc:   Naturalist
+    team:   *thehounds
+    kind:   normal
+  - &hatsune
+    name:   Hatsune Inugami
+    desc:   Wolfwoman
+    team:   *thehounds
+    kind:   esper
+  - &akira
+	name:   Akira Yadorigi
+	desc:   Animal Controller
+	team:   *thehounds
+	kind:   esper

data/examples/data-binding/BABEL.schema.yaml

@@ -0,0 +1,31 @@
+type: map
+required: yes
+mapping:
+ "teams":
+    type: seq
+    required: yes
+    sequence:
+      - &team
+        type:  map
+        required: yes
+        class:  Team
+        mapping:
+         "name":  {type: str, required: yes, unique: yes}
+         "desc":  {type: str}
+         "chief":  *member       # preceding alias
+         "members":
+            type: seq
+            sequence: [*member]  # preceding alias
+ "members":
+    type: seq
+    required: yes
+    sequence:
+      - &member
+        type:  map
+        required: yes
+        class:  Member
+        mapping:
+         "name":  {type: str, required: yes, unique: yes}
+         "desc":  {type: str}
+         "team":  *team
+	 "kind":  {type: str, enum: [normal, esper] }

data/examples/data-binding/Makefile

@@ -0,0 +1,8 @@
+all:	main.rb models.rb
+	ruby main.rb
+
+models.rb:	BABEL.schema.yaml
+	kwalify -a genclass-ruby -f BABEL.schema.yaml -tP --hashlike --module=Babel --initialize=false > models.rb
+
+clean:
+	rm -f models.rb

data/examples/data-binding/Rakefile

@@ -0,0 +1,13 @@
+task :default => 'main'
+
+task 'main' => ['models.rb'] do
+  sh "ruby main.rb"
+end
+
+file 'models.rb' => ['BABEL.schema.yaml'] do
+  sh "kwalify -a genclass-ruby -f BABEL.schema.yaml -tP --hashlike --module=Babel --initialize=false > models.rb"
+end
+
+task 'clean' do
+  rm_f 'models.rb'
+end

data/examples/data-binding/main.rb

@@ -0,0 +1,27 @@
+require 'kwalify'
+require 'models'
+
+## load schema definition
+schema = Kwalify::Yaml.load_file('BABEL.schema.yaml',
+                                 :untabify=>true,
+                                 :preceding_alias=>true)
+
+## add module name to 'class:'
+Kwalify::Util.traverse_schema(schema) do |rulehash|
+  if rulehash['class']
+    rulehash['class'] = 'Babel::' + rulehash['class']
+  end
+end
+
+## create validator
+validator = Kwalify::Validator.new(schema)
+
+## parse with data-binding
+parser = Kwalify::Yaml::Parser.new(validator)
+parser.preceding_alias = true
+parser.data_binding = true
+ydoc = parser.parse_file('BABEL.data.yaml', :untabify=>true)
+
+## show document
+require 'pp'
+pp ydoc

data/examples/invoice/invoice.schema.yaml

@@ -1,9 +1,9 @@
 ###
 ### Kwalify schema example for invoice
 ###
-### $Rev: 51 $
-### $Release: 0.6.1 $
-### copyright(c) 2005 kuwata-lab all rights reserved.
+### $Rev: 83 $
+### $Release: 0.7.0 $
+### copyright(c) 2005-2008 kuwata-lab all rights reserved.
 ###
 
 type:      map

data/examples/tapkit/tapkit.schema.yaml

@@ -1,8 +1,8 @@
 ##
 ## Kwalify schema example for TapKit
 ##
-## $Release: 0.6.1 $
-## copyright(c) 2005 kuwata-lab all rights reserved.
+## $Release: 0.7.0 $
+## copyright(c) 2005-2008 kuwata-lab all rights reserved.
 ##
 
 type: map

data/lib/kwalify.rb

@@ -1,13 +1,13 @@
 ###
-### $Rev: 48 $
-### $Release: 0.6.1 $
-### copyright(c) 2005 kuwata-lab all rights reserved.
+### $Rev: 95 $
+### $Release: 0.7.0 $
+### copyright(c) 2006 kuwata-lab.com all rights reserved.
 ###
 
 
 module Kwalify
 
-   RELEASE = ("$Release: 0.6.1 $" =~ /[.\d]+/) && $&
+  RELEASE = ("$Release: 0.7.0 $" =~ /[.\d]+/) && $&
 
 end
 
@@ -18,3 +18,40 @@ require 'kwalify/rule'
 require 'kwalify/validator'
 require 'kwalify/meta-validator'
 require 'kwalify/yaml-parser'
+#require 'kwalify/parser/base'
+#require 'kwalify/parser/yaml'
+
+
+module Kwalify
+
+  module Util
+
+    autoload :HashLike, 'kwalify/util/hashlike'
+
+  end
+
+  module Yaml
+
+    autoload :Parser, 'kwalify/parser/yaml'
+
+    def self.load(yaml_str, options={})
+      #require 'kwalify/parser/yaml'
+      parser = Kwalify::Yaml::Parser.new
+      parser.preceding_alias = true if options[:preceding_alias]
+      parser.data_binding    = true if options[:data_binding]
+      yaml_str = Kwalify::Util.untabify(yaml_str) if options[:untabify]
+      ydoc = parser.parse(yaml_str, :filename=>options[:filename])
+      return ydoc
+    end
+
+    def self.load_file(filename, options={})
+      options[:filename] = filename
+      return self.load(File.read(filename), options)
+    end
+
+  end
+
+  module Json
+  end
+
+end

data/lib/kwalify/errors.rb

@@ -1,105 +1,127 @@
 ###
-### $Rev: 48 $
-### $Release: 0.6.1 $
-### copyright(c) 2005 kuwata-lab all rights reserved.
+### $Rev: 93 $
+### $Release: 0.7.0 $
+### copyright(c) 2005-2008 kuwata-lab all rights reserved.
 ###
 
 require 'kwalify/messages'
 
 module Kwalify
 
-   class KwalifyError < StandardError
-   end
-
-
-   class AssertionError < KwalifyError
-      def initialize(msg)
-         super("*** assertion error: " + msg)
-      end
-   end
-
-
-   class BaseError < KwalifyError
-      def initialize(message="", path=nil, value=nil, rule=nil, error_symbol=nil)
-         super(message)
-         @path        = path
-         @rule         = rule
-         @value        = value
-         @error_symbol = error_symbol
-      end
-      attr_reader :error_symbol, :rule, :path, :value
-      attr_accessor :linenum
-
-      def path
-         return @path == '' ? "/" : @path
-      end
-
-      alias :_to_s :to_s
-
-      def message
-         _to_s
-      end
-
-      def to_s
-         return "[#{path()}] #{message()}"
-      end
-
-      def <=>(ex)
-        return @linenum <=> ex.linenum
-      end
-   end
-
-
-   class SchemaError < BaseError
-      def initialize(message="", path=nil, rule=nil, value=nil, error_symbol=nil)
-         super(message, path, rule, value, error_symbol)
-      end
-   end
-
-
-   class ValidationError < BaseError
-      def initialize(message="", path=nil, rule=nil, value=nil, error_symbol=nil)
-         super(message, path, rule, value, error_symbol)
-      end
-   end
-
-
-   class YamlSyntaxError < KwalifyError
-      def initialize(msg, linenum, error_symbol)
-         super("line #{linenum}: #{msg}")
-         @linenum = linenum
-         @error_symbol
-      end
-      attr_accessor :linenum, :error_symbol
-   end
-
-
-   module ErrorHelper
-
-      def assert_error(message="")
-         raise AssertionError.new(message)
-      end
-
-      def validate_error(error_symbol, rule, path, val, args=nil)
-         msg = _build_message(error_symbol, val, args);
-         return ValidationError.new(msg, path, val, rule, error_symbol)
-      end
-
-      def schema_error(error_symbol, rule, path, val, args=nil)
-         msg = _build_message(error_symbol, val, args);
-         return SchemaError.new(msg, path, val, rule, error_symbol)
-      end
-
-      def _build_message(message_key, val, args)
-         msg = Kwalify.msg(message_key)
-         assert_error("message_key=#{message_key.inspect}") unless msg
-         msg = msg % args if args
-         msg = "'#{val.to_s.gsub(/\n/, '\n')}': #{msg}" if val != nil && Types.scalar?(val)
-         return msg;
-      end
-
-   end
-
-   extend ErrorHelper
+  class KwalifyError < StandardError
+  end
+
+
+  class AssertionError < KwalifyError
+    def initialize(msg)
+      super("*** assertion error: " + msg)
+    end
+  end
+
+
+  class BaseError < KwalifyError
+    def initialize(message="", path=nil, value=nil, rule=nil, error_symbol=nil)
+      super(message)
+      @path  = path
+      @rule  = rule
+      @value = value
+      @error_symbol = error_symbol
+    end
+    attr_accessor :error_symbol, :rule, :path, :value
+    attr_accessor :filename, :linenum, :column
+
+    def path
+      return @path == '' ? "/" : @path
+    end
+
+    alias _to_s to_s
+    alias message to_s
+
+    def to_s
+      s = ''
+      s << @filename << ":" if @filename
+      s << "#{@linenum}:#{@column} " if @linenum
+      s << "[#{path()}] " if @path
+      s << _to_s()
+      return s
+    end
+
+    def <=>(ex)
+      #return @linenum <=> ex.linenum
+      v = 0
+      v = @linenum <=> ex.linenum if @linenum && ex.linenum
+      v = @column  <=> ex.column  if v == 0 && @column && ex.column
+      v = @path    <=> ex.path    if v == 0
+      return v
+    end
+  end
+
+
+  class SchemaError < BaseError
+    def initialize(message="", path=nil, rule=nil, value=nil, error_symbol=nil)
+      super(message, path, rule, value, error_symbol)
+    end
+  end
+
+
+  class ValidationError < BaseError
+    def initialize(message="", path=nil, rule=nil, value=nil, error_symbol=nil)
+      super(message, path, rule, value, error_symbol)
+    end
+  end
+
+
+  ## syntax error for YAML and JSON
+  class SyntaxError < BaseError  #KwalifyError
+    def initialize(msg, linenum=nil, error_symbol=nil)
+      super(linenum ? "line #{linenum}: #{msg}" : msg)
+      @linenum = linenum
+      @error_symbol = error_symbol
+    end
+    #attr_accessor :linenum, :error_symbol
+    def message
+      "file: #{@filename}, line #{@linenum}: #{super}"
+    end
+  end
+
+
+  ## (obsolete) use Kwalify::SyntaxError instead
+  class YamlSyntaxError < SyntaxError
+  end
+
+
+  module ErrorHelper
+
+    #module_function
+
+    def assert_error(message="")
+      raise AssertionError.new(message)
+    end
+
+    def validate_error(error_symbol, rule, path, val, args=nil)
+      msg = _build_message(error_symbol, val, args);
+      path = '/'+path.join('/') if path.is_a?(Array)
+      return ValidationError.new(msg, path, val, rule, error_symbol)
+    end
+    module_function :validate_error
+
+    def schema_error(error_symbol, rule, path, val, args=nil)
+      msg = _build_message(error_symbol, val, args);
+      path = '/'+path.join('/') if path.is_a?(Array)
+      return SchemaError.new(msg, path, val, rule, error_symbol)
+    end
+
+    def _build_message(message_key, val, args)
+      msg = Kwalify.msg(message_key)
+      assert_error("message_key=#{message_key.inspect}") unless msg
+      msg = msg % args if args
+      msg = "'#{val.to_s.gsub(/\n/, '\n')}': #{msg}" if !val.nil? && Types.scalar?(val)
+      return msg;
+    end
+    module_function :_build_message
+
+  end
+
+  extend ErrorHelper
 
 end