jetstream_bridge 1.8.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b7171c9e1932f55d61a904c1e372b65ba56d2fa0eced6f72ac42b6d4f3f7020
-  data.tar.gz: 8f6defde8bdf18e5421401a5b357c12b4d958efeaa91bf4963d4e253e29551ef
+  metadata.gz: 1fef54e5e8426e80c735e83ef11cf816643af9a0a8c3fac97089239f0b3743a7
+  data.tar.gz: 17442379f0f1a984fd89976b814a69752c83ec7efe4cc33602fb2998602999ce
 SHA512:
-  metadata.gz: 798ccab4db891332fd08acfa888e400a06b49d79e1ce835729f59536e365fb953cb12ace04e3f55973823716c0b8b955245f0f7a6dd5c1895a35cd403eb8ee76
-  data.tar.gz: 36c5b015c44a74213c11bd5bcd769dfd97409b4c022b9c3c569d587ff2c356a9b7eb59c36772be9601fe11f7a8a8fa4551f36a44a5ab4046f07f129c87b0c7b8
+  metadata.gz: 690ec24627cce26f73db546832083ed823ef4481451523260daf0d3802376ac999f631f8d56abd5a949d8a942210881b9da8656c0489264328215c5428db26b4
+  data.tar.gz: a7d17b77244fe5c3c260dad42c31cba8ddeef4988d96a0722cafc46cf5792d02e91f23332d0873d0230f624a331563652f2928e2219fde1572412dd6a4cca440

data/.rubocop.yml

@@ -5,10 +5,6 @@ plugins:
   - rubocop-performance
   - rubocop-packaging
 
-# If you keep a generated TODO, uncomment:
-# inherit_from:
-#   - .rubocop_todo.yml
-
 AllCops:
   NewCops: enable
   TargetRubyVersion: 2.7   # match gemspec minimum to avoid false positives

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jetstream_bridge (1.8.0)
+    jetstream_bridge (1.10.0)
       activerecord (>= 6.0)
       activesupport (>= 6.0)
       nats-pure (~> 2.4)

data/lib/jetstream_bridge/core/model_codec_setup.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module JetstreamBridge
+  module ModelCodecSetup
+    module_function
+
+    def apply!
+      return unless ar_connected?
+
+      [JetstreamBridge::OutboxEvent, JetstreamBridge::InboxEvent].each { |k| apply_to(k) }
+    end
+
+    def apply_to(klass)
+      return unless table_exists_safely?(klass)
+
+      %w[payload headers].each do |attr|
+        next unless column?(klass, attr)
+        next if json_column?(klass, attr) || already_serialized?(klass, attr)
+
+        klass.serialize attr.to_sym, coder: JSON
+      end
+    rescue ActiveRecord::StatementInvalid, ActiveRecord::ConnectionNotEstablished, ActiveRecord::NoDatabaseError
+      # ignore when schema isn’t available yet
+    end
+
+    # --- helpers ---
+
+    def ar_connected?
+      ActiveRecord::Base.connected?
+    rescue StandardError
+      false
+    end
+
+    def table_exists_safely?(klass)
+      klass.table_exists?
+    rescue StandardError
+      false
+    end
+
+    def column?(klass, attr)
+      klass.columns_hash.key?(attr)
+    rescue StandardError
+      false
+    end
+
+    def json_column?(klass, attr)
+      sql = klass.columns_hash.fetch(attr).sql_type.to_s.downcase
+      sql.include?('json') # covers json & jsonb
+    rescue StandardError
+      false
+    end
+
+    def already_serialized?(klass, attr)
+      klass.attribute_types.fetch(attr, nil).is_a?(ActiveRecord::Type::Serialized)
+    rescue StandardError
+      false
+    end
+  end
+end

data/lib/jetstream_bridge/models/inbox_event.rb

@@ -12,9 +12,9 @@ module JetstreamBridge
       self.table_name = 'jetstream_inbox_events'
 
       class << self
+        # 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
@@ -22,36 +22,51 @@ module JetstreamBridge
 
         def ar_connected?
           ActiveRecord::Base.connected? && connection_pool.active_connection?
-        rescue StandardError
+        rescue
           false
         end
       end
 
-      # Validations guarded by safe checks
-      if_condition = -> { self.class.has_column?(:event_id) }
-      unless_condition = -> { !self.class.has_column?(:event_id) }
+      # ---- Validations (NO with_options; guard everything with procs) ----
 
-      validates :event_id, presence: true, uniqueness: true, if: if_condition
+      # Preferred dedupe key
+      validates :event_id,
+                presence: true,
+                uniqueness: true,
+                if: -> { self.class.has_column?(:event_id) }
 
-      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 }
-        elsif has_column?(:stream_seq)
-          validates :stream_seq, uniqueness: true
-        end
-      end
+      # Fallback to (stream, stream_seq) when event_id column not present
+      validates :stream_seq,
+                presence: true,
+                if: -> { !self.class.has_column?(:event_id) && self.class.has_column?(:stream_seq) }
 
-      validates :subject, presence: true, if: -> { self.class.has_column?(:subject) }
+      validates :stream_seq,
+                uniqueness: { scope: :stream },
+                if: -> {
+                  !self.class.has_column?(:event_id) &&
+                    self.class.has_column?(:stream_seq) &&
+                    self.class.has_column?(:stream)
+                }
 
+      validates :stream_seq,
+                uniqueness: true,
+                if: -> {
+                  !self.class.has_column?(:event_id) &&
+                    self.class.has_column?(:stream_seq) &&
+                    !self.class.has_column?(:stream)
+                }
+
+      validates :subject,
+                presence: true,
+                if: -> { self.class.has_column?(:subject) }
+
+      # ---- Defaults that do not require schema at load time ----
       before_validation do
-        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
+        self.status      ||= 'received' if self.class.has_column?(:status) && status.blank?
+        self.received_at ||= Time.now.utc if self.class.has_column?(:received_at) && received_at.blank?
       end
 
+      # ---- Helpers ----
       def processed?
         if self.class.has_column?(:processed_at)
           processed_at.present?
@@ -65,34 +80,27 @@ module JetstreamBridge
       def payload_hash
         v = self[:payload]
         case v
-        when String then begin
-          JSON.parse(v)
-        rescue StandardError
-          {}
-        end
-        when Hash then v
+        when String then JSON.parse(v) rescue {}
+        when Hash   then v
         else v.respond_to?(:as_json) ? v.as_json : {}
         end
       end
     end
   else
+    # Shim: loud failure if AR isn't present but someone calls the model.
     class InboxEvent
       class << self
         def method_missing(method_name, *_args, &_block)
           raise_missing_ar!('Inbox', method_name)
         end
-
-        def respond_to_missing?(_m, _p = false)
-          false
-        end
+        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}). " \
-            '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

@@ -21,40 +21,54 @@ module JetstreamBridge
         end
 
         def ar_connected?
-          # Use connected? and avoid retrieving/creating a connection
+          # Avoid creating a connection; rescue if pool isn't set yet.
           ActiveRecord::Base.connected? && connection_pool.active_connection?
         rescue
           false
         end
       end
 
-      # ---- Validations guarded by safe schema checks (evaluated at validation time) ----
-      validates :payload, presence: true, if: -> { self.class.has_column?(:payload) }
+      # ---- Validations guarded by safe schema checks (no with_options) ----
+      validates :payload,
+                presence: true,
+                if: -> { self.class.has_column?(:payload) }
 
-      with_options if: -> { self.class.has_column?(:event_id) } do
-        validates :event_id, presence: true, uniqueness: true
-      end
+      # Preferred path when event_id exists
+      validates :event_id,
+                presence: true,
+                uniqueness: true,
+                if: -> { self.class.has_column?(:event_id) }
 
-      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
+      # Fallback legacy fields when event_id is absent
+      validates :resource_type,
+                presence: true,
+                if: -> { !self.class.has_column?(:event_id) && self.class.has_column?(:resource_type) }
+
+      validates :resource_id,
+                presence: true,
+                if: -> { !self.class.has_column?(:event_id) && self.class.has_column?(:resource_id) }
 
-      validates :subject, presence: true, if: -> { self.class.has_column?(:subject) }
+      validates :event_type,
+                presence: true,
+                if: -> { !self.class.has_column?(:event_id) && self.class.has_column?(:event_type) }
 
-      validates :attempts, numericality: { only_integer: true, greater_than_or_equal_to: 0 },
+      validates :subject,
+                presence: true,
+                if: -> { self.class.has_column?(:subject) }
+
+      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
+      # ---- Defaults that do not require schema at load time ----
       before_validation do
         now = Time.now.utc
-        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?
+        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
+      # ---- Helpers ----
       def mark_sent!
         now = Time.now.utc
         self.status  = 'sent' if self.class.has_column?(:status)
@@ -84,9 +98,11 @@ module JetstreamBridge
         def method_missing(method_name, *_args, &_block)
           raise_missing_ar!('Outbox', method_name)
         end
+
         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,32 +1,12 @@
 # frozen_string_literal: true
 
-# lib/jetstream_bridge/railtie.rb
+require_relative 'core/model_codec_setup'
+
 module 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
+        ActiveSupport::Reloader.to_prepare { JetstreamBridge::ModelCodecSetup.apply! }
       end
     end
 

data/lib/jetstream_bridge/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetstream_bridge
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Mike Attara
@@ -192,6 +192,7 @@ files:
 - lib/jetstream_bridge/core/connection.rb
 - lib/jetstream_bridge/core/duration.rb
 - lib/jetstream_bridge/core/logging.rb
+- lib/jetstream_bridge/core/model_codec_setup.rb
 - lib/jetstream_bridge/core/model_utils.rb
 - lib/jetstream_bridge/models/inbox_event.rb
 - lib/jetstream_bridge/models/outbox_event.rb