Merge branch 'master' into pr-189

Author: kerrizor

CHANGES.md

@@ -1,3 +1,15 @@
+1.4.7
+-----
+* Fixed grouping of associations (#190)
+* Fixed issue with command line options (#198)
+* Fixed horizontally graph when vertical was wanted and viceversa (#183)
+
+1.4.6
+-----
+* Revert auto-generation of diagrams added in #176 (#191)
+* Fix some Ruby warnings (#187)
+* Rescue from TypeError when loading target app (#185)
+
 1.4.5
 -----
 

README.md

@@ -6,7 +6,7 @@ Rails ERD - Generate Entity-Relationship Diagrams for Rails applications
 
 The second goal of Rails ERD is to provide you with a tool to inspect your application's domain model. If you don't like the default output, it is very easy to use the API to build your own diagrams.
 
-Rails ERD was created specifically for Rails and works on versions 3.0-4.2. It uses Active Record's built-in reflection capabilities to figure out how your models are associated.
+Rails ERD was created specifically for Rails and works on versions 3.0-5.0. It uses Active Record's built-in reflection capabilities to figure out how your models are associated.
 
 
 Preview
@@ -62,6 +62,7 @@ exclude: null
 only: null
 only_recursion_depth: null
 prepend_primary: false
+cluster: false
 ```
 
 

examples/erdconfig.example

@@ -19,3 +19,4 @@ exclude: null
 only: null
 only_recursion_depth: null
 prepend_primary: false
+cluster: false

lib/generators/erd/templates/auto_generate_diagram.rake

@@ -2,5 +2,5 @@
 # NOTE: are sensitive to local FS writes, and besides -- it's just not proper
 # NOTE: to have a dev-mode tool do its thing in production.
 if Rails.env.development?
-  RailsERD::Engine.load_tasks
+  Erd.load_tasks
 end

lib/rails_erd.rb

@@ -1,6 +1,5 @@
 require "active_support/ordered_options"
 require "rails_erd/railtie" if defined? Rails
-require "rails_erd/engine" if defined? Rails
 require "rails_erd/config"
 
 # Welcome to the API documentation of Rails ERD. If you wish to extend or
@@ -53,7 +52,8 @@ def default_options
         :exclude, nil,
         :only, nil,
         :only_recursion_depth, nil,
-        :prepend_primary, false
+        :prepend_primary, false,
+        :cluster, false,
       ]
     end
   end

lib/rails_erd/cli.rb

@@ -69,6 +69,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:"
 
@@ -154,9 +159,14 @@ def start
 
     def load_application
       $stderr.puts "Loading application in '#{File.basename(path)}'..."
-      # TODO: Add support for different kinds of environment.
-      require "#{path}/config/environment"
-      Rails.application.eager_load!
+      begin
+        environment_path = "#{path}/config/environment.rb"
+        require environment_path
+      rescue ::LoadError
+        puts "Please create a file in '#{environment_path}' that loads your application environment."
+        raise
+      end
+      Rails.application.eager_load! if defined? Rails
     rescue TypeError
     end
 

lib/rails_erd/config.rb

@@ -57,18 +57,20 @@ def normalize_value(key, value)
         end
 
       # <symbol>
-      when :filetype, :notation, :orientation
+      when :filetype, :notation
         value.to_sym
 
       # [<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>
-      when :filename
+      when :filename, :orientation
         value.nil? ? nil : value.to_s
 
       # true | false | <string>

lib/rails_erd/diagram/graphviz.rb

@@ -183,7 +183,7 @@ def relationship_style(relationship)
         EDGE_ATTRIBUTES.each  { |attribute, value| graph.edge[attribute] = value }
 
         # Switch rank direction if we're creating a vertically oriented graph.
-        graph[:rankdir] = :TB if options.orientation == :vertical
+        graph[:rankdir] = (options.orientation == "vertical") ? :LR : :TB
 
         # Title of the graph itself.
         graph[:label] = "#{title}\\n\\n" if title
@@ -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

lib/rails_erd/domain/relationship.rb

@@ -21,7 +21,7 @@ def from_associations(domain, associations) # @private :nodoc:
         private
 
         def association_identity(association)
-          identifier = association_identifier(association)
+          identifier = association_identifier(association).to_s
           Set[identifier, association_owner(association), association_target(association)]
         end