jetstream_bridge 1.11.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfcc046638139db229292e2eba3cb44ae91d8f519f2fc0423132c5d73b294c0a
-  data.tar.gz: 872622525951553b85fb88d4bb476ea9a7f19243218f16f99aa63a5056fa085e
+  metadata.gz: 6196adf923e1dff8c5d62c9e2e617234b701de9337e915bb09496d4ad625e9ff
+  data.tar.gz: e7f0ee0c49ae92a0304ad0e1e3e221c37c124420c30653cbcbed6e67d24e77c1
 SHA512:
-  metadata.gz: 0f2b6f102e783d4a58cc574500e19e2759233632ff3d1dbd628b61951dcf2b89209cb63a0305217f83bc3ce968fedefecca4ebda7922e579f85014750d0521bb
-  data.tar.gz: 3d562014f4459e9647314e3bd5c938685191df9f19418029a5ec637e0e570f05c15636c37cf0099f65b145b35c8c37925253c9a157db81fd2ea132d05a142309
+  metadata.gz: 535122ca803451429cbd3ee1e5d56b6f6f45e7412a1bdbd0bfb210970641a3d3ada9d8f1f0737751cc0f330494b43a0912f52b596974dc271ab1bd8e33c77a70
+  data.tar.gz: 599b1ddc980439dc84d032fc3c855ac059f66c55fe8f6e55e27bc55e5f93f0555c6c41a74c64e250996f642cb4a738af66cd841283c1b496a5487ce0a0c96a52

data/Gemfile.lock

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

data/lib/jetstream_bridge/publisher/outbox_repository.rb

@@ -27,15 +27,15 @@ module JetstreamBridge
       event_id = envelope['event_id'].to_s
 
       attrs = {
-        event_id:   event_id,
-        subject:    subject,
-        payload:    ModelUtils.json_dump(envelope),
-        headers:    ModelUtils.json_dump({ 'Nats-Msg-Id' => event_id }),
-        status:     'publishing',
+        event_id: event_id,
+        subject: subject,
+        payload: ModelUtils.json_dump(envelope),
+        headers: ModelUtils.json_dump({ 'Nats-Msg-Id' => event_id }),
+        status: 'publishing',
         last_error: nil
       }
-      attrs[:attempts]   = 1 + (record.attempts || 0) if record.respond_to?(:attempts)
-      attrs[:enqueued_at]= (record.enqueued_at || now) if record.respond_to?(:enqueued_at)
+      attrs[:attempts] = 1 + (record.attempts || 0) if record.respond_to?(:attempts)
+      attrs[:enqueued_at] = (record.enqueued_at || now) if record.respond_to?(:enqueued_at)
       attrs[:updated_at] = now if record.respond_to?(:updated_at)
 
       ModelUtils.assign_known_attrs(record, attrs)
@@ -45,8 +45,8 @@ module JetstreamBridge
     def persist_success(record)
       now = Time.now.utc
       attrs = { status: 'sent' }
-      attrs[:sent_at]   = now if record.respond_to?(:sent_at)
-      attrs[:updated_at]= now if record.respond_to?(:updated_at)
+      attrs[:sent_at] = now if record.respond_to?(:sent_at)
+      attrs[:updated_at] = now if record.respond_to?(:updated_at)
       ModelUtils.assign_known_attrs(record, attrs)
       record.save!
     end
@@ -61,9 +61,10 @@ module JetstreamBridge
 
     def persist_exception(record, error)
       return unless record
+
       persist_failure(record, "#{error.class}: #{error.message}")
-    rescue => e2
-      Logging.warn("Failed to persist outbox failure: #{e2.class}: #{e2.message}",
+    rescue StandardError => e
+      Logging.warn("Failed to persist outbox failure: #{e.class}: #{e.message}",
                    tag: 'JetstreamBridge::Publisher')
     end
   end

data/lib/jetstream_bridge/publisher/publisher.rb

@@ -6,6 +6,7 @@ require_relative '../core/connection'
 require_relative '../core/logging'
 require_relative '../core/config'
 require_relative '../core/model_utils'
+require_relative 'outbox_repository'
 
 module JetstreamBridge
   # Publishes to "{env}.data.sync.{app}.{dest}".
@@ -14,10 +15,10 @@ module JetstreamBridge
     RETRY_BACKOFFS  = [0.25, 1.0].freeze
 
     TRANSIENT_ERRORS = begin
-                         errs = [NATS::IO::Timeout, NATS::IO::Error]
-                         errs << NATS::IO::SocketTimeoutError if defined?(NATS::IO::SocketTimeoutError)
-                         errs.freeze
-                       end
+      errs = [NATS::IO::Timeout, NATS::IO::Error]
+      errs << NATS::IO::SocketTimeoutError if defined?(NATS::IO::SocketTimeoutError)
+      errs.freeze
+    end
 
     def initialize
       @jts = Connection.connect!
@@ -42,6 +43,7 @@ module JetstreamBridge
 
     def ensure_destination!
       return unless JetstreamBridge.config.destination_app.to_s.empty?
+
       raise ArgumentError, 'destination_app must be configured'
     end
 
@@ -78,7 +80,7 @@ module JetstreamBridge
       ok = with_retries { do_publish(subject, envelope) }
       ok ? repo.persist_success(record) : repo.persist_failure(record, 'Publish returned false')
       ok
-    rescue => e
+    rescue StandardError => e
       repo.persist_exception(record, e) if defined?(repo) && defined?(record)
       log_error(false, e)
     end
@@ -88,10 +90,11 @@ module JetstreamBridge
     def with_retries(retries = DEFAULT_RETRIES)
       attempts = 0
       begin
-        return yield
+        yield
       rescue *TRANSIENT_ERRORS => e
         attempts += 1
         return log_error(false, e) if attempts > retries
+
         backoff(attempts, e)
         retry
       end
@@ -112,15 +115,15 @@ module JetstreamBridge
 
     def build_envelope(resource_type, event_type, payload, options = {})
       {
-        'event_id'       => options[:event_id] || SecureRandom.uuid,
+        'event_id' => options[:event_id] || SecureRandom.uuid,
         'schema_version' => 1,
-        'event_type'     => event_type,
-        'producer'       => JetstreamBridge.config.app_name,
-        'resource_id'    => (payload['id'] || payload[:id]).to_s,
-        'occurred_at'    => (options[:occurred_at] || Time.now.utc).iso8601,
-        'trace_id'       => options[:trace_id] || SecureRandom.hex(8),
-        'resource_type'  => resource_type,
-        'payload'        => payload
+        'event_type' => event_type,
+        'producer' => JetstreamBridge.config.app_name,
+        'resource_id' => (payload['id'] || payload[:id]).to_s,
+        'occurred_at' => (options[:occurred_at] || Time.now.utc).iso8601,
+        'trace_id' => options[:trace_id] || SecureRandom.hex(8),
+        'resource_type' => resource_type,
+        'payload' => payload
       }
     end
   end

data/lib/jetstream_bridge/version.rb

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

data/lib/jetstream_bridge.rb

@@ -12,8 +12,8 @@ require_relative 'jetstream_bridge/consumer/consumer'
 require_relative 'jetstream_bridge/railtie' if defined?(Rails::Railtie)
 
 # Load gem-provided models from lib/
-require_relative 'jetstream_bridge/models/outbox_event'
-require_relative 'jetstream_bridge/models/inbox_event'
+require_relative 'jetstream_bridge/inbox_event'
+require_relative 'jetstream_bridge/outbox_event'
 
 
 # JetstreamBridge main module.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetstream_bridge
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Mike Attara
@@ -194,8 +194,8 @@ files:
 - 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
+- lib/jetstream_bridge/inbox_event.rb
+- lib/jetstream_bridge/outbox_event.rb
 - lib/jetstream_bridge/publisher/outbox_repository.rb
 - lib/jetstream_bridge/publisher/publisher.rb
 - lib/jetstream_bridge/railtie.rb