jetstream_bridge 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e0d3ee00b372ffe54ceca93b81a7c573385f6b85f16f584f15e8c5eef82cd44
-  data.tar.gz: b56fa1bc39e3b598719bced5b0be60172cd953214bee399c00341fd1f2d00906
+  metadata.gz: 4b7171c9e1932f55d61a904c1e372b65ba56d2fa0eced6f72ac42b6d4f3f7020
+  data.tar.gz: 8f6defde8bdf18e5421401a5b357c12b4d958efeaa91bf4963d4e253e29551ef
 SHA512:
-  metadata.gz: 342b6b3431d3768b843060402ededa4dcca39100c1d0c005153a3ea4f758a9ab6aff9a09e5d608444acbb332766cfb926f3c1555afb8d9df882cfcdb7a8b405f
-  data.tar.gz: eb257f387a461444121cb304c36e9fa3ce13062c81a8bc43c0cda4e6f6c706c2efa8cc7a4cf3fdfc721cedeab1d11f0ca8bb00e943644c01575d051f5e143c19
+  metadata.gz: 798ccab4db891332fd08acfa888e400a06b49d79e1ce835729f59536e365fb953cb12ace04e3f55973823716c0b8b955245f0f7a6dd5c1895a35cd403eb8ee76
+  data.tar.gz: 36c5b015c44a74213c11bd5bcd769dfd97409b4c022b9c3c569d587ff2c356a9b7eb59c36772be9601fe11f7a8a8fa4551f36a44a5ab4046f07f129c87b0c7b8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jetstream_bridge (1.7.0)
+    jetstream_bridge (1.8.0)
       activerecord (>= 6.0)
       activesupport (>= 6.0)
       nats-pure (~> 2.4)
@@ -142,8 +142,6 @@ GEM
       racc (~> 1.4)
     nokogiri (1.18.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.7-x86_64-linux-gnu)
-      racc (~> 1.4)
     parallel (1.27.0)
     parser (3.3.9.0)
       ast (~> 2.4.1)

data/lib/jetstream_bridge/models/inbox_event.rb

@@ -3,62 +3,59 @@
 begin
   require 'active_record'
 rescue LoadError
-  # No-op; shim below if AR missing.
+  # No-op; shim defined below.
 end
 
 module JetstreamBridge
-  # Default Inbox model when `use_inbox` is enabled.
-  # Prefers event_id, but can fall back to (stream, stream_seq).
   if defined?(ActiveRecord::Base)
     class InboxEvent < ActiveRecord::Base
       self.table_name = 'jetstream_inbox_events'
 
       class << self
-        def column?(name) = column_names.include?(name.to_s)
+        def has_column?(name)
+          return false unless ar_connected?
 
-        def attribute_json?(name)
-          return false unless respond_to?(:attribute_types) && attribute_types.key?(name.to_s)
-          attribute_types[name.to_s].to_s.downcase.include?('json')
+          connection.schema_cache.columns_hash(table_name).key?(name.to_s)
+        rescue ActiveRecord::ConnectionNotEstablished, ActiveRecord::NoDatabaseError
+          false
         end
-      end
 
-      if column?(:payload)
-        serialize :payload, coder: JSON unless attribute_json?(:payload)
-      end
-      if column?(:headers)
-        serialize :headers, coder: JSON unless attribute_json?(:headers)
+        def ar_connected?
+          ActiveRecord::Base.connected? && connection_pool.active_connection?
+        rescue StandardError
+          false
+        end
       end
 
-      if column?(:event_id)
-        validates :event_id, presence: true, uniqueness: true
-      elsif column?(:stream_seq)
-        validates :stream_seq, presence: true
-        validates :stream, presence: true, if: -> { self.class.column?(:stream) }
-        if column?(:stream)
+      # Validations guarded by safe checks
+      if_condition = -> { self.class.has_column?(:event_id) }
+      unless_condition = -> { !self.class.has_column?(:event_id) }
+
+      validates :event_id, presence: true, uniqueness: true, if: if_condition
+
+      with_options if: unless_condition do
+        validates :stream_seq, presence: true, if: -> { self.class.has_column?(:stream_seq) }
+        # uniqueness scoped to stream when both present
+        if has_column?(:stream) && has_column?(:stream_seq)
           validates :stream_seq, uniqueness: { scope: :stream }
-        else
+        elsif has_column?(:stream_seq)
           validates :stream_seq, uniqueness: true
         end
       end
 
-      validates :subject, presence: true, if: -> { self.class.column?(:subject) }
-
-      if self.class.column?(:status)
-        STATUSES = %w[received processing processed failed].freeze
-        validates :status, inclusion: { in: STATUSES }
-      end
-
-      scope :processed, -> { where(status: 'processed') }, if: -> { column?(:status) }
+      validates :subject, presence: true, if: -> { self.class.has_column?(:subject) }
 
       before_validation do
-        self.status      ||= 'received' if self.class.column?(:status) && status.blank?
-        self.received_at ||= Time.now.utc if self.class.column?(:received_at) && received_at.blank?
+        self.status ||= 'received' if self.class.has_column?(:status) && status.blank?
+        if self.class.has_column?(:received_at) && received_at.blank?
+          self.received_at ||= Time.now.utc
+        end
       end
 
       def processed?
-        if self.class.column?(:processed_at)
+        if self.class.has_column?(:processed_at)
           processed_at.present?
-        elsif self.class.column?(:status)
+        elsif self.class.has_column?(:status)
           status == 'processed'
         else
           false
@@ -68,8 +65,12 @@ module JetstreamBridge
       def payload_hash
         v = self[:payload]
         case v
-        when String then JSON.parse(v) rescue {}
-        when Hash   then v
+        when String then begin
+          JSON.parse(v)
+        rescue StandardError
+          {}
+        end
+        when Hash then v
         else v.respond_to?(:as_json) ? v.as_json : {}
         end
       end
@@ -81,15 +82,17 @@ module JetstreamBridge
           raise_missing_ar!('Inbox', method_name)
         end
 
-        def respond_to_missing?(_name, _priv = false) = false
+        def respond_to_missing?(_m, _p = false)
+          false
+        end
 
         private
 
         def raise_missing_ar!(which, method_name)
           raise(
             "#{which} requires ActiveRecord (tried to call ##{method_name}). " \
-              'Enable `use_inbox` only in apps with ActiveRecord, or add ' \
-              '`gem "activerecord"` to your Gemfile.'
+            'Enable `use_inbox` only in apps with ActiveRecord, or add ' \
+            '`gem "activerecord"` to your Gemfile.'
           )
         end
       end

data/lib/jetstream_bridge/models/outbox_event.rb

@@ -3,80 +3,68 @@
 begin
   require 'active_record'
 rescue LoadError
-  # No-op; we provide a shim below if AR is missing.
+  # No-op; shim defined below.
 end
 
 module JetstreamBridge
-  # Default Outbox model when `use_outbox` is enabled.
-  # Works with event-centric columns and stays compatible with legacy resource_* fields.
   if defined?(ActiveRecord::Base)
     class OutboxEvent < ActiveRecord::Base
       self.table_name = 'jetstream_outbox_events'
 
       class << self
-        def column?(name) = column_names.include?(name.to_s)
-
-        def attribute_json?(name)
-          return false unless respond_to?(:attribute_types) && attribute_types.key?(name.to_s)
-          attribute_types[name.to_s].to_s.downcase.include?('json')
+        # Safe column presence check that never boots a connection during class load.
+        def has_column?(name)
+          return false unless ar_connected?
+          connection.schema_cache.columns_hash(table_name).key?(name.to_s)
+        rescue ActiveRecord::ConnectionNotEstablished, ActiveRecord::NoDatabaseError
+          false
         end
-      end
 
-      # JSON casting fallback if column is text
-      if column?(:payload)
-        serialize :payload, coder: JSON unless attribute_json?(:payload)
-      end
-      if column?(:headers)
-        serialize :headers, coder: JSON unless attribute_json?(:headers)
+        def ar_connected?
+          # Use connected? and avoid retrieving/creating a connection
+          ActiveRecord::Base.connected? && connection_pool.active_connection?
+        rescue
+          false
+        end
       end
 
-      # Validations (guarded by column existence)
-      validates :payload, presence: true, if: -> { self.class.column?(:payload) }
+      # ---- Validations guarded by safe schema checks (evaluated at validation time) ----
+      validates :payload, presence: true, if: -> { self.class.has_column?(:payload) }
 
-      if self.class.column?(:event_id)
+      with_options if: -> { self.class.has_column?(:event_id) } do
         validates :event_id, presence: true, uniqueness: true
-      else
-        validates :resource_type, presence: true, if: -> { self.class.column?(:resource_type) }
-        validates :resource_id,   presence: true, if: -> { self.class.column?(:resource_id) }
-        validates :event_type,    presence: true, if: -> { self.class.column?(:event_type) }
       end
 
-      validates :subject, presence: true, if: -> { self.class.column?(:subject) }
-
-      if self.class.column?(:status)
-        STATUSES = %w[pending publishing sent failed].freeze
-        validates :status, inclusion: { in: STATUSES }
+      with_options if: -> { !self.class.has_column?(:event_id) } do
+        validates :resource_type, presence: true, if: -> { self.class.has_column?(:resource_type) }
+        validates :resource_id,   presence: true, if: -> { self.class.has_column?(:resource_id) }
+        validates :event_type,    presence: true, if: -> { self.class.has_column?(:event_type) }
       end
 
-      if self.class.column?(:attempts)
-        validates :attempts, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
-      end
+      validates :subject, presence: true, if: -> { self.class.has_column?(:subject) }
 
-      # Scopes (optional)
-      scope :pending,       -> { where(status: 'pending') },        if: -> { column?(:status) }
-      scope :publishing,    -> { where(status: 'publishing') },     if: -> { column?(:status) }
-      scope :failed,        -> { where(status: 'failed') },         if: -> { column?(:status) }
-      scope :sent,          -> { where(status: 'sent') },           if: -> { column?(:status) }
-      scope :ready_to_send, -> { where(status: %w[pending failed]) }, if: -> { column?(:status) }
+      validates :attempts, numericality: { only_integer: true, greater_than_or_equal_to: 0 },
+                if: -> { self.class.has_column?(:attempts) }
 
+      # Defaults that do not require schema at load time
       before_validation do
         now = Time.now.utc
-        self.status     ||= 'pending' if self.class.column?(:status)     && status.blank?
-        self.enqueued_at ||= now      if self.class.column?(:enqueued_at) && enqueued_at.blank?
-        self.attempts     = 0         if self.class.column?(:attempts)   && attempts.nil?
+        self.status     ||= 'pending' if self.class.has_column?(:status)     && status.blank?
+        self.enqueued_at ||= now      if self.class.has_column?(:enqueued_at) && enqueued_at.blank?
+        self.attempts     = 0         if self.class.has_column?(:attempts)   && attempts.nil?
       end
 
-      # Helpers (no-ops if columns missing)
+      # Helpers
       def mark_sent!
         now = Time.now.utc
-        self.status  = 'sent' if self.class.column?(:status)
-        self.sent_at = now    if self.class.column?(:sent_at)
+        self.status  = 'sent' if self.class.has_column?(:status)
+        self.sent_at = now    if self.class.has_column?(:sent_at)
         save!
       end
 
       def mark_failed!(err_msg)
-        self.status     = 'failed' if self.class.column?(:status)
-        self.last_error = err_msg  if self.class.column?(:last_error)
+        self.status     = 'failed' if self.class.has_column?(:status)
+        self.last_error = err_msg  if self.class.has_column?(:last_error)
         save!
       end
 
@@ -90,17 +78,15 @@ module JetstreamBridge
       end
     end
   else
-    # Shim: friendly error if AR is not available.
+    # Shim: loud failure if AR isn't present but someone calls the model.
     class OutboxEvent
       class << self
         def method_missing(method_name, *_args, &_block)
           raise_missing_ar!('Outbox', method_name)
         end
-
-        def respond_to_missing?(_name, _priv = false) = false
+        def respond_to_missing?(_m, _p = false) = false
 
         private
-
         def raise_missing_ar!(which, method_name)
           raise(
             "#{which} requires ActiveRecord (tried to call ##{method_name}). " \

data/lib/jetstream_bridge/railtie.rb

@@ -1,10 +1,35 @@
 # frozen_string_literal: true
 
-require 'rails/railtie'
-
+# lib/jetstream_bridge/railtie.rb
 module JetstreamBridge
-  # Railtie for JetstreamBridge.
   class Railtie < ::Rails::Railtie
+    initializer 'jetstream_bridge.defer_model_tweaks' do
+      ActiveSupport.on_load(:active_record) do
+        ActiveSupport::Reloader.to_prepare do
+          # Skip if not connected (e.g., non-DB rake tasks)
+          begin
+            next unless ActiveRecord::Base.connected?
+          rescue StandardError
+            next
+          end
+
+          [JetstreamBridge::OutboxEvent, JetstreamBridge::InboxEvent].each do |klass|
+            next unless klass.table_exists?
+
+            %w[payload headers].each do |attr|
+              next unless klass.columns_hash.key?(attr)
+
+              # Only add serialize if the column is not JSON/JSONB
+              type = klass.type_for_attribute(attr)
+              klass.serialize attr.to_sym, coder: JSON unless type&.json?
+            end
+          rescue ActiveRecord::StatementInvalid, ActiveRecord::ConnectionNotEstablished
+            # Ignore in tasks/environments without DB
+          end
+        end
+      end
+    end
+
     rake_tasks do
       load File.expand_path('tasks/install.rake', __dir__)
     end

data/lib/jetstream_bridge/version.rb

@@ -4,5 +4,5 @@
 #
 # Version constant for the gem.
 module JetstreamBridge
-  VERSION = '1.7.0'
+  VERSION = '1.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetstream_bridge
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Mike Attara