rails-erd 0.4.0 → 0.4.1

data/CHANGES.rdoc

@@ -1,3 +1,8 @@
+=== 0.4.1:
+
+* Fix processing of associations with class_name set to absolute module paths.
+* Adjust model loading process to include models in non-standard paths eagerly.
+
 === 0.4.0:
 
 * Support to optionally display single table inheritance relationships

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails-erd (0.3.0)
+    rails-erd (0.4.0)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
       ruby-graphviz (~> 0.9.18)

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/rails_erd/domain/relationship.rb

@@ -30,7 +30,7 @@ module RailsERD
         end
         
         def association_target(association)
-          association.class_name
+          association.options[:polymorphic] ? association.class_name : association.klass.name
         end
       end
       
@@ -58,8 +58,8 @@ module RailsERD
         else
           # Many-to-many associations don't have a clearly defined direction.
           # We sort by name and use the first model as the source.
-          source = associations.first.active_record
-          associations.partition { |association| association.active_record == source }
+          source = associations.map(&:active_record).sort_by(&:name).first
+          associations.partition { |association| association.active_record != source }
         end
       
         assoc = @forward_associations.first || @reverse_associations.first

data/lib/rails_erd/tasks.rake

@@ -15,18 +15,17 @@ namespace :erd do
   end
   
   task :load_models do
-    say "Loading Active Record models..."
-
+    say "Loading application environment..."
     Rake::Task[:environment].invoke
-    Rails.application.config.paths.app.models.paths.each do |model_path|
-      Dir["#{model_path}/**/*.rb"].sort.each do |file|
-        require_dependency file
-      end
-    end
+
+    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..."
+    say "Generating Entity-Relationship Diagram for #{ActiveRecord::Base.descendants.length} models..."
 
     require "rails_erd/diagram/graphviz"
     file = RailsERD::Diagram::Graphviz.create

data/rails-erd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails-erd}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rolf Timmermans"]
-  s.date = %q{2010-10-12}
+  s.date = %q{2010-10-14}
   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 = [

data/test/test_helper.rb

@@ -109,14 +109,16 @@ class ActiveSupport::TestCase
   private
   
   def reset_domain
-    ActiveRecord::Base.descendants.each do |model|
-      Object.send :remove_const, model.name.to_sym
-    end
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.drop_table table
+    if defined? ActiveRecord
+      ActiveRecord::Base.descendants.each do |model|
+        Object.send :remove_const, model.name.to_sym
+      end
+      ActiveRecord::Base.connection.tables.each do |table|
+        ActiveRecord::Base.connection.drop_table table
+      end
+      ActiveRecord::Base.direct_descendants.clear
+      Arel::Relation.send :class_variable_set, :@@connection_tables_primary_keys, {}
+      ActiveSupport::Dependencies::Reference.clear!
     end
-    ActiveRecord::Base.direct_descendants.clear
-    Arel::Relation.send :class_variable_set, :@@connection_tables_primary_keys, {}
-    ActiveSupport::Dependencies::Reference.clear!
   end
 end

data/test/unit/domain_test.rb

@@ -127,6 +127,18 @@ class DomainTest < ActiveSupport::TestCase
     assert_equal [Domain::Relationship] * 2, Domain.generate.relationships.collect(&:class)
   end
   
+  test "relationships should use model name first in alphabet as source for many to many relationships" do
+    create_table "many_more", :many_id => :integer, :more_id => :integer
+    create_model "Many" do
+      has_and_belongs_to_many :more
+    end
+    create_model "More" do
+      has_and_belongs_to_many :many
+    end
+    relationship = Domain.generate.relationships.first
+    assert_equal ["Many", "More"], [relationship.source.name, relationship.destination.name]
+  end
+  
   # Specialization processing ================================================
   test "specializations should return empty array for empty domain" do
     assert_equal [], Domain.generate.specializations

data/test/unit/rake_task_test.rb

@@ -29,6 +29,42 @@ class RakeTaskTest < ActiveSupport::TestCase
     assert !File.exists?("ERD.dot")
   end
   
+  test "generate task should eager load application environment" do
+    eager_loaded, environment_loaded = nil
+    Object::Quux = Module.new
+    Object::Quux::Application = Class.new
+    Object::Rails = Struct.new(:application).new(Object::Quux::Application.new)
+    Rails.application.class_eval do
+      define_method :eager_load! do
+        eager_loaded = true
+      end
+    end
+    Rake::Task.define_task :environment do
+      environment_loaded = true
+    end
+    create_simple_domain
+    Rake::Task["erd:generate"].invoke
+    assert_equal [true, true], [eager_loaded, environment_loaded]
+  end
+  
+  test "generate task should complain if active record is not loaded" do
+    Object::Quux = Module.new
+    Object::Quux::Application = Class.new
+    Object::Rails = Struct.new(:application).new(Object::Quux::Application.new)
+    Rails.application.class_eval do
+      define_method :eager_load! do end
+    end
+    Rake::Task.define_task :environment
+    Object.send :remove_const, :ActiveRecord
+    message = nil
+    begin
+      Rake::Task["erd:generate"].invoke
+    rescue => e
+      message = e.message
+    end
+    assert_equal "Active Record was not loaded.", message
+  end
+  
   # Option processing ========================================================
   test "options task should ignore unknown command line options" do
     ENV["unknownoption"] = "value"

data/test/unit/relationship_test.rb

@@ -34,6 +34,15 @@ class RelationshipTest < ActiveSupport::TestCase
     assert_equal [domain.entity_by_name("Foo")], domain.relationships.map(&:destination)
   end
   
+  test "destination should return relationship destination if specified with absolute module path" do
+    create_model "Foo", :bar => :references
+    create_model "Bar" do
+      has_many :foos, :class_name => "::Foo"
+    end
+    domain = Domain.generate
+    assert_equal [domain.entity_by_name("Foo")], domain.relationships.map(&:destination)
+  end
+  
   # Relationship properties ==================================================
   test "mutual should return false for one way relationship" do
     create_model "Foo", :bar => :references do
@@ -261,7 +270,7 @@ class RelationshipTest < ActiveSupport::TestCase
     More.class_eval do
       validates_length_of :many, :maximum => 29, :minimum => 7
     end
-    assert_equal [Domain::Relationship::Cardinality.new(3..18, 7..29)], domain_cardinalities
+    assert_equal [Domain::Relationship::Cardinality.new(7..29, 3..18)], domain_cardinalities
   end
 
   test "cardinality should be n-m to n-m for limited many to many associations with multiple validations" do
@@ -278,7 +287,7 @@ class RelationshipTest < ActiveSupport::TestCase
       validates_length_of :many, :minimum => 9
       validates_length_of :many, :maximum => 17
     end
-    assert_equal [Domain::Relationship::Cardinality.new(3..20, 9..17)], domain_cardinalities
+    assert_equal [Domain::Relationship::Cardinality.new(9..17, 3..20)], domain_cardinalities
   end
   
   # Cardinality for non-mutual relationships =================================

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Rolf Timmermans
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +02:00
+date: 2010-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency