Changeset 19133 for lang/ruby

Timestamp:

09/10/08 20:34:22 (2 months ago)

Author:

authorNari

Message:

imprement category describe function, add test.

Location:

lang/ruby/ymldot

Files:

• README (modified) (2 diffs)
• bin/ymldot (modified) (1 diff)
• lib/ymldot.rb (modified) (9 diffs)
• spec/test_category.yml (added)
• spec/test_category_none_table.yml (added)
• spec/ymldot_spec.rb (modified) (8 diffs)

lang/ruby/ymldot/README

@@ -27 +27 @@
     enumerate column names
   * foreginkeys
-    * belongs_to
     * has_many
     * has_one
@@ -33 +32 @@
       same meaning the relation of ActiveRecord.
       enumerate ref table name.
+* category
+   * label
+     category name set. and set frame.
+   * table
+     nested table.
 
 == Sample

lang/ruby/ymldot/bin/ymldot

@@ -1 +1 @@
 #!/usr/bin/ruby -wKU
+$: << File.join(File.dirname(__FILE__), "../lib")
 
-require 'lib/ymldot'
+require 'ymldot'
 require 'optparse'
 

lang/ruby/ymldot/lib/ymldot.rb

@@ -25 +25 @@
 end
 
+class Tables
+  def initialize(table_node, label=nil, category=false)
+    @label = label
+    @category = category
+    @table_node = table_node
+    @entity_dict = {}
+    table_node.each {|t| eval_entity(t) }
+  end
+  attr_accessor :entity_dict, :label, :table_node, :category
+
+  def entity_dict_to_dot
+    res = ""
+    s = []
+    @entity_dict.each_value{|e| s << e }
+    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"}
+    res
+  end
+
+  private
+  def eval_entity(table)
+    columns = table["columns"]; columns ||= []
+    @entity_dict[table["name"]] ||= Entity.new(table["name"], table["dependent"], columns)
+  end
+
+end
+
 
 class Ymldot
@@ -35 +65 @@
     end
     @file_name = $1 if filepath[/(\w+).yml\z/]
-    @entities = {}
+    @entity_dict = {}
+    @category = []
     @one_relations = []
     @many_relations = []
-    eval
+    eval_yml
   end
 
@@ -46 +77 @@
 digraph #{@file_name} {
 #{add_2_tab(config_to_dot)}
-#{add_2_tab(entities_to_dot)}
+#{add_2_tab(entity_dict_to_dot)}
 #{add_2_tab(relations_to_dot)}
 }
@@ -66 +97 @@
   end
 
-  def entities_to_dot
+  def entity_dict_to_dot
     res = ""
-    s = []
-    @entities.each_value{|e| s << e }
-    s.sort{|a, b| a.name <=> b.name}.each{|e| res << e.to_dot << "\n"}
+    unless @category.empty?
+      @category.each_with_index do |c, i|
+        unless c.category
+          res << c.entity_dict_to_dot
+        else
+          res << "subgraph cluster#{i} {\n"
+          res << add_2_tab(c.entity_dict_to_dot)
+          res << "}\n"
+        end
+      end
+    end
     res
   end
@@ -85 +124 @@
   end
 
-  def eval
+  def eval_yml
     @config = @node["config"]? @node["config"] : {}
-    @node["tables"].each {|t| eval_entity(t) }
-    @node["tables"].each {|t| eval_relation(t) }
-  end
-
-  def eval_entity(table)
-    columns = table["columns"]; columns ||= []
-    @entities[table["name"]] ||= Entity.new(table["name"], table["dependent"], columns)
+    @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) } }
   end
 
@@ -99 +135 @@
     foreignkeys = table["foreignkeys"]
     tname = table["name"]
-    eval_relation_belongs_to(foreignkeys["belongs_to"], tname) if foreignkeys["belongs_to"]
+    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"]
@@ -105 +141 @@
   end
 
-  def eval_relation_belongs_to(keys, tname)
-    keys.each do |rel|
-      @entities[tname].foreignkeys << "#{rel}ID(FK)"
-    end
-  end
-
   def eval_relation_has_many(keys, tname)
     keys.each do |rel|
-      @many_relations << {:self => @entities[tname], :have => @entities[rel]}
+      @entity_dict[rel].foreignkeys << "#{tname}ID(FK)"
+      @many_relations << {:self => @entity_dict[tname], :have => @entity_dict[rel]}
     end
   end
@@ -119 +150 @@
   def eval_relation_has_one(keys, tname)
     keys.each do |rel|
-      @one_relations << {:self => @entities[tname], :have => @entities[rel]}
+      @entity_dict[rel].foreignkeys << "#{tname}ID(FK)"
+      @one_relations << {:self => @entity_dict[tname], :have => @entity_dict[rel]}
     end
   end
@@ -126 +158 @@
     keys.each do |rel|
       join_tname = "#{rel}_#{tname}"
-      return if @entities.has_key? join_tname
+      return if @entity_dict.has_key? join_tname
       join_tname = "#{tname}_#{rel}"
-      @entities[join_tname] ||= Entity.new(join_tname, true)
-      @entities[join_tname].foreignkeys << "#{tname}ID(FK)"
-      @entities[join_tname].foreignkeys << "#{rel}ID(FK)"
-      @many_relations << {:self => @entities[tname], :have => @entities[join_tname]}
-      @many_relations << {:self => @entities[rel], :have => @entities[join_tname]}
+      @entity_dict[join_tname] ||= Entity.new(join_tname, true)
+      @entity_dict[join_tname].foreignkeys << "#{tname}ID(FK)"
+      @entity_dict[join_tname].foreignkeys << "#{rel}ID(FK)"
+
+      # make new category
+      keys = []
+      keys << "#{tname}ID(FK)"
+      keys << "#{rel}ID(FK)"
+      @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]}
     end
   end

lang/ruby/ymldot/spec/ymldot_spec.rb

@@ -3 +3 @@
 
 class Ymldot
-  attr_accessor :node, :entities, :one_relations, :many_relations, :file_name, :config
+  attr_accessor :node, :entity_dict, :one_relations, :many_relations, :file_name, :config, :category
 end
 
@@ -27 +27 @@
   end
 
-  it "#entities には正しいEntityクラスが格納されていること" do
-    @ymldot.entities["foo"].name.should == "foo"
-    @ymldot.entities["foo"].dependent?.should be_true
-    @ymldot.entities["foo"].columns.should == ["password", "group_id"]
-    @ymldot.entities["foo"].foreignkeys.should == ["hogeID(FK)"]
-    @ymldot.entities["hoge"].name.should == "hoge"
-    @ymldot.entities["hoge"].dependent?.should be_false
-    @ymldot.entities["hoge"].columns.should == ["password", "group_id"]
-    @ymldot.entities["hoge"].foreignkeys.should be_empty
+  it "#entity_dict には正しいEntityクラスが格納されていること" do
+    @ymldot.entity_dict["foo"].name.should == "foo"
+    @ymldot.entity_dict["foo"].dependent?.should be_true
+    @ymldot.entity_dict["foo"].columns.should == ["password", "group_id"]
+    @ymldot.entity_dict["foo"].foreignkeys.should == ["hogeID(FK)"]
+    @ymldot.entity_dict["hoge"].name.should == "hoge"
+    @ymldot.entity_dict["hoge"].dependent?.should be_false
+    @ymldot.entity_dict["hoge"].columns.should == ["password", "group_id"]
+    @ymldot.entity_dict["hoge"].foreignkeys.should be_empty
   end
 
@@ -69 +69 @@
   end
 
-  it "#entities には正しいEntityクラスが格納されていること" do
-    @ymldot.entities["one1_one2"].foreignkeys.should == ["one1ID(FK)", "one2ID(FK)"]
+  it "#entity_dict には正しいEntityクラスが格納されていること" do
+    @ymldot.entity_dict["one1_one2"].foreignkeys.should == ["one1ID(FK)", "one2ID(FK)"]
   end
 
@@ -88 +88 @@
   node [fontname="MSUIGOTHIC.ttf"]
   "one1" [shape=Mrecord, label="{one1|password\lgroup_id\l}"]
-  "one1_one2" [shape=Mrecord, label="{one1_one2|one1ID(FK)\lone2ID(FK)\l}"]
   "one2" [shape=record, label="{one2|password\lgroup_id\l}"]
+  "one1_one2" [shape=record, label="{one1_one2|one1ID(FK)\lone2ID(FK)\l}"]
 
   "one1" -> "one1_one2" [arrowtail=none arrowhead=dot headlabel="n" taillabel="1"]
@@ -104 +104 @@
   end
 
-  it "#entities には正しいEntityクラスが格納されていること" do
-    @ymldot.entities["one1"].foreignkeys.should == ["one2ID(FK)"]
+  it "#entity_dict には正しいEntityクラスが格納されていること" do
+    @ymldot.entity_dict["one1"].foreignkeys.should == ["one2ID(FK)"]
   end
 
@@ -129 +129 @@
   end
 
-  it "#entities には正しいEntityクラスが格納されていること" do
-    @ymldot.entities["コンテンツ_カテゴリ"].foreignkeys.should == ["コンテンツID(FK)", "カテゴリID(FK)"]
+  it "#entity_dict には正しいEntityクラスが格納されていること" do
+    @ymldot.entity_dict["コンテンツ_カテゴリ"].foreignkeys.should == ["コンテンツID(FK)", "カテゴリID(FK)"]
   end
 
@@ -159 +159 @@
   end
 
-  it "#entities の'baf'には'bar'へのforeginkeyがあること" do
-     @ymldot.entities["baf"].foreignkeys[0].should == "barID(FK)"
+  it "#entity_dict の'baf'には'bar'へのforeginkeyがあること" do
+     @ymldot.entity_dict["baf"].foreignkeys[0].should == "barID(FK)"
   end
 end
@@ -169 +169 @@
   end
 
-  it "#entities['foo'].columnsは空の配列であること" do
-    puts @ymldot.node.inspect
-    @ymldot.entities["foo"].columns.should == []
-    @ymldot.entities["hoge"].columns.should be_empty
-  end
-end
+  it "#entity_dict['foo'].columnsは空の配列であること" do
+    @ymldot.entity_dict["foo"].columns.should == []
+    @ymldot.entity_dict["hoge"].columns.should be_empty
+  end
+end
+
+describe Ymldot, "で読み込んだ.ymlにてカテゴリわけがしてがあった場合" do
+  before do
+    @ymldot = Ymldot.new("test_category.yml")
+  end
+
+  it "#category[1].labelはhogeであること" do
+    @ymldot.category[1].label.should == "hoge"
+  end
+
+  it "出力されるdotが正しいこと" do
+    @ymldot.dot_generate.should == <<'EOS'
+digraph test_category {
+  graph[overlap=false, splines=true]
+
+  "bar" [shape=record, label="{bar|fooID(FK)\lbazID(FK)\lfuge\l}"]
+  "foo" [shape=record, label="{foo|hoge\l}"]
+  subgraph cluster1 {
+    label=hoge
+    "baf" [shape=record, label="{baf|bazID(FK)\lbuge\l}"]
+    "baz" [shape=record, label="{baz|gage\l}"]
+  }
+
+  "baz" -> "baf" [arrowtail=none arrowhead=dot headlabel="n" taillabel="1"]
+  "baz" -> "bar" [arrowtail=none arrowhead=dot headlabel="n" taillabel="1"]
+  "foo" -> "bar" [arrowtail=none arrowhead=dot headlabel="n" taillabel="1"]
+
+}
+EOS
+  end
+end
+
+describe Ymldot, "で読み込んだ.ymlにてカテゴリわけがしてあり、かつ、tableが定義されていない場合" do
+  before do
+    @ymldot = Ymldot.new("test_category_none_table.yml")
+  end
+
+  it "出力されるdotが正しいこと" do
+    @ymldot.dot_generate.should == <<'EOS'
+digraph test_category_none_table {
+  graph[overlap=false, splines=true]
+
+  subgraph cluster0 {
+    label=hoge
+    "baf" [shape=record, label="{baf|buge\l}"]
+    "baz" [shape=record, label="{baz|gage\l}"]
+  }
+
+
+}
+EOS
+  end
+end