kwatable 0.0.1 → 0.1.0

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

@@ -1,16 +1,17 @@
 <%
 
    ##
-   ## kwatable template file for Java DTO class
+   ## kwatable template file for Ruby DTO class
    ##
    ## copyright(c) 2005 kuwata-lab.com all rights reserved.
-   ## $Release: 0.0.1 $
-   ## $Rev: 12 $
+   ## $Release: 0.1.0 $
+   ## $Rev: 15 $
    ##
    ## template properties:
    ##   module    -  module name
    ##   parent    -  parent class
    ##   reqpath   -  require path
+   ##
 
 
    #
@@ -18,46 +19,43 @@
    #
    table      = context['table']
    properties = context['properties']
-   raise "option '-m' is required when using 'dto-java.eruby'." unless table
-
-
-   unless defined?(KEYWORDS)
-      #
-      # java keywords
-      #
-      keywords = <<-END
-        BEGIN END alias and begin break case
-        class def defined do else elsif end
-        ensure false for if in module next
-        nil not or redo rescue retry return
-        self super then true undef unless
-        until when while yield
-      END
-      KEYWORDS = {}
-      keywords.split(/\s+/).each { |word| KEYWORDS[word] = true }
-
-
-      #
-      # escape java keywords
-      #
-      def _(word)
-         return KEYWORDS[word] ? "_#{word}" : word
-      end
+   raise "option '-m' is required when using 'dto-ruby.eruby'." unless table
 
 
-      #
-      # convert 'aaa_bbb_ccc' into 'AaaBbbCcc'
-      #
-      def camel_case(name, flag_all=true)
-         s = ''
-         name.split('_').each_with_index do |word, i|
-            s << (!flag_all && i == 0 ? word.downcase : word.capitalize)
-         end
-         return s
-         #s = name.split('_').collect { |w| w.capitalize }.join()
-         #s[0] = s[0].to_s.upcase.chr unless flag_all
-      end
+   #
+   # ruby keywords
+   #
+   keywords = <<-END
+     BEGIN END alias and begin break case
+     class def defined do else elsif end
+     ensure false for if in module next
+     nil not or redo rescue retry return
+     self super then true undef unless
+     until when while yield
+   END
+   @keywords = {}
+   keywords.split(/\s+/).each { |word| @keywords[word] = true }
+
+
+   #
+   # escape java keywords
+   #
+   def self._(word)
+      return @keywords[word] ? "_#{word}" : word
+   end
+
 
+   #
+   # convert 'aaa_bbb_ccc' into 'AaaBbbCcc'
+   #
+   def self.camel_case(name, flag_all=true)
+      s = ''
+      name.split('_').each_with_index do |word, i|
+         s << (!flag_all && i == 0 ? word.downcase : word.capitalize)
+      end
+      return s
+      #s = name.split('_').collect { |w| w.capitalize }.join()
+      #s[0] = s[0].to_s.upcase.chr unless flag_all
    end
 
 
@@ -103,9 +101,9 @@
    # require other dto file
    #
    for column in table['columns']
-      if column['ref-table']
-         refclass = column['ref-table']['class']
-         refclass ||= camel_case(column['ref-table']['name'])
+      if column['ref']
+         refclass = column['ref']['table']['class']
+         refclass ||= camel_case(column['ref']['table']['name'])
          reqpath = properties[:reqpath]
 %>
 require '<%= reqpath %><%= reqpath ? '/' : '' %><%= refclass %>'
@@ -127,15 +125,12 @@ class <%= mod %><%= klass[:name] %><% extends %>
 
 <%
    #
-   # initializer
+   # populator with hash
    #
-   argstr = variables.collect { |var| _(var[:name]) }.join(", ")
- %>
-
-   def initialize(<%= argstr %>)
+%>
+   def populate(values={})
 <% for var in variables %>
-      @<%= var[:name] %> = <%=_ var[:name] %>
-
+      self.<%= "%-14s" % var[:name] %> = values['<%= var[:name] %>']
 <% end %>
    end
 
@@ -149,15 +144,13 @@ class <%= mod %><%= klass[:name] %><% extends %>
 
 <% end %>
 
-    // -----------
-
 <%
    #
    # foreign keys
    #
    table['columns'].each do |column|
-      if column['ref-table']
-         refcol  = column['ref-column']['name']
+      if column['ref']
+         refcol  = column['ref']['name']
          refname = column['ref-name']
          varname = column['name']
          if refname == varname

data/lib/kwatable.rb

@@ -1,7 +1,7 @@
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.0.1 $
-### $Rev: 11 $
+### $Release: 0.1.0 $
+### $Rev: 15 $
 ###
 
 module Kwatable
@@ -27,5 +27,4 @@ module Kwatable
 end
 
 require 'kwatable/error-msg'
-
-require 'kwatable/manufactory'
+require 'kwatable/manipulator'

data/test/assert-diff.rb

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

data/test/test.rb

@@ -1,28 +1,31 @@
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.0.1 $
-### $Rev: 11 $
+### $Release: 0.1.0 $
+### $Rev: 15 $
 ###
 
-dir = Dir.pwd
-dir = File.dirname(dir) if File.basename(dir) == 'test'
-
-BASE_DIR     = dir
-TEST_DIR     = "#{BASE_DIR}/test"
-LIB_DIR      = "#{BASE_DIR}/lib"
-EXAMPLES_DIR = "#{BASE_DIR}/examples"
-
-Dir.chdir(TEST_DIR)
-
-$: << LIB_DIR
-$: << TEST_DIR
+unless defined?(BASE_DIR)
+   TEST_DIR     = File.expand_path(File.dirname(__FILE__))
+   BASE_DIR     = File.dirname(TEST_DIR)
+   LIB_DIR      = BASE_DIR + "/lib"
+   BIN_DIR      = BASE_DIR + "/bin"
+   EXAMPLES_DIR = BASE_DIR + "/examples"
+   $LOAD_PATH << LIB_DIR << TEST_DIR
+   
+   ENV['RUBYLIB'] = LIB_DIR
+   ENV['PATH']  = "#{BIN_DIR}:#{ENV['PATH']}"
+   #puts ENV['PATH']
+   #puts `kwatable -h`
+   #exit 0
+end
+Dir.chdir TEST_DIR
 
-ENV['RUBYLIB'] = LIB_DIR
 
 require 'test/unit'
 require 'test/unit/ui/console/testrunner'
 
 require 'kwatable.rb'
+require 'kwatable/main-program'
 require 'assert-diff'
 
 
@@ -37,8 +40,12 @@ class KwatableExampleTest < Test::Unit::TestCase
       cmd = "kwatable -f #{@template} #{optstr} #{@datafile}"
       #cmd = "kwatable -I #{BASE_DIR}/templates -f #{@template} #{optstr} #{@datafile}"
       $logger.write("- command: #{cmd}\n  thread: #{Thread.current.__id__}\n  timestamp: #{Time.new.to_s}\n")
-      #$stderr.puts "*** debug: cmd=#{cmd.inspect}"
-      actual = `#{cmd}`
+      #actual = `#{cmd}`
+      argv = cmd.split(/\s+/)
+      argv.shift
+      main = Kwatable::MainProgram.new(argv)
+      actual = main.execute()
+
       if @classnames
          actuals = {}
          @classnames.each do |classname|

data/test/test1/test1.ddl-mysql.expected

@@ -7,7 +7,8 @@
 create table groups (
    id                   integer              auto_increment primary key,
    name                 varchar(63)          not null,
-   `desc`               varchar(255)         
+   `desc`               varchar(255)         ,
+   class                enum('ADMIN', 'SYSTEM', 'USER', 'UNUSED') 
 );
 
 -- User master table
@@ -16,7 +17,7 @@ create table users (
    name                 varchar(63)          not null,
    `desc`               varchar(255)         ,
    email                varchar(63)          ,
-   group_id             integer              ,  -- references groups.id
+   group_id             integer              ,  -- references groups(id)
    account              varchar(31)          not null,
    password             varchar(31)          not null
 );

data/test/test1/test1.ddl-postgresql.expected

@@ -7,7 +7,8 @@
 create table groups (
    id                   serial               primary key,
    name                 varchar(63)          not null,
-   "desc"               varchar(255)         
+   "desc"               varchar(255)         ,
+   class                varchar(6)             -- ADMIN,SYSTEM,USER,UNUSED
 );
 
 -- User master table

data/test/test1/test1.dto-java.Group.expected

@@ -8,14 +8,16 @@
  */
 public class Group implements java.io.Serializable {
 
-    private  int          id;           /*  */
-    private  String       name;         /*  */
-    private  String       desc;         /*  */
-
-    public Group(int id, String name, String desc) {
-        this.id = id;
-        this.name = name;
-        this.desc = desc;
+    private  int          id;           /* group id */
+    private  String       name;         /* group name */
+    private  String       desc;         /* group description */
+    private  String       _class;       /* group class */
+
+    public void populate(java.sql.ResultSet resultset) {
+        setId(resultset.getInt("id"));
+        setName(resultset.getString("name"));
+        setDesc(resultset.getString("desc"));
+        setClass(resultset.getString("class"));
     }
 
     public int getId() { return id }
@@ -27,6 +29,7 @@ public class Group implements java.io.Serializable {
     public String getDesc() { return desc }
     public void setDesc(String desc) { this.desc = desc; }
 
-    // -----------
+    public String getClass() { return _class }
+    public void setClass(String _class) { this._class = _class; }
 
 }

data/test/test1/test1.dto-java.User.expected

@@ -8,22 +8,22 @@
  */
 public class User implements java.io.Serializable {
 
-    private  int          id;           /*  */
-    private  String       name;         /*  */
-    private  String       desc;         /*  */
+    private  int          id;           /* user id */
+    private  String       name;         /* user name */
+    private  String       desc;         /* description about user */
     private  String       email;        /*  */
-    private  int          group_id;     /*  */
+    private  int          group_id;     /* group id to which user belongs */
     private  String       account;      /*  */
     private  String       password;     /*  */
 
-    public User(int id, String name, String desc, String email, int group_id, String account, String password) {
-        this.id = id;
-        this.name = name;
-        this.desc = desc;
-        this.email = email;
-        this.group_id = group_id;
-        this.account = account;
-        this.password = password;
+    public void populate(java.sql.ResultSet resultset) {
+        setId(resultset.getInt("id"));
+        setName(resultset.getString("name"));
+        setDesc(resultset.getString("desc"));
+        setEmail(resultset.getString("email"));
+        setGroupId(resultset.getInt("group_id"));
+        setAccount(resultset.getString("account"));
+        setPassword(resultset.getString("password"));
     }
 
     public int getId() { return id }
@@ -47,8 +47,6 @@ public class User implements java.io.Serializable {
     public String getPassword() { return password }
     public void setPassword(String password) { this.password = password; }
 
-    // -----------
-
     private Group group;
     public Group getGroup() { return group; }
     public void setGroup(Group group) {

data/test/test1/test1.dto-ruby.Group.expected

@@ -5,17 +5,16 @@
 
 ## Group master table
 class Group
-
-   def initialize(id, name, desc)
-      @id = id
-      @name = name
-      @desc = desc
+   def populate(values={})
+      self.id             = values['id']
+      self.name           = values['name']
+      self.desc           = values['desc']
+      self.class          = values['class']
    end
 
-   attr_accessor :id             # 
-   attr_accessor :name           # 
-   attr_accessor :desc           # 
-
-    // -----------
+   attr_accessor :id             # group id
+   attr_accessor :name           # group name
+   attr_accessor :desc           # group description
+   attr_accessor :class          # group class
 
 end

data/test/test1/test1.dto-ruby.User.expected

@@ -6,27 +6,24 @@ require 'Group'
 
 ## User master table
 class User
-
-   def initialize(id, name, desc, email, group_id, account, password)
-      @id = id
-      @name = name
-      @desc = desc
-      @email = email
-      @group_id = group_id
-      @account = account
-      @password = password
+   def populate(values={})
+      self.id             = values['id']
+      self.name           = values['name']
+      self.desc           = values['desc']
+      self.email          = values['email']
+      self.group_id       = values['group_id']
+      self.account        = values['account']
+      self.password       = values['password']
    end
 
-   attr_accessor :id             # 
-   attr_accessor :name           # 
-   attr_accessor :desc           # 
+   attr_accessor :id             # user id
+   attr_accessor :name           # user name
+   attr_accessor :desc           # description about user
    attr_accessor :email          # 
-   attr_accessor :group_id       # 
+   attr_accessor :group_id       # group id to which user belongs
    attr_accessor :account        # 
    attr_accessor :password       # 
 
-    // -----------
-
    attr_reader :group
    def group=(group)
       @group = group

data/test/test1/test1.yaml

@@ -2,19 +2,19 @@
 ## example data file for kwatable
 ##
 ## copyright(c) 2005 kuwata-lab.com all rights reserved.
-## $Release: 0.0.1 $
-## $Rev$
+## $Release: 0.1.0 $
+## $Rev: 13 $
 ##
 
 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/test/test2/test2.ddl-mysql.expected

@@ -18,7 +18,7 @@ create table customers (
    name                 varchar(255)         not null,
    tel                  varchar(255)         ,
    email                varchar(255)         ,
-   address_id           integer              not null  -- references addresses.id
+   address_id           integer              not null  -- references addresses(id)
 );
 
 -- Item master table
@@ -32,7 +32,7 @@ create table items (
 -- Sales order master table
 create table sales_orders (
    id                   integer              auto_increment primary key,
-   customer_id          integer              not null,  -- references customers.id
+   customer_id          integer              not null,  -- references customers(id)
    ordered_date         date                 not null,
    delivery_date        date                 ,
    amount               decimal              
@@ -41,8 +41,8 @@ create table sales_orders (
 -- Sales Order detail lines
 create table sales_order_lines (
    num                  integer              not null,
-   order_id             integer              not null,  -- references sales_orders.id
-   item_id              integer              not null,  -- references items.id
+   order_id             integer              not null,  -- references sales_orders(id)
+   item_id              integer              not null,  -- references items(id)
    price                decimal              not null,
    quantity             integer              not null
    , primary key (order_id, item_id)

data/test/test2/test2.dto-java.Address.expected

@@ -14,12 +14,12 @@ public class Address implements java.io.Serializable {
     private  String       addr2;        /*  */
     private  String       addr3;        /*  */
 
-    public Address(int id, String zipcode, String addr1, String addr2, String addr3) {
-        this.id = id;
-        this.zipcode = zipcode;
-        this.addr1 = addr1;
-        this.addr2 = addr2;
-        this.addr3 = addr3;
+    public void populate(java.sql.ResultSet resultset) {
+        setId(resultset.getInt("id"));
+        setZipcode(resultset.getString("zipcode"));
+        setAddr1(resultset.getString("addr1"));
+        setAddr2(resultset.getString("addr2"));
+        setAddr3(resultset.getString("addr3"));
     }
 
     public int getId() { return id }
@@ -37,6 +37,4 @@ public class Address implements java.io.Serializable {
     public String getAddr3() { return addr3 }
     public void setAddr3(String addr3) { this.addr3 = addr3; }
 
-    // -----------
-
 }

data/test/test2/test2.dto-java.Customer.expected

@@ -14,12 +14,12 @@ public class Customer implements java.io.Serializable {
     private  String       email;        /*  */
     private  int          address_id;   /*  */
 
-    public Customer(int id, String name, String tel, String email, int address_id) {
-        this.id = id;
-        this.name = name;
-        this.tel = tel;
-        this.email = email;
-        this.address_id = address_id;
+    public void populate(java.sql.ResultSet resultset) {
+        setId(resultset.getInt("id"));
+        setName(resultset.getString("name"));
+        setTel(resultset.getString("tel"));
+        setEmail(resultset.getString("email"));
+        setAddressId(resultset.getInt("address_id"));
     }
 
     public int getId() { return id }
@@ -37,8 +37,6 @@ public class Customer implements java.io.Serializable {
     public int getAddressId() { return address_id }
     public void setAddressId(int address_id) { this.address_id = address_id; }
 
-    // -----------
-
     private Address address;
     public Address getAddress() { return address; }
     public void setAddress(Address address) {

data/test/test2/test2.dto-java.Item.expected

@@ -13,11 +13,11 @@ public class Item implements java.io.Serializable {
     private  String       desc;         /*  */
     private  double       price;        /*  */
 
-    public Item(int id, String name, String desc, double price) {
-        this.id = id;
-        this.name = name;
-        this.desc = desc;
-        this.price = price;
+    public void populate(java.sql.ResultSet resultset) {
+        setId(resultset.getInt("id"));
+        setName(resultset.getString("name"));
+        setDesc(resultset.getString("desc"));
+        setPrice(resultset.getDouble("price"));
     }
 
     public int getId() { return id }
@@ -32,6 +32,4 @@ public class Item implements java.io.Serializable {
     public double getPrice() { return price }
     public void setPrice(double price) { this.price = price; }
 
-    // -----------
-
 }

data/test/test2/test2.dto-java.SalesOrder.expected

@@ -15,12 +15,12 @@ public class SalesOrder implements java.io.Serializable {
     private  Date         delivery_date;  /*  */
     private  double       amount;       /*  */
 
-    public SalesOrder(int id, int customer_id, Date ordered_date, Date delivery_date, double amount) {
-        this.id = id;
-        this.customer_id = customer_id;
-        this.ordered_date = ordered_date;
-        this.delivery_date = delivery_date;
-        this.amount = amount;
+    public void populate(java.sql.ResultSet resultset) {
+        setId(resultset.getInt("id"));
+        setCustomerId(resultset.getInt("customer_id"));
+        setOrderedDate(resultset.getDate("ordered_date"));
+        setDeliveryDate(resultset.getDate("delivery_date"));
+        setAmount(resultset.getDouble("amount"));
     }
 
     public int getId() { return id }
@@ -38,8 +38,6 @@ public class SalesOrder implements java.io.Serializable {
     public double getAmount() { return amount }
     public void setAmount(double amount) { this.amount = amount; }
 
-    // -----------
-
     private Customer customer;
     public Customer getCustomer() { return customer; }
     public void setCustomer(Customer customer) {

data/test/test2/test2.dto-java.SalesOrderLine.expected

@@ -14,12 +14,12 @@ public class SalesOrderLine implements java.io.Serializable {
     private  double       price;        /*  */
     private  int          quantity;     /*  */
 
-    public SalesOrderLine(int num, int order_id, int item_id, double price, int quantity) {
-        this.num = num;
-        this.order_id = order_id;
-        this.item_id = item_id;
-        this.price = price;
-        this.quantity = quantity;
+    public void populate(java.sql.ResultSet resultset) {
+        setNum(resultset.getInt("num"));
+        setOrderId(resultset.getInt("order_id"));
+        setItemId(resultset.getInt("item_id"));
+        setPrice(resultset.getDouble("price"));
+        setQuantity(resultset.getInt("quantity"));
     }
 
     public int getNum() { return num }
@@ -37,8 +37,6 @@ public class SalesOrderLine implements java.io.Serializable {
     public int getQuantity() { return quantity }
     public void setQuantity(int quantity) { this.quantity = quantity; }
 
-    // -----------
-
     private SalesOrder order;
     public SalesOrder getOrder() { return order; }
     public void setOrder(SalesOrder order) {