rails-erd 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 16bfef1b79087e3017df7723bef8cf286df5a812
-  data.tar.gz: 7162f90b6dce224a0ec89693e7d307fbc15a9b45
+SHA256:
+  metadata.gz: f1c2702af0425705ff9d602b686fcb58e1076199c4fb529b201fa023edb3c9e7
+  data.tar.gz: 1ebd9f97445a40bbdb8f15de3d582e26e32796756cb24b038a17451dfa2dec3c
 SHA512:
-  metadata.gz: 34e2582512bfe6313f626d4de969eebc328415c97456b1cd151df3e19d75e55cc0b65a9ded7ba0c363d3708072d001266d96657e2a8669ee6a7c4ca7b0cc3ee0
-  data.tar.gz: 16ddf4ba4c7d640a4c139905fe6f238f76c70cf20712c467ebb9bf9075f0ee6603c0c532114b86bd0e66f7d275f5ae0200802e91c8978a469c6e39208dd3c709
+  metadata.gz: dcc2eb3fa90e42bd77df9bda8fb20d01ac49287f92ed8115abf9bd7b3022450eede790a6a82e369283c1d113d11e106369222b845d19135d192198504306db48
+  data.tar.gz: 1489e87683c7fbe2bf012ff423ff8796fa4e8c2e450ce0473616c6dce6ea5c51ef9fa8d8ad0f001df723f6f972cd3d37277747d1e8e9651863e2b32c077edf9b

data/README.md

@@ -64,6 +64,10 @@ only_recursion_depth: null
 prepend_primary: false
 cluster: false
 splines: spline
+fonts:
+ normal: "Arial"
+ bold: "Arial Bold"
+ italic: "Arial Italic"
 ```
 
 Auto generation

data/lib/rails_erd/cli.rb

@@ -174,17 +174,25 @@ module RailsERD
 
     def load_application
       $stderr.puts "Loading application in '#{File.basename(path)}'..."
-      begin
-        environment_path = "#{path}/config/environment.rb"
-        require environment_path
-      rescue ::LoadError
-        puts "Please create a file in '#{environment_path}' that loads your application environment."
-        raise
-      end
+      environment_path = "#{path}/config/environment.rb"
+      require environment_path
+
       if defined? Rails
         Rails.application.eager_load!
         Rails.application.config.eager_load_namespaces.each(&:eager_load!) if Rails.application.config.respond_to?(:eager_load_namespaces)
       end
+    rescue ::LoadError
+      error_message = <<~EOS
+        Tried to load your application environment from '#{environment_path}' but the file was not present.
+        This means that your models might not get loaded fully when the diagram gets buiilt. This can
+        make your entity diagram incomplete.
+
+        However, if you are using ActiveRecord without Rails just make sure your models get
+        loaded eagerly before we generate the ERD (for example, explicitly require your application
+        bootstrap file before calling rails-erd from your Rakefile). We will continue without loading the environment file,
+        and recommend you check your diagram for missing models after it gets generated.
+      EOS
+      puts error_message
     rescue TypeError
     end
 

data/lib/rails_erd/config.rb

@@ -81,6 +81,12 @@ module RailsERD
       when :title
         value.is_a?(String) ? value : !!value
 
+      # nil | <Hash>
+      when :fonts
+        if value
+          Hash(value).transform_keys(&:to_sym)
+        end
+
       else
         value
       end

data/lib/rails_erd/diagram/graphviz.rb

@@ -50,7 +50,7 @@ module RailsERD
 
       NODE_WIDTH = 130 # @private :nodoc:
 
-      FONTS = Config.font_names_based_on_os
+      FONTS = Config.font_names_based_on_os.merge(RailsERD.options[:fonts])
 
       # Default graph attributes.
       GRAPH_ATTRIBUTES = {

data/lib/rails_erd/domain/specialization.rb

@@ -30,7 +30,14 @@ module RailsERD
         end
 
         def abstract_from_models(domain, models)
-          models.select(&:abstract_class?).collect(&:direct_descendants).flatten.collect { |model|
+          abstract_classes = models.select(&:abstract_class?)          
+          direct_descendants = if ActiveRecord.version >= Gem::Version.new("7.0.0")
+                                 abstract_classes.collect(&:subclasses)
+                               else
+                                 abstract_classes.collect(&:direct_descendants)
+                               end
+          
+          direct_descendants.flatten.collect { |model|
             new(domain, domain.entity_by_name(model.superclass.name), domain.entity_by_name(model.name))
           }
         end

data/lib/rails_erd/tasks.rake

@@ -1,7 +1,9 @@
 require 'graphviz/utils'
 
-def say(message)
-  puts message unless Rake.application.options.silent
+module ErdRakeHelper
+  def say(message)
+    puts message unless Rake.application.options.silent
+  end
 end
 
 namespace :erd do
@@ -31,6 +33,8 @@ namespace :erd do
   end
 
   task :load_models do
+    include ErdRakeHelper
+
     say "Loading application environment..."
     Rake::Task[:environment].invoke
 
@@ -55,12 +59,14 @@ namespace :erd do
   end
 
   task :generate => [:check_dependencies, :options, :load_models] do
+    include ErdRakeHelper
+
     say "Generating Entity-Relationship Diagram for #{ActiveRecord::Base.descendants.length} models..."
 
     require "rails_erd/diagram/graphviz"
     file = RailsERD::Diagram::Graphviz.create
 
-    say "Done! Saved diagram to #{file}."
+    say "Done! Saved diagram to ./#{file}"
   end
 end
 

data/lib/rails_erd/version.rb

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

data/lib/rails_erd.rb

@@ -40,6 +40,7 @@ module RailsERD
         :disconnected, true,
         :filename, "erd",
         :filetype, :pdf,
+        :fonts, {},
         :indirect, true,
         :inheritance, false,
         :markup, true,

data/test/test_helper.rb

@@ -34,9 +34,11 @@ class ActiveSupport::TestCase
     opts = if pk then { :primary_key => pk } else { :id => false } end
     ActiveRecord::Schema.instance_eval do
       suppress_messages do
-        create_table table, opts do |t|
-          columns.each do |column, type|
-            t.send type, column
+        unless ActiveRecord::Base.connection.table_exists?(table)
+          create_table table, **opts do |t|
+            columns.each do |column, type|
+              t.send type, column
+            end
           end
         end
       end
@@ -47,7 +49,8 @@ class ActiveSupport::TestCase
   def add_column(*args)
     ActiveRecord::Schema.instance_eval do
       suppress_messages do
-        add_column(*args)
+        opts = args.slice!(3) || {}
+        add_column(*args, **opts)
       end
     end
     ActiveRecord::Base.clear_cache!
@@ -82,7 +85,7 @@ class ActiveSupport::TestCase
     klass = Object.const_set name.to_sym, Class.new(superklass)
 
     if superklass == ActiveRecord::Base || superklass.abstract_class?
-      create_table Object.const_get(name.to_sym).table_name, columns, Object.const_get(name.to_sym).primary_key rescue nil
+      create_table Object.const_get(name.to_sym).table_name, columns, Object.const_get(name.to_sym).primary_key
     end
     klass.class_eval(&block) if block_given?
     Object.const_get(name.to_sym)
@@ -212,15 +215,18 @@ class ActiveSupport::TestCase
         ActiveRecord::Base.connection.drop_table table
       end
 
-      if ActiveRecord.version >= Gem::Version.new("6.0.0.rc1")
+      if ActiveRecord.version >= Gem::Version.new("7.0.0")
+        ActiveSupport::DescendantsTracker.clear(ActiveRecord::Base.subclasses)
+      elsif ActiveRecord.version >= Gem::Version.new("6.0.0.rc1")
         cv = ActiveSupport::DescendantsTracker.class_variable_get(:@@direct_descendants)
         cv.delete(ActiveRecord::Base)
         ActiveSupport::DescendantsTracker.class_variable_set(:@@direct_descendants, cv)
+        ActiveSupport::Dependencies::Reference.clear!
       else
         ActiveRecord::Base.direct_descendants.clear
+        ActiveSupport::Dependencies::Reference.clear!
       end
-
-      ActiveSupport::Dependencies::Reference.clear!
+      
       ActiveRecord::Base.clear_cache!
     end
   end

data/test/unit/config_test.rb

@@ -115,6 +115,12 @@ class ConfigTest < ActiveSupport::TestCase
     assert_equal [:content, :primary_keys], normalize_value(:attributes, ["content", "primary_keys"])
   end
 
+  test "normalize_value should return hash with symbol keys when key is :fonts and value is a hash." do
+    fonts_value = { "normal" => "Arial", "bold" => "Arial Bold", "italic" => "Arial Italic" }
+    expected = {:normal => "Arial", :bold => "Arial Bold", :italic => "Arial Italic"}
+    assert_equal expected, normalize_value(:fonts, fonts_value)
+  end
+
   def normalize_value(key, value)
     RailsERD::Config.new.send(:normalize_value, key, value)
   end

data/test/unit/graphviz_test.rb

@@ -186,6 +186,16 @@ class GraphvizTest < ActiveSupport::TestCase
     assert_equal '"Domain model\n\n"', diagram.graph.graph[:label].to_s
   end
 
+  test "generate should use default value for fontname attribute" do
+    create_simple_domain
+    assert_equal "\"#{RailsERD::Config.font_names_based_on_os[:bold]}\"", diagram.graph.graph[:fontname].to_s
+  end
+
+  test "generate should add set value for fontname attribute" do
+    create_simple_domain
+    assert_equal '"Arial Bold"', diagram(fonts: {bold: "Arial Bold"}).graph.graph[:fontname].to_s
+  end
+
   test "generate should add default value for splines attribute" do
     create_simple_domain
     assert_equal '"spline"', diagram.graph.graph[:splines].to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-erd
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Rolf Timmermans
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -162,8 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.14
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Entity-relationship diagram for your Rails models.