yml2erd 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eec493eb97de029cef8b42b05732a2d1b6ba1488
-  data.tar.gz: c61166dbdd32c0ba012a5b41d6558d9c81e94db7
+  metadata.gz: 30861d60e3b7ec898d77d7651b115801e4a2411e
+  data.tar.gz: c89d8ff74ca28c0ffd9b8289e5c403acf90867f9
 SHA512:
-  metadata.gz: 5387b5c7e949e14b8c533d8c8cf28cde000afb494433699a337a15d43468eb65e4e02078f4d756cf3c086e9c6bb18e595f30be908f37776dd75eeba8720cd75c
-  data.tar.gz: af86f9eca39331122b73dc135939f25817d9744d13923b88a5f9883f24c19e8479c0d35ff93c8f4d1a9c8310f042548182134e3e6e69b562d03782d1d05fd26f
+  metadata.gz: 0d63ce75a0dc3b53a456ef574c238ac2da6f9369931783e6f9fbaea0126425994f8f92e3212298d486429bf7df100e32316eca3d1310c3336aea5ca03a749493
+  data.tar.gz: 0629c73061313f60e203098664648d8f7117bd5f07c59dba1894d4f5fe978352397a2f2ab2beb0b8203eea7edbe6b34ee9c3e0458d0f5ec5cb6b09d21b543c2b

data/lib/yml2erd/cli.rb

@@ -23,7 +23,12 @@ module Yml2erd
 
     private
 
+    def abort_unless_yml(path)
+      abort 'file must be a .yml file' unless path =~ /\.yml$/
+    end
+
     def load_yml(path)
+      abort_unless_yml(path)
       abort "#{path} is not found, please check your .yml file path" unless File.exists?(path)
       yml = YAML.load_file(path)
       Yml2erd::Parser.parse(yml)

data/lib/yml2erd/diagram.rb

@@ -14,8 +14,9 @@ module Yml2erd
 
         table_names.each do |table_name|
           columns = ''
+          schema_structure.shared_columns.each { |key, value| columns += build_column(key, value) } unless schema_structure.shared_columns.nil?
           schema_structure.columns(table_name).each do |column|
-            column.each { |key, value| columns += "#{key}: <FONT color='gray'>#{value}</FONT><BR/>" }
+            column.each { |key, value| columns += build_column(key, value) }
           end
 
           index = schema_structure.index(table_name)
@@ -25,8 +26,8 @@ module Yml2erd
 
         table_names.each do |table_name|
           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|
+            !schema_structure.belongs(table_name).nil?
+            schema_structure.belongs(table_name).each do |belongs_to|
               g.add_edges(belongs_to, table_name)
             end
           end
@@ -46,6 +47,10 @@ module Yml2erd
           "<{<FONT POINT-SIZE='15'>#{table_name}</FONT> | #{columns}}>"
         end
       end
+
+      def build_column(name, type)
+        "#{name}: <FONT color='gray'>#{type}</FONT><BR/>"
+      end
     end
   end
 end

data/lib/yml2erd/schema_structure/validator.rb

@@ -1,7 +1,7 @@
 module Yml2erd
   class SchemaStructure
     class Validator
-      RELATIONS_KEY = %w(belongs_to has_many)
+      RELATIONS_KEY = %w(belongs_to has_many has_one)
 
       class InvalidKeyNameError < StandardError;end
       class InvalidYmlStructureError < StandardError;end

data/lib/yml2erd/schema_structure.rb

@@ -11,14 +11,19 @@ module Yml2erd
     # returns an array which has table_names like bellow
     # => ["users", "user_auths", "posts", "companies"]
     def table_names
-      structure_yml.to_a.map { |s| s.first }
+      structure_yml.to_a.map { |s| s.first }.select{ |tn| tn != 'shared_columns' }
     end
 
     # returns a hash like below
-    # { users: { belongs_to: ['user_auths', 'companies'], has_many: ['posts'] } }
+    # { belongs_to: ['user_auths', 'companies'], has_many: ['posts'] }
     def relation(table_name)
       relations = structure_yml[table_name]['relations']
-      # { table_name.to_sym => relations }
+    end
+
+    # returns an array like below
+    # ['user_auths', 'companies']
+    def belongs(table_name)
+      relation(table_name)['belongs_to']
     end
 
     def relations
@@ -42,5 +47,11 @@ module Yml2erd
     def index(table_name)
       structure_yml[table_name]['index']
     end
+
+    # returns a hash like below
+    # => { "id"=>"integer", "created_at"=>"datetime", "updated_at"=>"datetime" }
+    def shared_columns
+      structure_yml['shared_columns']
+    end
   end
 end

data/lib/yml2erd/version.rb

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

data/sample.yml

@@ -1,23 +1,21 @@
+shared_columns:
+  id: integer
+  created_at: datetime
+  updated_at: datetime
 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
@@ -29,34 +27,25 @@ users:
       - user_logs
 roles:
   columns:
-    - id: integer
     - title: string
     - user_id: intger
-    - created_at: datetime
-    - updated_at: datetime
   relations:
     belongs_to:
       - users
 user_logs:
   columns:
-    - id: integer
     - recently_signed_in: datetime
     - user_id: integer
-    - created_at: datetime
-    - updated_at: datetime
   relations:
     belongs_to:
       - users
 posts:
   columns:
-    - 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:

data/yml2erd.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["suenagaryoutaabc@gmail.com"]
 
   spec.summary       = %q{This gem allows us to generate an erd easily.}
-  spec.description   = %q{Convert erd from a simple yml}
+  spec.description   = %q{This gem generates erd from a simple yml.}
   spec.homepage      = "https://github.com/asmsuechan/yml2erd"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yml2erd
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - asmsuechan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Convert erd from a simple yml
+description: This gem generates erd from a simple yml.
 email:
 - suenagaryoutaabc@gmail.com
 executables: