ruby_cms 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f44433fd9e94400ce208e14151bf0a79f79f35a4c03a9e52699fd83483ce735f
-  data.tar.gz: e99a049b39263d8cbfe4c1eaf05071652428401abd5fa1fec554c72286556dd5
+  metadata.gz: 4f85aad882d87190c071391e338a48b7f327af01400b5bc38fb71d64d014cf6a
+  data.tar.gz: de4bf71cc65a5068f636a0c6a20d7fa2b9dba70d74e768a6997fb94f5a2963e9
 SHA512:
-  metadata.gz: c3873c8aa83f4ff9beaf7d6f819a4e823a97518a4d68c7d15f3d9193204ab27b6f6b157944b7c8f2c1bcf7573709011598a2d025951a25e513e8f8a3ce50f1c1
-  data.tar.gz: 57a96a51c5e91ce0e8602cde488851e023e4d5966e90b7f021b046bd2db992538bdf669fee5c7fd12018c26514adb70d5a16c976e13a5d72858ee9cc6fc0b815
+  metadata.gz: 13d628925678ca174113efebf83567afe2624433030bcb6220357ca0c68084cb60f73d589034e9d0d8a6cbb2d966a68979db4c86c5f7609511f3faf12b6bb2ff
+  data.tar.gz: eaa696efdaeb63702871a4a6cb41147bd6916d4fe203cbe9518079a99f6fa08120914e37704ff6a883acd1f9b713498461c3a1fa52d29ce0471ddb593620fa00

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## [Unreleased]
 
+## [1.1.0] - 2026-06-29
+
+### Added
+
+- `RubyCms::MigrationReconciler` — partial-install recovery: stamps already-applied `noticed` migrations (`create_noticed_tables`, `add_notifications_count_to_noticed_event`) when their tables/columns already exist, so a re-run with duplicate migration files no longer fails `db:migrate`
+- `rails ruby_cms:reconcile_migrations` rake task to run the reconciler manually
+- Installer skips `noticed:install:migrations` when noticed migrations/tables are already present, and reconciles before `db:migrate`
+
+## [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/generators/ruby_cms/templates/lib/tasks/ruby_cms.rake

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 namespace :ruby_cms do
+  desc "Stamp duplicate noticed migrations when tables already exist (partial install recovery)"
+  task reconcile_migrations: :environment do
+    require "ruby_cms/migration_reconciler"
+    RubyCms::MigrationReconciler.new(app_root: Rails.root).reconcile!
+  end
+
   desc "Create default permissions/settings and grant manage_admin to admin users"
   task seed_permissions: :environment do
     Permission.ensure_defaults!

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

@@ -10,6 +10,7 @@ require "ruby_cms/file_installer"
 require "ruby_cms/routes_assembler"
 require "ruby_cms/nav_assembler"
 require "ruby_cms/migration_installer"
+require "ruby_cms/migration_reconciler"
 require "ruby_cms/lockfile"
 
 module RubyCms
@@ -114,14 +115,42 @@ module RubyCms
     def run_framework_steps(modules)
       steps = BASE_FRAMEWORK_STEPS.dup
       steps.insert(2, AHOY_STEP) if modules.any? {|m| m.key == :analytics }
-      steps.each {|cmd| @shell.run(cmd) }
+      steps.each {|cmd| run_framework_step(cmd) }
+    end
+
+    def run_framework_step(cmd)
+      if cmd.include?("noticed:install:migrations") && noticed_already_setup?
+        @shell.ok("notifications", hint: "migrations already present")
+        return
+      end
+
+      @shell.run(cmd)
+    end
+
+    def noticed_already_setup?
+      migrate = Pathname(@app_root).join("db/migrate")
+      return true if migrate.glob("*create_noticed_tables*.rb").any?
+
+      return false unless defined?(ActiveRecord::Base)
+
+      ActiveRecord::Base.connection.table_exists?(:noticed_events)
+    rescue StandardError
+      false
     end
 
     def run_rails_steps
+      reconcile_migrations
       run_critical("bin/rails db:migrate")
       @shell.run("bin/rails ruby_cms:seed_permissions")
     end
 
+    def reconcile_migrations
+      @shell.run(
+        'bin/rails runner "require \"ruby_cms/migration_reconciler\"; ' \
+        'RubyCms::MigrationReconciler.new(app_root: Rails.root).reconcile!"'
+      )
+    end
+
     # Run a command the rest of the install depends on; abort with a clear message
     # (rather than limping on to a misleading "installed") when it fails.
     def run_critical(cmd)

data/lib/ruby_cms/migration_reconciler.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "pathname"
+
+module RubyCms
+  # Stamps pending framework migrations when their schema is already present.
+  # Covers partial installs where tables were created under an older timestamp
+  # and a re-run added duplicate migration files.
+  class MigrationReconciler
+    NOTICED_PATTERNS = [
+      "*create_noticed_tables*.rb",
+      "*add_notifications_count_to_noticed*.rb"
+    ].freeze
+
+    def initialize(app_root:)
+      @migrate_dir = Pathname(app_root).join("db/migrate")
+    end
+
+    def reconcile!
+      return unless defined?(ActiveRecord::Base)
+
+      conn = ActiveRecord::Base.connection
+      return unless conn.table_exists?(:noticed_events)
+
+      stamp_pending!(@migrate_dir.glob(NOTICED_PATTERNS[0]))
+      return unless conn.column_exists?(:noticed_events, :notifications_count)
+
+      stamp_pending!(@migrate_dir.glob(NOTICED_PATTERNS[1]))
+    end
+
+    private
+
+    def stamp_pending!(paths)
+      paths.each do |path|
+        version = path.basename.to_s[/\A(\d+)_/, 1]
+        next unless version
+        next if schema_migration.where(version: version).exists?
+
+        schema_migration.create!(version: version)
+      end
+    end
+
+    def schema_migration
+      ActiveRecord::SchemaMigration
+    end
+  end
+end

data/lib/ruby_cms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_cms
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Codebyjob
@@ -682,6 +682,7 @@ files:
 - lib/ruby_cms/manifest.rb
 - lib/ruby_cms/manifest_data.rb
 - lib/ruby_cms/migration_installer.rb
+- lib/ruby_cms/migration_reconciler.rb
 - lib/ruby_cms/nav_assembler.rb
 - lib/ruby_cms/passkey_wiring.rb
 - lib/ruby_cms/path_map.rb