ruby_cms 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f44433fd9e94400ce208e14151bf0a79f79f35a4c03a9e52699fd83483ce735f
-  data.tar.gz: e99a049b39263d8cbfe4c1eaf05071652428401abd5fa1fec554c72286556dd5
+  metadata.gz: 8378bd1d90b672968f234d5df8a7aa0e01ee7666d5470cadf6ee548925f6a3c2
+  data.tar.gz: 687e17784aae8bb761450c93265e8bb658d67cdcbdfaa01f5a18b60016692e6b
 SHA512:
-  metadata.gz: c3873c8aa83f4ff9beaf7d6f819a4e823a97518a4d68c7d15f3d9193204ab27b6f6b157944b7c8f2c1bcf7573709011598a2d025951a25e513e8f8a3ce50f1c1
-  data.tar.gz: 57a96a51c5e91ce0e8602cde488851e023e4d5966e90b7f021b046bd2db992538bdf669fee5c7fd12018c26514adb70d5a16c976e13a5d72858ee9cc6fc0b815
+  metadata.gz: db5f852d54f456ec852900d3cbd53b609e6f8823f10ec0fe3f06da08d7277a7134ca53add8a8b6a73309f45d7ea6c65f46f493d5e549fff254aac774a3241c82
+  data.tar.gz: 92ba4a9b314f01fb747948bb137d09eed69309ddb4f3a8a9b8430bc7e56c592914253d8ce5eefce8db35ba8693cc4a3b31c9dd447e8c640042100084165cb687

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [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

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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyCms
-  VERSION = "1.0.1"
+  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.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Codebyjob