yaml2erd 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c951305aba9df6d52d9ee4cd03a37315600bddb6ad784d513989a6cd59a49f
-  data.tar.gz: 0d5056f95c9bc2ace3ae549ee3c7e0a35ce51822c4614cb37334b049136831ec
+  metadata.gz: c07d6b5fd4e512e61815f61e3ad4b2bb011aa9bcda3d9e831601c9b2d856ae45
+  data.tar.gz: 9bd8dc74f363c71d443e371c9141d1a936426c0d0c99bfcd8d9d9c640e52e838
 SHA512:
-  metadata.gz: 4dc611ca29259d56d984881e787ab8a7bc523df072c23772bb54f6939402fb54aff54c0c754a15f0e5fc398497fada7d171bf97247f5c86552c214f08163b213
-  data.tar.gz: e4010ff0d1a4433e71d60efb3827f124df5bd1113c59cb8427618c2c0179bebc5b8434929872dba4d4703149b4c26636b3787f366d966fbf247285c6c9b73ecd
+  metadata.gz: def24be6c39babaea1f83c9cd5dfd59e66b8fefe93f45781bc3cfb0831b4844789e01ed875b17d6d73907498169b472c8167878cfec2301947f9fd0ce850fb7b
+  data.tar.gz: 99c3ae3cfa1ca336c5e7f28897d7f135a05792f53030589094fe1821c28a6581225f2626c9bb0e7d6256901710d1cdc7cda41dc5144faae729402b5c21d85315

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    yaml2erd (0.2.0)
+    yaml2erd (0.3.0)
       activesupport (~> 5.2)
       gviz (~> 0.3.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     diff-lcs (1.3)
     gviz (0.3.5)
       thor
-    i18n (1.1.1)
+    i18n (1.5.2)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
     rake (10.5.0)
@@ -49,4 +49,4 @@ DEPENDENCIES
   yaml2erd!
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

data/lib/yaml2erd.rb

@@ -7,11 +7,6 @@ require 'yaml2erd/gv_id_map'
 class Yaml2erd
   attr_accessor :group_global_conf
 
-  ARROW_MAP = {
-    has_many: { arrowhead: 'crow', arrowtail: 'tee', arrowsize: 5, dir: 'both', minlen: 5, penwidth: 10 },
-    has_one: { arrowhead: 'tee', arrowtail: 'tee', arrowsize: 5, dir: 'both', minlen: 5, penwidth: 10 }
-  }.freeze
-
   TABLE_HEADER = %w[
     物理名
     論理名
@@ -23,19 +18,30 @@ class Yaml2erd
     説明
   ].freeze
 
-  DEFAULT_CONF = {
+  CUSTOMIZABLE_CONF = {
     global_conf: {
       layout: 'dot'
     },
     entity_conf: {
       shape: 'Mrecord',
       fontname: 'Noto Sans CJK JP Black',
-      fontsize: 50
+      fontsize: 20
     },
     group_conf: {
       shape: 'Mrecord',
       fontname: 'Noto Sans CJK JP Black',
-      fontsize: 120
+      fontsize: 40
+    },
+    arrow_map: {
+      has_many: { arrowsize: 3, minlen: 2, penwidth: 4 },
+      has_one: { arrowsize: 3, minlen: 2, penwidth: 4 }
+    }
+  }.freeze
+
+  NOT_CUSTOMIZABLE_CONF = {
+    arrow_map: {
+      has_many: { arrowhead: 'crow', arrowtail: 'tee', dir: 'both' },
+      has_one: { arrowhead: 'tee', arrowtail: 'tee', dir: 'both' }
     }
   }.freeze
 
@@ -45,7 +51,8 @@ class Yaml2erd
     @gv = Gviz.new
     @gv_id_map = GvIdMap.new
 
-    apply_conf(conf_yaml_path)
+    @customized_conf = fetch_conf(conf_yaml_path)
+    apply_conf(@customized_conf)
   end
 
   def write_erd
@@ -89,26 +96,38 @@ class Yaml2erd
 
   private
 
-  def apply_conf(conf_yaml_path)
-    conf = DEFAULT_CONF
-    custom_conf = {}
+  def fetch_conf(conf_yaml_path)
+    user_conf = {}
     if conf_yaml_path.present?
       File.open(conf_yaml_path) do |file|
-        custom_conf = YAML.safe_load(file.read).deep_symbolize_keys
+        user_conf = YAML.safe_load(file.read).deep_symbolize_keys
       end
     end
 
-    # DEFAULT_CONFとキー重複しているものだけ適用
-    custom_conf.each do |custom_key, custom_details|
-      if conf.keys.include?(custom_key)
-        custom_details.each do |custom_detail_key, custom_val|
-          if conf[custom_key].keys.include?(custom_detail_key)
-            conf[custom_key][custom_detail_key] = custom_val
-          end
-        end
+    # CUSTOMIZABLE_CONFとキー重複しているものだけ適用
+    customized_conf = merge_keep_struct(CUSTOMIZABLE_CONF.dup, user_conf)
+
+    # ユーザ設定取り込んで、固定値をマージして返す
+    customized_conf.deep_merge(NOT_CUSTOMIZABLE_CONF)
+  end
+
+  def merge_keep_struct(base_hash, input_hash)
+    input_hash.each do |key, val|
+      # input_hashのネストが深すぎる時にエラーになるからtry
+      next unless base_hash.try(:keys).try(:include?, key)
+
+      if val.is_a?(Hash)
+        base_hash[key] = merge_keep_struct(base_hash[key], input_hash[key])
+      else
+        # input_hashのネストが浅すぎる時(inputは底までついたけどbaseはまだhashの時)はスルーするように
+        next if base_hash[key].is_a?(Hash)
+        base_hash[key] = val
       end
     end
+    base_hash
+  end
 
+  def apply_conf(conf)
     # 適用
     @group_global_conf = conf[:group_conf]
     @nodes_conf = conf[:entity_conf]
@@ -196,8 +215,8 @@ class Yaml2erd
     return if relations.blank?
     relations.each do |relation|
       relation.each do |rel_type, rel_model|
-        next if rel_type == :belongs_to
-        @gv.edge "#{@gv_id_map.enc(model)}_#{@gv_id_map.enc(rel_model)}", ARROW_MAP[rel_type]
+        next if rel_type != :has_one && rel_type != :has_many
+        @gv.edge "#{@gv_id_map.enc(model)}_#{@gv_id_map.enc(rel_model)}", @customized_conf[:arrow_map][rel_type]
       end
     end
   end

data/lib/yaml2erd/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml2erd
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - rh-taro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: ERD create from yaml