ymldot 0.0.5 → 0.0.6

data/bin/ymldot

@@ -9,7 +9,7 @@ end
 require 'ymldot'
 require 'optparse'
 
-Version = "0.0.5"
+Version = "0.0.6"
 is_output = false
 is_csv = false
 opt = OptionParser.new

data/lib/ymldot.rb

@@ -67,6 +67,10 @@ class Tables
     res
   end
 
+  def add_entity(table)
+    eval_entity(table)
+  end
+  
   private
   def eval_entity(table)
     columns = table["columns"]; columns ||= []
@@ -128,8 +132,14 @@ EOS
     if @config["size"] && @config["size"]["x"] && @config["size"]["y"]
       res << %Q!graph [size="#{(@config["size"]["x"]/2.54).round},#{(@config["size"]["y"]/2.54).round}"]\n! 
     end
-    raise "Error: please seto 'font'" if @config["ja"] && @config["font"]
-    res << %Q!node [fontname="#{@config["font"]}"]! if @config["font"]
+    raise "Error: please set 'font'" if @config["ja"] && @config["font"]
+    
+    if @config["font"] || @config["fontsize"]
+      res << "node ["
+      res << %Q!fontname="#{@config["font"]}"! if @config["font"]
+      res << %Q!, fontsize=#{@config["fontsize"]}! if @config["fontsize"]
+      res << "]"
+    end
     res
   end
 
@@ -165,16 +175,16 @@ EOS
     @category << Tables.new(@node["tables"]) if @node["tables"] and !@node["tables"].empty?
     @node["category"].each{|c| @category << Tables.new(c["tables"], c["label"], true) } if @node["category"]
     @category.each{|c| c.entity_dict.each_pair{|k, v| @entity_dict[k] = v}}
-    @category.each{|c| c.table_node.each{|e| eval_relation(e) } }
+    @category.each{|c| c.table_node.each{|e| eval_relation(e, c) } }
   end
 
-  def eval_relation(table)
+  def eval_relation(table, category)
     foreignkeys = table["foreignkeys"]
     tname = table["name"]
     return unless foreignkeys
     eval_relation_has_many(foreignkeys["has_many"], tname) if foreignkeys["has_many"]
     eval_relation_has_one(foreignkeys["has_one"], tname) if foreignkeys["has_one"]
-    eval_relation_hmabt(foreignkeys["has_many_and_belongs_to"], tname) if foreignkeys["has_many_and_belongs_to"]
+    eval_relation_habtm(foreignkeys["has_and_belongs_to_many"], tname, category) if foreignkeys["has_and_belongs_to_many"]
     eval_relation_polymorphic(foreignkeys["polymorphic"], tname) if foreignkeys["polymorphic"]
   end
 
@@ -194,23 +204,22 @@ EOS
     end
   end
 
-  def eval_relation_hmabt(keys, tname)
+  def eval_relation_habtm(keys, tname, category)
     keys.each do |rel|
-      join_tname = "#{rel}_#{tname}"
-      return if @entity_dict.has_key? join_tname
-      join_tname = "#{tname}_#{rel}"
-      @entity_dict[join_tname] ||= Entity.new(join_tname, true)
-      @entity_dict[join_tname].foreignkeys << append_fk_str(singularize(tname))
-      @entity_dict[join_tname].foreignkeys << append_fk_str(singularize(rel))
+      join_tname = [rel, tname].sort.join("_")
+      return if category.entity_dict.has_key? join_tname
 
       # make new category
       keys = []
       keys << append_fk_str(tname)
       keys << append_fk_str(rel)
-      @category << Tables.new([{"name" => join_tname, "columns" => keys}])
-
-      @many_relations << {:self => @entity_dict[tname], :have => @entity_dict[join_tname]}
-      @many_relations << {:self => @entity_dict[rel], :have => @entity_dict[join_tname]}
+      
+      category.add_entity("name" => join_tname)
+      category.entity_dict[join_tname].foreignkeys << append_fk_str(singularize(tname))
+      category.entity_dict[join_tname].foreignkeys << append_fk_str(singularize(rel))
+      
+      @many_relations << {:self => category.entity_dict[tname], :have => category.entity_dict[join_tname]}
+      @many_relations << {:self => category.entity_dict[rel], :have => category.entity_dict[join_tname]}
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ymldot
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - nari
@@ -13,10 +13,10 @@ date: 2008-10-22 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
-description: ""
+description: Can describe ERD in a from of ".yml"
 email: authornari@gmail.com
-executables: []
-
+executables: 
+- ymldot
 extensions: []
 
 extra_rdoc_files: []