ruby_cms 0.2.0.3 → 0.2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6812068b183da96c729d26ae664a39d599aea509a17a11ac0851b715c652cdcf
-  data.tar.gz: b087d0fe4f6bb7af6db0aef47e195e7f4f179ab65476a2b6f1048bef514444ab
+  metadata.gz: 747105700c925ba3d9140a015fa477116795644d8a99c52b3aee53c4e786678d
+  data.tar.gz: 8a7bf4cea26c24f7f73f5c6800c6a8dcfb784031a8f313bf2fb7e421fb8bbf31
 SHA512:
-  metadata.gz: e0f9ca986cdc2d3c5caa5681261e49d015940c9e19be90406e341fffa215c5d1092ae9f47a30d64a39db9a221d2add4e6caac4eccaa3b79f9a8d3afd8e79343f
-  data.tar.gz: 5043cc31c3d8adcd61480d3fafc64b851d468d57ee7daf6e251793150c663c4d6cae9c94e43a880bfbd940d414b38408a7d32148bcd63db18404cf8e8b579c07
+  metadata.gz: 78ebfe96b5853ad7ab9698bdc0fca3eaa568f6a02ae691d7ba007c804e4076afe5bde33380d966875f2e24eb72f554d6918408f8fbe04ab80b3644808c11f9ae
+  data.tar.gz: e410f195decbe969b4a873624e440b9331a47081a305bd504eea5a44c0ae90b63e6fe4d0b734fd72a01ea09c471cff7ee7c733eca971525fa9ff0c094b5e0e2c

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [0.2.0.3] - 2026-04-02
 
+- The host app no longer needs to scan de gem for tailwind
+
+## [0.2.0.3] - 2026-04-02
+
 - Whole repo was scanned for comiling so it was slow.
 
 ## [0.2.0.2] - 2026-04-02

data/README.md

@@ -493,27 +493,9 @@ rails ruby_cms:css:compile_gem
 ### Faster Docker Builds (`assets:precompile`)
 
 `assets:precompile` loads the Rails app in production mode and can be slow in Docker/Fly builds.
-RubyCMS skips non-asset runtime initializers during this phase (navigation registration,
+RubyCMS now skips non-asset runtime initializers during this phase (navigation registration,
 dashboard registration, versioning hook, settings import, and permission seeding), which reduces
-precompile overhead. Detection uses `ARGV` (not only `$PROGRAM_NAME`) so it still applies when the
-Ruby program name is `ruby` instead of `rails`.
-
-**Tailwind CSS:** Do not add multiple `@source` globs that point at the same RubyCMS gem (e.g. both
-`../../../../gems/ruby_cms/...` and `/usr/local/bundle/.../ruby_cms-*`). That scans the engine twice
-and slows `tailwindcss:build` a lot. Instead, rely on [tailwindcss-rails engine support](https://github.com/rails/tailwindcss-rails#rails-engines-support-experimental):
-
-1. RubyCMS ships `app/assets/tailwind/ruby_cms_engine/engine.css` with `@source` paths relative to the gem
-   (the directory matches Rails’ `engine_name` for `RubyCms::Engine`, which is `ruby_cms_engine`).
-2. `rails tailwindcss:engines` (run automatically before `tailwindcss:build`) generates
-   `app/assets/builds/tailwind/ruby_cms_engine.css` in the host app.
-3. In the host’s `app/assets/tailwind/application.css`, add **once**:
-
-   ```css
-   @import "../builds/tailwind/ruby_cms_engine";
-   ```
-
-   Place it next to your other `@import` lines (e.g. after `@import "tailwindcss";`). Remove any
-   hand-written `@source` lines aimed at the RubyCMS gem.
+precompile overhead.
 
 Recommended Docker layer order:
 

data/app/views/layouts/ruby_cms/admin.html.erb

@@ -15,7 +15,7 @@
     <link rel="manifest" href="<%= asset_path("site.webmanifest") %>">
 
     <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
+    <%= stylesheet_link_tag "ruby_cms/admin", "data-turbo-track": "reload" rescue nil %>
     <%= stylesheet_link_tag "actiontext", "data-turbo-track": "reload" if asset_path("actiontext.css") rescue nil %>
     <%= javascript_importmap_tags "admin" %>
   </head>

data/lib/generators/ruby_cms/install_generator.rb

@@ -21,7 +21,7 @@ module RubyCms
         - If the host uses /admin already, remove or change those routes.
         - Avoid root to: redirect("/admin") — use a real root or ruby_cms.unauthorized_redirect_path.
         - Review config/initializers/ruby_cms.rb (session, CSP).
-        - Add 'css: bin/rails tailwindcss:watch' to Procfile.dev for Tailwind in development.
+        - RubyCMS admin styles are compiled once on install to app/assets/stylesheets/ruby_cms/admin.css.
         - Visit /admin (sign in as the admin you configured).
 
         Tracking:
@@ -215,7 +215,18 @@ module RubyCms
       no_tasks do
         def copy_admin_css(dest_dir)
           admin_css_dest = dest_dir.join("admin.css")
+          precompiled_admin_css = RubyCms::Engine.root.join("app/assets/stylesheets/ruby_cms/admin.css")
+          if File.exist?(precompiled_admin_css) && File.size(precompiled_admin_css).to_i.positive?
+            FileUtils.cp(precompiled_admin_css, admin_css_dest)
+            return
+          end
+
           RubyCms::Engine.compile_admin_css(admin_css_dest)
+          return if File.size(admin_css_dest).to_i > 64
+
+          say "⚠ Task css/copy: Generated admin.css is very small. " \
+              "Ensure RubyCMS ships precompiled CSS at app/assets/stylesheets/ruby_cms/admin.css.",
+              :yellow
         end
 
         def copy_components_css(src_dir, dest_dir)
@@ -478,8 +489,8 @@ module RubyCms
         end
 
         def configure_tailwind(tailwind_css)
-          add_ruby_cms_tailwind_source(tailwind_css)
-          add_ruby_cms_tailwind_content_paths
+          remove_ruby_cms_tailwind_source(tailwind_css)
+          remove_ruby_cms_tailwind_content_paths
           run "bin/rails tailwindcss:build" if File.exist?(tailwind_css)
           # Importmap pins are provided by the engine via `ruby_cms/config/importmap.rb`.
           add_importmap_pins
@@ -855,83 +866,45 @@ module RubyCms
           end.join("\n")
         end
 
-        # Adds a single @import for tailwindcss-rails' engine shim (see gem app/assets/tailwind/ruby_cms_engine/engine.css).
-        # Avoids duplicate @source globs to the gem, which makes tailwindcss:build much slower.
-        def add_ruby_cms_tailwind_source(tailwind_css_path)
+        # RubyCMS admin styles are precompiled to app/assets/stylesheets/ruby_cms/admin.css.
+        # Remove RubyCMS-specific Tailwind source globs to keep host-app builds fast.
+        # Not a generator task.
+        def remove_ruby_cms_tailwind_source(tailwind_css_path)
           return unless tailwind_css_path.to_s.present? && File.exist?(tailwind_css_path)
 
           content = File.read(tailwind_css_path)
-          return if content.match?(%r{builds/tailwind/ruby_cms_engine})
-
-          injection = +"\n/* RubyCMS: Tailwind content via tailwindcss-rails engine (see ruby_cms README). */\n"
-          injection << "@import \"../builds/tailwind/ruby_cms_engine\";\n"
-
-          inserted = inject_ruby_cms_engine_import_after_tailwind!(tailwind_css_path, content, injection)
-          unless inserted
-            inject_into_file tailwind_css_path.to_s, after: /\A/ do
-              injection
-            end
-          end
+          cleaned_content = remove_legacy_ruby_cms_tailwind_sources(content)
+          return if cleaned_content == content
 
-          say "✓ Task tailwind/source: Added RubyCMS engine import to #{tailwind_css_path}.", :green
+          File.write(tailwind_css_path, cleaned_content)
+          say "✓ Task tailwind/source: Removed RubyCMS @source paths from tailwind entry CSS.",
+              :green
         rescue StandardError => e
-          say "⚠ Task tailwind/source: Could not add engine import: #{e.message}. Add manually.", :yellow
-        end
-
-        def inject_ruby_cms_engine_import_after_tailwind!(tailwind_css_path, content, injection)
-          patterns = [
-            %(@import "tailwindcss";\n),
-            %(@import "tailwindcss";),
-            %(@import "tailwindcss"\n),
-            %(@import "tailwindcss")
-          ]
-          patterns.each do |after_pattern|
-            next unless content.include?(after_pattern)
-
-            inject_into_file tailwind_css_path.to_s, after: after_pattern do
-              injection
-            end
-            return true
-          end
-          false
+          say "⚠ Task tailwind/source: Could not clean @source lines: #{e.message}. " \
+              "Check tailwind/application.css manually.",
+              :yellow
         end
 
-        # Tailwind v3 support (tailwind.config.js content array)
-        def add_ruby_cms_tailwind_content_paths # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+        # Remove RubyCMS content globs from Tailwind v3 config as well.
+        def remove_ruby_cms_tailwind_content_paths
           config_path = Rails.root.join("config/tailwind.config.js")
           return unless File.exist?(config_path)
 
           content = File.read(config_path)
-          patterns = ruby_cms_tailwind_content_patterns
-          return if patterns.all? {|p| content.include?(p) }
-
-          inject = "#{patterns.map {|p| "    \"#{p}\"," }.join("\n")}\n"
+          cleaned = content.gsub(/^\s*["']?[^"'\n]*ruby_cms[^"'\n]*["']?,?\s*$\n?/i, "")
+          return if cleaned == content
 
-          # Insert inside `content: [` if present; otherwise no-op.
-          inserted = false
-          if content.match?(/content:\s*\[/)
-            gsub_file config_path.to_s, /content:\s*\[\s*\n/ do |match|
-              inserted = true
-              "#{match}#{inject}"
-            end
-          end
-
-          return unless inserted
-
-          say "✓ Task tailwind/content: Added RubyCMS paths to config/tailwind.config.js.", :green
+          File.write(config_path, cleaned)
+          say "✓ Task tailwind/content: Removed RubyCMS paths from tailwind.config.js.", :green
         rescue StandardError => e
-          say "⚠ Task tailwind/content: Could not update tailwind.config.js: #{e.message}.", :yellow
+          say "⚠ Task tailwind/content: Could not clean tailwind.config.js: #{e.message}.", :yellow
         end
 
-        def ruby_cms_tailwind_content_patterns
-          views = RubyCms::Engine.root.join("app/views").relative_path_from(Rails.root).to_s
-          components = RubyCms::Engine.root.join("app/components").relative_path_from(Rails.root).to_s
-          [
-            "#{views}/**/*.erb",
-            "#{components}/**/*.rb"
-          ]
+        def remove_legacy_ruby_cms_tailwind_sources(content)
+          content
+            .gsub(%r{^\s*/\*\s*Include RubyCMS views/components so Tailwind finds utility classes\.\s*\*/\s*$\n?}, "")
+            .gsub(/^\s*@source\s+"[^"\n]*ruby_cms[^"\n]*";\s*$\n?/i, "")
         end
-
       end
 
       def run_migrate

data/lib/generators/ruby_cms/templates/admin.html.erb

@@ -15,7 +15,7 @@
     <link rel="manifest" href="<%= asset_path("site.webmanifest") %>">
 
     <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
+    <%= stylesheet_link_tag "ruby_cms/admin", "data-turbo-track": "reload" rescue nil %>
     <%= stylesheet_link_tag "actiontext", "data-turbo-track": "reload" rescue nil %>
     <%= javascript_importmap_tags "admin" %>
   </head>

data/lib/ruby_cms/engine.rb

@@ -100,8 +100,7 @@ module RubyCms
       # For importmap: ensure engine's importmap is loaded
       if app.config.respond_to?(:importmap)
         app.config.importmap.paths << config.root.join("config/importmap.rb")
-        # Only sweep the engine's Stimulus tree (not the whole app/javascript tree)
-        app.config.importmap.cache_sweepers << config.root.join("app/javascript/controllers/ruby_cms")
+        app.config.importmap.cache_sweepers << config.root.join("app/javascript")
       end
     end
 
@@ -263,18 +262,12 @@ module RubyCms
       end
     end
 
-    # True during asset pipeline tasks so we skip DB-heavy initializers (permissions, settings import).
-    # Detect by ARGV first: $PROGRAM_NAME is often "ruby" when using `ruby bin/rails`, which would
-    # miss the old rake/rails basename check; tailwindcss:build runs as a prerequisite of
-    # assets:precompile and keeps the same ARGV, but a standalone `rails tailwindcss:build` must match too.
     def self.assets_precompile_phase?
-      argv = Array(ARGV).map(&:to_s)
-      return true if argv.include?("assets:precompile")
-      return true if argv.any? {|a| a.start_with?("tailwindcss:") }
-      return true if argv.include?("propshaft:compile")
-
       command = File.basename($PROGRAM_NAME.to_s)
-      (command == "rake" || command == "rails") && argv.include?("assets:precompile")
+      rake_assets_precompile = command == "rake" && ARGV.include?("assets:precompile")
+      rails_assets_precompile = command == "rails" && ARGV.include?("assets:precompile")
+
+      rake_assets_precompile || rails_assets_precompile
     end
   end
 end

data/lib/ruby_cms/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyCms
-  VERSION = "0.2.0.3"
+  VERSION = "0.2.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_cms
 version: !ruby/object:Gem::Version
-  version: 0.2.0.3
+  version: 0.2.0.5
 platform: ruby
 authors:
 - Codebyjob