activerecord_uml 0.6.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d91013520bd006341a0aa9487d794d4a5960ed7fecf0e05d741f21e002fba85a
-  data.tar.gz: 72c977aad9bce307f8fd00ee539dca8d39f9d290e5fa423f3543ca7cadc85718
+  metadata.gz: 14ef2902767bb5de3b65b387a336ab4f3ebe234dea52cf6c8b1d3cb756818fdc
+  data.tar.gz: 760d9f81fda80c254be2de0f207474555f93ae470260b9dc6644940981b0e720
 SHA512:
-  metadata.gz: a7ffdb9ccd505f0dc28f186d1fb12b6a6a01fb14cc60e5036c43c5de8f2edf69db37e7cec57727e7d9b12889acfe59b115755ebcec39b55b9404d53fda3ec859
-  data.tar.gz: 9217c641caa0ab215fda2fe9c27f0d02e5d18ad6e07b0684d61e9ecb0f0edbdaead58ef500e01d5101bead7c8bc86e4de776e537aefd81cc433702b92774a918
+  metadata.gz: 685b19398a365c8b47905bfdf6aba021fc61cbfaa4ecf022f6777a05dc09341b404816f3ba308edb729651d76a37c16970087de7072021591dbb490a4d3e2d9e
+  data.tar.gz: 4c1079d76751897c77ddfae33ed10708e675e0726871d3a34ffd57a8699ce36609a9fa5e2a56c2f906e140d780330fb3f7fa5e530da69ceb5d21bde66022e6a0

data/README.md

@@ -29,7 +29,7 @@ Or install it yourself as:
 In your Ruby on Rails directory:
 
 ```
-activerecord_uml User
+activerecord_uml User Book Review
 ```
 
 Execute the activerecord_uml command with name of model classes.

data/exe/activerecord_uml

@@ -1,7 +1,8 @@
 #! /usr/bin/env ruby
-require "activerecord_uml"
 
-require(File.join(Dir.pwd, "config/application"))
-Rails.application.require_environment!
+activerecord_uml = File.join __dir__,"../lib/activerecord_uml"
+ruby_script = "require \"#{activerecord_uml}\"; ActiverecordUml.draw"
+rails = File.join Dir.pwd,"bin/rails"
+rails_runner_command = "echo '#{ruby_script}' | #{rails} runner - #{ARGV.join ' '}"
 
-ActiverecordUml.draw
+system rails_runner_command

data/lib/activerecord_uml.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "erb"
 require_relative "activerecord_uml/version"
 require_relative "activerecord_uml/diagram_drawer"
 

data/lib/activerecord_uml/diagram_drawer.rb

@@ -28,11 +28,20 @@ EOF
 
     def relations
       @class_name.reflect_on_all_associations(:belongs_to).map do |a|
-        "#{a.name.to_s.classify} --* #{@class_name}"
+        "#{a.class_name} --* #{@class_name}#{label_for a}"
       end.concat(@class_name.reflect_on_all_associations(:has_many).map do |a|
-        "#{@class_name} --* #{a.name.to_s.classify}"
+        if a.is_a? ActiveRecord::Reflection::ThroughReflection
+          if a.source_reflection
+            # If a source association is specified, the class name of the source association is displayed.
+            "#{@class_name} *--* #{a.source_reflection.class_name}#{label_for a}"
+          else
+            "#{@class_name} *--* #{a.class_name}#{label_for a}"
+          end
+        else
+          "#{@class_name} --* #{a.class_name}#{label_for a}"
+        end
       end).concat(@class_name.reflect_on_all_associations(:has_one).map do |a|
-        "#{@class_name} --* #{a.name.to_s.classify}"
+        "#{@class_name} --* #{a.class_name}#{label_for a}"
       end)
     end
 
@@ -47,9 +56,18 @@ EOF
         method_parameters = @class_name.new.method(m)
                                        .parameters
                                        .filter { |a| a[0] == :req }
-                                       .map { |a| a[1] }.join(", ")
-        [m.to_s, method_parameters]
+                                       .map { |a| a[1] }
+
+        if method_parameters.length > 3
+          method_parameters = method_parameters.slice(0, 3).append("...")
+        end
+
+        [m.to_s, method_parameters.join(", ")]
       end
     end
+
+    def label_for(association)
+      association.class_name != association.name.to_s.classify ? " : #{association.name.to_s.classify}" : ""
+    end
   end
 end

data/lib/activerecord_uml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiverecordUml
-  VERSION = "0.6.0"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_uml
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.11.0
 platform: ruby
 authors:
 - shigeru.nakajima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-06-28 00:00:00.000000000 Z
 dependencies: []
 description: Generate UML class diagram for Mermaid.js from ActiveRecord instances
   by Rails runner.