pgbus 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69a6790c65867a2b802baeb5063ddaa9f2ca2037699e8c66a321c46ecbeed955
-  data.tar.gz: 439beda605c50814124b96891529e81e1deab4fe6f035c2ec669010646892247
+  metadata.gz: 5b8f740d2e7c3b561a9591c94d08aef98b22566a3f56517c3055e4fab2c76f98
+  data.tar.gz: a6ee24b79ade13317966dee815a49c1d03b2b290dd7635751fa070216fee7d0b
 SHA512:
-  metadata.gz: 96c36a79b909568c58d2072b4a2c15914939a6667386ec7811a67b7b3f1dab26f148b78bfb42d40afcc8cde821c2d8b0abcf1c1012f22c4caeeb15ab60a383b9
-  data.tar.gz: d5a2a508308a08948f66294ecf351563fa63d24abe4fde8e62c1265846b6e00b264f277a972da3b41c024ece3201fed5b12be79db206995f2435b811abe35ea7
+  metadata.gz: 4df75c29bc7aa63b4a37b6425f9adf333d0986225ee99d65b33a125fd12c23f03a4000b5a38a610c39c46608622cb4dce5998864dff16942aa223d0671f006bf
+  data.tar.gz: a8da2aafd4259b0a73502201aad5542ca31a8d7299e9b84e6e62f3413d62582febd947e1b748024fd09975d1e9b8d2efd16601b278367d6a69feb6e8456ad6d0

data/lib/pgbus/configuration.rb

@@ -137,7 +137,11 @@ module Pgbus
       elsif connection_params
         connection_params
       elsif defined?(ActiveRecord::Base)
-        -> { ActiveRecord::Base.connection.raw_connection }
+        if connects_to
+          -> { Pgbus::ApplicationRecord.connection.raw_connection }
+        else
+          -> { ActiveRecord::Base.connection.raw_connection }
+        end
       else
         raise ConfigurationError, "No database connection configured. " \
                                   "Set Pgbus.configuration.database_url, connection_params, or use with Rails."

data/lib/pgbus/engine.rb

@@ -6,6 +6,12 @@ module Pgbus
   class Engine < ::Rails::Engine
     isolate_namespace Pgbus
 
+    # When pgbus was loaded before Rails, a separate Zeitwerk loader manages
+    # app/models. Tear it down before Rails' autoloader claims the same paths.
+    initializer "pgbus.release_models_loader", before: :set_autoload_paths do
+      Pgbus.teardown_models_loader!
+    end
+
     initializer "pgbus.configure" do |app|
       config_path = app.root.join("config", "pgbus.yml")
       Pgbus::ConfigLoader.load(config_path) if config_path.exist?

data/lib/pgbus/process/worker.rb

@@ -107,7 +107,8 @@ module Pgbus
         dlq_suffix = config.dead_letter_queue_suffix
         prefix = "#{config.queue_prefix}_"
 
-        all_queues = ActiveRecord::Base.connection.select_values("SELECT queue_name FROM pgmq.meta ORDER BY queue_name")
+        conn = Pgbus.configuration.connects_to ? Pgbus::ApplicationRecord.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) }
                    .map { |q| q.delete_prefix(prefix) }

data/lib/pgbus/version.rb

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

data/lib/pgbus.rb

@@ -18,16 +18,33 @@ module Pgbus
         loader.inflector.inflect("pgbus" => "Pgbus", "cli" => "CLI", "dsl" => "DSL")
         loader.ignore("#{__dir__}/generators")
         loader.ignore("#{__dir__}/active_job")
-        # Register app/models for non-Rails usage (specs, standalone).
-        # When Rails is running, the Engine handles autoloading app/models.
-        unless defined?(Rails::Engine)
-          models_dir = File.expand_path("../app/models", __dir__)
-          loader.push_dir(models_dir) if File.directory?(models_dir)
-        end
         loader
       end
     end
 
+    # Separate loader for app/models used only in non-Rails contexts (specs,
+    # standalone scripts). When the Engine boots, Rails' autoloader takes over
+    # app/models and this loader is torn down to avoid conflicts.
+    def models_loader
+      models_dir = File.expand_path("../app/models", __dir__)
+      return nil unless File.directory?(models_dir)
+
+      @models_loader ||= begin
+        loader = Zeitwerk::Loader.new
+        loader.tag = "pgbus-models"
+        loader.push_dir(models_dir)
+        loader.setup
+        loader
+      end
+    end
+
+    def teardown_models_loader!
+      return unless @models_loader
+
+      @models_loader.unregister
+      @models_loader = nil
+    end
+
     def configuration
       @configuration ||= Configuration.new
     end
@@ -52,6 +69,10 @@ module Pgbus
   end
 
   loader.setup
+
+  # In non-Rails contexts, set up model autoloading via a separate loader.
+  # This is torn down by the Engine initializer when Rails boots.
+  models_loader unless defined?(Rails::Engine)
 end
 
 require "active_job/queue_adapters/pgbus_adapter" if defined?(ActiveJob)

data/lib/tasks/pgbus_pgmq.rake

@@ -12,8 +12,10 @@ namespace :pgbus do
       latest = Pgbus::PgmqSchema.latest_version
       puts "Vendored version:  #{latest}"
 
-      if ActiveRecord::Base.connection.table_exists?("pgbus_pgmq_schema_versions")
-        row = ActiveRecord::Base.connection.select_one(
+      conn = Pgbus.configuration.connects_to ? Pgbus::ApplicationRecord.connection : ActiveRecord::Base.connection
+
+      if conn.table_exists?("pgbus_pgmq_schema_versions")
+        row = conn.select_one(
           "SELECT version, install_method, installed_at FROM pgbus_pgmq_schema_versions ORDER BY installed_at DESC LIMIT 1"
         )
         if row
@@ -32,7 +34,7 @@ namespace :pgbus do
         end
       else
         # Check if pgmq schema exists at all
-        schema_exists = ActiveRecord::Base.connection.select_value(
+        schema_exists = conn.select_value(
           "SELECT 1 FROM information_schema.schemata WHERE schema_name = 'pgmq'"
         )
         if schema_exists

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbus
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Mikael Henriksson