kwatable 0.1.0 → 0.2.0

data/ChangeLog.txt

@@ -1,9 +1,21 @@
 .=title:	ChangeLog
 .?copyright:	copyright(c) 2005 kuwata-lab.com all rights reserved.
-.?release:	$Release: 0.1.0 $
-.?version:	$Rev: 15 $
+.?release:	$Release: 0.2.0 $
+.?version:	$Rev: 18 $
 
-.: 2005-10-13 rev.16 
+.: 2006-03-03 rev.18
+	.- [bugfix] wrong argument passed to Kwatable.msg() in Manipulaotr#_error()
+
+.: 2006-02-26 rev.17
+	.- [bugfix] fixed on dto-java.eruby
+	.- [bugfix] fixed on dto-ruby.eruby
+	.- [change] add new entry 'all2' on examples/*/Makefile
+	.- [change] add 'required: yes' and 'pattern: /^\w+$/' on column name in kwatable.schema.yaml
+	.- [enhance] add 'name: label, type: str' in kwatable.schema.yaml
+	.- [enhance] add 'validator-ruby.eruby'
+	.- [change] test/test.rb is rewrited and test/test{1,2} are removed
+
+.: 2005-10-14 rev.16 (release 0.1.0)
 	.- [release] 0.1.0
 
 .: 2005-10-13 rev.15

data/README.txt

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

data/bin/kwatable

@@ -4,17 +4,11 @@
 ### kwatable - create table, dto class, or other from table definition
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.1.0 $
-### $Rev: 13 $
+### $Release: 0.2.0 $
+### $Rev: 17 $
 ###
 
 require 'kwatable'
 require 'kwatable/main-program'
 
-begin
-   main = Kwatable::MainProgram.new(ARGV)
-   output = main.execute()
-   print output if output
-rescue Kwatable::KwatableError => ex
-   $stderr.puts "[ERROR] #{ex.message()}"
-end
+Kwatable::MainProgram.main(ARGV)

data/examples/ex1/Makefile

@@ -1,34 +1,26 @@
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.1.0 $
-### $Rev: 11 $
+### $Release: 0.2.0 $
+### $Rev: 17 $
 ###
 
-datafile = example1.yaml
+DATAFILE = example1.yaml
+OPTS_DTO_JAVA = --package=my.example --parent=Object --populate --constructor
+OPTS_DTO_RUBY = --module=Example --parent=Object --reqpath=lib --symbolkey
 
-all:	ddl-mysql ddl-postgresql dto-java dto-ruby
 
-clean:
-	rm -f *.sql *.java *.rb
+all:
+	kwatable    -f ddl-mysql.eruby      $(DATAFILE) > ddl-mysql.sql
+	kwatable    -f ddl-postgresql.eruby $(DATAFILE) > ddl-postgresql.sql
+	kwatable -m -f dto-java.eruby       $(DATAFILE)
+	kwatable -m -f dto-ruby.eruby       $(DATAFILE)
+
+all2:
+	kwatable -f ddl-mysql.eruby      $(DATAFILE) > ddl-mysql.sql
+	kwatable -f ddl-postgresql.eruby $(DATAFILE) > ddl-postgresql.sql
+	kwatable $(OPTS_DTO_JAVA) -m -f dto-java.eruby $(DATAFILE)
+	kwatable $(OPTS_DTO_RUBY) -m -f dto-ruby.eruby $(DATAFILE)
 
-ddl-mysql:
-	kwatable -f ddl-mysql.eruby      $(datafile) > ddl-mysql.sql
-ddl-postgresql:
-	kwatable -f ddl-postgresql.eruby $(datafile) > ddl-postgresql.sql
-dto-java:
-	kwatable -m -f dto-java.eruby $(datafile)
-dto-ruby:
-	kwatable -m -f dto-ruby.eruby $(datafile)
+clean:
+	rm -f *.sql *.java *.rb *.class
 
-#bindir   = ../../bin
-#libdir   = ../../lib
-#tpldir   = $(libdir)/kwatable/templates
-#
-#ddl-mysql:
-#	ruby -I $(libdir) $(bindir)/kwatable -I $(tpldir) -f ddl-mysql.eruby      $(datafile) > ddl-mysql.sql
-#ddl-postgresql:
-#	ruby -I $(libdir) $(bindir)/kwatable -I $(tpldir) -f ddl-postgresql.eruby $(datafile) > ddl-postgresql.sql
-#dto-java:
-#	ruby -I $(libdir) $(bindir)/kwatable -I $(tpldir) -m -f dto-java.eruby $(datafile)
-#dto-ruby:
-#	ruby -I $(libdir) $(bindir)/kwatable -I $(tpldir) -m -f dto-ruby.eruby $(datafile)

data/examples/ex1/example1.yaml

@@ -2,8 +2,8 @@
 ## example data file for kwatable
 ##
 ## copyright(c) 2005 kuwata-lab.com all rights reserved.
-## $Release: 0.1.0 $
-## $Rev: 15 $
+## $Release: 0.2.0 $
+## $Rev: 17 $
 ##
 
 columns:
@@ -52,7 +52,7 @@ columns:
     type:	timestamp
 
   - name:	gender
-    type:	string
+    type:	char
     enum:
       - M
       - F
@@ -68,10 +68,12 @@ tables:
         desc:		group name
       - name:		desc
         desc:		group description
-      - name:		class
-        desc:		group class
+      - name:		case
         type:		string
-        enum:		[ ADMIN, SYSTEM, USER, UNUSED ]
+        enum:		[ normal, debug, emergency ]
+      - name:		flag_active
+        desc:		is active?
+        type:		boolean
 
   - name:		users
     class:		User
@@ -84,6 +86,7 @@ tables:
       - name:		desc
         desc:		description about user
       - name:		email
+      - name:		gender
       - name:		group_id
         ref:		groups.id
         desc:		group id to which user belongs

data/examples/ex2/Makefile

@@ -1,34 +1,25 @@
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.1.0 $
-### $Rev: 11 $
+### $Release: 0.2.0 $
+### $Rev: 17 $
 ###
 
 datafile = example2.yaml
+props_dto_java = --package=my.example --parent=Object --populate --constructor
+props_dto_ruby = --module=Example --parent=Object --reqpath=lib --symbolkey
 
-all:	ddl-mysql ddl-postgresql dto-java dto-ruby
-
-clean:
-	rm -f *.sql *.java *.rb
+all:
+	kwatable    -f ddl-mysql.eruby      $(datafile) > ddl-mysql.sql
+	kwatable    -f ddl-postgresql.eruby $(datafile) > ddl-postgresql.sql
+	kwatable -m -f dto-java.eruby $(datafile)
+	kwatable -m -f dto-ruby.eruby $(datafile)
 
-ddl-mysql:
+all2:
 	kwatable -f ddl-mysql.eruby      $(datafile) > ddl-mysql.sql
-ddl-postgresql:
 	kwatable -f ddl-postgresql.eruby $(datafile) > ddl-postgresql.sql
-dto-java:
-	kwatable -m -f dto-java.eruby $(datafile)
-dto-ruby:
-	kwatable -m -f dto-ruby.eruby $(datafile)
+	kwatable $(props_dto_java) -m -f dto-java.eruby $(datafile)
+	kwatable $(props_dto_ruby) -m -f dto-ruby.eruby $(datafile)
+
+clean:
+	rm -f *.sql *.java *.rb *.class
 
-#bindir   = ../../bin
-#libdir   = ../../lib
-#tpldir   = $(libdir)/kwatable/templates
-#
-#ddl-mysql:
-#	ruby -I $(libdir) $(bindir)/kwatable -I $(tpldir) -f ddl-mysql.eruby      $(datafile) > ddl-mysql.sql
-#ddl-postgresql:
-#	ruby -I $(libdir) $(bindir)/kwatable -I $(tpldir) -f ddl-postgresql.eruby $(datafile) > ddl-postgresql.sql
-#dto-java:
-#	ruby -I $(libdir) $(bindir)/kwatable -I $(tpldir) -m -f dto-java.eruby $(datafile)
-#dto-ruby:
-#	ruby -I $(libdir) $(bindir)/kwatable -I $(tpldir) -m -f dto-ruby.eruby $(datafile)

data/kwatable.gemspec

@@ -4,7 +4,7 @@
 ### RubyGems Specification file for kwatable
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.1.0 $
+### $Release: 0.2.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.1.0 $" =~ /Release: ([\.\d]+)/) && $1
+  s.version     = ("$Release: 0.2.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.rb

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

data/lib/kwatable/error-msg.rb

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

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.1.0 $
-### $Rev: 15 $
+### $Release: 0.2.0 $
+### $Rev: 17 $
 ###
 
 
@@ -16,8 +16,12 @@ mapping:
         mapping: &columrule
          "name":
             type:  str
+            required: yes
+            pattern:  /^\w+$/
          "desc":
             type:  text
+         "label":
+            type:  str
          "type":
             type:  str
             enum:
@@ -36,6 +40,8 @@ mapping:
               - time
               - timestamp
               - money
+              - lob
+              - blob
          "width":
             type:  int
          #"identifier":
@@ -75,10 +81,14 @@ mapping:
          "name":
             type:  str
             required: yes
+            pattern:  /^\w+$/
          "desc":
             type:  text
+         "label":
+            type:  str
          "class":
             type:  str
+            pattern:  /^[A-Z]\w+$/
          "columns":
             type:  seq
             sequence:

data/lib/kwatable/main-program.rb

@@ -1,7 +1,7 @@
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.1.0 $
-### $Rev: 15 $
+### $Release: 0.2.0 $
+### $Rev: 17 $
 ###
 
 require 'yaml'
@@ -85,7 +85,7 @@ module Kwatable
                output_filename = context[:output_filename]
                output_filename = "#{options[?d]}/#{output_filename}" if options[?d]
                File.open(output_filename, 'w') { |f| f.write(output) }
-               unless options[?s]
+               unless options[?q]
                   #* key=:file_generated  msg="generated: %s"
                   $stderr.puts(Kwatable.msg(:file_generated) % output_filename)
                end
@@ -95,8 +95,19 @@ module Kwatable
          return output
       end
 
+      def self.main(argv=ARGV)
+         begin
+            main = MainProgram.new(ARGV)
+            output = main.execute()
+            print output if output
+         rescue KwatableError => ex
+            $stderr.puts "[ERROR] #{ex.message()}"
+         end
+      end
+
       private
-      
+
+
       def _option_error(message_key, *args)
          msg = Kwatable.msg(message_key) % args
          return CommandOptionError.new(msg)
@@ -131,7 +142,7 @@ module Kwatable
                   optchar = optstr[0]
                   optstr  = optstr[1, optstr.length-1]
                   case optchar
-                  when ?h, ?v, ?m, ?s, ?D
+                  when ?h, ?v, ?m, ?q, ?D
                      options[optchar] = true
                   when ?f, ?t
                      arg = optstr.empty? ? argv.shift : optstr
@@ -192,12 +203,12 @@ module Kwatable
          s << "  -f template  : template filename\n"
          s << "  -m           : multiple output file\n"
          s << "  -d dir       : output file directory (with '-m')\n"
-         s << "  -s           : silent mode\n"
+         s << "  -q           : quiet mode\n"
          return s
       end
 
       def _version()
-         return ("$Release: 0.1.0 $" =~ /[\.\d]+/ && $&)
+         return ("$Release: 0.2.0 $" =~ /[\.\d]+/ && $&)
       end
 
    end

data/lib/kwatable/manipulator.rb

@@ -1,7 +1,7 @@
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.1.0 $
-### $Rev: 15 $
+### $Release: 0.2.0 $
+### $Rev: 18 $
 ###
 
 require 'yaml'
@@ -51,7 +51,7 @@ module Kwatable
       private
 
       def _error(message_key, *args)
-         msg = Kwatable.msg(:regexp_invalid) % args
+         msg = Kwatable.msg(message_key) % args
          return ManipulationError.new(msg)
       end
 

data/lib/kwatable/templates/ddl-mysql.eruby

@@ -4,7 +4,7 @@
    ## kwatable template file for MySQL
    ##
    ## copyright(c) 2005 kuwata-lab.com all rights reserved.
-   ## $Release: 0.1.0 $
+   ## $Release: 0.2.0 $
    ## $Rev: 15 $
    ##
    ## template properties:

data/lib/kwatable/templates/ddl-postgresql.eruby

@@ -4,8 +4,8 @@
    ## kwatable template file for PostgreSQL
    ##
    ## copyright(c) 2005 kuwata-lab.com all rights reserved.
-   ## $Release: 0.1.0 $
-   ## $Rev: 15 $
+   ## $Release: 0.2.0 $
+   ## $Rev: 17 $
    ##
    ## template properties:
    ##   (none)
@@ -17,7 +17,7 @@
    #
    tables     = context['tables']
    properties = context['properties']
-   raise "don't use '-m' option with 'ddl-mysql.eruby'." unless tables
+   raise "don't use '-m' option with 'ddl-postgresql.eruby'." unless tables
 
 
    #

data/lib/kwatable/templates/defaults.yaml

@@ -4,7 +4,7 @@
 ## copyright(c) 2005 kuwata-lab all rights reserverd
 ## 
 ## $Id: defaults.yaml 13 2005-09-15 00:21:25Z kwatch $
-## $Release: 0.1.0 $
+## $Release: 0.2.0 $
 ##
 
 columns:

data/lib/kwatable/templates/dto-java.eruby

@@ -4,12 +4,14 @@
    ## kwatable template file for Java DTO class
    ##
    ## copyright(c) 2005 kuwata-lab.com all rights reserved.
-   ## $Release: 0.1.0 $
-   ## $Rev: 15 $
+   ## $Release: 0.2.0 $
+   ## $Rev: 17 $
    ##
    ## template properties:
-   ##   package   -  package name
-   ##   parent    -  parent class
+   ##   --package=name   :  package name
+   ##   --parent=name    :  parent class
+   ##   --constructor    :  define constructor
+   ##   --populate       :  define populate method
    ##
 
 
@@ -116,7 +118,7 @@
 
  */
 <% if klass[:package] %>
-package <%= package %>;
+package <%= klass[:package] %>;
 <% end %>
 <% for class_name in imports %>
 import <%= class_name %>;
@@ -141,15 +143,79 @@ public class <%= klass[:name] %><%= extends %> implements java.io.Serializable {
 
 <%
    #
-   # populator with java.sql.ResultSet
+   # constructor
    #
+   argstr = variables.collect { |var| "#{var[:type]} #{_(var[:name])}" }.join(', ')
  %>
-    public void populate(java.sql.ResultSet resultset) {
-<% for var in variables %>
+<% if properties[:constructor] %>
+    public <%= klass[:name] %>(<%= argstr %>) {
+<%    for var in variables %>
+        set<%= camel_case(var[:name]) %>(<%= _(var[:name]) %>);
+<%    end %>
+    }
+
+<% end %>
+<%
+   #
+   # set all values with java.sql.ResultSet
+   #
+ %>
+<% if properties[:populate] %>
+    public void populate(java.sql.ResultSet resultset) throws java.sql.SQLException {
+<%    n = 0 %>
+<%    for var in variables %>
+<%       if var[:type] == 'char' %>
+<%          if (n += 1) == 1 %>
+        String val;
+<%          end %>
+        val = resultset.getString("<%= var[:name] %>");
+        set<%= camel_case(var[:name]) %>(val != null && val.length() > 0 ? val.charAt(0) : 0);
+<%       else %>
         set<%= camel_case(var[:name]) %>(resultset.get<%= var[:type].capitalize %>("<%= var[:name] %>"));
+<%       end %>
+<%    end %>
+    }
+
 <% end %>
+<%
+   #
+   # set all properties
+   #
+ %>
+<% if properties[:populate] %>
+    public void populate(java.util.Map _map) {
+        String val = null;
+<%    for var in variables %>
+        if (_map.containsKey("<%= var[:name] %>")) {
+            val = (String)_map.get("<%= var[:name] %>");
+<%       case var[:type] %>
+<%       when 'String' %>
+            this.<%= _(var[:name]) %> = val;
+<%       when 'int' %>
+            this.<%= _(var[:name]) %> = Integer.parseInt(val);
+<%       when 'long' %>
+            this.<%= _(var[:name]) %> = Long.parseLong(val);
+<%       when 'float' %>
+            this.<%= _(var[:name]) %> = Float.parseFloat(val);
+<%       when 'double' %>
+            this.<%= _(var[:name]) %> = Double.parseDouble(val);
+<%       when 'char' %>
+            this.<%= _(var[:name]) %> = val.length() > 0 ? val.charAt(0) : 0;
+<%       when 'boolean' %>
+            this.<%= _(var[:name]) %> = val.length() > 0;
+<%       when 'Date' %>
+            try {
+                this.<%= _(var[:name]) %> = java.text.DateFormat.getDateInstance().parse(val);
+            } catch (java.text.ParseException ignore) {
+            }
+<%       else %>
+<%          raise "*** internal error: template='dto-java.eruby', var[:type]=#{var[:type].inspect}" %>
+<%       end %>
+        }
+<%    end %>
     }
 
+<% end %>
 <%
    #
    # getter/setter
@@ -160,7 +226,7 @@ public class <%= klass[:name] %><%= extends %> implements java.io.Serializable {
       getter  = "#{vartype == 'boolean' ? 'is' : 'get'}#{camel_case(varname)}"
       setter  = "set#{camel_case(varname)}"
  %>
-    public <%= vartype %> <%= getter %>() { return <%= _(varname) %> }
+    public <%= vartype %> <%= getter %>() { return <%= _(varname) %>; }
     public void <%= setter %>(<%= vartype %> <%= _(varname) %>) { this.<%= _(varname) %> = <%= _(varname) %>; }
 
 <% end %>