kwatable 0.0.1 → 0.1.0

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

@@ -5,13 +5,12 @@
 
 ## Address master table
 class Address
-
-   def initialize(id, zipcode, addr1, addr2, addr3)
-      @id = id
-      @zipcode = zipcode
-      @addr1 = addr1
-      @addr2 = addr2
-      @addr3 = addr3
+   def populate(values={})
+      self.id             = values['id']
+      self.zipcode        = values['zipcode']
+      self.addr1          = values['addr1']
+      self.addr2          = values['addr2']
+      self.addr3          = values['addr3']
    end
 
    attr_accessor :id             # 
@@ -20,6 +19,4 @@ class Address
    attr_accessor :addr2          # 
    attr_accessor :addr3          # 
 
-    // -----------
-
 end

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

@@ -6,13 +6,12 @@ require 'Address'
 
 ## Customer master table
 class Customer
-
-   def initialize(id, name, tel, email, address_id)
-      @id = id
-      @name = name
-      @tel = tel
-      @email = email
-      @address_id = address_id
+   def populate(values={})
+      self.id             = values['id']
+      self.name           = values['name']
+      self.tel            = values['tel']
+      self.email          = values['email']
+      self.address_id     = values['address_id']
    end
 
    attr_accessor :id             # 
@@ -21,8 +20,6 @@ class Customer
    attr_accessor :email          # 
    attr_accessor :address_id     # 
 
-    // -----------
-
    attr_reader :address
    def address=(address)
       @address = address

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

@@ -5,12 +5,11 @@
 
 ## Item master table
 class Item
-
-   def initialize(id, name, desc, price)
-      @id = id
-      @name = name
-      @desc = desc
-      @price = price
+   def populate(values={})
+      self.id             = values['id']
+      self.name           = values['name']
+      self.desc           = values['desc']
+      self.price          = values['price']
    end
 
    attr_accessor :id             # 
@@ -18,6 +17,4 @@ class Item
    attr_accessor :desc           # 
    attr_accessor :price          # 
 
-    // -----------
-
 end

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

@@ -6,13 +6,12 @@ require 'Customer'
 
 ## Sales order master table
 class SalesOrder
-
-   def initialize(id, customer_id, ordered_date, delivery_date, amount)
-      @id = id
-      @customer_id = customer_id
-      @ordered_date = ordered_date
-      @delivery_date = delivery_date
-      @amount = amount
+   def populate(values={})
+      self.id             = values['id']
+      self.customer_id    = values['customer_id']
+      self.ordered_date   = values['ordered_date']
+      self.delivery_date  = values['delivery_date']
+      self.amount         = values['amount']
    end
 
    attr_accessor :id             # 
@@ -21,8 +20,6 @@ class SalesOrder
    attr_accessor :delivery_date  # 
    attr_accessor :amount         # 
 
-    // -----------
-
    attr_reader :customer
    def customer=(customer)
       @customer = customer

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

@@ -7,13 +7,12 @@ require 'Item'
 
 ## Sales Order detail lines
 class SalesOrderLine
-
-   def initialize(num, order_id, item_id, price, quantity)
-      @num = num
-      @order_id = order_id
-      @item_id = item_id
-      @price = price
-      @quantity = quantity
+   def populate(values={})
+      self.num            = values['num']
+      self.order_id       = values['order_id']
+      self.item_id        = values['item_id']
+      self.price          = values['price']
+      self.quantity       = values['quantity']
    end
 
    attr_accessor :num            # 
@@ -22,8 +21,6 @@ class SalesOrderLine
    attr_accessor :price          # 
    attr_accessor :quantity       # 
 
-    // -----------
-
    attr_reader :order
    def order=(order)
       @order = order

data/test/test2/test2.yaml

@@ -53,7 +53,7 @@ tables:
       - name:	desc
       - name:	price
         type:	money
-	not-null: yes
+        not-null: yes
     
   - name:	sales_orders
     class:	SalesOrder
@@ -62,7 +62,7 @@ tables:
       - name:	id
       - name:	customer_id
         ref:	customers.id
-	not-null: yes
+        not-null: yes
       - name:	ordered_date
         type:   date
         not-null:  yes
@@ -80,7 +80,7 @@ tables:
         not-null:  yes
       - name:      order_id
         ref:       sales_orders.id
-	not-null:  yes
+        not-null:  yes
       - name:      item_id
         ref:       items.id
         not-null:  yes

metadata

@@ -1,91 +1,92 @@
---- !ruby/object:Gem::Specification 
+!ruby/object:Gem::Specification 
 rubygems_version: 0.8.11
 specification_version: 1
 name: kwatable
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2005-09-12 00:00:00 +09:00
+  version: 0.1.0
+date: 2005-10-14 00:00:00 +09:00
 summary: SQL and DTO generator from table definition
 require_paths: 
-  - lib
+- lib
 email: 
 homepage: http://www.kuwata-lab.com/kwatable
 rubyforge_project: 
-description: "Kwatable is a pretty tool to generate SQL and DTO from database table
-  definition. Kwatable reads table definition written in YAML, and generates
-  'create table' SQL script for MySQL and PostgreSQL, or generates DTO class file
-  for Java and Ruby. You can add your own eRuby template."
+description: Kwatable is a pretty tool to generate SQL and DTO from database table definition. Kwatable reads table definition written in YAML, and generates 'create table' SQL script for MySQL and PostgreSQL, or generates DTO class file for Java and Ruby. You can add your own eRuby template.
 autorequire: 
 default_executable: 
 bindir: bin
 has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-  - makoto kuwata
+- makoto kuwata
 files: 
-  - lib/kwatable
-  - lib/kwatable.rb
-  - lib/kwatable/error-msg.rb
-  - lib/kwatable/kwatable.schema.yaml
-  - lib/kwatable/main-program.rb
-  - lib/kwatable/manufactory.rb
-  - lib/kwatable/templates
-  - lib/kwatable/templates/ddl-mysql.eruby
-  - lib/kwatable/templates/ddl-postgresql.eruby
-  - lib/kwatable/templates/defaults.yaml
-  - lib/kwatable/templates/dto-java.eruby
-  - lib/kwatable/templates/dto-ruby.eruby
-  - bin/kwatable
-  - examples/ex1
-  - examples/ex2
-  - examples/ex1/example1.yaml
-  - examples/ex1/Makefile
-  - examples/ex2/example2.yaml
-  - examples/ex2/Makefile
-  - test/assert-diff.rb
-  - test/test.rb
-  - test/test1
-  - test/test2
-  - test/test1/test1.ddl-mysql.expected
-  - test/test1/test1.ddl-postgresql.expected
-  - test/test1/test1.dto-java.Group.expected
-  - test/test1/test1.dto-java.User.expected
-  - test/test1/test1.dto-ruby.Group.expected
-  - test/test1/test1.dto-ruby.User.expected
-  - test/test1/test1.yaml
-  - test/test2/test2.ddl-mysql.expected
-  - test/test2/test2.ddl-postgresql.expected
-  - test/test2/test2.dto-java.Address.expected
-  - test/test2/test2.dto-java.Customer.expected
-  - test/test2/test2.dto-java.Item.expected
-  - test/test2/test2.dto-java.SalesOrder.expected
-  - test/test2/test2.dto-java.SalesOrderLine.expected
-  - test/test2/test2.dto-ruby.Address.expected
-  - test/test2/test2.dto-ruby.Customer.expected
-  - test/test2/test2.dto-ruby.Item.expected
-  - test/test2/test2.dto-ruby.SalesOrder.expected
-  - test/test2/test2.dto-ruby.SalesOrderLine.expected
-  - test/test2/test2.yaml
-  - README.txt
-  - ChangeLog.txt
-  - COPYING
-  - setup.rb
-  - kwatable.gemspec
+- lib/kwatable
+- lib/kwatable.rb
+- lib/kwatable/error-msg.rb
+- lib/kwatable/kwatable.schema.yaml
+- lib/kwatable/main-program.rb
+- lib/kwatable/manipulator.rb
+- lib/kwatable/templates
+- lib/kwatable/templates/ddl-mysql.eruby
+- lib/kwatable/templates/ddl-postgresql.eruby
+- lib/kwatable/templates/defaults.yaml
+- lib/kwatable/templates/dto-java.eruby
+- lib/kwatable/templates/dto-ruby.eruby
+- bin/kwatable
+- examples/ex1
+- examples/ex2
+- examples/ex1/example1.yaml
+- examples/ex1/Makefile
+- examples/ex2/example2.yaml
+- examples/ex2/Makefile
+- test/assert-diff.rb
+- test/test.rb
+- test/test1
+- test/test2
+- test/test1/test1.ddl-mysql.expected
+- test/test1/test1.ddl-postgresql.expected
+- test/test1/test1.dto-java.Group.expected
+- test/test1/test1.dto-java.User.expected
+- test/test1/test1.dto-ruby.Group.expected
+- test/test1/test1.dto-ruby.User.expected
+- test/test1/test1.yaml
+- test/test2/test2.ddl-mysql.expected
+- test/test2/test2.ddl-postgresql.expected
+- test/test2/test2.dto-java.Address.expected
+- test/test2/test2.dto-java.Customer.expected
+- test/test2/test2.dto-java.Item.expected
+- test/test2/test2.dto-java.SalesOrder.expected
+- test/test2/test2.dto-java.SalesOrderLine.expected
+- test/test2/test2.dto-ruby.Address.expected
+- test/test2/test2.dto-ruby.Customer.expected
+- test/test2/test2.dto-ruby.Item.expected
+- test/test2/test2.dto-ruby.SalesOrder.expected
+- test/test2/test2.dto-ruby.SalesOrderLine.expected
+- test/test2/test2.yaml
+- README.txt
+- ChangeLog.txt
+- COPYING
+- setup.rb
+- kwatable.gemspec
 test_files: 
-  - test/test.rb
+- test/test.rb
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: 
-  - kwatable
+- kwatable
 extensions: []
+
 requirements: []
-dependencies: []
+
+dependencies: []
+

data/lib/kwatable/manufactory.rb

@@ -1,213 +0,0 @@
-###
-### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.0.1 $
-### $Rev: 11 $
-###
-
-require 'yaml'
-
-module Kwatable
-
-   class ManufactureError < KwatableError
-   end
-
-
-   ##
-   ## ex.
-   ##  manufactory = Kwatable::Manufactory.new
-   ##  tabledef = manufactory.parse(input)    # input is String or File
-   ##  p tabledef[:columns]
-   ##  p tabledef[:tables]
-   ##
-   class Manufactory
-
-      def parse(input)
-         str = ''
-         input.each_line do |line|
-            str << line.gsub(/([^\t]{8})|([^\t]*)\t/n){[$+].pack("A8")}    ## expand tab
-         end
-         ingredient = YAML.load(str)
-         manufacture(ingredient)
-         return ingredient
-      end
-
-      def manufacture(ingredient)
-         #assert unless ingredient.is_a?(Hash)
-      
-         column_map, patterned_columns = manufacture_columns(ingredient['columns'])
-         #assert unless column_map.is_a?(Hash)
-         #assert unless patterned_columns.is_a?(Array)
-
-         table_map = manufacture_tables(ingredient['tables'], column_map, patterned_columns)
-         #assert unless table_map.is_a?(Hash)
-
-         ingredient['column_map'] = column_map         # Hash
-         ingredient['table_map'] = table_map           # Hash
-         return ingredient
-      end
-
-      private
-
-      def manufacture_columns(columns)
-         column_map  = {}
-         patterned_columns = []
-         columns.each do |column|
-            name = column['name']
-            unless name
-               #* key=:colname_required  msg="column definition doesn't have a name."
-               raise ManufactureError.new(Kwatable.msg(:colname_required))
-            end
-            if name =~ /\A\/(.*)\/\z/
-               pattern = $1
-               begin
-                  name = Regexp.compile(pattern)
-               rescue RegexpError => ex
-                  #* key=:regexp_invalid  msg="column %s: %s"
-                  raise ManufactureError.new(Kwatable.msg(:regexp_invalid) % [name, ex.message])
-               end
-               column['namepattern'] = name
-               #column.delete('name')
-               patterned_columns << column
-            else
-               if column_map.key?(name)
-                  #* key=:coldef_duplicated  msg="column definition `%s' is duplicated."
-                  raise ManufactureError.new(Kwatable.msg(:coldef_duplicated) % name)
-               end
-               column_map[name] = column
-            end
-            #name = column['name'].strip
-            #namepattern = column['namepattern']
-            #unless name || namepattern
-            #   #* key=:colname_required  msg="column definition doesn't have a name nor namepattern."
-            #   raise ManufactureError.new(Kwatable.msg(:colname_required))
-            #end
-            #if name
-            #   if column_map.key?(name)
-            #      #* key=:coldef_duplicated  msg="column definition `%s' is duplicated."
-            #      raise ManufactureError.new(Kwatable.msg(:coldef_duplicated) % [name])
-            #   end
-            #   column_map[name] = column
-            #end
-            #if namepattern
-            #   pattern = namepattern.strip
-            #   pattern = $1 if pattern =~ /^\/(.*)\/$/
-            #   column['namepattern'] = Regexp.compile(pattern)
-            #   patterned_columns << column
-            #end
-         end if columns
-         return column_map, patterned_columns
-      end
-
-      def manufacture_tables(tables, column_map, patterned_columns)
-         #assert unless tables.is_a?(Array)
-         #assert unless column_map.is_a?(Hash)
-         #assert unless patterned_columns.is_a?(Array)
-
-         ## create table_map
-         table_map  = {}
-         tables.each do |table|
-            name = table['name']
-            unless name
-               #* key=:tablename_required  msg="table definition doesn't have a name."
-               raise ManufactureError.new(Kwatable.msg(:tablename_required))
-            end
-            if table_map.key?(name)
-               #* key=:tabledef_duplicated  msg="table definition `%s' is duplicated."
-               raise ManufactureError.new(Kwatable.msg(:tabledef_duplicated) % [name])
-            end
-            table_map[name] = table
-         end
-
-         ## manufacture table columns
-         tables.each do |table|
-            name_map = {}
-            table['columns'].each do |column|
-               name = column['name']
-               unless name
-                  #* key=:tablecolumn_required  msg="table '%s': column name requried."
-                  raise ManufactureError.new(Kwatable.msg(:tablecolumn_required % [table['name']]))
-               end
-               if name_map[name]
-                  #* key=:tablecolumn_duplicated msg="table '%s': column '%s' is duplicated."
-                  raise ManufactureError.new(Kwatable.msg(:tablecolumn_duplicated % [table['name'], name]))
-               end
-               name_map[name] = true
-               set_defaults(column, column_map, patterned_columns)
-               #alias_keys(column, "primary-key", "primarykey", "identifier")
-               #alias_keys(column, "not-null",    "notnull",    "required")
-               alias_key(column, "primary-key", "identifier")
-               alias_key(column, "not-null",    "required")
-               handle_ref(column, table_map) if column['ref']
-               handle_values(column) if column['values']
-               unless column['type']
-                  #* key=:tabletype_required  msg="table `%s': type of column `%s' is not determined."
-                  raise ManufactureError.new(Kwatable.msg(:tabletype_required) % [table['name'], column['name']])
-               end
-            end if table['columns']
-         end if tables
-
-         return table_map
-      end
-
-      def set_defaults(column, column_map, patterned_columns)
-         colname = column['name']
-         defaults = column_map[colname]
-         defaults ||= patterned_columns.find { |col| colname =~ col['namepattern'] }
-         defaults.each do |key, val|
-            column[key] = val if !column.key?(key) && key != 'namepattern'
-         end if defaults
-      end
-
-      def alias_keys(column, key, *old_keys)  # not used
-         old_keys.each do |old_key|
-            column[key] = column[old_key] if !column.key?(key) && column.key?(old_key)
-         end if old_keys
-      end
-
-      def alias_key(column, key1, key2)
-         if column[key1] && !column.key?(key2)
-            column[key2] = column[key1]
-         elsif column[key2] && !column.key?(key1)
-            column[key1] = column[key2]
-         end
-      end
-
-      def handle_values(column)
-         return unless column['values']
-         width = 0
-         column['values'].each do |value|
-            len = value.to_s.length
-            width = len if len > width
-         end
-         column['type']  ||= 'string'
-         column['width'] ||= width
-      end
-
-      def handle_ref(column, table_map)
-         ref = column['ref']
-         return unless ref
-         ref = ref.strip
-         return unless ref =~ /\A(\w+)\.(\w+)\z/ || ref =~ /\A(\w+)\((\w+)\)\z/
-         ref_table_name  = $1
-         ref_column_name = $2
-         ref_table = table_map[ref_table_name]
-         unless ref_table
-            #* key=:reftable_notfound  msg="`ref: %s': table not found."
-            raise ManufactureError.new(Kwatable.msg(:reftable_notfound) % column['ref'])
-         end
-         cols = ref_table['columns']
-         ref_column = cols ? cols.find { |col| col['name'] == ref_column_name } : nil
-         unless ref_column
-            #* key=:refcolumn_notfound  msg="`ref: %s': column not found in the table."
-            raise ManufactureError.new(Kwatable.msg(:refcolumn_notfound) % column['ref'])
-         end
-         column['ref-table']  = ref_table
-         column['ref-column'] = ref_column
-         column['ref-name'] ||= column['name'].sub(/_#{ref_column_name}$/, '')
-         column['type']       = ref_column['type']
-         column['width']    ||= ref_column['width']  if ref_column.key?('width')
-      end
-
-   end
-
-end