rails-erd 0.4.5 → 1.0.0

data/lib/rails_erd/diagram/graphviz.rb

@@ -103,6 +103,26 @@ module RailsERD
         end
       end
 
+      module Crowsfoot
+        include Simple
+        def relationship_style(relationship)
+          {}.tap do |options|
+            options[:style] = :dotted if relationship.indirect?
+
+            # Cardinality is "look-across".
+            dst = relationship.to_many? ? "crow" : "tee"
+            src = relationship.many_to? ? "crow" : "tee"
+
+            # Participation is "look-across".
+            dst << (relationship.destination_optional? ? "odot" : "tee")
+            src << (relationship.source_optional? ? "odot" : "tee")
+
+            options[:arrowsize] = 0.6
+            options[:arrowhead], options[:arrowtail] = dst, src
+          end
+        end
+      end
+
       module Bachman
         include Simple
         def relationship_style(relationship)
@@ -116,6 +136,7 @@ module RailsERD
             # Cardinality is "look-across".
             dst << "normal" if relationship.to_many?
             src << "normal" if relationship.many_to?
+
             options[:arrowsize] = 0.6
             options[:arrowhead], options[:arrowtail] = dst, src
           end
@@ -204,11 +225,11 @@ module RailsERD
       end
 
       def draw_node(name, options)
-        graph.add_node escape_name(name), options
+        graph.add_nodes escape_name(name), options
       end
 
       def draw_edge(from, to, options)
-        graph.add_edge 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.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)

data/lib/rails_erd/domain/attribute.rb

@@ -31,7 +31,7 @@ module RailsERD
       # The type of the attribute, equal to the Rails migration type. Can be any
       # of +:string+, +:integer+, +:boolean+, +:text+, etc.
       def type
-        column.type
+        column.type or column.sql_type.downcase.to_sym
       end
 
       # Returns +true+ if this attribute is a content column, that is, if it
@@ -100,12 +100,12 @@ 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 if column.limit != @model.connection.native_database_types[type][:limit]
+        column.limit.to_i if column.limit != native_type[:limit] and column.limit.respond_to?(:to_i)
       end
 
       # Returns any non-standard scale for this attribute (decimal types only).
       def scale
-        column.scale if column.scale != @model.connection.native_database_types[type][:scale]
+        column.scale.to_i if column.scale != native_type[:scale] and column.scale.respond_to?(:to_i)
       end
 
       # Returns a string that describes the limit for this attribute, such as
@@ -115,6 +115,12 @@ module RailsERD
         return "(#{limit},#{scale})" if limit and scale
         return "(#{limit})" if limit
       end
+
+      private
+
+      def native_type
+        @model.connection.native_database_types[type] or {}
+      end
     end
   end
 end

data/lib/rails_erd/domain/entity.rb

@@ -7,29 +7,29 @@ module RailsERD
         def from_models(domain, models) # @private :nodoc:
           (concrete_from_models(domain, models) + abstract_from_models(domain, models)).sort
         end
-        
+
         private
-        
+
         def concrete_from_models(domain, models)
           models.collect { |model| new(domain, model.name, model) }
         end
-        
+
         def abstract_from_models(domain, models)
           models.collect(&:reflect_on_all_associations).flatten.collect { |association|
             association.options[:as].to_s.classify if association.options[:as]
           }.flatten.compact.uniq.collect { |name| new(domain, name) }
         end
       end
-      
+
       extend Inspectable
       inspection_attributes :model
-    
+
       # The domain in which this entity resides.
       attr_reader :domain
-    
+
       # The Active Record model that this entity corresponds to.
       attr_reader :model
-      
+
       # The name of this entity. Equal to the class name of the corersponding
       # model (for concrete entities) or given name (for abstract entities).
       attr_reader :name
@@ -37,12 +37,12 @@ module RailsERD
       def initialize(domain, name, model = nil) # @private :nodoc:
         @domain, @name, @model = domain, name, model
       end
-    
+
       # Returns an array of attributes for this entity.
       def attributes
         @attributes ||= if generalized? then [] else Attribute.from_model(domain, model) end
       end
-    
+
       # Returns an array of all relationships that this entity has with other
       # entities in the domain model.
       def relationships
@@ -60,7 +60,7 @@ module RailsERD
       def disconnected?
         relationships.none?
       end
-      
+
       # Returns +true+ if this entity is a generalization, which does not
       # correspond with a database table. Generalized entities are constructed
       # from polymorphic interfaces. Any +has_one+ or +has_many+ association
@@ -69,7 +69,7 @@ module RailsERD
       def generalized?
         !model
       end
-    
+
       # Returns +true+ if this entity descends from another entity, and is
       # represented in the same table as its parent. In Rails this concept is
       # referred to as single-table inheritance. In entity-relationship
@@ -77,23 +77,23 @@ module RailsERD
       def specialized?
         !generalized? and !model.descends_from_active_record?
       end
-      
+
       # Returns +true+ if this entity does not correspond directly with a
       # database table (if and only if the entity is specialized or
       # generalized).
       def abstract?
         specialized? or generalized?
       end
-      
+
       # Returns all child entities, if this is a generalized entity.
       def children
         @children ||= domain.specializations_by_entity_name(name).map(&:specialized)
       end
-  
+
       def to_s # @private :nodoc:
         name
       end
-  
+
       def <=>(other) # @private :nodoc:
         self.name <=> other.name
       end

data/lib/rails_erd/domain/relationship.rb

@@ -21,10 +21,20 @@ module RailsERD
         private
 
         def association_identity(association)
-          identifier = association.options[:join_table] || association.options[:through] || association.send(Domain.foreign_key_method_name).to_s
+          identifier = association_identifier(association)
           Set[identifier, association_owner(association), association_target(association)]
         end
 
+        def association_identifier(association)
+          if association.macro == :has_and_belongs_to_many
+            # Rails 4+ supports the join_table method, and doesn't expose it
+            # as an option if it's an implicit default.
+            (association.respond_to?(:join_table) && association.join_table) || association.options[:join_table]
+          else
+            association.options[:through] || association.send(Domain.foreign_key_method_name).to_s
+          end
+        end
+
         def association_owner(association)
           association.options[:as] ? association.options[:as].to_s.classify : association.active_record.name
         end

data/lib/rails_erd/domain/relationship/cardinality.rb

@@ -4,9 +4,9 @@ module RailsERD
       class Cardinality
         extend Inspectable
         inspection_attributes :source_range, :destination_range
-        
+
         N = Infinity = 1.0/0 # And beyond.
-      
+
         CLASSES = {
           [1, 1] => :one_to_one,
           [1, N] => :one_to_many,
@@ -16,7 +16,7 @@ module RailsERD
 
         # Returns a range that indicates the source (left) cardinality.
         attr_reader :source_range
-      
+
         # Returns a range that indicates the destination (right) cardinality.
         attr_reader :destination_range
 
@@ -26,7 +26,7 @@ module RailsERD
           @source_range = compose_range(source_range)
           @destination_range = compose_range(destination_range)
         end
-      
+
         # Returns the name of this cardinality, based on its two cardinal
         # numbers (for source and destination). Can be any of
         # +:one_to_one:+, +:one_to_many+, or +:many_to_many+. The name
@@ -44,23 +44,23 @@ module RailsERD
         def name
           CLASSES[cardinality_class]
         end
-      
+
         # Returns +true+ if the source (left side) is not mandatory.
         def source_optional?
           source_range.first < 1
         end
-      
+
         # Returns +true+ if the destination (right side) is not mandatory.
         def destination_optional?
           destination_range.first < 1
         end
-      
+
         # Returns the inverse cardinality. Destination becomes source, source
         # becomes destination.
         def inverse
           self.class.new destination_range, source_range
         end
-      
+
         CLASSES.each do |cardinality_class, name|
           class_eval <<-RUBY
             def #{name}?
@@ -68,11 +68,11 @@ module RailsERD
             end
           RUBY
         end
-      
+
         def ==(other) # @private :nodoc:
           source_range == other.source_range and destination_range == other.destination_range
         end
-      
+
         def <=>(other) # @private :nodoc:
           (cardinality_class <=> other.cardinality_class).nonzero? or
           compare_with(other) { |x| x.source_range.first + x.destination_range.first }.nonzero? or
@@ -80,7 +80,7 @@ module RailsERD
           compare_with(other) { |x| x.source_range.last }.nonzero? or
           compare_with(other) { |x| x.destination_range.last }
         end
-      
+
         # Returns an array with the cardinality classes for the source and
         # destination of this cardinality. Possible return values are:
         # <tt>[1, 1]</tt>, <tt>[1, N]</tt>, <tt>[N, N]</tt>, and (in theory)
@@ -88,21 +88,21 @@ module RailsERD
         def cardinality_class
           [source_cardinality_class, destination_cardinality_class]
         end
-      
+
         protected
 
         # The cardinality class of the source (left side). Either +1+ or +Infinity+.
         def source_cardinality_class
           source_range.last == 1 ? 1 : N
         end
-      
+
         # The cardinality class of the destination (right side). Either +1+ or +Infinity+.
         def destination_cardinality_class
           destination_range.last == 1 ? 1 : N
         end
-      
+
         private
-      
+
         def compose_range(r)
           return r..r if r.kind_of?(Integer) && r > 0
           return (r.begin)..(r.end - 1) if r.exclude_end?

data/lib/rails_erd/domain/specialization.rb

@@ -8,9 +8,9 @@ module RailsERD
         def from_models(domain, models) # @private :nodoc:
           (inheritance_from_models(domain, models) + polymorphic_from_models(domain, models)).sort
         end
-        
+
         private
-        
+
         def polymorphic_from_models(domain, models)
           models.collect(&:reflect_on_all_associations).flatten.collect { |association|
             [association.options[:as].to_s.classify, association.active_record.name] if association.options[:as]
@@ -18,14 +18,14 @@ module RailsERD
             new(domain, domain.entity_by_name(names.first), domain.entity_by_name(names.last))
           }
         end
-        
+
         def inheritance_from_models(domain, models)
           models.reject(&:descends_from_active_record?).collect { |model|
             new(domain, domain.entity_by_name(model.base_class.name), domain.entity_by_name(model.name))
           }
         end
       end
-      
+
       extend Inspectable
       inspection_attributes :generalized, :specialized
 
@@ -34,18 +34,18 @@ module RailsERD
 
       # The source entity.
       attr_reader :generalized
-    
+
       # The destination entity.
       attr_reader :specialized
-      
+
       def initialize(domain, generalized, specialized) # @private :nodoc:
         @domain, @generalized, @specialized = domain, generalized, specialized
       end
-      
+
       def inheritance?
         !polymorphic?
       end
-      
+
       def polymorphic?
         generalized.generalized?
       end

data/lib/rails_erd/version.rb

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

data/test/test_helper.rb

@@ -14,7 +14,7 @@ class ActiveSupport::TestCase
 
   def create_table(table, columns = {}, pk = nil)
     opts = if pk then { :primary_key => pk } else { :id => false } end
-    ActiveRecord::Schema.define do
+    ActiveRecord::Schema.instance_eval do
       suppress_messages do
         create_table table, opts do |t|
           columns.each do |column, type|
@@ -23,14 +23,16 @@ class ActiveSupport::TestCase
         end
       end
     end
+    ActiveRecord::Base.clear_cache!
   end
-  
+
   def add_column(*args)
-    ActiveRecord::Schema.define do
+    ActiveRecord::Schema.instance_eval do
       suppress_messages do
         add_column *args
       end
     end
+    ActiveRecord::Base.clear_cache!
   end
 
   def create_model(name, *args, &block)
@@ -42,13 +44,13 @@ class ActiveSupport::TestCase
       create_table Object.const_get(name.to_sym).table_name, columns, Object.const_get(name.to_sym).primary_key rescue nil
     end
   end
-    
+
   def create_models(*names)
     names.each do |name|
       create_model name
     end
   end
-  
+
   def collect_stdout
     stdout = $stdout
     $stdout = StringIO.new
@@ -58,14 +60,14 @@ class ActiveSupport::TestCase
   ensure
     $stdout = stdout
   end
-  
+
   def create_simple_domain
     create_model "Beer", :bar => :references do
       belongs_to :bar
     end
     create_model "Bar"
   end
-  
+
   def create_one_to_one_assoc_domain
     create_model "One" do
       has_one :other
@@ -93,12 +95,12 @@ class ActiveSupport::TestCase
     end
     create_table "manies_mores", :many_id => :integer, :more_id => :integer
   end
-  
+
   def create_specialization
     create_model "Beverage", :type => :string
     Object.const_set :Beer, Class.new(Beverage)
   end
-  
+
   def create_generalization
     create_model "Cannon"
     create_model "Galleon" do
@@ -107,18 +109,19 @@ class ActiveSupport::TestCase
   end
 
   private
-  
+
   def reset_domain
     if defined? ActiveRecord
       ActiveRecord::Base.descendants.each do |model|
+        model.reset_column_information
         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!
+      ActiveRecord::Base.clear_cache!
     end
   end
 end