kwatable 0.0.1 → 0.1.0

data/ChangeLog.txt

@@ -1,7 +1,33 @@
 .=title:	ChangeLog
 .?copyright:	copyright(c) 2005 kuwata-lab.com all rights reserved.
-.?release:	$Release: 0.0.1 $
-.?version:	$Rev: 12 $
+.?release:	$Release: 0.1.0 $
+.?version:	$Rev: 15 $
+
+.: 2005-10-13 rev.16 
+	.- [release] 0.1.0
+
+.: 2005-10-13 rev.15
+	.- [change] rename class 'Manufactory' to 'Manipulator'
+	.- [change] delete column['ref-table'] and column['ref-column']
+	.- [change] add column['table']
+	.- [change] change column['ref'] to refer a column
+	.- [change] delete Manipulator#parse()
+	.- [change] delete constructor from dto-{java,ruby}.eruby
+	.- [enhance] add populator to dto-{java,ruby}.eruby
+	.- [refactor] use singleton method and instance variabe in template files
+
+.: 2005-09-17 rev.14
+	.- add table name and column name on error message
+	.- add '_' prefix on private method
+	.- new method Manufacture#_error() added
+	.- new method MainProgram#_option_error() added
+
+.: 2005-09-15 rev.13
+	.- change 'values:' to 'enum:' to adopt same keyword of kwalify
+	.- change to use 'str', 'int', and 'bool' rather than 'string', 'integer', and 'boolean'
+	.- change to use 'enum' instead of 'values'
+	.- modiy kwatable.schema.yaml
+	.- add java keyword 'assert' and 'enum' to dto-java.eruby
 
 .: 2005-09-12 rev.12 (release 0.0.1)
 	.- change ERB trim_mode from '%' to '>'

data/README.txt

@@ -1,5 +1,5 @@
 .=title:	README
-.?release:	$Release: 0.0.1 $
+.?release:	$Release: 0.1.0 $
 
 
 .$ About

data/bin/kwatable

@@ -4,8 +4,8 @@
 ### kwatable - create table, dto class, or other from table definition
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.0.1 $
-### $Rev$
+### $Release: 0.1.0 $
+### $Rev: 13 $
 ###
 
 require 'kwatable'

data/examples/ex1/Makefile

@@ -1,6 +1,6 @@
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.0.1 $
+### $Release: 0.1.0 $
 ### $Rev: 11 $
 ###
 

data/examples/ex1/example1.yaml

@@ -2,19 +2,19 @@
 ## example data file for kwatable
 ##
 ## copyright(c) 2005 kuwata-lab.com all rights reserved.
-## $Release: 0.0.1 $
-## $Rev: 10 $
+## $Release: 0.1.0 $
+## $Rev: 15 $
 ##
 
 columns:
   - name:	id
     type:	integer
-    primary-key: yes
+    ident:	yes
     serial:	yes
 
   - name:	name
     type:	string
-    not-null:	yes
+    required:	yes
     width:	63
 
   - name:	desc
@@ -53,7 +53,7 @@ columns:
 
   - name:	gender
     type:	string
-    values:
+    enum:
       - M
       - F
 
@@ -63,23 +63,34 @@ tables:
     desc:		Group master table
     columns:
       - name:		id
+        desc:		group id
       - name:		name
+        desc:		group name
       - name:		desc
+        desc:		group description
+      - name:		class
+        desc:		group class
+        type:		string
+        enum:		[ ADMIN, SYSTEM, USER, UNUSED ]
 
   - name:		users
     class:		User
     desc:		User master table
     columns:
       - name:		id
+        desc:		user id
       - name:		name
+        desc:		user name
       - name:		desc
+        desc:		description about user
       - name:		email
       - name:		group_id
         ref:		groups.id
+        desc:		group id to which user belongs
       - name:		account
         type:		string
         width:		31
-        not-null:	yes
+        required:	yes
       - name:		password
-        not-null:	yes
+        required:	yes
 

data/examples/ex2/Makefile

@@ -1,6 +1,6 @@
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.0.1 $
+### $Release: 0.1.0 $
 ### $Rev: 11 $
 ###
 

data/kwatable.gemspec

@@ -4,7 +4,7 @@
 ### RubyGems Specification file for kwatable
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.0.1 $
+### $Release: 0.1.0 $
 ### $Rev: 10 $
 ###
 
@@ -14,7 +14,7 @@ spec = Gem::Specification.new do |s|
   ## package information
   s.name        = 'kwatable'
   s.author      = 'makoto kuwata'
-  s.version     = ("$Release: 0.0.1 $" =~ /Release: ([\.\d]+)/) && $1
+  s.version     = ("$Release: 0.1.0 $" =~ /Release: ([\.\d]+)/) && $1
   s.platform    = Gem::Platform::RUBY
   s.homepage    = 'http://www.kuwata-lab.com/kwatable'
   s.summary     = "SQL and DTO generator from table definition"

data/lib/kwatable/error-msg.rb

@@ -1,7 +1,7 @@
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.0.1 $
-### $Rev: 12 $
+### $Release: 0.1.0 $
+### $Rev: 15 $
 ###
 
 module Kwatable
@@ -13,6 +13,8 @@ module Kwatable
    end
 
    #----- begin auto generate
+   @@messages[:tabledef_empty]       = "table definition file is empty."
+   @@messages[:tabledef_notmap]      = "table definition is not a mapping."
    @@messages[:template_required]    = "template is not specified."
    @@messages[:template_notfound]    = "`%s': template file not found."
    @@messages[:file_generated]       = "generated: %s"
@@ -20,18 +22,17 @@ module Kwatable
    @@messages[:outdir_required]      = "-%s: output directory required."
    @@messages[:directory_required]   = "-%s: directory required."
    @@messages[:option_invalid]       = "-%s: invalid option."
-   @@messages[:colname_required]     = "column definition doesn't have a name."
-   @@messages[:regexp_invalid]       = "column %s: %s"
-   @@messages[:coldef_duplicated]    = "column definition `%s' is duplicated."
-   @@messages[:colname_required]     = "column definition doesn't have a name nor namepattern."
-   @@messages[:coldef_duplicated]    = "column definition `%s' is duplicated."
-   @@messages[:tablename_required]   = "table definition doesn't have a name."
-   @@messages[:tabledef_duplicated]  = "table definition `%s' is duplicated."
-   @@messages[:tablecolumn_required] = "table '%s': column name requried."
-   @@messages[:tablecolumn_duplicated] = "table '%s': column '%s' is duplicated."
-   @@messages[:tabletype_required]   = "table `%s': type of column `%s' is not determined."
-   @@messages[:reftable_notfound]    = "`ref: %s': table not found."
-   @@messages[:refcolumn_notfound]   = "`ref: %s': column not found in the table."
+   @@messages[:colname_required]     = "table '%s': column name required (index=%d)."
+   @@messages[:regexp_invalid]       = "table '%s': column '%s': pattern %s: %s"
+   @@messages[:coldef_duplicated]    = "table '%s': column '%s': column name is duplicated."
+   @@messages[:tablename_required]   = "table definition doesn't have a name (index=%d)."
+   @@messages[:tabledef_duplicated]  = "table '%s': table name is duplicated."
+   @@messages[:tablecolumn_required] = "table '%s': column name requried (index=%d)."
+   @@messages[:tablecolumn_duplicated] = "table '%s': column '%s': column name is duplicated."
+   @@messages[:tabletype_required]   = "table `%s': column `%s': type is not determined."
+   @@messages[:alias_conflict]       = "table '%s', column '%s': alias key '%1:' and '%2:' are not allowed to use in the same time."
+   @@messages[:reftable_notfound]    = "`table '%s': column '%s': 'ref: %s': reference table not found."
+   @@messages[:refcolumn_notfound]   = "`table '%s': column '%s': ref: %s': reference column not found in the table."
    #----- end auto generate
 
 end

data/lib/kwatable/kwatable.schema.yaml

@@ -2,8 +2,8 @@
 ### schema definition of kwalify for kwatable
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.0.1 $
-### $Rev$
+### $Release: 0.1.0 $
+### $Rev: 15 $
 ###
 
 
@@ -13,121 +13,74 @@ mapping:
     type:  seq
     sequence:
       - type:  map
-        mapping:
+        mapping: &columrule
          "name":
-            type:  string
-         "namepattern":
-            type:  string
-            pattern: /^\/.*\/$/
+            type:  str
          "desc":
             type:  text
          "type":
-            type:  string
-            values:
+            type:  str
+            enum:
               - char
               - short
-              - integer
               - int
-              - string
+              - integer
               - str
+              - string
               - text
               - float
               - double
-              - boolean
               - bool
+              - boolean
               - date
+              - time
               - timestamp
               - money
          "width":
-            type:  integer
+            type:  int
+         #"identifier":
+         "ident":
+            type:  bool
          "primary-key":
-            type:  boolean
-         "identifier":
-            type:  boolean
-         "not-null":
-            type:  boolean
+            type:  bool
+            desc:  alias of 'ident'
          "required":
-            type:  boolean
+            type:  bool
+         "not-null":
+            type:  bool
+            desc:  alias of 'required'
          "unique":
-            type:  boolean
-         "sequence":
-            type:  boolean
+            type:  bool
          "serial":
-            type:  boolean
-         "values":
+            type:  bool
+         "enum":
             type:  seq
             sequence:
-              - type:  string
+              - type:  text
          "ref":
-            type:  string
-            pattern:  /^\w+\.\w+$/
+            type:  str
+            pattern:  /^\w+(\.\w+|\(\w+\))$/
          "ref-name":
-            type:  string
+            type:  str
          "pattern":
-            type:  string
-            pattern:  /^\/.*\/$/
+            type:  str
+            pattern: /^\/.*\/$/
+
 
  "tables":
-    type:   seq
+    type:  seq
     sequence:
       - type:  map
         mapping:
          "name":
-            type:  string
+            type:  str
             required: yes
          "desc":
             type:  text
          "class":
-            type:  string
+            type:  str
          "columns":
             type:  seq
             sequence:
               - type:  map
-                mapping:
-                 "name":
-                    type:  string
-                 "desc":
-                    type:  text
-                 "type":
-                    type:  string
-                    values:
-                      - char
-                      - short
-                      - integer
-                      - int
-                      - string
-                      - str
-                      - text
-                      - float
-                      - double
-                      - boolean
-                      - bool
-                      - money
-                 "width":
-                    type:  integer
-                 "primary-key":
-                    type:  boolean
-                 "identifier":
-                    type:  boolean
-                 "not-null":
-                    type:  boolean
-                 "required":
-                    type:  boolean
-                 "unique":
-                    type:  boolean
-                 "sequence":
-                    type:  boolean
-                 "serial":
-                    type:  boolean
-                 "values":
-                    type:  seq
-                    sequence:
-                      - type:  string
-                 "ref":
-                    type:  string
-                    pattern:  /^\w+\.\w+$/
-                 "ref-name":
-                    type:  string
-                 "pattern":
-                    type:  string
-                    pattern: /^\/.*\/$/
+                mapping: *columrule

data/lib/kwatable/main-program.rb

@@ -1,9 +1,10 @@
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.0.1 $
-### $Rev: 12 $
+### $Release: 0.1.0 $
+### $Rev: 15 $
 ###
 
+require 'yaml'
 require 'erb'
 
 module Kwatable
@@ -17,12 +18,12 @@ module Kwatable
       end
 
       def execute()
-         options, properties = parse_options(@argv)
+         options, properties = _parse_options(@argv)
 
          ## help or version
          if options[?h] || options[?v]
-            puts version() if options[?v]
-            puts usage()   if options[?h]
+            puts _version() if options[?v]
+            puts _usage()   if options[?h]
             return
          end
 
@@ -36,44 +37,51 @@ module Kwatable
                end
             end
          end
-         yaml = YAML.load(s)
+         tabledef = YAML.load(s)
+         unless tabledef
+            #* key=:tabledef_empty  msg="table definition file is empty."
+            raise _option_error(:tabledef_empty)
+         end
+         unless tabledef.is_a?(Hash)
+            #* key=:tabledef_notmap  msg="table definition is not a mapping."
+            raise _option_error(:tabledef_notmap)
+         end
 
-         ## manufacture
-         manufactory = Manufactory.new()
-         manufactory.manufacture(yaml)
-         $stderr.print yaml.to_yaml if options[?D]
+         ## manipulation
+         manipulator = Manipulator.new()
+         manipulator.manipulate(tabledef)
+         $stderr.print tabledef.to_yaml if options[?D]
 
          ## template filename
          template = options[?f]
          unless template
             return nil if options[?D]
             #* key=:template_required  msg="template is not specified."
-            raise CommandOptionError.new(Kwatable.msg(:template_required))
+            raise _option_error(:template_required)
          end
 
          ## template filepath
          template_filepath = nil
          if test(?f, template)
             template_filepath = template
-         elsif options[?I] && t = find_template(template, options[?I])
+         elsif options[?I] && t = _find_template(template, options[?I])
             template_filepath = t
          else
-            template_filepath = find_template(template, Kwatable.template_path)
+            template_filepath = _find_template(template, Kwatable.template_path)
          end
          unless template_filepath
             #* key=:template_notfound  msg="`%s': template file not found."
-            raise CommandOptionError.new(Kwatable.msg(:template_notfound) % template)
+            raise _option_error(:template_notfound, template)
          end
 
          ## apply template
          if !options[?m]
-            context = { 'tables' => yaml['tables'], 'properties' => properties, }
-            output = apply_template(template_filepath, context)
-            return output
+            context = { 'tables' => tabledef['tables'], 'properties' => properties, }
+            output = _apply_template(template_filepath, context)
          else
-            yaml['tables'].each do |table|
+            tabledef['tables'].each do |table|
                context = { 'table' => table, 'properties' => properties, }
-               output = apply_template(template_filepath, context)
+               output = _apply_template(template_filepath, context)
                output_filename = context[:output_filename]
                output_filename = "#{options[?d]}/#{output_filename}" if options[?d]
                File.open(output_filename, 'w') { |f| f.write(output) }
@@ -82,13 +90,19 @@ module Kwatable
                   $stderr.puts(Kwatable.msg(:file_generated) % output_filename)
                end
             end
-            return nil
+            output = nil
          end
+         return output
       end
 
       private
+      
+      def _option_error(message_key, *args)
+         msg = Kwatable.msg(message_key) % args
+         return CommandOptionError.new(msg)
+      end
 
-      def parse_options(argv)
+      def _parse_options(argv)
          options = {}
          properties = {}
          while argv[0] && argv[0][0] == ?-
@@ -122,31 +136,25 @@ module Kwatable
                   when ?f, ?t
                      arg = optstr.empty? ? argv.shift : optstr
                      optstr = nil
-                     unless arg
-                        #* key=:template_required  msg="-%s: template filename required."
-                        raise CommandOptionError.new(Kwatable.msg(:template_required) % optchar.chr)
-                     end
+                     #* key=:template_required  msg="-%s: template filename required."
+                     raise _option_error(:template_required, optchar.chr) unless arg
                      options[?f] = arg
                      #options[optchar] = arg
                   when ?d
                      arg = optstr.empty? ? argv.shift : optstr
                      optstr = nil
-                     unless arg
-                        #* key=:outdir_required  msg="-%s: output directory required."
-                        raise CommandOptionError.new(Kwatable.msg(:outdir_required) % optchar.chr)
-                     end
+                     #* key=:outdir_required  msg="-%s: output directory required."
+                     raise _option_error(:outdir_required, optchar.chr) unless arg
                      options[optchar] = arg
                   when ?I
                      arg = optstr.empty? ? argv.shift : optstr
                      optstr = nil
-                     unless arg
-                        #* key=:directory_required  msg="-%s: directory required."
-                        raise CommandOptionError.new(Kwatable.msg(:directory_required) % optchar.chr)
-                     end
+                     #* key=:directory_required  msg="-%s: directory required."
+                     raise _option_error(:directory_required, optchar.chr) unless arg
                      (options[optchar] ||= []).concat(arg.split(/,/))
                   else
                      #* key=:option_invalid  msg="-%s: invalid option."
-                     raise CommandOptionError.new(Kwatable.msg(:option_invalid) % optchar.chr)
+                     raise _option_error(:option_invalid, optchar.chr)
                   end
                end   # end while
             end   # end if
@@ -154,7 +162,7 @@ module Kwatable
          return options, properties
       end
 
-      def find_template(template, path_list)
+      def _find_template(template, path_list)
          path_list.each do |path|
             t = "#{path}/#{template}"
             return t if test(?f, t)
@@ -162,19 +170,19 @@ module Kwatable
          return nil
       end
 
-      def apply_template(filename, context)
+      def _apply_template(filename, context)
          str = File.open(filename) { |f| f.read() }
          trim_mode = '>'  # or '%'
          erb = ERB.new(str, $SAFE, trim_mode)
-         result = eval_erb(erb, context)
+         result = _eval_erb(erb, context)
          return result
       end
 
-      def eval_erb(__erb, context)
+      def _eval_erb(__erb, context)
          return __erb.result(binding())
       end
 
-      def usage()
+      def _usage()
          command = File::basename($0)
          s = ""
          s << "Usage: #{command} [-hvm] [-I path] [-d dir] -f template datafile [datafile2 ...]\n"
@@ -188,8 +196,8 @@ module Kwatable
          return s
       end
 
-      def version()
-         return ("$Release: 0.0.1 $" =~ /[\.\d]+/ && $&)
+      def _version()
+         return ("$Release: 0.1.0 $" =~ /[\.\d]+/ && $&)
       end
 
    end