ymldot 0.0.2 → 0.0.3

data/bin/ymldot

@@ -11,17 +11,21 @@ require 'optparse'
 
 Version = "0.0.2"
 is_output = false
+is_csv = false
 opt = OptionParser.new
 opt.version = Version
 opt.release = "0.0.1"
 opt.on('-o', 'output file to current directory. name is "#{input_filename}.dot"') {|v| is_output = true }
+opt.on('-c', '--csv', 'csv format output') {|v| is_csv = true }
 opt.parse!(ARGV)
 
 if is_output
   y = Ymldot.new(ARGV[0])
   open("./#{y.file_name}.dot", "w") do |f|
-    f.write(y.dot_generate)
+    f.write(y.to_dot)
   end
+elsif is_csv
+  puts Ymldot.new(ARGV[0]).to_csv
 else
-  puts Ymldot.new(ARGV[0]).dot_generate
+  puts Ymldot.new(ARGV[0]).to_dot
 end

data/lib/ymldot.rb

@@ -22,6 +22,20 @@ class Entity
     res << '}"]'
   end
 
+  def to_csv
+    res = ""
+    res << "#{@name}\n"
+    @foreignkeys.each{|f| res << "#{f}\n"}
+    @columns.each do |c|
+      if c.include? ":"
+        res << "#{c.split(':').join(',')}\n"
+      else
+        res << "#{c}\n"
+      end
+    end
+    res
+  end
+
   attr_accessor :name, :dependent, :columns, :foreignkeys
 end
 
@@ -31,26 +45,36 @@ class Tables
     @category = category
     @table_node = table_node
     @entity_dict = {}
+    @natural_order_entity = []
     table_node.each {|t| eval_entity(t) }
   end
   attr_accessor :entity_dict, :label, :table_node, :category
 
-  def entity_dict_to_dot
+  def to_dot
     res = ""
-    s = []
-    @entity_dict.each_value{|e| s << e }
+    s = @natural_order_entity
     if @category
       res << "label=#{@label}\n" if @label
       res << "style=invis\n" unless @label
     end
-    s.sort{|a, b| a.name <=> b.name}.each{|e| res << e.to_dot << "\n"}
+    s.each{|e| res << e.to_dot << "\n"}
+    res
+  end
+
+  def to_csv
+    res = ""
+    @natural_order_entity.each{|e| res << e.to_csv << "\n"}
     res
   end
 
   private
   def eval_entity(table)
     columns = table["columns"]; columns ||= []
-    @entity_dict[table["name"]] ||= Entity.new(table["name"], table["dependent"], columns)
+    unless @entity_dict[table["name"]]
+      e = Entity.new(table["name"], table["dependent"], columns)
+      @entity_dict[table["name"]]  = e
+      @natural_order_entity << e
+    end
   end
 
 end
@@ -72,17 +96,25 @@ class Ymldot
     eval_yml
   end
 
-  def dot_generate
+  def to_dot
     code = ""
     code += <<"EOS"
 digraph #{@file_name} {
 #{add_2_tab(config_to_dot)}
-#{add_2_tab(entity_dict_to_dot)}
+#{add_2_tab(entity_to_dot)}
 #{add_2_tab(relations_to_dot)}
 }
 EOS
   end
 
+  def to_csv
+    csv = ""
+    @category.each do |e|
+      csv << e.to_csv
+    end
+    csv
+  end
+
   private
   def add_2_tab(str)
     res = ""
@@ -97,15 +129,15 @@ EOS
     res
   end
 
-  def entity_dict_to_dot
+  def entity_to_dot
     res = ""
     unless @category.empty?
       @category.each_with_index do |c, i|
         unless c.category
-          res << c.entity_dict_to_dot
+          res << c.to_dot
         else
           res << "subgraph cluster#{i} {\n"
-          res << add_2_tab(c.entity_dict_to_dot)
+          res << add_2_tab(c.to_dot)
           res << "}\n"
         end
       end
@@ -144,6 +176,7 @@ EOS
 
   def eval_relation_has_many(keys, tname)
     keys.each do |rel|
+      raise "Error Relation! has many #{tname} to #{rel}" if @entity_dict[rel] == nil
       @entity_dict[rel].foreignkeys << "#{singularize(tname)}ID(FK)"
       @many_relations << {:self => @entity_dict[tname], :have => @entity_dict[rel]}
     end
@@ -151,6 +184,7 @@ EOS
 
   def eval_relation_has_one(keys, tname)
     keys.each do |rel|
+      raise "Error Relation! has one #{tname} to #{rel}" if @entity_dict[rel] == nil
       @entity_dict[rel].foreignkeys << "#{singularize(tname)}ID(FK)"
       @one_relations << {:self => @entity_dict[tname], :have => @entity_dict[rel]}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ymldot
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - nari
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-29 00:00:00 +09:00
+date: 2008-10-21 00:00:00 +09:00
 default_executable: 
 dependencies: []