rails-erd 0.4.1 → 0.4.3

data/CHANGES.rdoc

@@ -1,3 +1,9 @@
+=== 0.4.3:
+
+* Display the scale of decimal attributes when set. A decimal attribute with
+  precision 5 and scale 2 is now indicated with (5,2).
+* Fixed deprecation warnings for edge Rails (upcoming 3.1).
+
 === 0.4.1:
 
 * Fix processing of associations with class_name set to absolute module paths.

data/Gemfile

@@ -1,17 +1,21 @@
 source "http://rubygems.org"
 
-gem "rails-erd", :path => "."
-gem "activerecord"
-gem "activesupport"
-gem "rake"
-gem "jeweler"
+gem "activerecord", "~> 3.0"
+gem "activesupport", "~> 3.0"
+gem "ruby-graphviz", "~> 0.9.18"
 
-platforms :ruby do
-  gem "sqlite3-ruby"
-end
+group :development do
+  gem "rake"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.5.2"
+
+  platforms :ruby do
+    gem "sqlite3"
+  end
 
-platforms :jruby do
-  gem "jdbc-sqlite3", :require => "jdbc/sqlite3"
-  gem "activerecord-jdbc-adapter", "1.0.0.beta2"
-  gem "jruby-openssl", :require => false # Silence openssl warnings.
+  platforms :jruby do
+    gem "jdbc-sqlite3"
+    gem "activerecord-jdbc-adapter"
+    gem "jruby-openssl", :require => false # Silence openssl warnings.
+  end
 end

data/Gemfile.lock

@@ -1,58 +1,46 @@
-PATH
-  remote: .
-  specs:
-    rails-erd (0.4.0)
-      activerecord (~> 3.0)
-      activesupport (~> 3.0)
-      ruby-graphviz (~> 0.9.18)
-
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activerecord-jdbc-adapter (1.0.0.beta2-java)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activerecord-jdbc-adapter (1.1.1)
+    activesupport (3.0.3)
+    arel (2.0.7)
     bouncy-castle-java (1.5.0145.2)
     builder (2.1.2)
-    gemcutter (0.6.1)
     git (1.2.5)
-    i18n (0.4.1)
-    jdbc-sqlite3 (3.6.3.054)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
+    i18n (0.5.0)
+    jdbc-sqlite3 (3.6.14.2.056-java)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
       git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    jruby-openssl (0.7.1)
+      rake
+    jruby-openssl (0.7.3)
       bouncy-castle-java
-    json_pure (1.4.6)
     rake (0.8.7)
-    ruby-graphviz (0.9.18)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    sqlite3-ruby (1.3.1)
-    tzinfo (0.3.23)
+    ruby-graphviz (0.9.20)
+    sqlite3 (1.3.3)
+    tzinfo (0.3.24)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  activerecord
-  activerecord-jdbc-adapter (= 1.0.0.beta2)
-  activesupport
+  activerecord (~> 3.0)
+  activerecord-jdbc-adapter
+  activesupport (~> 3.0)
+  bundler (~> 1.0.0)
   jdbc-sqlite3
-  jeweler
+  jeweler (~> 1.5.2)
   jruby-openssl
-  rails-erd!
   rake
-  sqlite3-ruby
+  ruby-graphviz (~> 0.9.18)
+  sqlite3

data/Rakefile

@@ -12,11 +12,6 @@ Jeweler::Tasks.new do |spec|
   spec.email = "r.timmermans@voormedia.com"
   spec.homepage = "http://rails-erd.rubyforge.org/"
 
-  spec.add_runtime_dependency "activerecord", "~> 3.0"
-  spec.add_runtime_dependency "activesupport", "~> 3.0"
-  spec.add_runtime_dependency "ruby-graphviz", "~> 0.9.18"
-  spec.add_development_dependency "sqlite3-ruby"
-  
   # Don't bundle examples or website in gem.
   excluded = Dir["{examples,site}/**/*"]
   spec.files -= excluded

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.3

data/lib/rails_erd/domain.rb

@@ -26,11 +26,17 @@ module RailsERD
       def generate(options = {})
         new ActiveRecord::Base.descendants, options
       end
+
+      # Returns the method name to retrieve the foreign key from an
+      # association reflection object.
+      def foreign_key_method_name # @private :nodoc:
+        @foreign_key_method_name ||= ActiveRecord::Reflection::AssociationReflection.method_defined?(:foreign_key) ? :foreign_key : :primary_key_name
+      end
     end
-    
+
     extend Inspectable
     inspection_attributes
-    
+
     # The options that are used to generate this domain model.
     attr_reader :options
 
@@ -45,42 +51,42 @@ module RailsERD
     def name
       defined? Rails and Rails.application and Rails.application.class.parent.name
     end
-    
+
     # Returns all entities of your domain model.
     def entities
       @entities ||= Entity.from_models(self, models)
     end
-    
+
     # Returns all relationships in your domain model.
     def relationships
       @relationships ||= Relationship.from_associations(self, associations)
     end
-    
+
     # Returns all specializations in your domain model.
     def specializations
       @specializations ||= Specialization.from_models(self, models)
     end
-    
+
     # Returns a specific entity object for the given Active Record model.
     def entity_by_name(name) # @private :nodoc:
       entity_mapping[name]
     end
-    
+
     # Returns an array of relationships for the given Active Record model.
     def relationships_by_entity_name(name) # @private :nodoc:
       relationships_mapping[name] or []
     end
-    
+
     def specializations_by_entity_name(name)
       specializations_mapping[name] or []
     end
-    
+
     def warn(message) # @private :nodoc:
       puts "Warning: #{message}" if options.warn
     end
-    
+
     private
-    
+
     def entity_mapping
       @entity_mapping ||= {}.tap do |mapping|
         entities.each do |entity|
@@ -88,7 +94,7 @@ module RailsERD
         end
       end
     end
-    
+
     def relationships_mapping
       @relationships_mapping ||= {}.tap do |mapping|
         relationships.each do |relationship|
@@ -97,7 +103,7 @@ module RailsERD
         end
       end
     end
-    
+
     def specializations_mapping
       @specializations_mapping ||= {}.tap do |mapping|
         specializations.each do |specialization|
@@ -106,21 +112,21 @@ module RailsERD
         end
       end
     end
-    
+
     def models
       @models ||= @source_models.reject(&:abstract_class?).select { |model| check_model_validity(model) }
     end
-    
+
     def associations
       @associations ||= models.collect(&:reflect_on_all_associations).flatten.select { |assoc| check_association_validity(assoc) }
     end
-    
+
     def check_model_validity(model)
       model.table_exists? or raise "table #{model.table_name} does not exist"
     rescue => e
       warn "Ignoring invalid model #{model.name} (#{e.message})"
     end
-    
+
     def check_association_validity(association)
       # Raises an ActiveRecord::ActiveRecordError if the association is broken.
       association.check_validity!
@@ -135,7 +141,7 @@ module RailsERD
     rescue => e
       warn "Ignoring invalid association #{association_description(association)} (#{e.message})"
     end
-    
+
     def association_description(association)
       "#{association.name.inspect} on #{association.active_record}"
     end

data/lib/rails_erd/domain/attribute.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+
+#--
 module RailsERD
   class Domain
     # Describes an entity's attribute. Attributes correspond directly to
@@ -11,49 +13,51 @@ module RailsERD
           model.columns.collect { |column| new(domain, model, column) }.sort
         end
       end
-      
+
       extend Inspectable
       inspection_attributes :name, :type
 
       attr_reader :column # @private :nodoc:
-  
+
       def initialize(domain, model, column) # @private :nodoc:
         @domain, @model, @column = domain, model, column
       end
-    
+
       # The name of the attribute, equal to the column name.
       def name
         column.name
       end
-    
+
       # The type of the attribute, equal to the Rails migration type. Can be any
       # of +:string+, +:integer+, +:boolean+, +:text+, etc.
       def type
         column.type
       end
-    
+
       # Returns +true+ if this attribute is a content column, that is, if it
       # is not a primary key, foreign key, timestamp, or inheritance column.
       def content?
         !primary_key? and !foreign_key? and !timestamp? and !inheritance?
       end
-    
+
       # Returns +true+ if this attribute is mandatory. Mandatory attributes
       # either have a presence validation (+validates_presence_of+), or have a
       # <tt>NOT NULL</tt> database constraint.
       def mandatory?
         !column.null or @model.validators_on(name).map(&:kind).include?(:presence)
       end
-    
+
       # Returns +true+ if this attribute is the primary key of the entity.
       def primary_key?
         column.primary
       end
-  
+
       # Returns +true+ if this attribute is used as a foreign key for any
       # relationship.
       def foreign_key?
-        @domain.relationships_by_entity_name(@model.name).map(&:associations).flatten.map(&:primary_key_name).include?(name)
+        @domain.relationships_by_entity_name(@model.name).map(&:associations).flatten.map { |associaton|
+          associaton.send(Domain.foreign_key_method_name)
+        }.include?(name)
       end
 
       # Returns +true+ if this attribute is used for single table inheritance.
@@ -68,15 +72,15 @@ module RailsERD
       def timestamp?
         TIMESTAMP_NAMES.include? name
       end
-    
+
       def <=>(other) # @private :nodoc:
         name <=> other.name
       end
-  
+
       def to_s # @private :nodoc:
         name
       end
-  
+
       # Returns a description of the attribute type. If the attribute has
       # a non-standard limit or if it is mandatory, this information is included.
       #
@@ -84,19 +88,33 @@ module RailsERD
       # <tt>:integer</tt>:: integer
       # <tt>:string, :limit => 255</tt>:: string
       # <tt>:string, :limit => 128</tt>:: string (128)
+      # <tt>:decimal, :precision => 5, :scale => 2/tt>:: decimal (5,2)
       # <tt>:boolean, :null => false</tt>:: boolean *
       def type_description
         type.to_s.tap do |desc|
-          desc << " (#{limit})" if limit
+          desc << " #{limit_description}" if limit_description
           desc << " ∗" if mandatory? # Add a hair space + low asterisk (Unicode characters).
         end
       end
-    
+
       # 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]
       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]
+      end
+
+      # Returns a string that describes the limit for this attribute, such as
+      # +(128)+, or +(5,2)+ for decimal types. Returns nil if no non-standard
+      # limit was set.
+      def limit_description # @private :nodoc:
+        return "(#{limit},#{scale})" if limit and scale
+        return "(#{limit})" if limit
+      end
     end
   end
 end

data/lib/rails_erd/domain/relationship.rb

@@ -11,29 +11,29 @@ module RailsERD
     # join table in the case of many-to-many associations.
     class Relationship
       N = Cardinality::N
-    
+
       class << self
         def from_associations(domain, associations) # @private :nodoc:
           assoc_groups = associations.group_by { |assoc| association_identity(assoc) }
           assoc_groups.collect { |_, assoc_group| new(domain, assoc_group.to_a) }
         end
-      
+
         private
-      
+
         def association_identity(association)
-          identifier = association.options[:join_table] || association.options[:through] || association.primary_key_name.to_s
+          identifier = association.options[:join_table] || association.options[:through] || association.send(Domain.foreign_key_method_name).to_s
           Set[identifier, association_owner(association), association_target(association)]
         end
-        
+
         def association_owner(association)
           association.options[:as] ? association.options[:as].to_s.classify : association.active_record.name
         end
-        
+
         def association_target(association)
           association.options[:polymorphic] ? association.class_name : association.klass.name
         end
       end
-      
+
       extend Inspectable
       inspection_attributes :source, :destination
 
@@ -43,14 +43,14 @@ module RailsERD
       # The source entity. It corresponds to the model that has defined a
       # +has_one+ or +has_many+ association with the other model.
       attr_reader :source
-    
+
       # The destination entity. It corresponds to the model that has defined
       # a +belongs_to+ association with the other model.
       attr_reader :destination
-    
+
       delegate :one_to_one?, :one_to_many?, :many_to_many?, :source_optional?,
         :destination_optional?, :to => :cardinality
-  
+
       def initialize(domain, associations) # @private :nodoc:
         @domain = domain
         @reverse_associations, @forward_associations = *unless any_habtm?(associations)
@@ -61,19 +61,19 @@ module RailsERD
           source = associations.map(&:active_record).sort_by(&:name).first
           associations.partition { |association| association.active_record != source }
         end
-      
+
         assoc = @forward_associations.first || @reverse_associations.first
         @source = @domain.entity_by_name(self.class.send(:association_owner, assoc))
         @destination = @domain.entity_by_name(self.class.send(:association_target, assoc))
         @source, @destination = @destination, @source if assoc.belongs_to?
       end
-    
+
       # Returns all Active Record association objects that describe this
       # relationship.
       def associations
         @forward_associations + @reverse_associations
       end
-    
+
       # Returns the cardinality of this relationship.
       def cardinality
         @cardinality ||= begin
@@ -83,7 +83,7 @@ module RailsERD
           Cardinality.new(reverse_range, forward_range)
         end
       end
-    
+
       # Indicates if a relationship is indirect, that is, if it is defined
       # through other relationships. Indirect relationships are created in
       # Rails with <tt>has_many :through</tt> or <tt>has_one :through</tt>
@@ -91,45 +91,45 @@ module RailsERD
       def indirect?
         !@forward_associations.empty? and @forward_associations.all?(&:through_reflection)
       end
-    
+
       # Indicates whether or not the relationship is defined by two inverse
       # associations (e.g. a +has_many+ and a corresponding +belongs_to+
       # association).
       def mutual?
         @forward_associations.any? and @reverse_associations.any?
       end
-    
+
       # Indicates whether or not this relationship connects an entity with itself.
       def recursive?
         @source == @destination
       end
-    
+
       # Indicates whether the destination cardinality class of this relationship
       # is equal to one. This is +true+ for one-to-one relationships only.
       def to_one?
         cardinality.cardinality_class[1] == 1
       end
-    
+
       # Indicates whether the destination cardinality class of this relationship
       # is equal to infinity. This is +true+ for one-to-many or
       # many-to-many relationships only.
       def to_many?
         cardinality.cardinality_class[1] != 1
       end
-    
+
       # Indicates whether the source cardinality class of this relationship
       # is equal to one. This is +true+ for one-to-one or
       # one-to-many relationships only.
       def one_to?
         cardinality.cardinality_class[0] == 1
       end
-    
+
       # Indicates whether the source cardinality class of this relationship
       # is equal to infinity. This is +true+ for many-to-many relationships only.
       def many_to?
         cardinality.cardinality_class[0] != 1
       end
-    
+
       # The strength of a relationship is equal to the number of associations
       # that describe it.
       def strength
@@ -139,7 +139,7 @@ module RailsERD
       def <=>(other) # @private :nodoc:
         (source.name <=> other.source.name).nonzero? or (destination.name <=> other.destination.name)
       end
-    
+
       private
 
       def associations_range(associations, absolute_max)
@@ -157,7 +157,7 @@ module RailsERD
 
         min..max
       end
-    
+
       def association_minimum(association)
         minimum = association_validators(:presence, association).any? ||
           foreign_key_required?(association) ? 1 : 0
@@ -166,22 +166,22 @@ module RailsERD
       end
 
       def association_maximum(association)
-        maximum = association.collection? ? N : 1      
+        maximum = association.collection? ? N : 1
         length_validators = association_validators(:length, association)
         length_validators.map { |v| v.options[:maximum] }.compact.min or maximum
       end
-    
+
       def association_validators(kind, association)
         association.active_record.validators_on(association.name).select { |v| v.kind == kind }
       end
-    
+
       def any_habtm?(associations)
         associations.any? { |association| association.macro == :has_and_belongs_to_many }
       end
-    
+
       def foreign_key_required?(association)
         if association.belongs_to?
-          column = association.active_record.columns_hash[association.primary_key_name] and !column.null
+          column = association.active_record.columns_hash[association.send(Domain.foreign_key_method_name)] and !column.null
         end
       end
     end

data/rails-erd.gemspec

@@ -1,72 +1,70 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rails-erd}
-  s.version = "0.4.1"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rolf Timmermans"]
-  s.date = %q{2010-10-14}
+  s.date = %q{2011-01-27}
   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 = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "CHANGES.rdoc",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/rails-erd.rb",
-     "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/domain.rb",
-     "lib/rails_erd/domain/attribute.rb",
-     "lib/rails_erd/domain/entity.rb",
-     "lib/rails_erd/domain/relationship.rb",
-     "lib/rails_erd/domain/relationship/cardinality.rb",
-     "lib/rails_erd/domain/specialization.rb",
-     "lib/rails_erd/railtie.rb",
-     "lib/rails_erd/tasks.rake",
-     "rails-erd.gemspec",
-     "test/test_helper.rb",
-     "test/unit/attribute_test.rb",
-     "test/unit/cardinality_test.rb",
-     "test/unit/diagram_test.rb",
-     "test/unit/domain_test.rb",
-     "test/unit/entity_test.rb",
-     "test/unit/graphviz_test.rb",
-     "test/unit/rake_task_test.rb",
-     "test/unit/relationship_test.rb",
-     "test/unit/specialization_test.rb"
+    "CHANGES.rdoc",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/rails-erd.rb",
+    "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/domain.rb",
+    "lib/rails_erd/domain/attribute.rb",
+    "lib/rails_erd/domain/entity.rb",
+    "lib/rails_erd/domain/relationship.rb",
+    "lib/rails_erd/domain/relationship/cardinality.rb",
+    "lib/rails_erd/domain/specialization.rb",
+    "lib/rails_erd/railtie.rb",
+    "lib/rails_erd/tasks.rake",
+    "rails-erd.gemspec",
+    "test/test_helper.rb",
+    "test/unit/attribute_test.rb",
+    "test/unit/cardinality_test.rb",
+    "test/unit/diagram_test.rb",
+    "test/unit/domain_test.rb",
+    "test/unit/entity_test.rb",
+    "test/unit/graphviz_test.rb",
+    "test/unit/rake_task_test.rb",
+    "test/unit/relationship_test.rb",
+    "test/unit/specialization_test.rb"
   ]
   s.homepage = %q{http://rails-erd.rubyforge.org/}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rails-erd}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Entity-relationship diagram for your Rails models.}
   s.test_files = [
     "test/test_helper.rb",
-     "test/unit/attribute_test.rb",
-     "test/unit/cardinality_test.rb",
-     "test/unit/diagram_test.rb",
-     "test/unit/domain_test.rb",
-     "test/unit/entity_test.rb",
-     "test/unit/graphviz_test.rb",
-     "test/unit/rake_task_test.rb",
-     "test/unit/relationship_test.rb",
-     "test/unit/specialization_test.rb"
+    "test/unit/attribute_test.rb",
+    "test/unit/cardinality_test.rb",
+    "test/unit/diagram_test.rb",
+    "test/unit/domain_test.rb",
+    "test/unit/entity_test.rb",
+    "test/unit/graphviz_test.rb",
+    "test/unit/rake_task_test.rb",
+    "test/unit/relationship_test.rb",
+    "test/unit/specialization_test.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -77,18 +75,36 @@ Gem::Specification.new do |s|
       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<sqlite3-ruby>, [">= 0"])
+      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"])
+      s.add_development_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
+      s.add_development_dependency(%q<jruby-openssl>, [">= 0"])
     else
       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<sqlite3-ruby>, [">= 0"])
+      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"])
+      s.add_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
+      s.add_dependency(%q<jruby-openssl>, [">= 0"])
     end
   else
     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<sqlite3-ruby>, [">= 0"])
+    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"])
+    s.add_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
+    s.add_dependency(%q<jruby-openssl>, [">= 0"])
   end
 end
 

data/test/unit/attribute_test.rb

@@ -18,18 +18,18 @@ class AttributeTest < ActiveSupport::TestCase
       end
     end
   end
-  
+
   def create_attribute(model, name)
     Domain::Attribute.new(Domain.generate, model, model.columns_hash[name])
   end
-  
+
   # Attribute ================================================================
   test "column should return database column" do
     create_model "Foo", :my_column => :string
     assert_equal Foo.columns_hash["my_column"],
       Domain::Attribute.from_model(Domain.new, Foo).reject(&:primary_key?).first.column
   end
-  
+
   test "spaceship should sort attributes by name" do
     create_model "Foo", :a => :string, :b => :string, :c => :string
     a = create_attribute(Foo, "a")
@@ -37,18 +37,18 @@ class AttributeTest < ActiveSupport::TestCase
     c = create_attribute(Foo, "c")
     assert_equal [a, b, c], [c, a, b].sort
   end
-  
+
   test "inspect should show column" do
     create_model "Foo", :my_column => :string
     assert_match %r{#<RailsERD::Domain::Attribute:.* @name="my_column" @type=:string>},
       Domain::Attribute.new(Domain.new, Foo, Foo.columns_hash["my_column"]).inspect
   end
-  
+
   test "type should return attribute type" do
     create_model "Foo", :a => :binary
     assert_equal :binary, create_attribute(Foo, "a").type
   end
-  
+
   # Attribute properties =====================================================
   test "mandatory should return false by default" do
     create_model "Foo", :column => :string
@@ -111,21 +111,21 @@ class AttributeTest < ActiveSupport::TestCase
     assert_equal [true] * 4, [create_attribute(Foo, "created_at"), create_attribute(Foo, "updated_at"),
       create_attribute(Foo, "created_on"), create_attribute(Foo, "updated_on")].collect(&:timestamp?)
   end
-  
+
   test "inheritance should return false by default" do
     create_model "Foo", :type => :string, :alternative => :string do
       set_inheritance_column :alternative
     end
     assert_equal false, create_attribute(Foo, "type").inheritance?
   end
-  
+
   test "inheritance should return if this column is used for single table inheritance" do
     create_model "Foo", :type => :string, :alternative => :string do
       set_inheritance_column :alternative
     end
     assert_equal true, create_attribute(Foo, "alternative").inheritance?
   end
-  
+
   test "content should return true by default" do
     create_model "Foo", :my_first_column => :string
     assert_equal true, create_attribute(Foo, "my_first_column").content?
@@ -138,7 +138,7 @@ class AttributeTest < ActiveSupport::TestCase
     create_model "Case"
     assert_equal [false] * 4, %w{id type created_at case_id}.map { |a| create_attribute(Book, a).content? }
   end
-  
+
   # Type descriptions ========================================================
   test "type_description should return short type description" do
     create_model "Foo", :a => :binary
@@ -161,20 +161,26 @@ class AttributeTest < ActiveSupport::TestCase
       assert_equal "string", create_attribute(Foo, "my_str").type_description
     end
   end
-  
+
   test "type_description should append hair space and low asterisk if field is mandatory" do
     create_model "Foo", :a => :integer do
       validates_presence_of :a
     end
     assert_equal "integer ∗", create_attribute(Foo, "a").type_description
   end
-  
+
+  test "type_description should return short type description with scale and precision for decimal types if nonstandard" do
+    create_model "Foo"
+    add_column :foos, :num, :decimal, :precision => 5, :scale => 2
+    assert_equal "decimal (5,2)", create_attribute(Foo, "num").type_description
+  end
+
   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
   end
-  
+
   test "limit should return nil if equal to standard database limit" do
     with_native_limit :string, 456 do
       create_model "Foo"
@@ -182,7 +188,7 @@ class AttributeTest < ActiveSupport::TestCase
       assert_equal nil, create_attribute(Foo, "my_str").limit
     end
   end
-  
+
   test "limit should return limit if nonstandard" do
     with_native_limit :string, 456 do
       create_model "Foo"
@@ -190,4 +196,34 @@ class AttributeTest < ActiveSupport::TestCase
       assert_equal 255, create_attribute(Foo, "my_str").limit
     end
   end
+
+  test "limit should return precision for decimal columns if nonstandard" do
+    create_model "Foo"
+    add_column :foos, :num, :decimal, :precision => 5, :scale => 2
+    assert_equal 5, create_attribute(Foo, "num").limit
+  end
+
+  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
+  end
+
+  test "scale should return scale for decimal columns if nonstandard" do
+    create_model "Foo"
+    add_column :foos, :num, :decimal, :precision => 5, :scale => 2
+    assert_equal 2, create_attribute(Foo, "num").scale
+  end
+
+  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
+  end
+
+  test "scale should return zero for decimal columns if left to default setting when specifying precision" do
+    create_model "Foo"
+    add_column :foos, :num, :decimal, :precision => 5
+    assert_equal 0, create_attribute(Foo, "num").scale
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Rolf Timmermans
@@ -14,12 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 +02:00
+date: 2011-01-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,10 +29,10 @@ dependencies:
         - 0
         version: "3.0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,10 +43,10 @@ dependencies:
         - 0
         version: "3.0"
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ruby-graphviz
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,10 +58,10 @@ dependencies:
         - 18
         version: 0.9.18
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
+  name: rake
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -72,7 +71,90 @@ dependencies:
         - 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 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: jdbc-sqlite3
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: activerecord-jdbc-adapter
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: jruby-openssl
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id010
 description: Automatically generate an entity-relationship diagram (ERD) for your Rails models.
 email: r.timmermans@voormedia.com
 executables: []
@@ -83,7 +165,6 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
-- .gitignore
 - CHANGES.rdoc
 - Gemfile
 - Gemfile.lock
@@ -120,8 +201,8 @@ homepage: http://rails-erd.rubyforge.org/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,10 +0,0 @@
-.DS_Store
-.bundle
-.yardoc
-*.pdf
-*.rbc
-doc
-pkg
-output
-rdoc
-site/_generated