yaml2erd 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 713fa7bae57f1a43bc0cb36d3512b5e11e6c0a052602d37e5b2edfb3ff1ee254
-  data.tar.gz: '049f87a45acc4f05105e6ac3198365a556c58e68a67913bdcdd3ff14e1f4abf1'
+  metadata.gz: 3850dbeb1221f38ca3aa3b5e9e17698a6d85d6e1bc31a69618d000c3df16f1a4
+  data.tar.gz: 1e4bf1354d0781a8766a13ccd38a91f4e3c9eb71172bbdc5d2da379ef39388b9
 SHA512:
-  metadata.gz: 9213646a34afb98d6c2010230183bccb78244b8ccfa8e4df363cf7fb97aeac113434d21e84bec70e33d137c1ee196bf2916a7af4167eb80e8c8283f70bddf9cb
-  data.tar.gz: 62e1dfd95cdc553e9ab80fa3f29c2eab90294b9f292830a9250596d8b461670e671d81df8ab8936ab7b151c9919144026bf0b6f5ba6dc356c49401d5efa427e2
+  metadata.gz: ccbbd27c4923761bfab989bab49248aa34ec0595d165ec2dc5fd43ea42b1112cced84a6b014ca9f1413f75cfdab9c9edfad2926270ef21a728c81e5f47a72c60
+  data.tar.gz: ae016ea85279a000b7140b44398bebf0f58fedd8e6aa255b0684b2c2d380e232e41a5ee34c16c910b22b416190f172dd6482c067916ba37cf1de225ae70c9fd3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yaml2erd (0.4.0)
+    yaml2erd (0.5.0)
       activesupport (~> 5.2)
       gviz (~> 0.3.5)
 
@@ -17,7 +17,7 @@ GEM
     diff-lcs (1.3)
     gviz (0.3.5)
       thor
-    i18n (1.5.2)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
     rake (10.5.0)

data/lib/yaml2erd.rb

@@ -18,37 +18,25 @@ class Yaml2erd
     説明
   ].freeze
 
-  CUSTOMIZABLE_CONF = {
+  DEFAULT_CONF = {
     global_conf: {
-      layout: 'fdp',
+      layout: 'dot',
       splines: 'ortho',
-      K: 5
     },
     entity_conf: {
       shape: 'Mrecord',
       fontname: 'Noto Sans CJK JP Black',
-      fontsize: 20
+      fontsize: 20,
     },
     group_conf: {
       shape: 'Mrecord',
       fontname: 'Noto Sans CJK JP Black',
-      fontsize: 40
+      fontsize: 40,
     },
     arrow_map: {
-      has_many: { arrowsize: 3, penwidth: 4, len: 10 },
-      has_one: { arrowsize: 3, penwidth: 4, len: 10 }
-    }
-  }.freeze
-
-  NOT_CUSTOMIZABLE_CONF = {
-    global_conf: {
-      overlap: false,
-      sep: '+1'
+      has_many: {},
+      has_one: {},
     },
-    arrow_map: {
-      has_many: { arrowhead: 'crow', arrowtail: 'tee', dir: 'both' },
-      has_one: { arrowhead: 'tee', arrowtail: 'tee', dir: 'both' }
-    }
   }.freeze
 
   # TODO: nodesとglobalの違いみたいなの調査
@@ -110,27 +98,8 @@ class Yaml2erd
       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
+    DEFAULT_CONF.deep_merge(user_conf)
   end
 
   def apply_conf(conf)

data/lib/yaml2erd/version.rb

@@ -1,3 +1,3 @@
 class Yaml2erd
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml2erd
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - rh-taro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-27 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport