Changeset 31339

Timestamp:

03/18/09 15:43:50 (4 years ago)

Author:

authorNari

Message:

relase version 0.0.6

Location:

lang/ruby/ymldot

Files:

• bin/ymldot (modified) (1 diff)
• lib/ymldot.rb (modified) (6 diffs)
• spec/test_jp.yml (modified) (2 diffs)
• spec/ymldot_spec.rb (modified) (5 diffs)
• ymldot.gemspec (modified) (2 diffs)

lang/ruby/ymldot/bin/ymldot

@@ -10 +10 @@
 require 'optparse'
 
-Version = "0.0.5"
+Version = "0.0.6"
 is_output = false
 is_csv = false

lang/ruby/ymldot/lib/ymldot.rb

@@ -68 +68 @@
   end
 
+  def add_entity(table)
+    eval_entity(table)
+  end
+  
   private
   def eval_entity(table)
@@ -129 +133 @@
       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
@@ -166 +176 @@
     @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) } }
-  end
-
-  def eval_relation(table)
+    @category.each{|c| c.table_node.each{|e| eval_relation(e, c) } }
+  end
+
+  def eval_relation(table, category)
     foreignkeys = table["foreignkeys"]
     tname = table["name"]
@@ -175 +185 @@
     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
@@ -195 +205 @@
   end
 
-  def eval_relation_hmabt(keys, tname)
-    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))
+  def eval_relation_habtm(keys, tname, category)
+    keys.each do |rel|
+      join_tname = [rel, tname].sort.join("_")
+      return if category.entity_dict.has_key? join_tname
 
       # make new category
@@ -208 +214 @@
       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

lang/ruby/ymldot/spec/test_jp.yml

@@ -8 +8 @@
       - タイトル
     foreignkeys:
-      has_many_and_belongs_to:
+      has_and_belongs_to_many:
         - カテゴリ
     dependent: 
@@ -16 +16 @@
       - 種別名
     foreignkeys:
-      has_many_and_belongs_to:
+      has_and_belongs_to_many:
          - コンテンツ
     dependent: false

lang/ruby/ymldot/spec/ymldot_spec.rb

@@ -64 +64 @@
 end
 
-describe Ymldot, "で読み込んだ.ymlのリレーションがhas_many_and_belongs_toである場合" do
-  before do
-    @ymldot = Ymldot.new("test_has_many_and_belongs_to.yml")
+describe Ymldot, "で読み込んだ.ymlのリレーションがhas_and_belongs_to_manyである場合" do
+  before do
+    @ymldot = Ymldot.new("test_has_and_belongs_to_many.yml")
   end
 
   it "#entity_dict には正しいEntityクラスが格納されていること" do
-    @ymldot.entity_dict["one1_one2"].foreignkeys.should == ["one1_id(FK)", "one2_id(FK)"]
+    @ymldot.category.first.entity_dict["one1_one2"].foreignkeys.should == ["one1_id(FK)", "one2_id(FK)"]
   end
 
@@ -84 +84 @@
     @ymldot.to_dot.should_not be_empty
     @ymldot.to_dot.should == <<'EOS'
-digraph test_has_many_and_belongs_to {
+digraph test_has_and_belongs_to_many {
   graph [overlap=false, splines=true]
   node [fontname="MSUIGOTHIC.ttf"]
@@ -130 +130 @@
 
   it "#entity_dict には正しいEntityクラスが格納されていること" do
-    @ymldot.entity_dict["コンテンツ_カテゴリ"].foreignkeys.should == ["コンテンツID(FK)", "カテゴリID(FK)"]
+    @ymldot.category.first.entity_dict["カテゴリ_コンテンツ"].foreignkeys.should == ["コンテンツID(FK)", "カテゴリID(FK)"]
   end
 
@@ -238 +238 @@
 
   it "#entity_dict['foo'] のforeginkeyは'entiity_id(FK)'であること" do
-    @ymldot.entity_dict['foo'].foreignkeys.should be_include 'entity_id(FK)'
+    @ymldot.entity_dict['foo'].foreignkeys.should be_include('entity_id(FK)')
   end
 
   it "#entity_dict['foo'] のcolumnsには'entity_tyep(type)'があること" do
-    @ymldot.entity_dict['foo'].columns.should be_include 'entity_type(type)'
+    @ymldot.entity_dict['foo'].columns.should be_include('entity_type(type)')
   end
 
@@ -255 +255 @@
   "baf" [shape=record, label="{baf|buge\l}"]
 
-  "baf" -> "foo" [arrowtail=none arrowhead=dot headlabel="1" taillabel="1"]
-  "bar" -> "foo" [arrowtail=none arrowhead=dot headlabel="1" taillabel="1"]
-  "baz" -> "foo" [arrowtail=none arrowhead=dot headlabel="1" taillabel="1"]
+  "baf" -> "foo" [arrowtail=none arrowhead=dot headlabel="n" taillabel="1"]
+  "bar" -> "foo" [arrowtail=none arrowhead=dot headlabel="n" taillabel="1"]
+  "baz" -> "foo" [arrowtail=none arrowhead=dot headlabel="n" taillabel="1"]
 
 }

lang/ruby/ymldot/ymldot.gemspec

@@ -1 +1 @@
 Gem::Specification.new do |s|
   s.name = %q{ymldot}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
@@ -8 +8 @@
   s.authors = ["nari"]
   s.date = %q{2008-10-22}
-  s.description = %q{}
+  s.description = %q{Can describe ERD in a from of ".yml"}
   s.email = %q{authornari@gmail.com}
   s.files = ["README", "bin/ymldot", "lib/ymldot.rb", "lib/util.rb", "sample/sample.dot", "sample/sample.png", "sample/sample.yml", "sample/sample_jp.dot", "sample/sample_jp.png", "sample/sample_jp.yml"]
+  s.executables = ["ymldot"]
   s.homepage = %q{http://coderepos.org/share/browser/lang/ruby/ymldot}
   s.require_paths = ["lib"]