kwatable 0.1.0 → 0.2.0

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

@@ -4,13 +4,14 @@
    ## kwatable template file for Ruby 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:
-   ##   module    -  module name
-   ##   parent    -  parent class
-   ##   reqpath   -  require path
+   ##   --module=name    :  module name
+   ##   --parent=name    :  parent class
+   ##   --reqpath=path   :  require path
+   ##   --symbolkey      :  use symbol as hash key
    ##
 
 
@@ -100,11 +101,15 @@
    #
    # require other dto file
    #
+   refclass_table = {}
    for column in table['columns']
       if column['ref']
          refclass = column['ref']['table']['class']
          refclass ||= camel_case(column['ref']['table']['name'])
          reqpath = properties[:reqpath]
+         next if refclass_table[refclass]
+         refclass_table[refclass] = true
+
 %>
 require '<%= reqpath %><%= reqpath ? '/' : '' %><%= refclass %>'
 <%
@@ -118,31 +123,38 @@ require '<%= reqpath %><%= reqpath ? '/' : '' %><%= refclass %>'
    #
    mod     = klass[:module] ? "#{klass[:module]}::" : ""
    extends = klass[:parent] ? " < #{klass[:parent]}" : ""
+
  %>
 ## <%= klass[:desc] %>
 
-class <%= mod %><%= klass[:name] %><% extends %>
+class <%= mod %><%= klass[:name] %><%= extends %>
+
 
 <%
    #
-   # populator with hash
+   # accessor
    #
-%>
-   def populate(values={})
+ %>
 <% for var in variables %>
-      self.<%= "%-14s" % var[:name] %> = values['<%= var[:name] %>']
+   attr_accessor :<%= '%-14s' % var[:name] %> # <%= var[:desc] %>
+
 <% end %>
-   end
 
 <%
    #
-   # accessor
+   # set all values
    #
- %>
+%>
+   def populate(_hash={})
+<% flag_symbol = properties[:keytype] == 'symbol' %>
 <% for var in variables %>
-   attr_accessor :<%= '%-14s' % var[:name] %> # <%= var[:desc] %>
-
+<%    if flag_symbol %>
+      @<%= "%-14s" % var[:name] %> = _hash[:<%= var[:name] %>]
+<%    else %>
+      @<%= "%-14s" % var[:name] %> = _hash['<%= var[:name] %>']
+<%    end %>
 <% end %>
+   end
 
 <%
    #

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

@@ -0,0 +1,97 @@
+<%
+
+   ##
+   ## kwatable template file for Ruby Validator
+   ##
+   ## copyright(c) 2005 kuwata-lab.com all rights reserved.
+   ## $Release: 0.2.0 $
+   ## $Rev$
+   ##
+   ## template properties:
+   ##   module  - module/class name
+   ##
+
+   #
+   # context variables
+   #
+   tables     = context['tables']
+   properties = context['properties']
+   
+   #
+   # constraint keys
+   #
+   constraint_keys = %w[required with max-length min-length enum pattern]
+
+%>
+##
+## validator for Ruby
+##   generated by kwatable with template 'validator-ruby.eruby'
+##   at <%= Time.now.to_s %>
+
+##
+<% if properties[:module] %>
+
+module <%= properties[:module] %>
+
+<% end %>
+<% for table in tables %>
+
+  ## <%= table['name'] %> - <%= table['desc'] %>
+
+  def validate_<%= table['name'] %>(values)
+    errors = []
+<%    for column in table['columns'] %>
+<%       colname = column['name'] %>
+<%       has_constraints = ! (column.keys & constraint_keys).empty? %>
+
+    ## <%= table['name'] %>.<%= column['name'] %>
+
+<%       next if column['serial'] || column['auto'] %>
+<%       if column['strip'] != false || has_constraints %>
+    val = values[:<%= colname %>]
+<%       end %>
+<%       if column['strip'] != false %>
+    val.strip! if val
+<%       end %>
+<%       next unless has_constraints %>
+    if val == nil || val.empty?
+<%       if column['required'] %>
+      errors << [:<%= colname %>, :required]
+<%       else %>
+      # nothing
+<%       end %>
+<%       if (column['max-length'] || column['width']) && !column['enum'] %>
+    elsif val.length > <%= column['max-length'] || column['width'] %>
+
+      errors << [:<%= colname %>, :max_length]
+<%       end %>
+<%       if column['min-length'] && !column['width'] %>
+    elsif val.length < <%= column['max-length'] %>
+
+      errors << [:<%= colname %>, :min_length]
+<%       end %>
+<%       if column['enum'] %>
+<%          enum = column['enum'].find_all { |e| e != nil } %>
+<%          if enum.length == 1 %>
+    elsif val != <%= enum.first.inspect %>
+
+<%          else %>
+    elsif ! <%= column['enum'].inspect %>.include?(val)
+<%          end %>
+      errors << [:<%= colname %>, :enum]
+<%       end %>
+<%       if pat = column['pattern'] %>
+    elsif val !~ <%= pat.is_a?(Regexp) ? pat.intern : pat %>
+
+      errors << [:<%= colname %>, :pattern]
+<%       end %>
+    end
+<%    end   ## for column %>
+
+    return errors
+  end
+<% end   ## for table %>
+<% if properties[:module] %>
+
+end
+<% end %>

data/test/assert-diff.rb

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

data/test/test.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 $
 ###
 
 unless defined?(BASE_DIR)
@@ -11,7 +11,7 @@ unless defined?(BASE_DIR)
    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']
@@ -29,181 +29,110 @@ require 'kwatable/main-program'
 require 'assert-diff'
 
 
-class KwatableExampleTest < Test::Unit::TestCase
-
-   def _test(options={})
-      optstr = "#{@option}"
-      if options[:multiple]      # or if @classnames
-         outdir = prefix()
-         optstr << " -smd #{outdir}"
-      end
-      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")
-      #actual = `#{cmd}`
-      argv = cmd.split(/\s+/)
-      argv.shift
-      main = Kwatable::MainProgram.new(argv)
-      actual = main.execute()
-
-      if @classnames
-         actuals = {}
-         @classnames.each do |classname|
-            actual = File.read(@output % classname)
-            File.unlink(@output % classname)
-            if options[:ignore_linenum]
-               actual = _ignore_line(actual, options[:ignore_linenum])
-            end
-            actuals[classname] = actual
-            File.open(@actual % classname, 'w') { |f| f.write(actual) }
-         end
-         @classnames.each do |classname|
-            actual = actuals[classname]
-            expected = File.read(@expected % classname)
-            assert_equal_with_diff(expected, actual)
-         end
-      else
-         if options[:ignore_linenum]
-            actual = _ignore_line(actual, options[:ignore_linenum])
-         end
-         File.open(@actual, 'w') { |f| f.write(actual) }
-         expected = File.open(@expected) { |f| f.read() }
-         assert_equal_with_diff(expected, actual)
-      end
-   end
 
-   def prefix
-      raise NotImplementedError.new("#{self.class.name}#prefix() is not implemented.")
-   end
+DATE_PATTERN = /^.*?at [\w ]+ \d\d:\d\d:\d\d [A-Z]{3} \d\d\d\d\s*$/
 
-   def classnames
-      raise NotImplementedError.new("#{self.class.name}#classnames() is not implemented.")
-   end
+class ExampleTest < Test::Unit::TestCase
 
 
-   def _ignore_line(str, linenum)
-      s = ''
-      i = 0
-      str.each_line do |line|
-         i += 1
-         s << line if i != linenum
+   def _test
+      #Dir.chdir TEST_DIR
+      Dir.chdir @dir
+      argv = ["-f", @template]
+      argv.concat @options if @options
+      argv << @datafile
+      main = Kwatable::MainProgram.new(argv)
+      output = main.execute()
+      @expfiles.each do |expfile|
+         expected = File.read(".expected/#{expfile}")
+         actual = output ? output.dup : File.read(expfile)
+         actual.sub!(DATE_PATTERN, '')
+         expected.sub!(DATE_PATTERN, '')
+         assert_equal_with_diff(expected, actual)
       end
-      return s
    end
 
-   def _setup_ddl(basename)
-      dir = prefix()
-      @datafile   = "#{dir}/#{prefix()}.yaml"
-      @template   = "#{basename}.eruby"
-      @actual     = "#{dir}/#{prefix()}.#{basename}.actual"
-      @expected   = "#{dir}/#{prefix()}.#{basename}.expected"
-   end
 
-   def _setup_dto(basename, suffix)
-      dir = prefix()
-      @datafile   = "#{dir}/#{prefix()}.yaml"
-      @template   = "#{basename}.eruby"
-      @actual     = "#{dir}/#{prefix()}.#{basename}.%s.actual"
-      @expected   = "#{dir}/#{prefix()}.#{basename}.%s.expected"
-      @classnames = classnames()
-      @output     = "#{dir}/%s#{suffix}"
+   def test_ex1_mysql
+      @dir = "#{EXAMPLES_DIR}/ex1"
+      @template = 'ddl-mysql.eruby'
+      @datafile = 'example1.yaml'
+      @expfiles = %w[ddl-mysql.sql]
+      _test
    end
 
-end
-
 
-class KwatableExample1Test < KwatableExampleTest
-
-   def prefix
-      return 'test1'
-   end
-
-   def classnames
-      return %w[Group User]
+   def test_ex1_postgresql
+      @dir = "#{EXAMPLES_DIR}/ex1"
+      @template = 'ddl-postgresql.eruby'
+      @datafile = 'example1.yaml'
+      @expfiles = %w[ddl-postgresql.sql]
+      _test
    end
 
 
-   def test1_ddl_mysql
-      #@datafile   = "test1.yaml"
-      #@template   = "ddl-mysql.eruby"
-      #@actual     = "test1.ddl-mysql.actual"
-      #@expected   = "test1.ddl-mysql.expected"
-      _setup_ddl('ddl-mysql')
-      _test(:ignore_linenum=>4)
-   end
-
-   def test1_ddl_postgresql
-      #@datafile   = "test1.yaml"
-      #@template   = "ddl-postgresql.eruby"
-      #@actual     = "test1.ddl-postgresql.actual"
-      #@expected   = "test1.ddl-postgresql.expected"
-      _setup_ddl('ddl-postgresql')
-      _test(:ignore_linenum=>4)
-   end
-
-   def test1_dto_java
-      #@datafile   = "test1.yaml"
-      #@template   = "dto-java.eruby"
-      #@actual     = "test1.dto-java.%s.actual"
-      #@expected   = "test1.dto-java.%s.expected"
-      #@classnames = dto_classes()
-      #@output     = "%s.java"
-      _setup_dto('dto-java', '.java')
-      _test(:ignore_linenum=>4, :multiple=>true)
-   end
-
-   def test1_dto_ruby
-      #@datafile   = "#test1.yaml"
-      #@template   = "dto-ruby.eruby"
-      #@actual     = "test1.dto-ruby.%s.actual"
-      #@expected   = "test1.dto-ruby.%s.expected"
-      #@classnames = dto_classes()
-      #@output     = "%s.rb"
-      _setup_dto('dto-ruby', '.rb')
-      _test(:ignore_linenum=>4, :multiple=>true)
+   def test_ex1_java
+      @dir = "#{EXAMPLES_DIR}/ex1"
+      @template = 'dto-java.eruby'
+      @datafile = 'example1.yaml'
+      @expfiles = %w[Group.java User.java]
+      @options  = %w[-qm --package=my.example --parent=Object --populate --constructor]
+      begin
+         _test
+      ensure
+         @expfiles.each { |filename| File.unlink(filename) }
+      end
    end
 
-end
-
-
-class KwatableExample2Test < KwatableExampleTest
 
-   def prefix
-      return 'test2'
+   def test_ex1_ruby
+      @dir = "#{EXAMPLES_DIR}/ex1"
+      @template = 'dto-ruby.eruby'
+      @datafile = 'example1.yaml'
+      @expfiles = %w[Group.rb User.rb]
+      @options  = %w[-qm --module=Example --parent=Object --reqpath=lib --populate --symbolkey]
+      begin
+         _test
+      ensure
+         @expfiles.each { |filename| File.unlink(filename) }
+      end
    end
+   
+   
+   ##---
+   
 
-   def classnames
-      return %w[Address Customer Item SalesOrder SalesOrderLine]
+   def test_ex2_mysql
+      @dir = "#{EXAMPLES_DIR}/ex2"
+      @template = 'ddl-mysql.eruby'
+      @datafile = 'example2.yaml'
+      @expfiles = %w[ddl-mysql.sql]
+      _test
    end
 
 
-   def test2_ddl_mysql
-      _setup_ddl('ddl-mysql')
-      _test(:ignore_linenum=>4)
+   def test_ex2_postgresql
+      @dir = "#{EXAMPLES_DIR}/ex2"
+      @template = 'ddl-postgresql.eruby'
+      @datafile = 'example2.yaml'
+      @expfiles = %w[ddl-postgresql.sql]
+      _test
    end
 
-   def test2_ddl_postgresql
-      _setup_ddl('ddl-postgresql')
-      _test(:ignore_linenum=>4)
-   end
 
-   def test2_dto_java
-      _setup_dto('dto-java', '.java')
-      _test(:ignore_linenum=>4, :multiple=>true)
+   def test_ex2_java
+      @dir = "#{EXAMPLES_DIR}/ex2"
+      @template = 'dto-java.eruby'
+      @datafile = 'example2.yaml'
+      @expfiles = %w[Address.java Customer.java Item.java SalesOrder.java SalesOrderLine.java]
+      @options  = %w[-qm --package=my.example --parent=Object --populate --constructor]
+      begin
+         _test
+      ensure
+         @expfiles.each { |filename| File.unlink(filename) if test(?f, filename)}
+      end
    end
 
-   def test2_dto_ruby
-      _setup_dto('dto-ruby', '.rb')
-      _test(:ignore_linenum=>4, :multiple=>true)
-   end
 
 end
 
-
-File.open('test.log', 'a') do |f|
-   $logger = f
-   suite = Test::Unit::TestSuite.new()
-   suite << KwatableExample1Test.suite()
-   suite << KwatableExample2Test.suite()
-   Test::Unit::UI::Console::TestRunner.run(suite)
-end