pgbus 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daac3606ba66624f54b5b6cf8db0830827c2ce0492b7d6d38ce347d1e0f3aeb2
-  data.tar.gz: ad7eb6ea7beae1e07a813cac5cac37980671f8106f2ac7444a127a81d6f7a2e3
+  metadata.gz: cfd2ea5ccec3e3715dbcf2dd409a652527cf1d9e18c60fe4d5797fd5cf5be6ec
+  data.tar.gz: 6983d4977aeb792ba0857884752a8b662a15164cde8cd6ee3bb5406d95d7f225
 SHA512:
-  metadata.gz: f7a513fd3e2f7aac5a3c0db040a3e7b6b11b6c4c0f619f6f0d37ebbf3e2cd6336737af20e4a7a00da19a1937d5be2b8e24d666483bf661005422c04bbac1805c
-  data.tar.gz: 255c0382fbc4f4b797577757ebe5bfa9611f350456292d78e41678d6ebe834c52a5588e2f902159b0c5467becb076f0b724b8dc782b21dfb0d423404dc31d178
+  metadata.gz: c6f3e19f1e3fe2d5eae02fe52dcd2878f5bbcb13cd7387a41b3902ad91cb8c20ce2d1e3c606488bdce1c901126d1192f7a34747e8746c397d016d0c2541a8828
+  data.tar.gz: da5ed5a1a2012d757547e3e2f1f48586a84e7d096df91a793d9ba18f76da881e52dab650d4fb3c605c4da6de06b1e8b58b0d11c99bd90e30ef64b3c368c44093

data/app/controllers/pgbus/application_controller.rb

@@ -57,8 +57,11 @@ module Pgbus
     end
 
     def available_locales
-      @available_locales ||= Dir[Pgbus::Engine.root.join("config", "locales", "*.yml")]
-                             .map { |f| File.basename(f, ".yml").to_sym }
+      @available_locales ||= begin
+        pgbus_locales = Dir[Pgbus::Engine.root.join("config", "locales", "*.yml")]
+                        .map { |f| File.basename(f, ".yml").to_sym }
+        pgbus_locales & I18n.available_locales
+      end
     end
     helper_method :available_locales
 

data/app/models/pgbus/application_record.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 module Pgbus
-  class ApplicationRecord < ActiveRecord::Base
+  # Backward-compatible alias — host apps that subclassed
+  # Pgbus::ApplicationRecord will continue to work.
+  # New code should inherit from Pgbus::BusRecord directly.
+  class ApplicationRecord < BusRecord
     self.abstract_class = true
   end
 end

data/app/models/pgbus/batch_entry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pgbus
-  class BatchEntry < ApplicationRecord
+  class BatchEntry < BusRecord
     self.table_name = "pgbus_batches"
 
     COUNTER_COLUMNS = %w[completed_jobs discarded_jobs].freeze

data/app/models/pgbus/blocked_execution.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pgbus
-  class BlockedExecution < ApplicationRecord
+  class BlockedExecution < BusRecord
     self.table_name = "pgbus_blocked_executions"
 
     scope :for_key, ->(key) { where(concurrency_key: key) }

data/app/models/pgbus/job_lock.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pgbus
-  class JobLock < Pgbus::ApplicationRecord
+  class JobLock < BusRecord
     self.table_name = "pgbus_job_locks"
 
     # States:

data/app/models/pgbus/job_stat.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pgbus
-  class JobStat < Pgbus::ApplicationRecord
+  class JobStat < BusRecord
     self.table_name = "pgbus_job_stats"
 
     scope :since, ->(time) { where("created_at >= ?", time) }

data/app/models/pgbus/outbox_entry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pgbus
-  class OutboxEntry < Pgbus::ApplicationRecord
+  class OutboxEntry < BusRecord
     self.table_name = "pgbus_outbox_entries"
 
     scope :unpublished, -> { where(published_at: nil) }

data/app/models/pgbus/process_entry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pgbus
-  class ProcessEntry < ApplicationRecord
+  class ProcessEntry < BusRecord
     self.table_name = "pgbus_processes"
 
     scope :stale, ->(threshold) { where("last_heartbeat_at < ?", threshold) }

data/app/models/pgbus/processed_event.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pgbus
-  class ProcessedEvent < ApplicationRecord
+  class ProcessedEvent < BusRecord
     self.table_name = "pgbus_processed_events"
 
     scope :expired, ->(before) { where("processed_at < ?", before) }

data/app/models/pgbus/queue_state.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pgbus
-  class QueueState < Pgbus::ApplicationRecord
+  class QueueState < BusRecord
     self.table_name = "pgbus_queue_states"
 
     scope :paused, -> { where(paused: true) }

data/app/models/pgbus/recurring_execution.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pgbus
-  class RecurringExecution < ApplicationRecord
+  class RecurringExecution < BusRecord
     self.table_name = "pgbus_recurring_executions"
 
     validates :task_key, presence: true

data/app/models/pgbus/recurring_task.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pgbus
-  class RecurringTask < ApplicationRecord
+  class RecurringTask < BusRecord
     self.table_name = "pgbus_recurring_tasks"
 
     validates :key, presence: true, uniqueness: true

data/app/models/pgbus/semaphore.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pgbus
-  class Semaphore < ApplicationRecord
+  class Semaphore < BusRecord
     self.table_name = "pgbus_semaphores"
 
     scope :expired, ->(now = Time.current) { where("expires_at < ? OR value <= 0", now) }

data/lib/pgbus/bus_record.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "active_record"
+
+module Pgbus
+  # Base class for all Pgbus ActiveRecord models.
+  #
+  # Lives in lib/pgbus/ so the main Zeitwerk gem loader picks it up
+  # regardless of Rails engine boot order. This avoids the NameError
+  # that occurs when a host app uses selective railtie requires
+  # (require "rails" + individual railties instead of require "rails/all")
+  # and the engine's app/models path isn't registered yet.
+  class BusRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

data/lib/pgbus/configuration.rb

@@ -201,7 +201,7 @@ module Pgbus
         connection_params
       elsif defined?(ActiveRecord::Base)
         if connects_to
-          -> { Pgbus::ApplicationRecord.connection.raw_connection }
+          -> { Pgbus::BusRecord.connection.raw_connection }
         else
           -> { ActiveRecord::Base.connection.raw_connection }
         end

data/lib/pgbus/engine.rb

@@ -27,7 +27,7 @@ module Pgbus
 
     initializer "pgbus.db" do
       ActiveSupport.on_load(:active_record) do
-        Pgbus::ApplicationRecord.connects_to(**Pgbus.configuration.connects_to) if Pgbus.configuration.connects_to
+        Pgbus::BusRecord.connects_to(**Pgbus.configuration.connects_to) if Pgbus.configuration.connects_to
       end
     end
 

data/lib/pgbus/process/consumer_priority.rb

@@ -27,7 +27,7 @@ module Pgbus
       # that share at least one queue with the given queue list,
       # excluding the current worker (by PID).
       def self.max_active_priority(queues, my_pid)
-        conn = Pgbus.configuration.connects_to ? Pgbus::ApplicationRecord.connection : ActiveRecord::Base.connection
+        conn = Pgbus.configuration.connects_to ? Pgbus::BusRecord.connection : ActiveRecord::Base.connection
         rows = conn.select_all(
           "SELECT metadata FROM pgbus_processes WHERE kind = 'worker' AND pid != $1 AND last_heartbeat_at > $2",
           "Pgbus ConsumerPriority",

data/lib/pgbus/process/dispatcher.rb

@@ -180,7 +180,7 @@ module Pgbus
         batch_size = config.archive_compaction_batch_size || 1000
         prefix = config.queue_prefix
 
-        conn = config.connects_to ? Pgbus::ApplicationRecord.connection : ActiveRecord::Base.connection
+        conn = config.connects_to ? Pgbus::BusRecord.connection : ActiveRecord::Base.connection
         queue_names = conn.select_values("SELECT queue_name FROM pgmq.meta ORDER BY queue_name")
 
         queue_names.each do |full_name|

data/lib/pgbus/process/queue_lock.rb

@@ -77,7 +77,7 @@ module Pgbus
 
       def connection
         if Pgbus.configuration.connects_to
-          Pgbus::ApplicationRecord.connection
+          Pgbus::BusRecord.connection
         else
           ActiveRecord::Base.connection
         end

data/lib/pgbus/process/worker.rb

@@ -191,7 +191,7 @@ module Pgbus
         dlq_suffix = config.dead_letter_queue_suffix
         prefix = "#{config.queue_prefix}_"
 
-        conn = Pgbus.configuration.connects_to ? Pgbus::ApplicationRecord.connection : ActiveRecord::Base.connection
+        conn = Pgbus.configuration.connects_to ? Pgbus::BusRecord.connection : ActiveRecord::Base.connection
         all_queues = conn.select_values("SELECT queue_name FROM pgmq.meta ORDER BY queue_name")
         resolved = all_queues
                    .reject { |q| q.end_with?(dlq_suffix) }

data/lib/pgbus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pgbus
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/pgbus/web/data_source.rb

@@ -561,7 +561,7 @@ module Pgbus
       private
 
       def connection
-        Pgbus::ApplicationRecord.connection
+        Pgbus::BusRecord.connection
       end
 
       # name is the full PGMQ queue name (already prefixed)

data/lib/pgbus.rb

@@ -83,6 +83,10 @@ module Pgbus
     def logger
       configuration.logger
     end
+
+    def logger=(value)
+      configuration.logger = value
+    end
   end
 
   loader.setup

data/lib/tasks/pgbus_pgmq.rake

@@ -12,7 +12,7 @@ namespace :pgbus do
       latest = Pgbus::PgmqSchema.latest_version
       puts "Vendored version:  #{latest}"
 
-      conn = Pgbus.configuration.connects_to ? Pgbus::ApplicationRecord.connection : ActiveRecord::Base.connection
+      conn = Pgbus.configuration.connects_to ? Pgbus::BusRecord.connection : ActiveRecord::Base.connection
 
       if conn.table_exists?("pgbus_pgmq_schema_versions")
         row = conn.select_one(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbus
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Mikael Henriksson
@@ -211,6 +211,7 @@ files:
 - lib/pgbus/active_job/adapter.rb
 - lib/pgbus/active_job/executor.rb
 - lib/pgbus/batch.rb
+- lib/pgbus/bus_record.rb
 - lib/pgbus/circuit_breaker.rb
 - lib/pgbus/cli.rb
 - lib/pgbus/client.rb