schemerd 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6867fc6f77949e2e09eff74caa333877a73ec4e87c97202654dd5e350974db7
-  data.tar.gz: 9320abd1d6db3df30512861c8a044d49c0d7e89ab5e45175b4b3dc9e0967591b
+  metadata.gz: ca6f1b673c235b1bdefd3373a34bd56e3d573c2bc9d9e152692937d47335ae58
+  data.tar.gz: bb3b90351c3cd8b28679fe9abf9c253405c420dbbc80a7ab589357bffd523195
 SHA512:
-  metadata.gz: 5e9b186348b5d726770a0257ec2710e5f2b7f1629855211795b4d1b81ce179ab7ec06672c20e1acbe38fb7f18ab707d48527349b888f9121fd4c56ea413882d3
-  data.tar.gz: 05f2bf31dd2cb83a1039117e33b1efa0b6e203aab920d386fb9b3791b07dbfb86b77aa8aac031358750886eb275885ff5a2c96c43837097ba9cfed128921ae64
+  metadata.gz: 4fbb96858dc176e329b092c7ef6badba3064e75f8256252b83e856b8409192066e78c12ac628539ff6ecf44ac454e050694547cdddc7d2ac24d59ce9c1a6588f
+  data.tar.gz: 74737e1813ab6e52296db20f5bfc5ab4cab970f73008ba10115b4ba4c44756b6fc3bc3d0489e0e13112948e844001acb590d7fa60c299e2663137033ed28ec13

data/lib/schemerd/generator.rb

@@ -27,17 +27,28 @@ module Schemerd
       Rails.application.eager_load!
 
       base = @config.base_class.constantize
-      base.descendants
+      all_models = base.descendants
         .reject(&:abstract_class?)
         .reject { |m| excluded?(m.name) }
         .select { |m| m.table_exists? rescue false }
-        .sort_by(&:name)
+
+      @sti_children = Hash.new { |h, k| h[k] = [] }
+      sti, non_sti = all_models.partition { |m| sti_child?(m) }
+      sti.each { |m| @sti_children[m.superclass.name] << m.name }
+
+      non_sti.sort_by(&:name)
     end
 
     def excluded?(model_name)
       @config.excluded_prefixes.any? { |prefix| model_name.start_with?(prefix) }
     end
 
+    def sti_child?(model)
+      model.superclass != @config.base_class.constantize &&
+        !model.superclass.abstract_class? &&
+        model.table_name == model.superclass.table_name
+    end
+
     def build_diagram(models)
       lines = []
 
@@ -60,7 +71,7 @@ module Schemerd
       model_names = models.map(&:name).to_set
 
       models.each do |model|
-        model.reflect_on_all_associations.each do |assoc|
+        model.reflect_on_all_associations.reject { |a| a.options[:through] }.each do |assoc|
           target_name = assoc.klass.name rescue next
           next unless model_names.include?(target_name)
 
@@ -81,10 +92,12 @@ module Schemerd
 
       models.each do |model|
         lines << "    #{model.name} {"
+        subtypes = @sti_children.fetch(model.name, [])
         sort_columns(model.columns).each do |col|
           pk = col.name == model.primary_key ? "PK" : ""
+          comment = col.name == "type" && subtypes.any? ? "\"#{subtypes.sort.join(', ')}\"" : ""
           type = col.type || "string"
-          lines << "        #{type} #{col.name} #{pk}".rstrip
+          lines << "        #{type} #{col.name} #{pk} #{comment}".rstrip
         end
         lines << "    }"
         lines << ""
@@ -121,6 +134,8 @@ module Schemerd
         "#{source} ||--o{ #{target} : \"#{assoc.name}\""
       when :has_one
         "#{source} ||--o| #{target} : \"#{assoc.name}\""
+      when :has_and_belongs_to_many
+        "#{source} }o--o{ #{target} : \"#{assoc.name}\""
       end
     end
   end

data/lib/schemerd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Schemerd
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schemerd
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Pablo Monfort