Skip to content

Commit f21f93d

Browse files
committed
merge voormedia#414 and voormedia#417 from root
1 parent 7c66258 commit f21f93d

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

lib/rails_erd/cli.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
option :generator do
99
long "--generator=Generator"
1010
desc "Generator to use (graphviz or mermaid). Defaults to graphviz."
11+
default "graphviz"
1112
end
1213

1314
option :title do
@@ -164,7 +165,8 @@ def start
164165

165166
def initialize(path, options)
166167
@path, @options = path, options
167-
require "rails_erd/diagram/graphviz" if options.generator == :graphviz
168+
require "rails_erd/diagram/graphviz" if options[:generator] == 'graphviz'
169+
require "rails_erd/diagram/mermaid" if options[:generator] == 'mermaid'
168170
end
169171

170172
def start
@@ -202,7 +204,7 @@ def load_application
202204
end
203205

204206
def generator
205-
if options.generator == :mermaid
207+
if options[:generator] == 'mermaid'
206208
RailsERD::Diagram::Mermaid
207209
else
208210
RailsERD::Diagram::Graphviz

lib/rails_erd/domain.rb

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,26 @@ def models
130130
def rails_models
131131
%w(
132132
ActionMailbox::InboundEmail
133+
ActionText::EncryptedRichText
134+
ActionText::RichText
133135
ActiveStorage::Attachment
134136
ActiveStorage::Blob
135137
ActiveStorage::VariantRecord
136-
ActionText::RichText
137-
ActionText::EncryptedRichText
138+
SolidCable::Message
139+
SolidCache::Entry
140+
SolidQueue::BlockedExecution
141+
SolidQueue::ClaimedExecution
142+
SolidQueue::Execution
143+
SolidQueue::FailedExecution
144+
SolidQueue::Job
145+
SolidQueue::Message
146+
SolidQueue::Pause
147+
SolidQueue::Process
148+
SolidQueue::ReadyExecution
149+
SolidQueue::RecurringExecution
150+
SolidQueue::RecurringTask
151+
SolidQueue::ScheduledExecution
152+
SolidQueue::Semaphore
138153
).map{ |model| Object.const_get(model) rescue nil }.compact
139154
end
140155

0 commit comments

Comments
 (0)