yaml2erd 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd5696521ec49d8752a8b85cdf0eac256ccfd2e7b807031b956d454cc9bc4c8b
-  data.tar.gz: 3b9308df9411151cec2cb7f0dd358ad859db04446e174efd46f700b3df4123ea
+  metadata.gz: b0c951305aba9df6d52d9ee4cd03a37315600bddb6ad784d513989a6cd59a49f
+  data.tar.gz: 0d5056f95c9bc2ace3ae549ee3c7e0a35ce51822c4614cb37334b049136831ec
 SHA512:
-  metadata.gz: b0ff3fd25fa6751e68fc1b806e19fda231126cd683623b0364e4928de5e457469ab29fa9de8b417028c365f6a6851607b8d82e0afd4ec06600051132ee8525c8
-  data.tar.gz: a28aaeb33320bc7943e37d97beb109b6988b3a15b84627ca64f5869272cc936a70021cf446196d4c56fe5caa3f8da34dea9757425ade63942f03e51fd3cbef7d
+  metadata.gz: 4dc611ca29259d56d984881e787ab8a7bc523df072c23772bb54f6939402fb54aff54c0c754a15f0e5fc398497fada7d171bf97247f5c86552c214f08163b213
+  data.tar.gz: e4010ff0d1a4433e71d60efb3827f124df5bd1113c59cb8427618c2c0179bebc5b8434929872dba4d4703149b4c26636b3787f366d966fbf247285c6c9b73ecd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yaml2erd (0.1.0)
+    yaml2erd (0.2.0)
       activesupport (~> 5.2)
       gviz (~> 0.3.5)
 

data/README.md

@@ -46,12 +46,28 @@ sample path
 ### step4. execute
 ```
 mkdir erd
-bin/yaml2erd erd/table.yaml -c config/gv_conf.yaml -o erd/table.png
+yaml2erd erd/table.yaml -c config/gv_conf.yaml -o erd/table.png
 ```
 
 - `-c` option is config path
 - `-o` option is outputed path
 
+## you can notice the difference between ERD and DDL
+- step1. get column info from yaml
+
+```
+parser = ErYamlParser.new('erd/table.yaml')
+columns_hash_yaml = parser.models[:Post].columns
+```
+
+- step2. get column info from ActiveRecord
+
+```
+columns_hash_ar = Post.column_names
+```
+
+- step3. Write test code to compare these two
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/yaml2erd/gv_id_map.rb

@@ -0,0 +1,17 @@
+class GvIdMap
+  def initialize
+    @map = {}
+    @cnt = 1
+  end
+
+  def enc(model)
+    model = model.to_sym if model.class == String
+
+    if @map[model].nil?
+      @map[model] = @cnt.to_s.to_sym
+      @cnt += 1
+    end
+
+    @map[model]
+  end
+end

data/lib/yaml2erd/version.rb

@@ -1,3 +1,3 @@
 class Yaml2erd
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/yaml2erd.rb

@@ -1,7 +1,8 @@
 require 'gviz'
-require 'rails/all'
+require 'active_support/all'
 require 'yaml2erd/version'
 require 'yaml2erd/er_yaml_parser'
+require 'yaml2erd/gv_id_map'
 
 class Yaml2erd
   attr_accessor :group_global_conf
@@ -42,6 +43,7 @@ class Yaml2erd
   def initialize(yaml_file_path, conf_yaml_path)
     @yaml = ErYamlParser.new(yaml_file_path)
     @gv = Gviz.new
+    @gv_id_map = GvIdMap.new
 
     apply_conf(conf_yaml_path)
   end
@@ -57,11 +59,11 @@ class Yaml2erd
 
       # TODO: addとrouteの違いはなんだろう
       # entityの枠(model)作成
-      @gv.route model
+      @gv.route @gv_id_map.enc(model)
 
       # entityの中身(tableタグ)作成、適用
       table_tag = create_table_tag(model, columns, description)
-      @gv.node model, label: table_tag
+      @gv.node @gv_id_map.enc(model), label: table_tag
 
       # relation適用
       apply_relation(model, relations)
@@ -195,7 +197,7 @@ class Yaml2erd
     relations.each do |relation|
       relation.each do |rel_type, rel_model|
         next if rel_type == :belongs_to
-        @gv.edge "#{model}_#{rel_model}", ARROW_MAP[rel_type]
+        @gv.edge "#{@gv_id_map.enc(model)}_#{@gv_id_map.enc(rel_model)}", ARROW_MAP[rel_type]
       end
     end
   end
@@ -208,13 +210,14 @@ class Yaml2erd
     # mapをもとにグルーピング
     @yaml.groups_map.each do |group_name, models|
       group_bgcolor = @yaml.groups_bgcolor_map[group_name.to_sym]
+      alias_models = models.map do |model| @gv_id_map.enc(model) end
 
       @gv.subgraph do
         global group_conf.merge(label: group_name, bgcolor: group_bgcolor)
         nodes nodes_conf
         # model割り当て
-        models.each do |model|
-          node model
+        alias_models.each do |alias_model|
+          node alias_model
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaml2erd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - rh-taro
@@ -103,6 +103,7 @@ files:
 - lib/yaml2erd.rb
 - lib/yaml2erd/er_yaml_model.rb
 - lib/yaml2erd/er_yaml_parser.rb
+- lib/yaml2erd/gv_id_map.rb
 - lib/yaml2erd/version.rb
 - yaml2erd.gemspec
 homepage: https://github.com/rh-taro/yaml2erd