Merge pull request #205 from bstegmaier/cluster_by_namespace

Implement clustering by namespace

Author: kerrizor

README.md

@@ -61,6 +61,7 @@ title: sample title
 exclude: null
 only: null
 prepend_primary: false
+cluster: false
 ```
 
 

examples/erdconfig.example

@@ -18,3 +18,4 @@ title: sample title
 exclude: null
 only: null
 prepend_primary: false
+cluster: false

lib/rails_erd.rb

@@ -51,7 +51,8 @@ def default_options
         :title, true,
         :exclude, nil,
         :only, nil,
-        :prepend_primary, false
+        :prepend_primary, false,
+        :cluster, false
       ]
     end
   end

lib/rails_erd/cli.rb

@@ -64,6 +64,11 @@
     desc "Ensure primary key is at start of attribute list"
   end
 
+  option :cluster do
+    long "--cluster"
+    desc "Display models in subgraphs based on their namespace."
+  end
+
   separator ""
   separator "Output options:"
 

lib/rails_erd/config.rb

@@ -63,8 +63,10 @@ def normalize_value(key, value)
       # [<string>]
       when :only, :exclude
         Array(value).join(",").split(",").map { |v| v.strip }
+
       # true | false
-      when :disconnected, :indirect, :inheritance, :markup, :polymorphism, :warn
+      when :disconnected, :indirect, :inheritance, :markup, :polymorphism,
+           :warn, :cluster
         !!value
 
       # nil | <string>

lib/rails_erd/diagram/graphviz.rb

@@ -210,7 +210,14 @@ def relationship_style(relationship)
       end
 
       each_entity do |entity, attributes|
-        draw_node entity.name, entity_options(entity, attributes)
+        if options[:cluster] && entity.namespace
+          cluster_name = "cluster_#{entity.namespace}"
+          cluster = graph.get_graph(cluster_name) ||
+                    graph.add_graph(cluster_name, label: entity.namespace)
+          draw_cluster_node cluster, entity.name, entity_options(entity, attributes)
+        else
+          draw_node entity.name, entity_options(entity, attributes)
+        end
       end
 
       each_specialization do |specialization|
@@ -233,15 +240,19 @@ def relationship_style(relationship)
       private
 
       def node_exists?(name)
-        !!graph.get_node(escape_name(name))
+        !!graph.search_node(escape_name(name))
       end
 
       def draw_node(name, options)
         graph.add_nodes escape_name(name), options
       end
 
+      def draw_cluster_node(cluster, name, options)
+        cluster.add_nodes escape_name(name), options
+      end
+
       def draw_edge(from, to, options)
-        graph.add_edges graph.get_node(escape_name(from)), graph.get_node(escape_name(to)), options if node_exists?(from) and node_exists?(to)
+        graph.add_edges graph.search_node(escape_name(from)), graph.search_node(escape_name(to)), options if node_exists?(from) and node_exists?(to)
       end
 
       def escape_name(name)

lib/rails_erd/domain/entity.rb

@@ -92,6 +92,10 @@ def children
         @children ||= domain.specializations_by_entity_name(name).map(&:specialized)
       end
 
+      def namespace
+        name.scan(/(.*)::.*/).dig(0,0)
+      end
+
       def to_s # @private :nodoc:
         name
       end