rails-erd 0.4.3 → 0.4.4

data/CHANGES.rdoc

@@ -1,3 +1,14 @@
+=== 0.4.4:
+
+* Added the ability to disable HTML markup in node labels (markup=false). This
+  causes .dot files to be compatible with OmniGraffle, which otherwise fails
+  to import graphs with HTML node labels (issue reported by Lucas Florio,
+  implementation based on template by Troy Anderson).
+* Prevent models named after Graphviz reserved words (Node, Edge) from causing
+  errors in .dot files (reported by gguthrie).
+* Improved error messages when Graphviz is throwing errors (reported by
+  Michael Irwin).
+
 === 0.4.3:
 
 * Display the scale of decimal attributes when set. A decimal attribute with

data/Gemfile

@@ -5,8 +5,6 @@ gem "activesupport", "~> 3.0"
 gem "ruby-graphviz", "~> 0.9.18"
 
 group :development do
-  gem "rake"
-  gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
 
   platforms :ruby do

data/Gemfile.lock

@@ -1,18 +1,18 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.4)
+      activesupport (= 3.0.4)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activerecord (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
     activerecord-jdbc-adapter (1.1.1)
-    activesupport (3.0.3)
-    arel (2.0.7)
+    activesupport (3.0.4)
+    arel (2.0.8)
     bouncy-castle-java (1.5.0145.2)
     builder (2.1.2)
     git (1.2.5)
@@ -37,10 +37,8 @@ DEPENDENCIES
   activerecord (~> 3.0)
   activerecord-jdbc-adapter
   activesupport (~> 3.0)
-  bundler (~> 1.0.0)
   jdbc-sqlite3
   jeweler (~> 1.5.2)
   jruby-openssl
-  rake
   ruby-graphviz (~> 0.9.18)
   sqlite3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Voormedia B.V.
+Copyright (c) 2010-2011 Voormedia B.V.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -51,7 +51,7 @@ About Rails ERD
 
 Rails ERD was created by Rolf Timmermans (r.timmermans *at* voormedia.com)
 
-Copyright 2010 Voormedia - [www.voormedia.com](http://www.voormedia.com/)
+Copyright 2010-2011 Voormedia - [www.voormedia.com](http://www.voormedia.com/)
 
 
 License

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/rails_erd.rb

@@ -4,9 +4,9 @@ require "rails_erd/railtie" if defined? Rails
 # Welcome to the API documentation of Rails ERD. If you wish to extend or
 # customise the output that is generated by Rails ERD, you have come to the
 # right place.
-# 
+#
 # == Creating custom output
-# 
+#
 # If you want to create your own kind of diagrams, or some other output, a
 # good starting point is the RailsERD::Diagram class. It can serve as the base
 # of your output generation code.
@@ -33,7 +33,7 @@ module RailsERD
     # RailsERD::Diagram will use these options unless overridden.
     attr_accessor :options
   end
-  
+
   module Inspectable # @private :nodoc:
     def inspection_attributes(*attributes)
       attribute_inspection = attributes.collect { |attribute|
@@ -54,6 +54,7 @@ module RailsERD
     :filetype, :pdf,
     :indirect, true,
     :inheritance, false,
+    :markup, true,
     :notation, :simple,
     :orientation, :horizontal,
     :polymorphism, false,

data/lib/rails_erd/diagram/graphviz.rb

@@ -40,13 +40,13 @@ module RailsERD
     #               or +:vertical+. Defaults to +horizontal+. The orientation of the
     #               PDF that is generated depends on the amount of hierarchy
     #               in your models.
-    # title:: The title to add at the top of the diagram. Defaults to 
+    # title:: The title to add at the top of the diagram. Defaults to
     #         <tt>"YourApplication domain model"</tt>.
     class Graphviz < Diagram
-      NODE_LABEL_TEMPLATE = ERB.new(File.read(File.expand_path("templates/node.erb", File.dirname(__FILE__))), nil, "<>") # @private :nodoc:
+      NODE_LABEL_TEMPLATES = { :html => "node.html.erb", :record => "node.record.erb" } # @private :nodoc:
 
       NODE_WIDTH = 130 # @private :nodoc:
-      
+
       # Default graph attributes.
       GRAPH_ATTRIBUTES = {
         :rankdir => :LR,
@@ -78,16 +78,16 @@ module RailsERD
         :penwidth => 1.0,
         :labelangle => 32,
         :labeldistance => 1.8,
-        :fontsize => 7  
+        :fontsize => 7
       }
-      
+
       module Simple
         def entity_style(entity, attributes)
           {}.tap do |options|
             options[:fontcolor] = options[:color] = :grey60 if entity.abstract?
           end
         end
-        
+
         def relationship_style(relationship)
           {}.tap do |options|
             options[:style] = :dotted if relationship.indirect?
@@ -102,7 +102,7 @@ module RailsERD
           { :color => :grey60, :arrowtail => :onormal, :arrowhead => :none, :arrowsize => 1.2 }
         end
       end
-    
+
       module Bachman
         include Simple
         def relationship_style(relationship)
@@ -121,7 +121,7 @@ module RailsERD
           end
         end
       end
-      
+
       module Uml
         include Simple
         def relationship_style(relationship)
@@ -143,7 +143,7 @@ module RailsERD
           end
         end
       end
-      
+
       attr_accessor :graph
 
       setup do
@@ -156,33 +156,36 @@ module RailsERD
 
         # Switch rank direction if we're creating a vertically oriented graph.
         graph[:rankdir] = :TB if options.orientation == :vertical
-        
+
         # Title of the graph itself.
         graph[:label] = "#{title}\\n\\n" if title
-        
+
         # Setup notation options.
         extend self.class.const_get(options.notation.to_s.capitalize.to_sym)
       end
-      
+
       save do
-        raise "Saving diagram failed. Output directory '#{File.dirname(filename)}' does not exist." unless File.directory?(File.dirname(filename))
+        raise "Saving diagram failed!\nOutput directory '#{File.dirname(filename)}' does not exist." unless File.directory?(File.dirname(filename))
         begin
           graph.output(filetype => filename)
           filename
+        rescue RuntimeError => e
+          raise "Saving diagram failed!\nGraphviz produced errors. Verify it has support for filetype=#{options.filetype}, or use filetype=dot." <<
+            "\nOriginal error: #{e.message.split("\n").last}"
         rescue StandardError => e
-          raise "Saving diagram failed. Verify that Graphviz is installed or select filetype=dot."
+          raise "Saving diagram failed!\nVerify that Graphviz is installed and in your path, or use filetype=dot."
         end
       end
 
       each_entity do |entity, attributes|
         draw_node entity.name, entity_options(entity, attributes)
       end
-      
+
       each_specialization do |specialization|
         from, to = specialization.generalized, specialization.specialized
         draw_edge from.name, to.name, specialization_options(specialization)
       end
-      
+
       each_relationship do |relationship|
         from, to = relationship.source, relationship.destination
         unless draw_edge from.name, to.name, relationship_options(relationship)
@@ -193,19 +196,23 @@ module RailsERD
           end
         end
       end
-      
+
       private
-      
+
       def node_exists?(name)
-        !!graph.get_node(name)
+        !!graph.get_node(escape_name(name))
       end
-      
+
       def draw_node(name, options)
-        graph.add_node name, options
+        graph.add_node escape_name(name), options
       end
-      
+
       def draw_edge(from, to, options)
-        graph.add_edge graph.get_node(from), graph.get_node(to), options if node_exists?(from) and node_exists?(to)
+        graph.add_edge graph.get_node(escape_name(from)), graph.get_node(escape_name(to)), options if node_exists?(from) and node_exists?(to)
+      end
+
+      def escape_name(name)
+        "m_#{name}"
       end
 
       # Returns the title to be used for the graph.
@@ -217,26 +224,27 @@ module RailsERD
         else options.title
         end
       end
-      
+
       # Returns the file name that will be used when saving the diagram.
       def filename
         "#{options.filename}.#{options.filetype}"
       end
-      
+
       # Returns the default file extension to be used when saving the diagram.
       def filetype
         if options.filetype.to_sym == :dot then :none else options.filetype.to_sym end
       end
 
       def entity_options(entity, attributes)
-        entity_style(entity, attributes).merge :label => "<#{NODE_LABEL_TEMPLATE.result(binding)}>"
+        label = options[:markup] ? "<#{read_template(:html).result(binding)}>" : "#{read_template(:record).result(binding)}"
+        entity_style(entity, attributes).merge :label => label
       end
-      
+
       def relationship_options(relationship)
         relationship_style(relationship).tap do |options|
           # Edges with a higher weight are optimised to be shorter and straighter.
           options[:weight] = relationship.strength
-          
+
           # Indirect relationships should not influence node ranks.
           options[:constraint] = false if relationship.indirect?
         end
@@ -245,6 +253,10 @@ module RailsERD
       def specialization_options(specialization)
         specialization_style(specialization)
       end
+
+      def read_template(type)
+        ERB.new(File.read(File.expand_path("templates/#{NODE_LABEL_TEMPLATES[type]}", File.dirname(__FILE__))), nil, "<>")
+      end
     end
   end
 end

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

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

data/lib/rails_erd/tasks.rake

@@ -13,17 +13,17 @@ namespace :erd do
       end
     end
   end
-  
+
   task :load_models do
     say "Loading application environment..."
     Rake::Task[:environment].invoke
 
     say "Loading code in search of Active Record models..."
     Rails.application.eager_load!
-    
+
     raise "Active Record was not loaded." unless defined? ActiveRecord
   end
-  
+
   task :generate => [:options, :load_models] do
     say "Generating Entity-Relationship Diagram for #{ActiveRecord::Base.descendants.length} models..."
 

data/rails-erd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails-erd}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rolf Timmermans"]
-  s.date = %q{2011-01-27}
+  s.date = %q{2011-03-22}
   s.description = %q{Automatically generate an entity-relationship diagram (ERD) for your Rails models.}
   s.email = %q{r.timmermans@voormedia.com}
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".gemtest",
     "CHANGES.rdoc",
     "Gemfile",
     "Gemfile.lock",
@@ -28,7 +29,8 @@ Gem::Specification.new do |s|
     "lib/rails_erd.rb",
     "lib/rails_erd/diagram.rb",
     "lib/rails_erd/diagram/graphviz.rb",
-    "lib/rails_erd/diagram/templates/node.erb",
+    "lib/rails_erd/diagram/templates/node.html.erb",
+    "lib/rails_erd/diagram/templates/node.record.erb",
     "lib/rails_erd/domain.rb",
     "lib/rails_erd/domain/attribute.rb",
     "lib/rails_erd/domain/entity.rb",
@@ -52,7 +54,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://rails-erd.rubyforge.org/}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rails-erd}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Entity-relationship diagram for your Rails models.}
   s.test_files = [
     "test/test_helper.rb",
@@ -68,15 +70,12 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, ["~> 3.0"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
       s.add_runtime_dependency(%q<ruby-graphviz>, ["~> 0.9.18"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<jdbc-sqlite3>, [">= 0"])
@@ -86,8 +85,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activerecord>, ["~> 3.0"])
       s.add_dependency(%q<activesupport>, ["~> 3.0"])
       s.add_dependency(%q<ruby-graphviz>, ["~> 0.9.18"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<jdbc-sqlite3>, [">= 0"])
@@ -98,8 +95,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activerecord>, ["~> 3.0"])
     s.add_dependency(%q<activesupport>, ["~> 3.0"])
     s.add_dependency(%q<ruby-graphviz>, ["~> 0.9.18"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<jdbc-sqlite3>, [">= 0"])

data/test/unit/graphviz_test.rb

@@ -6,18 +6,18 @@ class GraphvizTest < ActiveSupport::TestCase
     RailsERD.options.warn = false
     load "rails_erd/diagram/graphviz.rb"
   end
-  
+
   def teardown
     FileUtils.rm Dir["ERD.*"] rescue nil
     RailsERD::Diagram.send :remove_const, :Graphviz rescue nil
   end
-  
+
   def diagram(options = {})
     @diagram ||= Diagram::Graphviz.new(Domain.generate(options), options).tap do |diagram|
       diagram.generate
     end
   end
-  
+
   def find_dot_nodes(diagram)
     [].tap do |nodes|
       diagram.graph.each_node do |name, node|
@@ -37,7 +37,7 @@ class GraphvizTest < ActiveSupport::TestCase
       end
     end
   end
-  
+
   def find_dot_edges(diagram)
     [].tap do |edges|
       diagram.graph.each_edge do |edge|
@@ -45,7 +45,7 @@ class GraphvizTest < ActiveSupport::TestCase
       end
     end
   end
-  
+
   def find_dot_edge_styles(diagram)
     find_dot_edges(diagram).map { |e| [e[:arrowtail].to_s.tr('"', ''), e[:arrowhead].to_s.tr('"', '')] }
   end
@@ -59,7 +59,7 @@ class GraphvizTest < ActiveSupport::TestCase
       FileUtils.rm "ERD.svg" rescue nil
     end
   end
-  
+
   test "rank direction should be lr for horizontal orientation" do
     create_simple_domain
     assert_equal '"LR"', diagram(:orientation => :horizontal).graph[:rankdir].to_s
@@ -69,7 +69,7 @@ class GraphvizTest < ActiveSupport::TestCase
     create_simple_domain
     assert_equal '"TB"', diagram(:orientation => :vertical).graph[:rankdir].to_s
   end
-  
+
   # Diagram generation =======================================================
   test "create should create output for domain with attributes" do
     create_model "Foo", :bar => :references, :column => :string do
@@ -85,7 +85,7 @@ class GraphvizTest < ActiveSupport::TestCase
     Diagram::Graphviz.create
     assert File.exists?("ERD.png")
   end
-  
+
   test "create should write to file with dot extension if type is dot" do
     create_simple_domain
     Diagram::Graphviz.create :filetype => :dot
@@ -108,7 +108,7 @@ class GraphvizTest < ActiveSupport::TestCase
       end
     end
   end
-  
+
   test "create should create output for domain with attributes if orientation is vertical" do
     create_model "Foo", :bar => :references, :column => :string do
       belongs_to :bar
@@ -138,7 +138,7 @@ class GraphvizTest < ActiveSupport::TestCase
     end
     assert_match /No entities found/, message
   end
-  
+
   test "create should write to given file name plus extension if present" do
     begin
       create_simple_domain
@@ -148,7 +148,7 @@ class GraphvizTest < ActiveSupport::TestCase
       FileUtils.rm "foobar.png" rescue nil
     end
   end
-  
+
   test "create should abort and complain if output directory does not exist" do
     message = nil
     begin
@@ -160,12 +160,22 @@ class GraphvizTest < ActiveSupport::TestCase
     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
+    create_model "Node", :name => :string
+    create_model "Edge", :node => :references do
+      belongs_to :node
+    end
+    assert_nothing_raised do
+      Diagram::Graphviz.create
+    end
+  end
+
   # Graphviz output ==========================================================
   test "generate should create directed graph" do
     create_simple_domain
     assert_equal "digraph", diagram.graph.type
   end
-  
+
   test "generate should add title to graph" do
     create_simple_domain
     assert_equal '"Domain model\n\n"', diagram.graph.graph[:label].to_s
@@ -189,29 +199,49 @@ class GraphvizTest < ActiveSupport::TestCase
     create_simple_domain
     assert_equal "", diagram(:title => false).graph.graph[:label].to_s
   end
-  
+
   test "generate should create node for each entity" do
     create_model "Foo", :bar => :references do
       belongs_to :bar
     end
     create_model "Bar"
-    assert_equal ["Bar", "Foo"], find_dot_nodes(diagram).map(&:id).sort
+    assert_equal ["m_Bar", "m_Foo"], find_dot_nodes(diagram).map(&:id).sort
+  end
+
+  test "generate should add html label for entities" do
+    RailsERD.options.markup = true
+    create_model "Foo", :bar => :references do
+      belongs_to :bar
+    end
+    create_model "Bar"
+    assert_match %r{<\w+.*?>Bar</\w+>}, find_dot_node(diagram, "m_Bar")[:label].to_gv
   end
-  
-  test "generate should add label for entities" do
+
+  test "generate should add record label for entities" do
+    RailsERD.options.markup = false
     create_model "Foo", :bar => :references do
       belongs_to :bar
     end
     create_model "Bar"
-    assert_match %r{<\w+.*?>Bar</\w+>}, find_dot_node(diagram, "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 labels" do
+  test "generate should add attributes to entity html labels" do
+    RailsERD.options.markup = true
     create_model "Foo", :bar => :references do
       belongs_to :bar
     end
     create_model "Bar", :column => :string
-    assert_match %r{<\w+.*?>column <\w+.*?>string</\w+.*?>}, find_dot_node(diagram, "Bar")[:label].to_gv
+    assert_match %r{<\w+.*?>column <\w+.*?>string</\w+.*?>}, find_dot_node(diagram, "m_Bar")[:label].to_gv
+  end
+
+  test "generate should add attributes to entity record labels" do
+    RailsERD.options.markup = false
+    create_model "Foo", :bar => :references do
+      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
   end
 
   test "generate should not add any attributes to entity labels if attributes is set to false" do
@@ -219,35 +249,55 @@ class GraphvizTest < ActiveSupport::TestCase
     create_model "Lid", :jar => :references do
       belongs_to :jar
     end
-    assert_no_match %r{contents}, find_dot_node(diagram(:attributes => false), "Jar")[:label].to_gv
+    assert_no_match %r{contents}, find_dot_node(diagram(:attributes => false), "m_Jar")[:label].to_gv
   end
 
-  test "generate should create edge for each relationship" do
-    create_model "Foo", :bar => :references do
-      belongs_to :bar
+  test "node html labels should have direction reversing braces for vertical orientation" do
+    RailsERD.options.markup = true
+    create_model "Book", :author => :references do
+      belongs_to :author
     end
-    create_model "Bar", :foo => :references do
-      belongs_to :foo
+    create_model "Author", :name => :string
+    assert_match %r(\A<\{\s*<.*\|.*>\s*\}>\Z)m, find_dot_node(diagram(:orientation => :vertical), "m_Author")[:label].to_gv
+  end
+
+  test "node html labels should not have direction reversing braces for horizontal orientation" do
+    RailsERD.options.markup = true
+    create_model "Book", :author => :references do
+      belongs_to :author
     end
-    assert_equal [["Bar", "Foo"], ["Foo", "Bar"]], find_dot_node_pairs(diagram).sort
+    create_model "Author", :name => :string
+    assert_match %r(\A<\s*<.*\|.*>\s*>\Z)m, find_dot_node(diagram(:orientation => :horizontal), "m_Author")[:label].to_gv
   end
-  
-  test "node records should have direction reversing braces for vertical orientation" do
+
+  test "node record labels should 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<\{\s*<.*\|.*>\s*\}>\Z)m, find_dot_node(diagram(:orientation => :vertical), "Author")[:label].to_gv
+    assert_match %r(\A"\{\w+|.*\}"\Z)m, find_dot_node(diagram(:orientation => :vertical), "m_Author")[:label].to_gv
   end
 
-  test "node records should not have direction reversing braces for horizontal orientation" do
+  test "node record labels should not 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<\s*<.*\|.*>\s*>\Z)m, find_dot_node(diagram(:orientation => :horizontal), "Author")[:label].to_gv
+    assert_match %r(\A"\w+|.*"\Z)m, find_dot_node(diagram(:orientation => :horizontal), "m_Author")[:label].to_gv
   end
-  
+
+  test "generate should create edge for each relationship" do
+    create_model "Foo", :bar => :references do
+      belongs_to :bar
+    end
+    create_model "Bar", :foo => :references do
+      belongs_to :foo
+    end
+    assert_equal [["m_Bar", "m_Foo"], ["m_Foo", "m_Bar"]], find_dot_node_pairs(diagram).sort
+  end
+
   test "generate should create edge to generalized entity if polymorphism is true" do
     create_model "Cannon", :defensible => :references do
       belongs_to :defensible, :polymorphic => true
@@ -258,7 +308,7 @@ class GraphvizTest < ActiveSupport::TestCase
     create_model "Galleon" do
       has_many :cannons, :as => :defensible
     end
-    assert_equal [["Defensible", "Cannon"], ["Defensible", "Galleon"], ["Defensible", "Stronghold"]],
+    assert_equal [["m_Defensible", "m_Cannon"], ["m_Defensible", "m_Galleon"], ["m_Defensible", "m_Stronghold"]],
       find_dot_node_pairs(diagram(:polymorphism => true)).sort
   end
 
@@ -272,9 +322,9 @@ class GraphvizTest < ActiveSupport::TestCase
     create_model "Galleon" do
       has_many :cannons, :as => :defensible
     end
-    assert_equal [["Galleon", "Cannon"], ["Stronghold", "Cannon"]], find_dot_node_pairs(diagram).sort
+    assert_equal [["m_Galleon", "m_Cannon"], ["m_Stronghold", "m_Cannon"]], find_dot_node_pairs(diagram).sort
   end
-  
+
   # Simple notation style ====================================================
   test "generate should use no style for one to one cardinalities with simple notation" do
     create_one_to_one_assoc_domain

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rails-erd
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 3
-  version: 0.4.3
+  prerelease: 
+  version: 0.4.4
 platform: ruby
 authors: 
 - Rolf Timmermans
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +01:00
+date: 2011-03-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,9 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :runtime
   prerelease: false
@@ -38,9 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :runtime
   prerelease: false
@@ -52,109 +42,65 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 18
         version: 0.9.18
   type: :runtime
   prerelease: false
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jdbc-sqlite3
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: activerecord-jdbc-adapter
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: jruby-openssl
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id008
 description: Automatically generate an entity-relationship diagram (ERD) for your Rails models.
 email: r.timmermans@voormedia.com
 executables: []
@@ -165,6 +111,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
+- .gemtest
 - CHANGES.rdoc
 - Gemfile
 - Gemfile.lock
@@ -176,7 +123,8 @@ files:
 - lib/rails_erd.rb
 - lib/rails_erd/diagram.rb
 - lib/rails_erd/diagram/graphviz.rb
-- lib/rails_erd/diagram/templates/node.erb
+- lib/rails_erd/diagram/templates/node.html.erb
+- lib/rails_erd/diagram/templates/node.record.erb
 - lib/rails_erd/domain.rb
 - lib/rails_erd/domain/attribute.rb
 - lib/rails_erd/domain/entity.rb
@@ -210,21 +158,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rails-erd
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Entity-relationship diagram for your Rails models.