pub_sub_model_sync 1.5.1pre → 1.6.1pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55d5a541d463ac4b23a26bbcb2ba14f5c4d6336d72bde40d1ea9c1ff5bc4b89f
-  data.tar.gz: 496ed96aacf2c6ab74ffb4f997b00cfffc76168f168647f94fec3fa57bc3ae59
+  metadata.gz: 8ef75354a40d7b4da0e81bf3d56dcafca197f63827e77ec504bb041875032d6c
+  data.tar.gz: 7ebcdc2be8176224f774b9ea65d4cdd98829d2b514a0fa13d3e8938abe56e8af
 SHA512:
-  metadata.gz: 199e1c3841b4038ec67b189b2da974655d7ce87c637297b59c646628e7cba0359f64f11e8b1e0c4d3db65827ffa3a4f81fb52492bb0e5c40e1f9438b894135a6
-  data.tar.gz: 951e65c9e9e7d109b5c3fe9c7e79ffb00ebe7110bbdd7d15c93a1a5c83e460a0512292bfe21b87fc8bba5d11dcf79c75af2723cfc0b61cacef8f6f812cab9834
+  metadata.gz: b9dddee04900a58852d7410b3aeaeefc8875703c67cfa7e8becb90ecb74cfb92c4126e8de1db7e52a57ff639d5c254665886f94abbea4d3e6ba859a52ca62cde
+  data.tar.gz: acb90e09cc29fa7e8d26b88cd1c5a4b34a74d09af84b263389cdf3b4e694d44d823f6addd0656f145503dea17d87898d9e029c6e4829822b11c595617e38a0d7

data/.github/workflows/ruby.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.5, 2.6]
+        ruby: [2.6]
         rails: [4, 5, 6]
         include:
           - ruby: 2.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pub_sub_model_sync (1.5.0)
+    pub_sub_model_sync (1.6.0)
       rails
 
 GEM

data/README.md

@@ -271,8 +271,10 @@ PubSubModelSync::Payload.new({ ids: [my_user.id] }, { klass: 'User', action: :ba
   - `as_klass:` (String, default current class name): Class name of the notification
   - `headers:` (Hash, optional): header settings (More in Payload.headers)
 
-- `ps_perform_publish(action = :create)` Permits to perform manually the callback of a specific `ps_after_action`
+- `ps_perform_publish(action = :create, parents_actions: false)` Permits to perform manually the callback of a specific `ps_after_action`
   - `action` (Symbol, default: :create) Only :create|:update|:destroy
+  - `parents_actions` (Boolean, default: false) When `true`, includes inherited PubSub-callbacks from parent classes
+    
   
 #### **Publisher helpers**
 - Publish or republish a notification
@@ -317,6 +319,7 @@ Any notification before delivering is transformed as a Payload for a better port
       Note: Final `ordering_key` is calculated as: `payload.headers[:forced_ordering_key] || current_transaction&.key || payload.headers[:ordering_key]`         
     - `topic_name`: (String|Array<String>, optional): Specific topic name where to deliver the notification (default `PubSubModelSync::Config.topic_name`).
     - `forced_ordering_key`: (String, optional): Overrides `ordering_key` with the provided value even withing transactions. Default `nil`.
+    - `target_app_key`: (String, optional): Allows to send the notification to a specific app (includes the application key, separated by comma when multiple apps). Default `nil`.
     - `cache` (Boolean | Hash, Default false) Cache settings   
         - `true`: Skip publishing similar payloads
         - `Hash<required: Array<Symbol>>`: Same as `true` and enables payload optimization to exclude unchanged non important attributes. Sample: `{ required: %i[id email] }`
@@ -379,16 +382,17 @@ Note: To reduce Payload size, some header info are not delivered (Enable debug m
   - Manual transactions   
     `PubSubModelSync::MessagePublisher::transaction(key, max_buffer: , &block)`
     - `key` (String|nil) Key used as the ordering_key for all inner notifications (When nil, will use `ordering_key` of the first notification)  
-    - `max_buffer:` (Integer, default: `PubSubModelSync::Config.transactions_max_buffer`) Transaction buffer size (more details in #transactions_max_buffer).     
+    - `max_buffer:` (Integer, default: `PubSubModelSync::Config.transactions_max_buffer`) Transaction buffer size (DEPRECATED).     
+    - `headers:` (Hash) Header settings to be added to each Payload's header inside this transaction     
     Sample:
     ```ruby
-      PubSubModelSync::MessagePublisher::transaction('my-custom-key') do
+      PubSubModelSync::MessagePublisher::transaction('my-custom-key', headers: { key: 'my-key' }) do
         user = User.create(name: 'test') # `User`:`:create` notification
         post = Post.create(title: 'sample') # `Post`:`:create` notification
         PubSubModelSync::Payload.new({ ids: [user.id] }, { klass: 'User', action: :send_welcome, mode: :klass }).publish! # `User`:`:send_welcome` notification
       end
     ```
-    All notifications uses `ordering_key: 'my-custom-key'` and will be processed in the same order they were published.
+    All notifications uses `ordering_key: 'my-custom-key'` and will be processed in the same order they were published (Payload headers will include `key="my-key"`).
 
 ## **Testing with RSpec**
 - Config: (spec/rails_helper.rb)

data/lib/pub_sub_model_sync/message_processor.rb

@@ -23,15 +23,15 @@ module PubSubModelSync
     end
 
     def process
-      retries ||= 0
       process!
     rescue => e
-      retry_process?(e, retries += 1) ? retry : notify_error(e)
+      notify_error(e)
     end
 
     private
 
-    def run_subscriber(subscriber)
+    def run_subscriber(subscriber) # rubocop:disable Metrics/AbcSize
+      retries ||= 0
       processor = PubSubModelSync::RunSubscriber.new(subscriber, payload)
       return unless processable?(subscriber)
 
@@ -39,6 +39,10 @@ module PubSubModelSync
       processor.call
       res = config.on_success_processing.call(payload, { subscriber: subscriber })
       log "processed message with: #{payload.inspect}" if res != :skip_log
+    rescue => e
+      rr = retry_process?(e, retries += 1)
+      log("failed processing sync: #{{ klass: e.class.name, msg: e.message, retries: retries, rr: rr, payload: payload }.inspect}", :error)
+      rr ? retry : raise(e)
     end
 
     def processable?(subscriber)
@@ -47,7 +51,7 @@ module PubSubModelSync
       !cancel
     end
 
-    # @param error (StandardError)
+    # @param error (StandardError, Exception)
     def notify_error(error)
       error_msg = 'Error processing message: '
       error_details = [payload, error.message, error.backtrace]
@@ -67,9 +71,6 @@ module PubSubModelSync
 
     def retry_process?(error, retries) # rubocop:disable Metrics/MethodLength
       error_payload = [payload, error.message, error.backtrace]
-      if error.message.include('Connection refused') || error.message.include('no connection to the server')
-        log("Error pubsub: #{[error.class.name, error.message]} (retries: #{retries}) => #{lost_db_connection?(error)}", :error)
-      end
       return false unless lost_db_connection?(error)
 
       if retries <= 5

data/lib/pub_sub_model_sync/message_publisher.rb

@@ -18,6 +18,9 @@ module PubSubModelSync
       #   worker/thread.
       # @see Transaction.new(...)
       # @param key (String|Nil)
+      # @param settings (Hash<:headers, :max_buffer>)
+      #   @option headers [Hash] Headers to be merged for each payload inside this transaction
+      #   @option max_buffer [Integer] Deprecated
       # @param block (Yield) block to be executed
       def transaction(key, settings = {}, &block)
         t = init_transaction(key, settings)
@@ -71,7 +74,7 @@ module PubSubModelSync
       # @return Payload
       # Raises error if exist
       def publish!(payload, &block)
-        payload.headers[:ordering_key] = ordering_key_for(payload)
+        add_transaction_headers(payload)
         return unless ensure_publish(payload)
 
         current_transaction ? current_transaction.add_payload(payload) : connector_publish(payload)
@@ -106,8 +109,10 @@ module PubSubModelSync
         !cancelled
       end
 
-      def ordering_key_for(payload)
-        payload.headers[:forced_ordering_key] || current_transaction&.key || payload.headers[:ordering_key]
+      def add_transaction_headers(payload)
+        key = payload.headers[:forced_ordering_key] || current_transaction&.key || payload.headers[:ordering_key]
+        payload.headers[:ordering_key] = key
+        payload.headers.merge!(current_transaction.headers) if current_transaction
       end
 
       def ensure_model_publish(model, action, payload)

data/lib/pub_sub_model_sync/publisher_concern.rb

@@ -39,11 +39,9 @@ module PubSubModelSync
     # Permits to perform manually the callback for a specific action
     # @param action (Symbol, default: :create) Only :create|:update|:destroy
     def ps_perform_publish(action = :create, parents_actions: false)
-      parent_callbacks = parents_actions ? self.class.superclass.ps_cache_publish_callbacks : []
       callbacks = self.class.ps_cache_publish_callbacks
-      items = (callbacks + parent_callbacks).select { |item| item[:actions].include?(action) }
-      raise(StandardError, "No callback found for action :#{action}") if items.empty?
-
+      callbacks = self.class.ancestors.map { |p| p.try(:ps_cache_publish_callbacks) }.compact.flatten if parents_actions
+      items = callbacks.select { |item| item[:actions].include?(action) }
       items.each { |item| instance_exec(action, &item[:callback]) }
       self
     end

data/lib/pub_sub_model_sync/service_base.rb

@@ -59,8 +59,8 @@ module PubSubModelSync
     end
 
     def target_app_message?(payload)
-      key = payload.headers[:target_app_key]
-      key == config.subscription_key || !key
+      key = payload.headers[:target_app_key].to_s
+      !key.present? || key.split(',').include?(config.subscription_key)
     end
   end
 end

data/lib/pub_sub_model_sync/transaction.rb

@@ -3,17 +3,18 @@
 module PubSubModelSync
   class Transaction < Base
     PUBLISHER_KLASS = PubSubModelSync::MessagePublisher
-    attr_accessor :key, :payloads, :max_buffer, :root, :children, :finished
+    attr_accessor :key, :payloads, :max_buffer, :root, :children, :finished, :headers
 
     # @param key (String,Nil) Transaction key, if empty will use the ordering_key from first payload
     # @param max_buffer (Integer) Once this quantity of notifications is reached, then all notifications
     #   will immediately be delivered.
     #   Note: There is no way to rollback delivered notifications if current transaction fails
-    def initialize(key, max_buffer: config.transactions_max_buffer)
+    def initialize(key, max_buffer: config.transactions_max_buffer, headers: {})
       @key = key
       @max_buffer = max_buffer
       @children = []
       @payloads = []
+      @headers = headers
     end
 
     # @param payload (Payload)

data/lib/pub_sub_model_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PubSubModelSync
-  VERSION = '1.5.1pre'
+  VERSION = '1.6.1pre'
 end

data/pub_sub_model_sync.gemspec

@@ -4,7 +4,7 @@ lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pub_sub_model_sync/version'
 
-Gem::Specification.new do |spec|
+Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.required_ruby_version = '>= 2.4' # rubocop:disable Gemspec/RequiredRubyVersion
   spec.name          = 'pub_sub_model_sync'
   spec.version       = PubSubModelSync::VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pub_sub_model_sync
 version: !ruby/object:Gem::Version
-  version: 1.5.1pre
+  version: 1.6.1pre
 platform: ruby
 authors:
 - Owen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails