rails-erd 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ab56fc63661711b90e26347a430db4ade715904
-  data.tar.gz: 33656498d2b249fe4f8ab7cf462f70e9e85b3fed
+  metadata.gz: 7ada96cc38a16ade059a334c1b0c228f1d950799
+  data.tar.gz: 4ce8b31b96b63dd9da6651d932787d78067fbc74
 SHA512:
-  metadata.gz: aec8e77aa5ba7c424ae2f3322d35c944b5f20f41e07aadeff9da0c606414dddc0d70f05457b0863d2c9c6693db25dce68573b7e7a2fe65194e3e3a9c07bb1c47
-  data.tar.gz: 09ebb3782261d1ce42e628116288ccfc6360e2e2fd348a298e4490bc615175e022b7d9df7d6363dd41f1a306b43cfc54282772b24315f5b5bb97b0382ab1c254
+  metadata.gz: 05bebbfc35caa2f8db94a5fd444de5342d8fa1ebae29f5d954b7858b2a61ab9dccd7c48093e19dbac693584de9e41e0c50c1030fbd4b30e59e44e58a73838a0f
+  data.tar.gz: 8b6d762b352f2638e482deb1f8e2330af32a040a651264b70cee13d1bfbfce7dc594ede091d8a3df66954be5dc3b0c798e289c0eb64f2979a1f68b946aa6d110

data/README.md

@@ -18,6 +18,12 @@ Here's an example entity-relationship diagram that was generated by Rails ERD:
 Browse the [gallery](http://voormedia.github.io/rails-erd/gallery.html) for more example diagrams.
 
 
+Requirements
+---------------
+
+* Ruby 1.9.3+
+* ActiveRecord 3.x
+
 Getting started
 ---------------
 
@@ -67,7 +73,7 @@ About Rails ERD
 
 Rails ERD was created by Rolf Timmermans (r.timmermans *at* voormedia.com)
 
-Copyright 2010-2014 Voormedia - [www.voormedia.com](http://www.voormedia.com/)
+Copyright 2010-2015 Voormedia - [www.voormedia.com](http://www.voormedia.com/)
 
 
 License

data/lib/rails_erd/config.rb

@@ -1,3 +1,5 @@
+require "yaml"
+
 module RailsERD
   class Config
     USER_WIDE_CONFIG_FILE = File.expand_path(".erdconfig", ENV["HOME"])

data/lib/rails_erd/diagram/graphviz.rb

@@ -43,7 +43,10 @@ module RailsERD
     # title:: The title to add at the top of the diagram. Defaults to
     #         <tt>"YourApplication domain model"</tt>.
     class Graphviz < Diagram
-      NODE_LABEL_TEMPLATES = { :html => "node.html.erb", :record => "node.record.erb" } # @private :nodoc:
+      NODE_LABEL_TEMPLATES = {
+        html:   "node.html.erb",
+        record: "node.record.erb"
+      } # @private :nodoc:
 
       NODE_WIDTH = 130 # @private :nodoc:
 
@@ -51,36 +54,35 @@ module RailsERD
 
       # Default graph attributes.
       GRAPH_ATTRIBUTES = {
-        :rankdir => :LR,
-        :ranksep => 0.5,
-        :nodesep => 0.4,
-        :pad => "0.4,0.4",
-        :margin => "0,0",
-        :concentrate => true,
-        :labelloc => :t,
-        :fontsize => 13,
-        :fontname => FONTS[:bold]
+        rankdir:     :LR,
+        ranksep:     0.5,
+        nodesep:     0.4,
+        pad:         "0.4,0.4",
+        margin:      "0,0",
+        concentrate: true,
+        labelloc:    :t,
+        fontsize:    13,
+        fontname:    FONTS[:bold]
       }
 
       # Default node attributes.
       NODE_ATTRIBUTES = {
-        :shape => "Mrecord",
-        :fontsize => 10,
-        :fontname => FONTS[:normal],
-        :margin => "0.07,0.05",
-        :penwidth => 1.0
+        shape:    "Mrecord",
+        fontsize: 10,
+        fontname: FONTS[:normal],
+        margin:   "0.07,0.05",
+        penwidth: 1.0
       }
 
       # Default edge attributes.
       EDGE_ATTRIBUTES = {
-        :fontname => FONTS[:normal],
-        :fontsize => 8,
-        :dir => :both,
-        :arrowsize => 0.9,
-        :penwidth => 1.0,
-        :labelangle => 32,
-        :labeldistance => 1.8,
-        :fontsize => 7
+        fontname:      FONTS[:normal],
+        fontsize:      7,
+        dir:           :both,
+        arrowsize:     0.9,
+        penwidth:      1.0,
+        labelangle:    32,
+        labeldistance: 1.8,
       }
 
       module Simple
@@ -101,7 +103,10 @@ module RailsERD
         end
 
         def specialization_style(specialization)
-          { :color => :grey60, :arrowtail => :onormal, :arrowhead => :none, :arrowsize => 1.2 }
+          { color:     :grey60,
+            arrowtail: :onormal,
+            arrowhead: :none,
+            arrowsize: 1.2 }
         end
       end
 
@@ -194,10 +199,12 @@ module RailsERD
           graph.output(filetype => filename.gsub(/\s/,"\\ "))
           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}"
+          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!\nVerify that Graphviz is installed and in your path, or use filetype=dot."
+          raise "Saving diagram failed!\nVerify that Graphviz is installed " +
+                  "and in your path, or use filetype=dot."
         end
       end
 
@@ -267,7 +274,7 @@ module RailsERD
 
       def relationship_options(relationship)
         relationship_style(relationship).tap do |options|
-          # Edges with a higher weight are optimised to be shorter and straighter.
+          # Edges with a higher weight are optimized to be shorter and straighter.
           options[:weight] = relationship.strength
 
           # Indirect relationships should not influence node ranks.

data/lib/rails_erd/domain.rb

@@ -114,7 +114,7 @@ module RailsERD
     end
 
     def models
-      @models ||= @source_models.select { |model| check_model_validity(model) }
+      @models ||= @source_models.select { |model| check_model_validity(model) }.reject { |model| check_habtm_model(model) }
     end
 
     def associations
@@ -145,5 +145,9 @@ module RailsERD
     def association_description(association)
       "#{association.name.inspect} on #{association.active_record}"
     end
+
+    def check_habtm_model(model)
+      model.name.start_with?("HABTM_")
+    end
   end
 end

data/lib/rails_erd/domain/attribute.rb

@@ -49,7 +49,7 @@ module RailsERD
 
       # Returns +true+ if this attribute is the primary key of the entity.
       def primary_key?
-        column.primary
+        @model.primary_key.to_s == name.to_s
       end
 
       # Returns +true+ if this attribute is used as a foreign key for any
@@ -100,12 +100,14 @@ module RailsERD
       # Returns any non-standard limit for this attribute. If a column has no
       # limit or uses a default database limit, this method returns +nil+.
       def limit
-        column.limit.to_i if column.limit != native_type[:limit] and column.limit.respond_to?(:to_i)
+        return column.limit.to_i if column.limit != native_type[:limit] and column.limit.respond_to?(:to_i)
+        column.precision.to_i if column.precision != native_type[:precision] and column.precision.respond_to?(:to_i)
       end
 
       # Returns any non-standard scale for this attribute (decimal types only).
       def scale
-        column.scale.to_i if column.scale != native_type[:scale] and column.scale.respond_to?(:to_i)
+        return column.scale.to_i if column.scale != native_type[:scale] and column.scale.respond_to?(:to_i)
+        0 if column.precision
       end
 
       # Returns a string that describes the limit for this attribute, such as

data/lib/rails_erd/version.rb

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

data/test/test_helper.rb

@@ -2,7 +2,11 @@ require "rubygems"
 require "bundler/setup"
 
 require "active_record"
-require "test/unit"
+if ActiveSupport::VERSION::MAJOR >= 4
+  require "minitest/autorun"
+else
+  require "test/unit"
+end
 require "rails_erd/domain"
 
 ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
@@ -127,13 +131,15 @@ class ActiveSupport::TestCase
     RailsERD::Config.send :remove_const, :CURRENT_CONFIG_FILE
     RailsERD::Config.send :const_set, :CURRENT_CONFIG_FILE,
       File.expand_path("../../examples/erdconfig.not_exists", __FILE__)
+
+    RailsERD.options = RailsERD.default_options.merge(Config.load)
   end
 
   def reset_domain
     if defined? ActiveRecord
       ActiveRecord::Base.descendants.each do |model|
         model.reset_column_information
-        Object.send :remove_const, model.name.to_sym
+        Object.send :remove_const, model.name.to_sym if Object.const_defined? model.name.to_sym
       end
       ActiveRecord::Base.connection.tables.each do |table|
         ActiveRecord::Base.connection.drop_table table

data/test/unit/diagram_test.rb

@@ -1,14 +1,7 @@
 require File.expand_path("../test_helper", File.dirname(__FILE__))
+require "rails_erd/diagram"
 
 class DiagramTest < ActiveSupport::TestCase
-  def setup
-    load "rails_erd/diagram.rb"
-  end
-
-  def teardown
-    RailsERD.send :remove_const, :Diagram
-  end
-
   def retrieve_entities(options = {})
     klass = Class.new(Diagram)
     [].tap do |entities|

data/test/unit/graphviz_test.rb

@@ -1,15 +1,14 @@
 require File.expand_path("../test_helper", File.dirname(__FILE__))
+require "rails_erd/diagram/graphviz"
 
 class GraphvizTest < ActiveSupport::TestCase
   def setup
     RailsERD.options.filetype = :png
     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 = {})

data/test/unit/rake_task_test.rb

@@ -14,7 +14,6 @@ class RakeTaskTest < ActiveSupport::TestCase
 
   def teardown
     FileUtils.rm "erd.dot" rescue nil
-    RailsERD::Diagram.send :remove_const, :Graphviz rescue nil
   end
 
   define_method :create_app do

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: rails-erd
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Rolf Timmermans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency