rails-erd 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dadf622a2d2bcae2e4961d23b1f86647b7eaf4e68ae062dad5a18050b2fc935
-  data.tar.gz: 72115211691f90710ccdfea75c6b8456bae393cc1794b73727006ee3ec7475af
+  metadata.gz: 96a5321997e7b69697914d2555515de577676734e66f60cf0b76ff6c6f307846
+  data.tar.gz: 973f6409aeb4fcd221659e4c9dabadd4a32a047218ea056b4b24b9c71476454c
 SHA512:
-  metadata.gz: f19813191fc9a1258053cab237535fb5358e2a804af4bf394bcae0eb1e2b743c1d48c284d100b2044bed76aa57e8f95cd998379e84fc16de9cecbf452d29d816
-  data.tar.gz: b77b4b3e57436b9a32fe92cfec304aa35c8f094fc0c00d615f01c394fae6680f899eab1f548d50986a61534372b48b661d656638502ad1bdad5bc4da3757c139
+  metadata.gz: c5b98489174be741cf8056040f3a6eadd2c5ab673dfb9463b2db0b4fe7e9209a742765464b02c842b859c700231285cae40cfbcbe4eca3bed24d3cf1a191b453
+  data.tar.gz: 3793cbe2da98c90a4e379864e7dd5e3d4072248ff8245dfa5dfc75d0957e9c9e1f6aab4140ec54af00010312c53791e513e3898b41e2669c365802151497d9aa

data/lib/rails_erd/diagram/mermaid.rb

@@ -20,7 +20,8 @@ module RailsERD
       each_entity do |entity, attributes|
         if er_diagram?
           # Build entity block as a single string to avoid uniq issues with closing braces
-          entity_lines = ["\t#{entity} {"]
+          quoted_entity = quote_entity_name(entity)
+          entity_lines = ["\t#{quoted_entity} {"]
           attributes.each do |attr|
             key_marker = attribute_key_marker(attr)
             entity_lines << "\t\t#{attr.type} #{attr.name}#{key_marker}"
@@ -39,7 +40,7 @@ module RailsERD
         from, to = specialization.generalized, specialization.specialized
         if er_diagram?
           # erDiagram doesn't have a direct polymorphic notation, use inheritance-like
-          graph << "\t#{from.name} ||--o{ #{to.name} : \"specializes\""
+          graph << "\t#{quote_entity_name(from.name)} ||--o{ #{quote_entity_name(to.name)} : \"specializes\""
         else
           graph << "\t<<polymorphic>> `#{specialization.generalized}`"
           graph << "\t #{from.name} <|-- #{to.name}"
@@ -51,14 +52,14 @@ module RailsERD
         next unless from && to
 
         if er_diagram?
-          graph << "\t#{from.name} #{er_relation_notation(relationship)} #{to.name} : \"\""
+          graph << "\t#{quote_entity_name(from.name)} #{er_relation_notation(relationship)} #{quote_entity_name(to.name)} : \"\""
 
           from.children.each do |child|
-            graph << "\t#{child.name} #{er_relation_notation(relationship)} #{to.name} : \"\""
+            graph << "\t#{quote_entity_name(child.name)} #{er_relation_notation(relationship)} #{quote_entity_name(to.name)} : \"\""
           end
 
           to.children.each do |child|
-            graph << "\t#{from.name} #{er_relation_notation(relationship)} #{child.name} : \"\""
+            graph << "\t#{quote_entity_name(from.name)} #{er_relation_notation(relationship)} #{quote_entity_name(child.name)} : \"\""
           end
         else
           graph << "\t`#{from.name}` #{relation_arrow(relationship)} `#{to.name}`"
@@ -92,6 +93,17 @@ module RailsERD
         options[:mermaid_style] == :erdiagram || options[:mermaid_style] == :er
       end
 
+      # Quote entity names that contain special characters (like :: for namespaces)
+      # Mermaid erDiagram requires double quotes for names with special characters
+      def quote_entity_name(name)
+        name = name.to_s
+        if name.include?("::")
+          %("#{name}")
+        else
+          name
+        end
+      end
+
       # erDiagram relationship notation using crow's foot
       # Format: left_cardinality--right_cardinality
       # Cardinality markers:

data/lib/rails_erd/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module RailsERD
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
   BANNER  = "RailsERD #{VERSION}"
 end

data/test/test_helper.rb

@@ -2,6 +2,7 @@ require "rubygems"
 require "bundler/setup"
 require 'pry'
 require 'pry-nav'
+require 'tmpdir'
 
 require "active_record"
 
@@ -60,14 +61,17 @@ class ActiveSupport::TestCase
     superklass = args.first.kind_of?(Class) ? args.shift : ActiveRecord::Base
 
     names = full_name.split('::')
+    name = names.pop  # Remove and store the model name
 
-    parent_module = names[0..-1].inject(Object) do |parent,child|
-      parent = parent.const_set(child.to_sym, Module.new)
+    # Create namespace modules (all parts except the model name)
+    parent_module = names.inject(Object) do |parent, child|
+      if parent.const_defined?(child.to_sym, false)
+        parent.const_get(child.to_sym)
+      else
+        parent.const_set(child.to_sym, Module.new)
+      end
     end
 
-    parent_module ||= Object
-    name = names.last
-
     columns = args.first || {}
     klass = parent_module.const_set name.to_sym, Class.new(superklass)
     konstant = parent_module.const_get(name.to_sym)
@@ -173,6 +177,9 @@ class ActiveSupport::TestCase
       File.expand_path("../../examples/erdconfig.not_exists", __FILE__)
 
     RailsERD.options = RailsERD.default_options.merge(Config.load)
+
+    # Use temp directory for test output to avoid polluting the project root
+    RailsERD.options.filename = File.join(Dir.tmpdir, "rails_erd_test_erd")
   end
 
   def name_to_object_symbol_pairs(name)

data/test/unit/graphviz_test.rb

@@ -7,10 +7,6 @@ class GraphvizTest < ActiveSupport::TestCase
     RailsERD.options.warn     = false
   end
 
-  def teardown
-    FileUtils.rm Dir["erd*.*"] rescue nil
-  end
-
   def diagram(options = {})
     @diagram ||= Diagram::Graphviz.new(Domain.generate(options), options).tap do |diagram|
       diagram.generate
@@ -52,11 +48,8 @@ class GraphvizTest < ActiveSupport::TestCase
   # Diagram properties =======================================================
   test "file name should depend on file type" do
     create_simple_domain
-    begin
-      assert_equal "erd.svg", Diagram::Graphviz.create(:filetype => :svg)
-    ensure
-      FileUtils.rm "erd.svg" rescue nil
-    end
+    result = Diagram::Graphviz.create(:filetype => :svg)
+    assert result.end_with?(".svg"), "Expected filename to end with .svg, got: #{result}"
   end
 
   test "rank direction should be tb for horizontal orientation" do

data/test/unit/mermaid_test.rb

@@ -8,10 +8,6 @@ class MermaidTest < ActiveSupport::TestCase
     RailsERD.options.mermaid_style = :classdiagram
   end
 
-  def teardown
-    FileUtils.rm Dir["erd*.*"] rescue nil
-  end
-
   def diagram(options = {})
     @diagram ||= Diagram::Mermaid.new(Domain.generate(options), options).tap do |diagram|
       diagram.generate
@@ -27,13 +23,10 @@ class MermaidTest < ActiveSupport::TestCase
   end
 
   # Diagram properties =======================================================
-  test "file name should be mmd" do
+  test "file name should have mmd extension" do
     create_simple_domain
-    begin
-      assert_equal "erd.mmd", Diagram::Mermaid.create
-    ensure
-      FileUtils.rm "erd.mmd" rescue nil
-    end
+    result = Diagram::Mermaid.create
+    assert result.end_with?(".mmd"), "Expected filename to end with .mmd, got: #{result}"
   end
 
   test "direction should be top to bottom by default" do
@@ -385,4 +378,63 @@ class MermaidTest < ActiveSupport::TestCase
 
     assert result.include?("erDiagram")
   end
+
+  # Namespace tests (Issue #450) ================================================
+
+  test "classDiagram should handle namespaced model names" do
+    create_model "Post"
+    create_module_model "Admin::Author", :post => :references do
+      belongs_to :post
+    end
+
+    result = diagram.graph
+
+    assert result.include?("classDiagram")
+    # Backticks should properly escape the namespace
+    assert result.any? { |line| line.include?("`Admin::Author`") }, "Should wrap namespaced entity in backticks"
+    assert result.any? { |line| line.include?("`Post`") && line.include?("`Admin::Author`") }, "Relationship should use backticks for both entities"
+  end
+
+  test "erDiagram should wrap namespaced model names in double quotes" do
+    create_model "Post"
+    create_module_model "Admin::Author", :post => :references do
+      belongs_to :post
+    end
+
+    result = diagram(:mermaid_style => :erdiagram).graph.join("\n")
+
+    assert result.include?("erDiagram")
+    # Double quotes are required for entity names containing ::
+    assert result.include?('"Admin::Author"'), "Should wrap namespaced entity in double quotes, got: #{result}"
+    # Relationship line should also quote the namespaced entity (order may vary)
+    assert result.match?(/("Admin::Author".*--.*Post|Post.*--.*"Admin::Author")/), "Relationship should quote namespaced entity"
+  end
+
+  test "erDiagram should handle multiple namespaced models in relationships" do
+    create_module_model "Admin::User" do
+      has_many :posts, class_name: "Blog::Post"
+    end
+    create_module_model "Blog::Post", :admin_user => :references do
+      belongs_to :admin_user, class_name: "Admin::User"
+    end
+
+    result = diagram(:mermaid_style => :erdiagram).graph.join("\n")
+
+    assert result.include?('"Admin::User"'), "Should quote Admin::User"
+    assert result.include?('"Blog::Post"'), "Should quote Blog::Post"
+  end
+
+  test "erDiagram should quote namespaced entities in specialization relationships" do
+    create_model "Vehicle", :type => :string
+    # Create a namespaced subclass (STI)
+    create_module_model "Transport::Car", Vehicle
+
+    # STI requires inheritance: true option
+    result = diagram(:mermaid_style => :erdiagram, :inheritance => true).graph.join("\n")
+
+    # The specialization relationship should quote the namespaced entity
+    assert result.include?('"Transport::Car"'), "Should quote namespaced specialized entity"
+    # Verify the specialization relationship line also quotes it
+    assert result.match?(/Vehicle.*--.*"Transport::Car"/), "Specialization relationship should quote namespaced entity"
+  end
 end

data/test/unit/rake_task_test.rb

@@ -14,10 +14,6 @@ class RakeTaskTest < ActiveSupport::TestCase
     Rake.application.options.silent = true
   end
 
-  def teardown
-    FileUtils.rm "erd.dot" rescue nil
-  end
-
   define_method :create_app do
     Object::Quux = Module.new
     Object::Quux::Application = Class.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-erd
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Rolf Timmermans