ruby_cms 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c51e2bcca3bdc826fa4876db0709f8e0528be4534f2b336d9349430f7286e6c
-  data.tar.gz: 96028a6acf6db9942132779bd45de972ae73e67d105a64e5726f1135f3e6d4b7
+  metadata.gz: 8378bd1d90b672968f234d5df8a7aa0e01ee7666d5470cadf6ee548925f6a3c2
+  data.tar.gz: 687e17784aae8bb761450c93265e8bb658d67cdcbdfaa01f5a18b60016692e6b
 SHA512:
-  metadata.gz: 5c4b45df852da2fb69cf5842643f9e520128dd383ba951023139abd69e354587f3b0cd2460e8fa28fe19ec18765a3f0bf056f8b4bfba77f491e7f54226010894
-  data.tar.gz: 26ae563187beb44f6af36d3926b643b3c70dd8d4495537608febf4f4fb56196a6681eeb438dc8ed72c52dd122827d56d02cef9572796279985f492780d1e758b
+  metadata.gz: db5f852d54f456ec852900d3cbd53b609e6f8823f10ec0fe3f06da08d7277a7134ca53add8a8b6a73309f45d7ea6c65f46f493d5e549fff254aac774a3241c82
+  data.tar.gz: 92ba4a9b314f01fb747948bb137d09eed69309ddb4f3a8a9b8430bc7e56c592914253d8ce5eefce8db35ba8693cc4a3b31c9dd447e8c640042100084165cb687

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## [1.0.2] - 2026-06-29
+
+### Fixed
+
+- `HelperWiring` no longer wires `Pagy::Frontend` (removed in Pagy 43+); admin pagination uses `Pagy::Offset` via `AdminPagination` / `RubyUI::DataTable`. The installer now also strips an obsolete `include Pagy::Frontend` from the host app's `application_helper.rb`
+
+## [1.0.1] - 2026-06-29
+
+### Fixed
+
+- Installer resolves the passkeys/webauthn vs `bitwarden-sdk-secrets` `WebAuthn` constant clash by patching the host Gemfile to load `bitwarden-sdk-secrets` with `require: false` (`GemSetup#resolve_conflicts!`)
+
 ## [1.0.0] - 2026-06-29
 
 First public release of the modular install-only admin scaffolding gem.

data/lib/ruby_cms/gem_setup.rb

@@ -71,8 +71,37 @@ module RubyCms
       added
     end
 
+    # Patch known Gemfile declarations that break optional modules (e.g. passkeys +
+    # webauthn vs bitwarden-sdk-secrets both defining `WebAuthn`).
+    # Returns true when the Gemfile was modified.
+    def resolve_conflicts!(modules: [])
+      return false unless @gemfile.exist?
+      return false unless modules.any? { |mod| mod.key == :passkeys }
+
+      content = @gemfile.read
+      patched = patch_bitwarden_require_false(content)
+      return false if patched == content
+
+      @gemfile.write(patched)
+      true
+    end
+
     private
 
+    BITWARDEN_GEM_LINE = /
+      ^\s*gem\s+["']bitwarden-sdk-secrets["']
+      (?<opts>[^\n]*)
+      \n
+    /x
+
+    def patch_bitwarden_require_false(content)
+      content.gsub(BITWARDEN_GEM_LINE) do |line|
+        next line if line.match?(/require:\s*false/)
+
+        line.sub(/(\n)\z/, ", require: false\\1")
+      end
+    end
+
     def gem_present?(content, name)
       content.match?(/^\s*gem\s+["']#{Regexp.escape(name)}["']/)
     end

data/lib/ruby_cms/helper_wiring.rb

@@ -7,10 +7,12 @@ module RubyCms
   #   * RubyUI            — Phlex::Kit, makes components callable as methods in ERB
   #                         (e.g. AdminPageHeader(...)); defined by ruby_ui:install
   #   * CmsApplicationHelpers / ContentBlocksHelper — shipped by the gem
-  #   * Pagy::Frontend    — pagination helpers
+  # Pagy 43+ has no Pagy::Frontend; admin pagination uses Pagy::Offset in
+  # AdminPagination and RubyUI::DataTable components instead.
   # Idempotent: only adds includes that are missing.
   class HelperWiring
-    INCLUDES = %w[CmsApplicationHelpers RubyUI ContentBlocksHelper Pagy::Frontend].freeze
+    INCLUDES = %w[CmsApplicationHelpers RubyUI ContentBlocksHelper].freeze
+    OBSOLETE_INCLUDES = %w[Pagy::Frontend].freeze
 
     def initialize(app_root:)
       @path = Pathname.new(app_root).join("app/helpers/application_helper.rb")
@@ -20,12 +22,19 @@ module RubyCms
       return false unless @path.exist?
 
       content = @path.read
-      missing = INCLUDES.reject {|mod| content.include?("include #{mod}") }
-      return false if missing.empty?
-      return false unless content.include?("module ApplicationHelper\n")
+      cleaned = OBSOLETE_INCLUDES.reduce(content) do |text, mod|
+        text.gsub(/^\s*include #{Regexp.escape(mod)}\n/, "")
+      end
+      missing = INCLUDES.reject {|mod| cleaned.include?("include #{mod}") }
+      changed = cleaned != content
+      return false if missing.empty? && !changed
+      return false unless cleaned.include?("module ApplicationHelper\n")
 
-      lines = missing.map {|mod| "  include #{mod}" }.join("\n")
-      @path.write(content.sub("module ApplicationHelper\n", "module ApplicationHelper\n#{lines}\n"))
+      if missing.any?
+        lines = missing.map {|mod| "  include #{mod}" }.join("\n")
+        cleaned = cleaned.sub("module ApplicationHelper\n", "module ApplicationHelper\n#{lines}\n")
+      end
+      @path.write(cleaned)
       true
     end
   end

data/lib/ruby_cms/installer.rb

@@ -44,8 +44,13 @@ module RubyCms
 
       # Gems first: base + module gems on a fresh install; on `--add`, only the newly
       # selected modules' own gems (so e.g. adding passkeys pulls in webauthn).
-      added = GemSetup.new(app_root: @app_root).ensure_gems!(modules: modules, include_base: framework_setup)
-      run_critical("bundle install") if added.any?
+      gem_setup = GemSetup.new(app_root: @app_root)
+      added = gem_setup.ensure_gems!(modules: modules, include_base: framework_setup)
+      conflicts_patched = gem_setup.resolve_conflicts!(modules: modules)
+      if conflicts_patched
+        @shell.ok("bitwarden-sdk-secrets", hint: "set require: false (conflicts with webauthn passkeys)")
+      end
+      run_critical("bundle install") if added.any? || conflicts_patched
 
       # Framework scaffolding runs on the still-vanilla app, fresh install only, so the
       # Rails generators don't collide with (and interactively prompt about) gem files.

data/lib/ruby_cms/version.rb

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

metadata

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