rails-erd 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 624c7ed61b6bbe81a043bae64969f6bb1b6dd6f5
-  data.tar.gz: e3bf81680b796b264ac3d761d8ca8f13a0f4b9f9
+  metadata.gz: 908b423dba1519fc2769f64ec4d9cb80ec81e9e2
+  data.tar.gz: c360f615b7ab66d757aaadfa79cef2877a756008
 SHA512:
-  metadata.gz: f4ec67e46803ac4c48801278c2f96e148c6f076d494ca0c16411f3a45f2fd517989ceacc42518315c22a34bb3e235ccfc4a841051d5022688f4f87897fe7b1fc
-  data.tar.gz: 9d7fdca071d98d557a0217659bee5a4550b6edb60a6850267050f9c591ae4b8eae2df3b787693cd78985aafd182f9b87a3de8f14262543596e037fd5c7f942e9
+  metadata.gz: 0b0195f4c8f8c9119bfeb00a8fd6ae929d4ac1023509f06bccd20316aaba51a907d080ea2f720866231168252092f139b727d705452029739a0548bef2bb1d09
+  data.tar.gz: 6c64ed31acdda5d1b3983641f4c02f5d434ab562930e8905a1ca5e5a4d8ade1aa0721f1e50de06cbd1e2161e099e08e87a0710ba2e71c7e9f51d97f6c3b36c57

data/README.md

@@ -2,7 +2,7 @@ Rails ERD - Generate Entity-Relationship Diagrams for Rails applications
 ========================================================================
 [![Build Status](https://travis-ci.org/voormedia/rails-erd.svg?branch=master)](https://travis-ci.org/voormedia/rails-erd) [![Code Climate](https://codeclimate.com/github/voormedia/rails-erd/badges/gpa.svg)](https://codeclimate.com/github/voormedia/rails-erd)
 
-[Rails ERD](http://voormedia.github.io/rails-erd/) is a gem that allows you to easily generate a diagram based on your application's Active Record models. The diagram gives an overview of how your models are related. Having a diagram that describes your models is perfect documentation for your application.
+[Rails ERD](https://voormedia.github.io/rails-erd/) is a gem that allows you to easily generate a diagram based on your application's Active Record models. The diagram gives an overview of how your models are related. Having a diagram that describes your models is perfect documentation for your application.
 
 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.
 
@@ -14,23 +14,23 @@ Preview
 
 Here's an example entity-relationship diagram that was generated by Rails ERD:
 
-![Entity-Relationship Diagram](http://voormedia.github.io/rails-erd/images/entity-relationship-diagram.png)
+![Entity-Relationship Diagram](https://voormedia.github.io/rails-erd/images/entity-relationship-diagram.png)
 
-Browse the [gallery](http://voormedia.github.io/rails-erd/gallery.html) for more example diagrams.
+Browse the [gallery](https://voormedia.github.io/rails-erd/gallery.html) for more example diagrams.
 
 
 Requirements
 ---------------
 
 * Ruby 1.9.3+
-* ActiveRecord 3.x
+* ActiveRecord 3.x - 5.0.x
 
 Getting started
 ---------------
 
-See the [installation instructions](http://voormedia.github.io/rails-erd/install.html) for a complete description of how to install Rails ERD. Here's a summary:
+See the [installation instructions](https://voormedia.github.io/rails-erd/install.html) for a complete description of how to install Rails ERD. Here's a summary:
 
-* Install Graphviz 2.22+ ([how?](http://voormedia.github.io/rails-erd/install.html))
+* Install Graphviz 2.22+ ([how?](https://voormedia.github.io/rails-erd/install.html))
 
 * Add <tt>gem "rails-erd"</tt> to your application's Gemfile
 
@@ -39,9 +39,9 @@ See the [installation instructions](http://voormedia.github.io/rails-erd/install
 ### Configuration
 
 
-Rails ERD has the ability to be configured via the command line or through the use of a YAML file with configuration options set. It will look for this file first at `~/.erdconfig` and then `./.erdconfig` (which will override any settings in `~/.erdconfig`). The format of the file is as follows (shown here with the default settings used if no `.erdconfig` is found). More information on [customization options](http://voormedia.github.io/rails-erd/customise.html) can be found in Rails ERD's project documentation.
+Rails ERD has the ability to be configured via the command line or through the use of a YAML file with configuration options set. It will look for this file first at `~/.erdconfig` and then `./.erdconfig` (which will override any settings in `~/.erdconfig`). The format of the file is as follows (shown here with the default settings used if no `.erdconfig` is found). More information on [customization options](https://voormedia.github.io/rails-erd/customise.html) can be found in Rails ERD's project documentation.
 
-```
+```yaml
 attributes:
   - content
   - foreign_key
@@ -63,13 +63,19 @@ only: null
 only_recursion_depth: null
 prepend_primary: false
 cluster: false
+splines: spline
 ```
 
+Auto generation
+---------------
+
+* Run <tt>rails generate erd:install</tt>
+* Run <tt>rails db:migrate</tt>, then the diagram is generated
 
 Learn more
 ----------
 
-More information can be found on [Rails ERD's project homepage](http://voormedia.github.io/rails-erd/).
+More information can be found on [Rails ERD's project homepage](https://voormedia.github.io/rails-erd/).
 
 If you wish to extend or customise Rails ERD, take a look at the [API documentation](http://rubydoc.info/github/voormedia/rails-erd/frames).
 

data/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?
-  Erd.load_tasks
+  RailsERD.load_tasks
 end

data/lib/rails_erd.rb

@@ -56,6 +56,16 @@ module RailsERD
         :cluster, false,
       ]
     end
+
+    def loaded_tasks=(val); @loaded_tasks = val; end
+    def loaded_tasks; return @loaded_tasks; end
+
+    def load_tasks
+      return if(self.loaded_tasks)
+      self.loaded_tasks = true
+
+      Dir[File.join(File.dirname(__FILE__), 'tasks', '**/*.rake')].each { |rake| load rake }
+    end
   end
 
   module Inspectable # @private :nodoc:

data/lib/rails_erd/cli.rb

@@ -74,6 +74,11 @@ Choice.options do
     desc "Display models in subgraphs based on their namespace."
   end
 
+  option :splines do
+    long "--splines=SPLINE_TYPE"
+    desc "Control how edges are represented. See http://www.graphviz.org/doc/info/attrs.html#d:splines for values."
+  end
+
   separator ""
   separator "Output options:"
 
@@ -166,7 +171,10 @@ module RailsERD
         puts "Please create a file in '#{environment_path}' that loads your application environment."
         raise
       end
-      Rails.application.eager_load! if defined? Rails
+      if defined? Rails
+        Rails.application.eager_load!
+        Rails.application.config.eager_load_namespaces.each(&:eager_load!)
+      end
     rescue TypeError
     end
 

data/lib/rails_erd/diagram.rb

@@ -7,7 +7,7 @@ module RailsERD
   # and (optionally) +save+.
   #
   # As an example, a diagram class that generates code that can be used with
-  # yUML (http://yuml.me) can be as simple as:
+  # yUML (https://yuml.me) can be as simple as:
   #
   #   require "rails_erd/diagram"
   #
@@ -124,13 +124,12 @@ module RailsERD
     # internally by Diagram#create.
     def generate
       instance_eval(&callbacks[:setup])
-
       if options.only_recursion_depth.present?
         depth = options.only_recursion_depth.to_i
-        options.only.dup.each do |class_name|
-          options.only += recurse_into_relationships(@domain.entity_by_name(class_name), depth)
+        options[:only].dup.each do |class_name|
+          options[:only]+= recurse_into_relationships(@domain.entity_by_name(class_name), depth)
         end
-        options.only.uniq!
+        options[:only].uniq!
       end
 
       filtered_entities.each do |entity|
@@ -179,7 +178,7 @@ module RailsERD
     def filtered_entities
       @domain.entities.reject { |entity|
         options.exclude.present? && entity.model && [options.exclude].flatten.map(&:to_sym).include?(entity.name.to_sym) or
-        options.only.present? && entity.model && ![options.only].flatten.map(&:to_sym).include?(entity.name.to_sym) or
+        options[:only].present? && entity.model && ![options[:only]].flatten.map(&:to_sym).include?(entity.name.to_sym) or
         !options.inheritance && entity.specialized? or
         !options.polymorphism && entity.generalized? or
         !options.disconnected && entity.disconnected?

data/lib/rails_erd/diagram/graphviz.rb

@@ -62,7 +62,8 @@ module RailsERD
         concentrate: true,
         labelloc:    :t,
         fontsize:    13,
-        fontname:    FONTS[:bold]
+        fontname:    FONTS[:bold],
+        splines:     'spline'
       }
 
       # Default node attributes.
@@ -188,6 +189,9 @@ module RailsERD
         # Title of the graph itself.
         graph[:label] = "#{title}\\n\\n" if title
 
+        # Style of splines
+        graph[:splines] = options.splines unless options.splines.nil?
+
         # Setup notation options.
         extend self.class.const_get(options.notation.to_s.capitalize.to_sym)
       end

data/lib/rails_erd/diagram/templates/node.html.erb

@@ -1,4 +1,4 @@
-<% if options.orientation == :vertical %>{<% end %>
+<% if options.orientation == :horizontal %>{<% end %>
 <table border="0" align="center" cellspacing="0.5" cellpadding="0" width="<%= NODE_WIDTH + 4 %>">
   <tr><td align="center" valign="bottom" width="<%= NODE_WIDTH %>"><font face="<%= FONTS[:bold] %>" point-size="11"><%= entity.name %></font></td></tr>
 </table>
@@ -11,4 +11,4 @@
 </table>
 <% else %>
 <% end %>
-<% if options.orientation == :vertical %>}<% end %>
+<% if options.orientation == :horizontal %>}<% end %>

data/lib/rails_erd/diagram/templates/node.record.erb

@@ -1,4 +1,4 @@
-<% if options.orientation == :vertical %>{<% end %><%= entity.name %><% if attributes.any? %>
+<% if options.orientation == :horizontal %>{<% end %><%= entity.name %><% if attributes.any? %>
 |<%  attributes.each do |attribute| %><%=
        attribute %> (<%= attribute.type_description %>)
-<%   end %><% end %><% if options.orientation == :vertical %>}<% end %>
+<%   end %><% end %><% if options.orientation == :horizontal %>}<% end %>

data/lib/rails_erd/domain/entity.rb

@@ -93,7 +93,7 @@ module RailsERD
       end
 
       def namespace
-        name.scan(/(.*)::.*/).dig(0,0)
+        $1 if name.match /(.*)::.*/
       end
 
       def to_s # @private :nodoc:

data/lib/rails_erd/tasks.rake

@@ -1,8 +1,18 @@
+require 'graphviz/utils'
+
 def say(message)
   puts message unless Rake.application.options.silent
 end
 
 namespace :erd do
+  task :check_dependencies do
+    include GraphViz::Utils
+    unless find_executable("dot", nil)
+      raise "Unable to find GraphViz's \"dot\" executable. Please " \
+            "visit https://voormedia.github.io/rails-erd/install.html for installation instructions."
+    end
+  end
+
   task :options do
     (RailsERD.options.keys.map(&:to_s) & ENV.keys).each do |option|
       RailsERD.options[option.to_sym] = case ENV[option]
@@ -21,6 +31,10 @@ namespace :erd do
     say "Loading code in search of Active Record models..."
     begin
       Rails.application.eager_load!
+
+      if Rails.application.respond_to?(:config) && !Rails.application.config.nil?
+        Rails.application.config.eager_load_namespaces.each(&:eager_load!)
+      end
     rescue Exception => err
       if Rake.application.options.trace
         raise
@@ -34,7 +48,7 @@ namespace :erd do
     raise "Active Record was not loaded." unless defined? ActiveRecord
   end
 
-  task :generate => [:options, :load_models] do
+  task :generate => [:check_dependencies, :options, :load_models] do
     say "Generating Entity-Relationship Diagram for #{ActiveRecord::Base.descendants.length} models..."
 
     require "rails_erd/diagram/graphviz"

data/lib/rails_erd/version.rb

@@ -1,4 +1,4 @@
 module RailsERD
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
   BANNER  = "RailsERD #{VERSION}"
 end

data/test/test_helper.rb

@@ -48,6 +48,29 @@ class ActiveSupport::TestCase
     ActiveRecord::Base.clear_cache!
   end
 
+  def create_module_model(full_name,*args,&block)
+    superklass = args.first.kind_of?(Class) ? args.shift : ActiveRecord::Base
+
+    names = full_name.split('::')
+
+    parent_module = names[0..-1].inject(Object) do |parent,child|
+      parent = parent.const_set(child.to_sym, Module.new)
+    end
+
+    parent_module ||= Object
+    name = names.last
+
+    columns = args.first || {}
+    klass = parent_module.const_set name.to_sym, Class.new(superklass)
+    konstant = parent_module.const_get(name.to_sym)
+
+    if superklass == ActiveRecord::Base || superklass.abstract_class?
+      create_table konstant.table_name, columns, konstant.primary_key rescue nil
+    end
+    klass.class_eval(&block) if block_given?
+    konstant
+  end
+
   def create_model(name, *args, &block)
     superklass = args.first.kind_of?(Class) ? args.shift : ActiveRecord::Base
     columns = args.first || {}
@@ -143,14 +166,37 @@ class ActiveSupport::TestCase
     RailsERD.options = RailsERD.default_options.merge(Config.load)
   end
 
+  def name_to_object_symbol_pairs(name)
+    parts = name.to_s.split('::')
+
+    return [] if parts.first == '' || parts.count == 0
+
+    parts[1..-1].inject([[Object, parts.first.to_sym]]) do |pairs,string|
+      last_parent, last_child = pairs.last
+
+      break pairs unless last_parent.const_defined?(last_child)
+
+      next_parent = last_parent.const_get(last_child)
+      next_child = string.to_sym
+      pairs << [next_parent, next_child]
+    end
+  end
+
+  def remove_fully_qualified_constant(name)
+    pairs = name_to_object_symbol_pairs(name)
+    pairs.reverse.each do |parent, child|
+      parent.send(:remove_const,child) if parent.const_defined?(child)
+    end
+  end
+
   def reset_domain
     if defined? ActiveRecord
       ActiveRecord::Base.descendants.each do |model|
         next if model.name == "ActiveRecord::InternalMetadata"
         model.reset_column_information
-        Object.send :remove_const, model.name.to_sym if Object.const_defined? model.name.to_sym
+        remove_fully_qualified_constant(model.name)
       end
-      ActiveRecord::Base.connection.tables.each do |table|
+      tables_and_views.each do |table|
         ActiveRecord::Base.connection.drop_table table
       end
       ActiveRecord::Base.direct_descendants.clear
@@ -158,4 +204,12 @@ class ActiveSupport::TestCase
       ActiveRecord::Base.clear_cache!
     end
   end
+
+  def tables_and_views
+    if ActiveRecord::VERSION::MAJOR >= 5
+      ActiveRecord::Base.connection.data_sources
+    else
+      ActiveRecord::Base.connection.tables
+    end
+  end
 end

data/test/unit/attribute_test.rb

@@ -224,14 +224,14 @@ class AttributeTest < ActiveSupport::TestCase
   test "limit should return nil if there is no limit" do
     create_model "Foo"
     add_column :foos, :my_txt, :text
-    assert_equal nil, create_attribute(Foo, "my_txt").limit
+    assert_nil create_attribute(Foo, "my_txt").limit
   end
 
   test "limit should return nil if equal to standard database limit" do
     with_native_limit :string, 456 do
       create_model "Foo"
       add_column :foos, :my_str, :string, :limit => 456
-      assert_equal nil, create_attribute(Foo, "my_str").limit
+      assert_nil create_attribute(Foo, "my_str").limit
     end
   end
 
@@ -252,7 +252,7 @@ class AttributeTest < ActiveSupport::TestCase
   test "limit should return nil for decimal columns if equal to standard database limit" do
     create_model "Foo"
     add_column :foos, :num, :decimal
-    assert_equal nil, create_attribute(Foo, "num").limit
+    assert_nil create_attribute(Foo, "num").limit
   end
 
   test "limit should return nil if type is unsupported by rails" do
@@ -262,7 +262,7 @@ class AttributeTest < ActiveSupport::TestCase
         add_column "foos", "a", "REAL"
       end
     end
-    assert_equal nil, create_attribute(Foo, "a").limit
+    assert_nil create_attribute(Foo, "a").limit
   end
 
   test "limit should return nil for oddball column types that misuse the limit attribute" do
@@ -274,7 +274,7 @@ class AttributeTest < ActiveSupport::TestCase
         { :srid => 4326, :type => "point", :geographic => true }
       end
     end
-    assert_equal nil, attribute.limit
+    assert_nil attribute.limit
   end
 
   test "scale should return scale for decimal columns if nonstandard" do
@@ -286,7 +286,7 @@ class AttributeTest < ActiveSupport::TestCase
   test "scale should return nil for decimal columns if equal to standard database limit" do
     create_model "Foo"
     add_column :foos, :num, :decimal
-    assert_equal nil, create_attribute(Foo, "num").scale
+    assert_nil create_attribute(Foo, "num").scale
   end
 
   test "scale should return zero for decimal columns if left to default setting when specifying precision" do
@@ -302,7 +302,7 @@ class AttributeTest < ActiveSupport::TestCase
         add_column "foos", "a", "REAL"
       end
     end
-    assert_equal nil, create_attribute(Foo, "a").scale
+    assert_nil create_attribute(Foo, "a").scale
   end
 
   test "scale should return nil for oddball column types that misuse the scale attribute" do
@@ -313,6 +313,6 @@ class AttributeTest < ActiveSupport::TestCase
         1..5
       end
     end
-    assert_equal nil, attribute.scale
+    assert_nil attribute.scale
   end
 end

data/test/unit/domain_test.rb

@@ -225,7 +225,7 @@ class DomainTest < ActiveSupport::TestCase
     output = collect_stdout do
       Domain.generate.relationships
     end
-    assert_match /Ignoring invalid association :flabs on Foo/, output
+    assert_match(/Ignoring invalid association :flabs on Foo/, output)
   end
 
   test "relationships should output a warning when an association to model outside domain is encountered" do
@@ -236,7 +236,7 @@ class DomainTest < ActiveSupport::TestCase
     output = collect_stdout do
       Domain.new([Foo]).relationships
     end
-    assert_match /model Bar exists, but is not included in domain/, output
+    assert_match(/model Bar exists, but is not included in domain/, output)
   end
 
   test "relationships should output a warning when an association to a non existent generalization is encountered" do
@@ -249,7 +249,7 @@ class DomainTest < ActiveSupport::TestCase
     output = collect_stdout do
       Domain.generate.relationships
     end
-    assert_match /polymorphic interface FooBar does not exist/, output
+    assert_match(/polymorphic interface FooBar does not exist/, output)
   end
 
   test "relationships should not warn when a bad association is encountered if warnings are disabled" do
@@ -273,6 +273,6 @@ class DomainTest < ActiveSupport::TestCase
     output = collect_stdout do
       Domain.generate.entities
     end
-    assert_match /Ignoring invalid model Foo \(table foos does not exist\)/, output
+    assert_match(/Ignoring invalid model Foo \(table foos does not exist\)/, output)
   end
 end

data/test/unit/entity_test.rb

@@ -249,4 +249,30 @@ class EntityTest < ActiveSupport::TestCase
     assert_equal [domain.entity_by_name("Galleon"), domain.entity_by_name("Stronghold")],
       domain.entity_by_name("Defensible").children
   end
+
+  # Namespace ===================================================================
+  test "namespace should return nil for models outside modules" do
+    create_module_model "Plane"
+    assert_nil create_entity(Plane).namespace
+  end
+
+  test "namespace should return the module name for single-module models" do
+    create_module_model "Saw::Plane"
+    assert_equal "Saw", create_entity(Saw::Plane).namespace
+  end
+
+  test "namespace should return the module path if more than one module" do
+    create_module_model "Augur::Chisel::Saw::Plane"
+    assert_equal "Augur::Chisel::Saw", create_entity(Augur::Chisel::Saw::Plane).namespace
+  end
+  
+  test "namespace defaults to nil" do
+    create_model "Foo"
+    assert_nil create_entity(Foo).namespace
+  end
+
+  test "namespace returns appropriate modules" do
+    entity = Domain::Entity.new(Domain.new, "Foo::Bar::Qux")
+    assert_equal "Foo::Bar", entity.namespace
+  end
 end

data/test/unit/graphviz_test.rb

@@ -149,7 +149,7 @@ class GraphvizTest < ActiveSupport::TestCase
     rescue => e
       message = e.message
     end
-    assert_match /No entities found/, message
+    assert_match(/No entities found/, message)
   end
 
   test "create should abort and complain if output directory does not exist" do
@@ -162,7 +162,7 @@ class GraphvizTest < ActiveSupport::TestCase
       message = e.message
     end
 
-    assert_match /Output directory 'does_not_exist' does not exist/, message
+    assert_match(/Output directory 'does_not_exist' does not exist/, message)
   end
 
   test "create should not fail when reserved words are used as node names" do
@@ -186,6 +186,16 @@ class GraphvizTest < ActiveSupport::TestCase
     assert_equal '"Domain model\n\n"', diagram.graph.graph[:label].to_s
   end
 
+  test "generate should add default value for splines attribute" do
+    create_simple_domain
+    assert_equal '"spline"', diagram.graph.graph[:splines].to_s
+  end
+
+  test "generate should add set value for splines attribute" do
+    create_simple_domain
+    assert_equal '"ortho"', diagram(splines: 'ortho').graph.graph[:splines].to_s
+  end
+
   test "generate should add title with application name to graph" do
     begin
       Object::Quux = Module.new
@@ -228,7 +238,7 @@ class GraphvizTest < ActiveSupport::TestCase
       belongs_to :bar
     end
     create_model "Bar"
-    assert_equal %Q("Bar"), find_dot_node(diagram, "m_Bar")[:label].to_gv
+    assert_equal %Q("{Bar}"), find_dot_node(diagram, "m_Bar")[:label].to_gv
   end
 
   test "generate should add attributes to entity html labels" do
@@ -246,7 +256,7 @@ class GraphvizTest < ActiveSupport::TestCase
       belongs_to :bar
     end
     create_model "Bar", :column => :string, :column_two => :boolean
-    assert_equal %Q("Bar|column (string)\\ncolumn_two (boolean)\\n"), find_dot_node(diagram, "m_Bar")[:label].to_gv
+    assert_equal %Q("{Bar|column (string)\\ncolumn_two (boolean)\\n}"), find_dot_node(diagram, "m_Bar")[:label].to_gv
   end
 
   test "generate should not add any attributes to entity labels if attributes is set to false" do
@@ -257,40 +267,40 @@ class GraphvizTest < ActiveSupport::TestCase
     assert_no_match %r{contents}, find_dot_node(diagram(:attributes => false), "m_Jar")[:label].to_gv
   end
 
-  test "node html labels should have direction reversing braces for vertical orientation" do
+  test "node html labels should have direction reversing braces for horizontal orientation" do
     RailsERD.options.markup = true
     create_model "Book", :author => :references do
       belongs_to :author
     end
     create_model "Author", :name => :string
-    assert_match %r(\A<\{\s*<.*\|.*>\s*\}>\Z)m, find_dot_node(diagram(:orientation => :vertical), "m_Author")[:label].to_gv
+    assert_match %r(\A<\{\s*<.*\|.*>\s*\}>\Z)m, find_dot_node(diagram(:orientation => :horizontal), "m_Author")[:label].to_gv
   end
 
-  test "node html labels should not have direction reversing braces for horizontal orientation" do
+  test "node html labels should not have direction reversing braces for vertical orientation" do
     RailsERD.options.markup = true
     create_model "Book", :author => :references do
       belongs_to :author
     end
     create_model "Author", :name => :string
-    assert_match %r(\A<\s*<.*\|.*>\s*>\Z)m, find_dot_node(diagram(:orientation => :horizontal), "m_Author")[:label].to_gv
+    assert_match %r(\A<\s*<.*\|.*>\s*>\Z)m, find_dot_node(diagram(:orientation => :vertical), "m_Author")[:label].to_gv
   end
 
-  test "node record labels should have direction reversing braces for vertical orientation" do
+  test "node record labels should have direction reversing braces for horizontal orientation" do
     RailsERD.options.markup = false
     create_model "Book", :author => :references do
       belongs_to :author
     end
     create_model "Author", :name => :string
-    assert_match %r(\A"\{\w+|.*\}"\Z)m, find_dot_node(diagram(:orientation => :vertical), "m_Author")[:label].to_gv
+    assert_match %r(\A"\{\w+\|.*\}"\Z)m, find_dot_node(diagram(:orientation => :horizontal), "m_Author")[:label].to_gv
   end
 
-  test "node record labels should not have direction reversing braces for horizontal orientation" do
+  test "node record labels should not have direction reversing braces for vertical orientation" do
     RailsERD.options.markup = false
     create_model "Book", :author => :references do
       belongs_to :author
     end
     create_model "Author", :name => :string
-    assert_match %r(\A"\w+|.*"\Z)m, find_dot_node(diagram(:orientation => :horizontal), "m_Author")[:label].to_gv
+    assert_match %r(\A"\w+\|.*"\Z)m, find_dot_node(diagram(:orientation => :vertical), "m_Author")[:label].to_gv
   end
 
   test "generate should create edge for each relationship" do

data/test/unit/rake_task_test.rb

@@ -20,6 +20,7 @@ class RakeTaskTest < ActiveSupport::TestCase
     Object::Quux = Module.new
     Object::Quux::Application = Class.new
     Object::Rails = Struct.new(:application).new(Object::Quux::Application.new)
+
     Rails.class_eval do
       define_method :backtrace_cleaner do
         ActiveSupport::BacktraceCleaner.new.tap do |cleaner|
@@ -100,12 +101,13 @@ class RakeTaskTest < ActiveSupport::TestCase
     rescue => e
       message = e.message
     end
-    assert_match /#{Regexp.escape(<<-MSG.strip).gsub("xxx", ".*?")}/, message
+    assert_match(/#{Regexp.escape(<<-MSG.strip).gsub("xxx", ".*?")}/, message
 Loading models failed!
 Error occurred while loading application: FooBar (RuntimeError)
     test/unit/rake_task_test.rb:#{l1}:in `xxx'
     test/unit/rake_task_test.rb:#{l2}:in `xxx'
     MSG
+    )
   end
 
   test "generate task should reraise if application could not be loaded and trace option is enabled" do

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rails-erd
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Rolf Timmermans
+- Kerri Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -70,6 +71,7 @@ description: Automatically generate an entity-relationship diagram (ERD) for you
   Rails models.
 email:
 - r.timmermans@voormedia.com
+- kerrizor@kerrizor.com
 executables:
 - erd
 extensions: []
@@ -133,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Entity-relationship diagram for your Rails models.
@@ -152,4 +154,3 @@ test_files:
 - test/unit/rake_task_test.rb
 - test/unit/relationship_test.rb
 - test/unit/specialization_test.rb
-has_rdoc: