rails-schema 0.1.5 → 0.1.7

data/lib/rails/schema/assets/style.css

@@ -142,11 +142,65 @@ body {
   margin: 0 4px;
 }
 
+#toolbar label.toolbar-label {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  font-size: 13px;
+  color: var(--text-secondary);
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+#toolbar label.toolbar-label input[type="checkbox"] {
+  margin: 0;
+  cursor: pointer;
+  accent-color: var(--accent);
+}
+
 #toolbar .shortcuts-hint {
   font-size: 11px;
   color: var(--text-muted);
 }
 
+.toolbar-dropdown {
+  position: relative;
+}
+
+.toolbar-dropdown-menu {
+  display: none;
+  position: absolute;
+  top: 100%;
+  right: 0;
+  margin-top: 4px;
+  background: var(--bg-primary);
+  border: 1px solid var(--border-color);
+  border-radius: 6px;
+  box-shadow: 0 4px 12px rgba(0,0,0,0.15);
+  z-index: 300;
+  min-width: 160px;
+}
+
+.toolbar-dropdown-menu.open {
+  display: flex;
+  flex-direction: column;
+}
+
+.toolbar-dropdown-menu button {
+  border: none;
+  border-radius: 0;
+  text-align: left;
+  padding: 8px 12px;
+}
+
+.toolbar-dropdown-menu button:first-child {
+  border-radius: 6px 6px 0 0;
+}
+
+.toolbar-dropdown-menu button:last-of-type {
+  border-radius: 0 0 6px 6px;
+}
+
 /* Sidebar */
 #sidebar {
   width: var(--sidebar-width);
@@ -232,6 +286,10 @@ body {
   background: var(--bg-tertiary);
 }
 
+#collapse-groups-btn {
+  margin-left: auto;
+}
+
 #model-list {
   flex: 1;
   overflow-y: auto;
@@ -545,6 +603,15 @@ body {
   gap: 4px;
 }
 
+.legend-toggle {
+  cursor: pointer;
+}
+
+.legend-toggle input[type="checkbox"] {
+  margin: 0;
+  cursor: pointer;
+}
+
 .legend-line {
   width: 20px;
   height: 2px;
@@ -591,3 +658,59 @@ body {
   );
   background-color: transparent;
 }
+
+/* Sidebar group headers */
+.group-header {
+  display: flex;
+  align-items: center;
+  padding: 6px 16px;
+  font-size: 12px;
+  font-weight: 700;
+  border-bottom: 1px solid var(--border-color);
+  color: var(--text-secondary);
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+  cursor: pointer;
+  user-select: none;
+  gap: 6px;
+}
+
+.group-header:hover {
+  background: var(--bg-tertiary);
+}
+
+.group-header.active {
+  background: var(--accent-light);
+}
+
+.group-count {
+  font-size: 11px;
+  color: var(--text-secondary);
+  font-weight: normal;
+  margin-left: auto;
+  flex-shrink: 0;
+}
+
+.group-toggle {
+  font-size: 10px;
+  width: 12px;
+  flex-shrink: 0;
+}
+
+.group-color-dot {
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  display: inline-block;
+  flex-shrink: 0;
+}
+
+.group-header-label {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.group-models {
+  border-bottom: 1px solid var(--border-color);
+}

data/lib/rails/schema/assets/template.html.erb

@@ -19,6 +19,7 @@
       <div id="sidebar-actions">
         <button id="select-all-btn">Select All</button>
         <button id="deselect-all-btn">Deselect All</button>
+        <button id="collapse-groups-btn" style="display:none" title="Collapse all groups">&#9660;</button>
       </div>
       <div id="model-list"></div>
     </div>
@@ -31,7 +32,7 @@
         <span class="legend-item"><span class="legend-line habtm"></span> habtm (M:M)</span>
         <span class="legend-item" data-mode="mongoid"><span class="legend-line embeds_many"></span> embeds_many</span>
         <span class="legend-item" data-mode="mongoid"><span class="legend-line embeds_one"></span> embeds_one</span>
-        <span class="legend-item" data-mode="active_record"><span class="legend-line through"></span> :through</span>
+        <label class="legend-item legend-toggle" data-mode="active_record"><input type="checkbox" id="toggle-through" checked><span class="legend-line through"></span> :through</label>
         <span class="legend-item"><span class="legend-line polymorphic"></span> polymorphic</span>
       </div>
       <div class="spacer"></div>
@@ -41,7 +42,17 @@
       <button id="fit-btn" title="Fit to screen (F)">Fit</button>
       <button id="theme-btn" title="Toggle theme">Theme</button>
       <span class="toolbar-divider"></span>
-      <button id="export-mermaid-btn" title="Export as Mermaid (Markdown)">Export Mermaid</button>
+      <label class="toolbar-label" for="manual-positioning"><input type="checkbox" id="manual-positioning">Manual Positioning</label>
+      <span class="toolbar-divider"></span>
+      <div class="toolbar-dropdown">
+        <button id="file-menu-btn">File &#9660;</button>
+        <div class="toolbar-dropdown-menu" id="file-menu">
+          <button id="export-mermaid-btn">Export Mermaid</button>
+          <button id="save-layout-btn">Save Layout</button>
+          <button id="load-layout-btn">Load Layout</button>
+          <input type="file" id="load-layout-input" accept=".json" style="display:none">
+        </div>
+      </div>
       <span class="shortcuts-hint">/ search · Esc deselect · F fit</span>
     </div>
 

data/lib/rails/schema/configuration.rb

@@ -3,7 +3,8 @@
 module Rails
   module Schema
     class Configuration
-      attr_accessor :output_path, :exclude_models, :exclude_model_if, :title, :theme, :expand_columns, :schema_format
+      attr_accessor :output_path, :exclude_models, :exclude_model_if, :title, :theme, :expand_columns, :schema_format,
+                    :model_schema_group, :collapse_groups, :show_through_edges
 
       def initialize
         @output_path = "docs/schema.html"
@@ -13,6 +14,20 @@ module Rails
         @theme = :auto
         @expand_columns = false
         @schema_format = :auto
+        @model_schema_group = nil
+        @collapse_groups = true
+        @show_through_edges = true
+      end
+
+      def resolved_group_proc
+        case @model_schema_group
+        when nil then nil
+        when :namespaces
+          ->(model) { model.name.split("::")[0..-2] }
+        when Proc then @model_schema_group
+        else
+          raise ArgumentError, "model_schema_group must be nil, :namespaces, or a Proc"
+        end
       end
     end
   end

data/lib/rails/schema/extractor/model_scanner.rb

@@ -36,13 +36,9 @@ module Rails
 
         def eager_load_via_zeitwerk!
           loader = ::Rails.autoloaders.main
-          models_path = ::Rails.root&.join("app", "models")&.to_s
-
-          if models_path && File.directory?(models_path) && loader.respond_to?(:eager_load_dir)
-            loader.eager_load_dir(models_path)
-          else
-            loader.eager_load
-          end
+          dirs = model_directories
+          dirs.each { |dir| loader.eager_load_dir(dir) } if dirs.any? && loader.respond_to?(:eager_load_dir)
+          loader.eager_load if no_concrete_descendants?
         rescue StandardError, LoadError => e
           warn "[rails-schema] Zeitwerk eager_load failed (#{e.class}: #{e.message}), " \
                "trying Rails.application.eager_load!"
@@ -60,22 +56,29 @@ module Rails
         def eager_load_model_files!
           return unless defined?(::Rails.root) && ::Rails.root
 
-          models_path = ::Rails.root.join("app", "models")
-          return unless models_path.exist?
+          dirs = model_directories
+          return if dirs.empty?
 
-          Dir.glob(models_path.join("**/*.rb")).sort.each do |file|
+          dirs.flat_map { |d| Dir.glob(File.join(d, "**/*.rb")) }.sort.each do |file|
             require file
           rescue StandardError, LoadError => e
             warn "[rails-schema] Could not load #{file}: #{e.class}: #{e.message}"
           end
         end
 
+        def model_directories
+          dirs = PackwerkDiscovery.new.model_paths
+          default_path = ::Rails.root&.join("app", "models")&.to_s
+          dirs << default_path if default_path && !dirs.include?(default_path)
+          dirs.select { |d| d && File.directory?(d) }.uniq
+        end
+
+        def no_concrete_descendants?
+          ActiveRecord::Base.descendants.none? { |m| !m.abstract_class? && m.name }
+        end
+
         def table_known?(model)
-          if @schema_data
-            @schema_data.key?(model.table_name)
-          else
-            safe_table_exists?(model)
-          end
+          @schema_data ? @schema_data.key?(model.table_name) : safe_table_exists?(model)
         end
 
         def safe_table_exists?(model)
@@ -89,11 +92,7 @@ module Rails
           return true if @configuration.exclude_model_if&.call(model)
 
           @configuration.exclude_models.any? do |pattern|
-            if pattern.end_with?("*")
-              model.name.start_with?(pattern.delete_suffix("*"))
-            else
-              model.name == pattern
-            end
+            pattern.end_with?("*") ? model.name.start_with?(pattern.delete_suffix("*")) : model.name == pattern
           end
         end
 

data/lib/rails/schema/extractor/packwerk_discovery.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Rails
+  module Schema
+    module Extractor
+      class PackwerkDiscovery
+        def model_paths
+          return [] unless defined?(::Rails.root) && ::Rails.root
+
+          find_package_directories.flat_map do |dir|
+            %w[app/models app/public].map { |sub| File.join(dir, sub) }
+          end
+        end
+
+        private
+
+        def find_package_directories
+          patterns = package_paths
+          return [] if patterns.empty?
+
+          patterns.flat_map do |pattern|
+            Dir.glob(::Rails.root.join(pattern).to_s).select do |path|
+              File.directory?(path) && File.exist?(File.join(path, "package.yml"))
+            end
+          end
+        end
+
+        def package_paths
+          packwerk_yml = ::Rails.root.join("packwerk.yml")
+          return [] unless File.exist?(packwerk_yml)
+
+          require "yaml"
+          config = YAML.safe_load(File.read(packwerk_yml)) || {}
+          config["package_paths"] || ["**/"]
+        rescue StandardError
+          []
+        end
+      end
+    end
+  end
+end

data/lib/rails/schema/renderer/html_generator.rb

@@ -61,7 +61,10 @@ module Rails
         def config_json
           config = {
             expand_columns: @configuration.expand_columns,
-            theme: @configuration.theme.to_s
+            theme: @configuration.theme.to_s,
+            grouping_enabled: !@configuration.model_schema_group.nil?,
+            collapse_groups: @configuration.collapse_groups,
+            show_through_edges: @configuration.show_through_edges
           }
           JSON.generate(config).gsub("</", '<\/')
         end

data/lib/rails/schema/transformer/graph_builder.rb

@@ -6,9 +6,11 @@ module Rails
   module Schema
     module Transformer
       class GraphBuilder
-        def initialize(column_reader: Extractor::ColumnReader.new, association_reader: Extractor::AssociationReader.new)
+        def initialize(column_reader: Extractor::ColumnReader.new, association_reader: Extractor::AssociationReader.new,
+                       configuration: ::Rails::Schema.configuration)
           @column_reader = column_reader
           @association_reader = association_reader
+          @group_proc = configuration.resolved_group_proc
         end
 
         def build(models)
@@ -40,10 +42,12 @@ module Rails
         end
 
         def build_node(model, unique_id)
+          group = @group_proc ? Array(@group_proc.call(model)) : []
           Node.new(
             id: unique_id,
             table_name: model.table_name,
-            columns: @column_reader.read(model)
+            columns: @column_reader.read(model),
+            group: group
           )
         end
 

data/lib/rails/schema/transformer/node.rb

@@ -4,20 +4,19 @@ module Rails
   module Schema
     module Transformer
       class Node
-        attr_reader :id, :table_name, :columns
+        attr_reader :id, :table_name, :columns, :group
 
-        def initialize(id:, table_name:, columns: [])
+        def initialize(id:, table_name:, columns: [], group: [])
           @id = id
           @table_name = table_name
           @columns = columns
+          @group = group
         end
 
         def to_h
-          {
-            id: @id,
-            table_name: @table_name,
-            columns: @columns
-          }
+          h = { id: @id, table_name: @table_name, columns: @columns }
+          h[:group] = @group unless @group.empty?
+          h
         end
       end
     end

data/lib/rails/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Rails
   module Schema
-    VERSION = "0.1.5"
+    VERSION = "0.1.7"
   end
 end

data/lib/rails/schema.rb

@@ -6,6 +6,7 @@ require_relative "schema/transformer/node"
 require_relative "schema/transformer/edge"
 require_relative "schema/extractor/schema_file_parser"
 require_relative "schema/extractor/structure_sql_parser"
+require_relative "schema/extractor/packwerk_discovery"
 require_relative "schema/extractor/model_scanner"
 require_relative "schema/extractor/column_reader"
 require_relative "schema/extractor/association_reader"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rails-schema
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Andrei Kislichenko
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -80,6 +79,7 @@ files:
 - lib/rails/schema/extractor/mongoid/column_reader.rb
 - lib/rails/schema/extractor/mongoid/model_adapter.rb
 - lib/rails/schema/extractor/mongoid/model_scanner.rb
+- lib/rails/schema/extractor/packwerk_discovery.rb
 - lib/rails/schema/extractor/schema_file_parser.rb
 - lib/rails/schema/extractor/structure_sql_parser.rb
 - lib/rails/schema/railtie.rb
@@ -97,7 +97,6 @@ metadata:
   source_code_uri: https://github.com/andrew2net/rails-schema
   changelog_uri: https://github.com/andrew2net/rails-schema/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,8 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Interactive HTML visualization of your Rails database schema
 test_files: []