ruby_cms 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8378bd1d90b672968f234d5df8a7aa0e01ee7666d5470cadf6ee548925f6a3c2
-  data.tar.gz: 687e17784aae8bb761450c93265e8bb658d67cdcbdfaa01f5a18b60016692e6b
+  metadata.gz: c0185a46e938019d424aa89089031c85db4426e8c3f82a10b08931a90f61c30f
+  data.tar.gz: 48748adc9faa34afbc0f2c2226732576dce5fe90dbc364ce6f95e818dbc27605
 SHA512:
-  metadata.gz: db5f852d54f456ec852900d3cbd53b609e6f8823f10ec0fe3f06da08d7277a7134ca53add8a8b6a73309f45d7ea6c65f46f493d5e549fff254aac774a3241c82
-  data.tar.gz: 92ba4a9b314f01fb747948bb137d09eed69309ddb4f3a8a9b8430bc7e56c592914253d8ce5eefce8db35ba8693cc4a3b31c9dd447e8c640042100084165cb687
+  metadata.gz: 6498bde78bde18f65d54315fc4ebdddf3791a8fc3c5313d4960e704142453787b4fa9807b76a87e5f4ffa5f71550b1d36d3a122fbcb12bfa899f02c54d96f940
+  data.tar.gz: 7f47ce07cc7a7152464a10d9d24500d8ea29d209c50ac39a2dd6114c9fc8cb76f67061e3bc4443027e249b4c24778e448d39f3b711d8a47654346776db25b14c

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## [Unreleased]
 
+## [1.1.1] - 2026-06-29
+
+### Fixed
+
+- SQLite compatibility: new `RubyCms::MigrationHelpers.json_column` picks `jsonb` on PostgreSQL and `json` elsewhere; all gem migrations (`content_block_versions`, `audit_log_entries`, `media_assets`, `command_runs`) use it
+- `media_assets` GIN index on `tags` is now created only on PostgreSQL
+- `MigrationReconciler` stamps via adapter-agnostic raw SQL against the real `schema_migrations` table instead of the `ActiveRecord::SchemaMigration` model
+- Installer reconciles via the `ruby_cms:reconcile_migrations` rake task; CLI shows a "Reconciling migrations" step label
+
+## [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

data/lib/generators/ruby_cms/templates/db/migrate/20260328000001_create_content_block_versions.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "ruby_cms/migration_helpers"
+
 class CreateContentBlockVersions < ActiveRecord::Migration[7.1]
   def change
     create_table :content_block_versions, if_not_exists: true do |t|
@@ -12,7 +14,7 @@ class CreateContentBlockVersions < ActiveRecord::Migration[7.1]
       t.string :content_type, null: false
       t.boolean :published, null: false, default: true
       t.string :event, null: false, default: "update"
-      t.jsonb :metadata, default: {}
+      RubyCms::MigrationHelpers.json_column(t, :metadata, default: {})
       t.datetime :created_at, null: false
     end
 

data/lib/generators/ruby_cms/templates/db/migrate/20260525120000_create_audit_log_entries.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "ruby_cms/migration_helpers"
+
 class CreateAuditLogEntries < ActiveRecord::Migration[8.0]
   def change
     create_table :audit_log_entries, if_not_exists: true do |t|
@@ -12,7 +14,7 @@ class CreateAuditLogEntries < ActiveRecord::Migration[8.0]
       t.string  :summary,      limit: 500
       t.string  :ip,           limit: 64
       t.string  :user_agent,   limit: 500
-      t.jsonb   :metadata,     null: false, default: {}
+      RubyCms::MigrationHelpers.json_column(t, :metadata, null: false, default: {})
       t.datetime :created_at,  null: false
     end
 

data/lib/generators/ruby_cms/templates/db/migrate/20260525140000_create_media_assets.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "ruby_cms/migration_helpers"
+
 class CreateMediaAssets < ActiveRecord::Migration[8.1]
   def change
     create_table :media_assets, if_not_exists: true do |t|
@@ -11,7 +13,7 @@ class CreateMediaAssets < ActiveRecord::Migration[8.1]
       t.integer :width
       t.integer :height
       t.references :uploaded_by, foreign_key: { to_table: :users }, type: :bigint
-      t.jsonb   :tags, default: []
+      RubyCms::MigrationHelpers.json_column(t, :tags, default: [])
       t.string  :tone
       t.integer :used_count, default: 0
       t.timestamps
@@ -20,6 +22,8 @@ class CreateMediaAssets < ActiveRecord::Migration[8.1]
     add_index :media_assets, :folder, if_not_exists: true
     add_index :media_assets, :kind, if_not_exists: true
     add_index :media_assets, :created_at, if_not_exists: true
-    add_index :media_assets, :tags, using: :gin, if_not_exists: true
+    if connection.adapter_name.match?(/postgres/i)
+      add_index :media_assets, :tags, using: :gin, if_not_exists: true
+    end
   end
 end

data/lib/generators/ruby_cms/templates/db/migrate/20260525160000_create_command_runs.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "ruby_cms/migration_helpers"
+
 class CreateCommandRuns < ActiveRecord::Migration[8.1]
   def change
     create_table :command_runs, if_not_exists: true do |t|
@@ -8,7 +10,7 @@ class CreateCommandRuns < ActiveRecord::Migration[8.1]
       t.integer :duration_ms,  null: false, default: 0
       t.text    :output
       t.text    :error_message
-      t.jsonb   :params_used, null: false, default: {}
+      RubyCms::MigrationHelpers.json_column(t, :params_used, null: false, default: {})
       t.references :ran_by, foreign_key: { to_table: :users }, type: :bigint
       t.string :ran_by_label
       t.datetime :started_at, null: false

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

@@ -151,6 +151,7 @@ module RubyCms
         "noticed:install:migrations" => "Installing notifications",
         "db:migrate" => "Running migrations",
         "seed_permissions" => "Seeding permissions",
+        "reconcile_migrations" => "Reconciling migrations",
         "tailwindcss:build" => "Building styles"
       }.freeze
 

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,39 @@ 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 ruby_cms:reconcile_migrations")
+    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_helpers.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module RubyCms
+  # Shared helpers for CMS migrations (json on SQLite, jsonb on PostgreSQL).
+  module MigrationHelpers
+    module_function
+
+    def json_column(table, name, **options)
+      if table.respond_to?(:jsonb)
+        table.jsonb(name, **options)
+      else
+        table.json(name, **options)
+      end
+    end
+  end
+end

data/lib/ruby_cms/migration_reconciler.rb

@@ -0,0 +1,63 @@
+# 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!(conn, @migrate_dir.glob(NOTICED_PATTERNS[0]))
+      return unless conn.column_exists?(:noticed_events, :notifications_count)
+
+      stamp_pending!(conn, @migrate_dir.glob(NOTICED_PATTERNS[1]))
+    end
+
+    private
+
+    def stamp_pending!(conn, paths)
+      paths.each do |path|
+        version = path.basename.to_s[/\A(\d+)_/, 1]
+        next unless version
+        next if migration_recorded?(conn, version)
+
+        conn.execute(
+          ActiveRecord::Base.sanitize_sql_array(
+            ["INSERT INTO #{schema_migrations_table(conn)} (version) VALUES (?)", version]
+          )
+        )
+      end
+    end
+
+    def migration_recorded?(conn, version)
+      conn.select_value(
+        ActiveRecord::Base.sanitize_sql_array(
+          ["SELECT 1 FROM #{schema_migrations_table(conn)} WHERE version = ? LIMIT 1", version]
+        )
+      )
+    end
+
+    def schema_migrations_table(conn)
+      if conn.respond_to?(:schema_migration) && conn.schema_migration.respond_to?(:table_name)
+        conn.schema_migration.table_name
+      else
+        "schema_migrations"
+      end
+    end
+  end
+end

data/lib/ruby_cms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_cms
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Codebyjob
@@ -681,7 +681,9 @@ files:
 - lib/ruby_cms/lockfile.rb
 - lib/ruby_cms/manifest.rb
 - lib/ruby_cms/manifest_data.rb
+- lib/ruby_cms/migration_helpers.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