kwalify 0.5.1 → 0.6.0

data/examples/address-book/Makefile

@@ -2,4 +2,9 @@
 all:
 	kwalify -lm address-book.schema.yaml
 	kwalify -lf address-book.schema.yaml address-book.yaml
+	kwalify -a genclass-ruby -lf address-book.schema.yaml > address-book.rb
+#	kwalify -a genclass-java -lf address-book.schema.yaml
 
+
+clean:
+	rm -f address-book.rb

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

@@ -1,7 +1,7 @@
 ##
 ## Kwalify schema example for address book
 ##
-## $Release: 0.5.1 $
+## $Release: 0.6.0 $
 ## copyright(c) 2005 kuwata-lab all rights reserved.
 ##
 ##
@@ -12,6 +12,7 @@ type:      seq
 required:  yes
 sequence:
   - type:      map
+    classname: Person
     required:  yes
     mapping:
      "name":

data/examples/invoice/Makefile

@@ -1,4 +1,9 @@
 all:
 	kwalify -lm invoice.schema.yaml
 	kwalify -lf invoice.schema.yaml invoice.yaml
+	kwalify -a genclass-ruby -lf invoice.schema.yaml > invoice.rb
+#	kwalify -a genclass-java -lf invoice.schema.yaml
 
+
+clean:
+	rm -f invoice.rb

data/examples/invoice/invoice.schema.yaml

@@ -1,12 +1,13 @@
 ###
 ### Kwalify schema example for invoice
 ###
-### $Rev: 41 $
-### $Release: 0.5.1 $
+### $Rev: 51 $
+### $Release: 0.6.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
 type:      map
+classname: Invoice
 required:  yes
 mapping:
  "invoice":  { type: int, required: yes, unique: yes }

data/examples/tapkit/Makefile

@@ -2,4 +2,9 @@
 all:
 	kwalify -lm tapkit.schema.yaml
 	kwalify -lf tapkit.schema.yaml tapkit.yaml
+	kwalify -a genclass-ruby -lf tapkit.schema.yaml --module=Tapkit > tapkit.rb
+#	kwalify -a genclass-java -lf tapkit.schema.yaml --package=tapkit
 
+
+clean:
+	rm -f tapkit.rb

data/examples/tapkit/main.rb

@@ -0,0 +1,7 @@
+require 'yaml'
+ydoc = YAML.load_file('tapkit.yaml')
+
+require 'tapkit'
+schema = Tapkit::Schema.new(ydoc)
+require 'pp'
+pp schema

data/examples/tapkit/tapkit.schema.yaml

@@ -1,11 +1,12 @@
 ##
 ## Kwalify schema example for TapKit
 ##
-## $Release: 0.5.1 $
+## $Release: 0.6.0 $
 ## copyright(c) 2005 kuwata-lab all rights reserved.
 ##
 
 type: map
+classname: Schema
 mapping:
  "adapter_name":
     type: str
@@ -17,6 +18,7 @@ mapping:
       #- OpenBase
  "connection":
     type: map
+    classname: Connection
     mapping:
      "url":
         type: str
@@ -37,6 +39,7 @@ mapping:
     type: seq
     sequence:
       - type: map
+        classname: Entity
         mapping:
          "name":
             type: str
@@ -61,6 +64,7 @@ mapping:
             required: yes
             sequence:
               - type: map
+                classname: Attribute
                 mapping:
                  "name":
                     type: str
@@ -104,6 +108,7 @@ mapping:
             type: seq
             sequence:
               - type: map
+                classname: Relationship
                 mapping:
                  "name":
                     type: str

data/lib/kwalify.rb

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

data/lib/kwalify/errors.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 42 $
-### $Release: 0.5.1 $
+### $Rev: 48 $
+### $Release: 0.6.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 

data/lib/kwalify/main.rb

@@ -1,10 +1,11 @@
 ###
-### $Rev: 44 $
-### $Release: 0.5.1 $
+### $Rev: 51 $
+### $Release: 0.6.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
 require 'yaml'
+require 'erb'
 require 'kwalify'
 require 'kwalify/util/yaml-helper'
 #require 'kwalify/util/option-parser'
@@ -12,6 +13,7 @@ require 'kwalify/util/yaml-helper'
 
 module Kwalify
 
+
    class CommandOptionError < KwalifyError
       def initialize(message, option, error_symbol)
          super(message)
@@ -39,43 +41,40 @@ module Kwalify
    ##
    class Main
 
+
       def initialize(command=nil)
          @command = command || File.basename($0)
-         @flag_help     = false
-         @flag_version  = false
-         @flag_silent   = false
-         @flag_meta     = false
-         @flag_untabify = false
-         @flag_emacs    = false
-         @flag_linenum  = false
-         @flag_debug    = false
-         @schema_filename = nil
+         @options = {}
          @properties    = {}
+         @template_path  = []
+         $:.each do |path|
+            tpath = "#{path}/kwalify/templates"
+            @template_path << tpath if test(?d, tpath)
+         end
       end
 
 
       def debug?
-         @flag_debug
+         @options[:debug]
       end
 
 
       def _inspect()
-         s =     ""
-         s <<    "command       : #{@command}\n"
-         s <<    "flag_help     : #{@flag_help}\n"
-         s <<    "flag_version  : #{@flag_version}\n"
-         s <<    "flag_silent   : #{@flag_silent}\n"
-         s <<    "flag_meta     : #{@flag_meta}\n"
-         s <<    "flag_untabify : #{@flag_untabify}\n"
-         s <<    "flag_emacs    : #{@flag_emacs}\n"
-         s <<    "flag_linenum  : #{@flag_linenum}\n"
-         s <<    "flag_debug    : #{@flag_debug}\n"
-         s <<    "schema_filename : #{@schema_filename != nil ? @schema_filename : 'null'}\n"
-         s <<    "properties:\n"
-         @properties.each do |key, val|
-            s << "  #{key}: #{val}\n"
+         sb = []
+         sb <<    "command: #{@command}\n"
+         sb <<    "options:\n"
+         @options.keys.sort {|k1,k2| k1.to_s<=>k2.to_s }.each do |key|
+            sb << "  - #{key}: #{@options[key]}\n"
          end
-         return s
+         sb <<    "properties:\n"
+         @properties.keys.sort_by {|k| k.to_s}.each do |key|
+            sb << "  - #{key}: #{@properties[key]}\n"
+         end
+         #sb <<    "template_path:\n"
+         #@template_path.each do |path|
+         #   sb << "  - #{path}\n"
+         #end
+         return sb.join
       end
 
 
@@ -84,21 +83,31 @@ module Kwalify
          filenames = _parse_argv(argv)
 
          # help or version
-         s = ''
-         s << _version() << "\n" if @flag_version
-         s << _usage()           if @flag_help
-         return s unless s.empty?
+         if @options[:help] || @options[:version]
+            action = @options[:action]
+            s = ''
+            s << _version() << "\n"           if @options[:version]
+            s << _usage()                     if @options[:help] && !action
+            s << _describe_properties(action) if @options[:help] && action
+            return s
+         end
 
          # validation
-         if @flag_meta2
+         if @options[:meta2]
             s = _quick_meta_validate(filenames)
-         elsif @flag_meta
+         elsif @options[:meta]
             s = _meta_validate(filenames)
-         elsif @schema_filename
-            if @flag_debug
-               s = _inspect_schema(@schema_filename)
+         elsif @options[:action]
+            if !@options[:schema]
+               #* key=:command_option_actionnoschema  msg="schema filename is not specified."
+               raise option_error(:command_option_actionnoschema, @options[:action])
+            end
+            s = _perform_action(@options[:action], @options[:schema])
+         elsif @options[:schema]
+            if @options[:debug]
+               s = _inspect_schema(@options[:schema])
             else
-               s = _validate(filenames, @schema_filename)
+               s = _validate(filenames, @options[:schema])
             end
          else
             #* key=:command_option_noaction  msg="command-line option '-f' or '-m' required."
@@ -111,21 +120,21 @@ module Kwalify
       def self.main(command, argv=ARGV)
          begin
             main = Kwalify::Main.new(command)
-            s = main.execute(ARGV)
+            s = main.execute(argv)
             print s if s
-            #rescue Kwalify::CommandOptionError => ex
-            #   $stderr.puts ex.message
-            #   exit 1
-            #rescue Kwalify::KwalifyError => ex
-            #   $stderr.puts "ERROR: #{ex.message}"
-            #   exit 1
-         rescue => ex
-            if main.debug?
-               raise ex
-            else
-               $stderr.puts ex.message
-               exit 1
-            end
+         rescue Kwalify::CommandOptionError => ex
+            $stderr.puts ex.message
+            exit 1
+         rescue Kwalify::KwalifyError => ex
+            $stderr.puts "ERROR: #{ex.message}"
+            exit 1
+         #rescue => ex
+         #   if main.debug?
+         #      raise ex
+         #   else
+         #      $stderr.puts ex.message
+         #      exit 1
+         #   end
          end
       end
 
@@ -139,10 +148,51 @@ module Kwalify
       end
 
 
+      def _find_template(action)
+         template_filename = action + '.eruby'
+         unless test(?f, template_filename)
+            tpath = @template_path.find { |path| test(?f, "#{path}/#{template_filename}") }
+            #* key=:command_option_notemplate  msg="%s: invalid action (template not found).\n"
+            raise option_error(:command_option_notemplate, action) unless tpath
+            template_filename = "#{tpath}/#{action}.eruby"
+         end
+         return template_filename
+      end
+
+
+      def _apply_template(template_filename, hash)
+         template = File.read(template_filename)
+         trim_mode = 1
+         erb = ERB.new(template, $SAFE, trim_mode)
+         context = Object.new
+         hash.each do |key, val|
+            context.instance_variable_set("@#{key}", val)
+         end
+         return context.instance_eval(erb.src, template_filename)
+      end
+
+
+      def _describe_properties(action)
+         template_filename = _find_template(action)
+         s = _apply_template(template_filename, :describe=>true)
+         return s
+      end
+
+
+      def _perform_action(action, schema_filename, describe=false)
+         template_filename = _find_template(action)
+         schema = _load_schema_file(schema_filename)
+         rule = Rule.new(schema)
+         @properties[:schema_filename] = schema_filename
+         s = _apply_template(template_filename, :rule=>rule, :properties=>@properties)
+         return s
+      end
+
+
       def _inspect_schema(schema_filename)
          filename = schema_filename
          str = File.open(schema_filename) { |f| f.read() }
-         str = YamlUtil.untabify(str) if @flag_untabify
+         str = YamlUtil.untabify(str) if @options[:untabify]
          schema = YAML.load(str)
          return nil if schema == nil
          validator = Kwalify::Validator.new(schema)  # error raised when schema is wrong
@@ -152,6 +202,7 @@ module Kwalify
       end
 
 
+      #--
       #class QuickMetaValidator
       #   def validate(schema)
       #      errors = []
@@ -163,6 +214,7 @@ module Kwalify
       #      return errors
       #   end
       #end
+      #++
 
 
       def _quick_meta_validate(filenames)
@@ -181,6 +233,15 @@ module Kwalify
       end
 
 
+      def _load_schema_file(schema_filename)
+         filename = schema_filename
+         str = File.read(filename)
+         str = YamlHelper.untabify(str) if @options[:untabify]
+         schema = YAML.load(str)
+         return schema
+      end
+
+
       def _meta_validate(filenames)
          meta_validator = Kwalify::MetaValidator.instance()
          s = _validate_files(meta_validator, filenames)
@@ -189,10 +250,7 @@ module Kwalify
 
 
       def _validate(filenames, schema_filename)
-         filename = schema_filename
-         str = File.open(filename) { |f| f.read() }   # or File.read(filename) in ruby1.8
-         str = YamlHelper.untabify(str) if @flag_untabify
-         schema = YAML.load(str)
+         schema = _load_schema_file(schema_filename)
          if schema
             validator = Kwalify::Validator.new(schema)
             s = _validate_files(validator, filenames)
@@ -214,8 +272,8 @@ module Kwalify
                str = $stdin.read()
                filename = '(stdin)'
             end
-            str = YamlHelper.untabify(str) if @flag_untabify
-            if @flag_linenum
+            str = YamlHelper.untabify(str) if @options[:untabify]
+            if @options[:linenum]
                parser = Kwalify::YamlParser.new(str)
                i = 0
                while parser.has_next?
@@ -246,22 +304,22 @@ module Kwalify
          errors = validator.validate(doc)
          if errors == nil || errors.empty?
             #* key=:validation_valid  msg="%s#%d: valid.\n"
-            s << Kwalify.msg(:validation_valid) % [filename, i] unless @flag_silent
+            s << Kwalify.msg(:validation_valid) % [filename, i] unless @options[:silent]
          else
             #* key=:validation_invalid  msg="%s#%d: INVALID\n"
             s << Kwalify.msg(:validation_invalid) % [filename, i]
-            if @flag_linenum
+            if @options[:linenum]
                #assert parser != nil
                raise unless parser != nil
                parser.set_errors_linenum(errors)
                errors.sort!
             end
             errors.each do |error|
-               if @flag_emacs
-                  #assert @flag_linenum
-                  raise unless @flag_linenum
+               if @options[:emacs]
+                  #assert @options[:linenum]
+                  raise unless @options[:linenum]
                   s << "#{filename}:#{error.linenum}: [#{error.path}] #{error.message}\n"
-               elsif @flag_linenum
+               elsif @options[:linenum]
                   s << "  - (line #{error.linenum}) [#{error.path}] #{error.message}\n"
                else
                   s << "  - [#{error.path}] #{error.message}\n"
@@ -273,7 +331,8 @@ module Kwalify
 
 
       def _usage()
-         msg = Kwalify.msg(:command_help) % [@command, @command]
+         #msg = Kwalify.msg(:command_help) % [@command, @command, @command]
+         msg = Kwalify.msg(:command_help)
          return msg
       end
 
@@ -298,6 +357,30 @@ module Kwalify
 
 
       def _parse_argv(argv)
+         option_table = {
+            ?h => :help,
+            ?v => :version,
+            ?s => :silent,
+            ?t => :untabify,
+            ?m => :meta,
+            ?M => :meta2,
+            ?E => :emacs,
+            ?l => :linenum,
+            ?f => :schema,
+            ?D => :debug,
+            ?a => :action,
+            ?I => :tpath,
+         }
+
+         errcode_table = {
+            #* key=:command_option_noschema  msg="-%s: schema filename required."
+            ?f => :command_option_noschema,
+            #* key=:command_option_noaction  msg="-%s: action required."
+            ?a => :command_option_noaction,
+            #* key=:command_option_notpath   msg="-%s: template path required."
+            ?I => :command_option_notpath,
+         }
+
          while argv[0] && argv[0][0] == ?-
             optstr = argv.shift
             optstr = optstr[1, optstr.length-1]
@@ -316,33 +399,27 @@ module Kwalify
                while optstr && !optstr.empty?
                   optchar = optstr[0]
                   optstr[0,1] = ""
+                  unless option_table.key?(optchar)
+                     #* key=:command_option_invalid  msg="-%s: invalid command option."
+                     raise option_error(:command_option_invalid, optchar.chr)
+                  end
+                  optkey = option_table[optchar]
                   case optchar
-                  when ?h  ;  @flag_help     = true
-                  when ?v  ;  @flag_version  = true
-                  when ?s  ;  @flag_silent   = true
-                  when ?t  ;  @flag_untabify = true
-                  when ?m  ;  @flag_meta     = true
-                  when ?M  ;  @flag_meta2    = true
-                  when ?E  ;  @flag_emacs    = true ; @flag_linenum = true
-                  when ?l  ;  @flag_linenum  = true
-                  when ?D  ;  @flag_debug    = true
-                  when ?f  ;
+                  when ?f, ?a, ?I
                      arg = optstr.empty? ? argv.shift : optstr
-                     #* key=:command_option_noarg  msg="-%s: argument required."
-                     #* key=:command_option_noschema  msg="-%s: schema filename required."
-                     raise option_error(:command_option_noschema, "f") unless arg
-                     @schema_filename = arg
-                     optstr = nil
+                     raise option_error(errcode_table[optchar], optchar.chr) unless arg
+                     @options[optkey] = arg
+                     optstr = ''
                   else
-                     #* key=:command_option_invalid  msg="-%s: invalid command option."
-                     raise option_error(:command_option_invalid, optchar.chr)
+                     @options[optkey] = true
                   end
                end
             end
          end  # end of while
          #
-         @flag_help    = true if @properties[:help]
-         @flag_version = true if @properties[:version]
+         @options[:linenum] = true if @options[:emacs]
+         @options[:help]    = true if @properties[:help]
+         @options[:version] = true if @properties[:version]
          filenames = argv
          return filenames
       end