yml2erd 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 166d9aea0ea8799713fb3f89d965fadc65824a26
-  data.tar.gz: a9937380ca26d72580e232a0c8f276519967251b
+  metadata.gz: eec493eb97de029cef8b42b05732a2d1b6ba1488
+  data.tar.gz: c61166dbdd32c0ba012a5b41d6558d9c81e94db7
 SHA512:
-  metadata.gz: 64b352491096eb2d9d7ecf35a6d0de6513924354a6225e5543117dbdc92965bd485e42451da73b57e1c62546fc46dd721e649a71af8f031d5a1e9011982a83cd
-  data.tar.gz: 47a40a5f02ebea24d73ac2e0e7edfc80d0a86b186c459bf5d25e813b0c33efdc94a0b36f73987963ae47df3ad95dafb530132156481b526c84406bd1b493c4f3
+  metadata.gz: 5387b5c7e949e14b8c533d8c8cf28cde000afb494433699a337a15d43468eb65e4e02078f4d756cf3c086e9c6bb18e595f30be908f37776dd75eeba8720cd75c
+  data.tar.gz: af86f9eca39331122b73dc135939f25817d9744d13923b88a5f9883f24c19e8479c0d35ff93c8f4d1a9c8310f042548182134e3e6e69b562d03782d1d05fd26f

data/lib/yml2erd/cli.rb

@@ -5,8 +5,6 @@ require "yaml"
 
 module Yml2erd
   class CLI < Thor
-    class YmlNotFoundError < StandardError;end
-
     desc "convert <path>", "Convert erd from yml"
     option :output, aliases: :o, banner: 'FILE_PATH', desc: 'default: output.png'
     option :projectname, aliases: :p, banner: 'PROJECT_NAME', desc: 'default: null'
@@ -32,7 +30,7 @@ module Yml2erd
     end
 
     # This method has a bug around `which gvpr`.
-    # That is because which may not exist in except UNIX based OS.
+    # That is because which command may not exist except UNIX based OS.
     def abort_if_graphviz_isnt_installed
       abort "GraphViz is not installed, please install graphviz from http://www.graphviz.org/Download..php \n\nOr you can get by\n   $ brew install graphviz    # on macOS\n   $ apt-get install graphviz # on Ubuntu" unless !`which gvpr`.empty?
     end

data/lib/yml2erd/diagram.rb

@@ -5,10 +5,6 @@ module Yml2erd
     class << self
       DEFAULT_OPTIONS = { output_path: './output.png' }.freeze
 
-      def table_relations(schema_structure)
-        schema_structure.relations
-      end
-
       def create(schema_structure, opts = {})
         opts = opts.merge(DEFAULT_OPTIONS)
         GraphViz::options(use: 'dot')
@@ -28,7 +24,8 @@ module Yml2erd
         end
 
         table_names.each do |table_name|
-          unless schema_structure.relation(table_name)['belongs_to'].nil?
+          if !schema_structure.relation(table_name).nil? && \
+            !schema_structure.relation(table_name)['belongs_to'].nil?
             schema_structure.relation(table_name)['belongs_to'].each do |belongs_to|
               g.add_edges(belongs_to, table_name)
             end

data/lib/yml2erd/schema_structure/validator.rb

@@ -48,7 +48,7 @@ module Yml2erd
       # belongs_to or has_many is not necessary
       def keyname
         ss.table_names.each do |table_name|
-          if correct_relation_key?(table_name) && ss.columns(table_name).nil? && ss.relation(table_name).nil?
+          if ss.columns(table_name).nil? && ss.relation(table_name).nil?
             raise InvalidKeyNameError, 'you must use correct keyname'
           end
         end

data/lib/yml2erd/version.rb

@@ -1,3 +1,3 @@
 module Yml2erd
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

data/sample.yml

@@ -1,30 +1,64 @@
-users:
+companies:
   columns:
+    - id: integer
     - name: string
+    - address: string
+    - created_at: datetime
+    - updated_at: datetime
+  relations:
+    has_many:
+      - users
+users:
+  columns:
+    - id: integer
+    - crypted_password: string
     - email: string
+    - password_salt: string
+    - auth_token: string
+    - company_id: integer
+    - created_at: datetime
+    - updated_at: datetime
+    - deleted_at: datetime
+  index:
+    - email
   relations:
     belongs_to:
-      - user_auths
       - companies
     has_many:
       - posts
-  index:
-    - email
-user_auths:
+      - user_logs
+roles:
   columns:
-    - password: string
+    - id: integer
+    - title: string
+    - user_id: intger
+    - created_at: datetime
+    - updated_at: datetime
   relations:
-    has_many:
+    belongs_to:
       - users
-posts:
+user_logs:
   columns:
-    - content: text
+    - id: integer
+    - recently_signed_in: datetime
+    - user_id: integer
+    - created_at: datetime
+    - updated_at: datetime
   relations:
     belongs_to:
       - users
-companies:
+posts:
   columns:
-    - name: string
-    - address: string
+    - id: integer
+    - title: string
+    - body: text
+    - attachment_path: string
+    - deleted_at: datetime
+    - user_id: integer
+    - created_at: datetime
+    - updated_at: datetime
+  index:
+    - user_id
   relations:
-    has_many: users
+    belongs_to:
+      - users

data/sample_abnormal.yml

@@ -1,5 +1,5 @@
 invalid_columns_style:
-  columns:
+  column:
     name: string
     email: string
   relations:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yml2erd
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - asmsuechan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz