hermes_messenger_of_the_gods 3.0.0.rc1 → 3.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c476e60bbfdcf74e23ae4c0678a170d0db9d74252f754f0597c2c9ffec3f087
-  data.tar.gz: 07a7a6be81771b775f975e67e4c068e6a63462e978b6dda90706714c0283f264
+  metadata.gz: cd5650b206ac5ee874b867a415dc4b1fa35a59df94dd9ee686f6d4a568d0ec18
+  data.tar.gz: 1095c1beb1db82beafc7eb23818fcba5bca0e65a0511237d796c5b7bc67a2d8c
 SHA512:
-  metadata.gz: 2e95976b36e7e11d10f083a6e7aab7786a6e8caa651c83907babf6b62d403d55256b0dd7156c571fffc585c4105475b95ea8a44b336ff277dc05ae329c45be74
-  data.tar.gz: 23e2e98b7b448148d4c9641526568c5806e8c6e98ea3aa06d33e16317f06aed6ee90188e610bdd5749f675e3c515a8daec4ee31c8e6a4a12a047e415eaaad916
+  metadata.gz: c09be9e2e461be0406068d22c779d851b1d0858414f0a8273f74fe0cc56839d253ed00c538026a80c6213bf12d05ddc193b071884cd2d944694d5a2ef9bce0fd
+  data.tar.gz: 68fa8509b6d12e21dadbb46d2bbdcfb2b7dbda972e975de2d34977823ee4e7abfde1403c181022fdbe6ddc44e55d936980bbd4885e7ee114f564c3a2afc4492d

data/.github/workflows/test.yml

@@ -7,10 +7,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rubyimage: ["getterminus/ruby-docker-images:3.0-je-20210920", "getterminus/ruby-docker-images:2.7-je-20210920",]
+        rubyVersion: ["2.7.8", "3.0.4", "3.1.2", "3.2.2"]
     runs-on: ubuntu-latest
-    container:
-      image: ${{ matrix.rubyimage }}
     steps:
       - name: Install SSH Key
         uses: webfactory/ssh-agent@v0.5.2
@@ -21,7 +19,11 @@ jobs:
         uses: actions/checkout@v2
         with:
           path: ${{ github.workspace }}/src/github.com/${{ github.repository }}
-
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.rubyVersion }}
+          bundler-cache: true
+          cache-version: "${{ matrix.rubyVersion }}-1"
       - name: Run Test
         working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }}
         run: >

data/lib/hermes_messenger_of_the_gods/concerns/message.rb

@@ -16,7 +16,7 @@ module HermesMessengerOfTheGods
       attr_accessor :original_message, :source_endpoint
 
       def validate!
-        raise HermesMessengerOfTheGods::ValidationError, self unless valid?
+        raise HermesMessengerOfTheGods::ValidationError.new(self) unless valid?
       end
 
       def dispatch
@@ -70,6 +70,12 @@ module HermesMessengerOfTheGods
       end
 
       class_methods do
+        def send_messages(messages, options = {})
+          raise ArgumentError, "All messages must be #{self.class}" unless messages.all?{|m| m.is_a?(self) }
+          messages.map(&:validate!)
+          messages.first.endpoint.bulk_dispatch!(messages, options)
+        end
+
         def from_message(attrs = {}, &blk)
           attrs = attrs.slice(*_defined_attributes.map(&:to_s))
           new(attrs, &blk)

data/lib/hermes_messenger_of_the_gods/endpoints/base.rb

@@ -25,10 +25,22 @@ module HermesMessengerOfTheGods
         false
       end
 
+      def _transmit_payload(message, options)
+        to_transmit_payload(transform_message(message), message, options)
+      end
+
+      def bulk_dispatch!(messages, options)
+        payloads = messages.map do |message|
+          _transmit_payload(message, options)
+        end
+
+        bulk_transmit(payloads)
+      end
+
       def dispatch!(message, options = {})
         retry_number = 0
         begin
-          self.result = transmit(transform_message(message), message, options)
+          self.result = transmit(_transmit_payload(message, options))
         rescue StandardError => e
           errors << e
           retry_number += 1

data/lib/hermes_messenger_of_the_gods/endpoints/sns.rb

@@ -6,18 +6,43 @@ require 'json'
 module HermesMessengerOfTheGods
   module Endpoints
     class Sns < Base
-      def sns_topic
-        @sns_topic ||= Aws::SNS::Topic.new(endpoint,
-                                           {
-                                             client: HermesMessengerOfTheGods.configuration.sns_client,
-                                           }.merge(options[:client_options] || {}))
+      def sns_client
+        HermesMessengerOfTheGods.configuration.sns_client
       end
 
-      def transmit(message, raw_message, dispatch_options = {})
+      def to_transmit_payload(message, raw_message, dispatch_options = {})
         pub_opts = fetch_option(:publish_options, raw_message) || {}
 
         message = JSON.dump(message) if options[:jsonify]
-        sns_topic.publish(pub_opts.merge(dispatch_options, message: message))
+
+        pub_opts.merge(dispatch_options, message: message)
+      end
+
+      def transmit(payload)
+        bulk_transmit([payload])
+      end
+
+      def bulk_transmit(payloads)
+        # Batch Publish requires a message id, so we'll generate one if it's not set
+        all_publish_batch_request_entries = payloads.map do |payload|
+          {id: SecureRandom.uuid}.merge(payload)
+        end
+
+        failed_msgs = []
+
+        all_publish_batch_request_entries.each_slice(10) do |publish_batch_request_entries|
+          resp = sns_client.publish_batch(topic_arn: endpoint, publish_batch_request_entries: publish_batch_request_entries)
+          failed_msgs.concat(resp.failed)
+        end
+
+        if failed_msgs.any?
+          all_sender_fault = failed_msgs.all?(&:sender_fault)
+          raise  FatalError, "Error in dispatching: #{failed_msgs[0].message}" if all_sender_fault
+
+          raise "Some messages failed to send due to recoverable error #{failed_msgs[0].message}"
+        end
+
+        true
       end
     end
   end

data/lib/hermes_messenger_of_the_gods/endpoints/sqs.rb

@@ -114,6 +114,10 @@ module HermesMessengerOfTheGods
         false
       end
 
+      def sqs_client
+        HermesMessengerOfTheGods.configuration.sqs_client
+      end
+
       def queue
         @queue ||= Aws::SQS::Queue.new(
           endpoint,
@@ -138,11 +142,38 @@ module HermesMessengerOfTheGods
         approximate_pending_messages.positive?
       end
 
-      def transmit(message, raw_message, dispatch_options = {})
+      def to_transmit_payload(message, raw_message, dispatch_options = {})
         send_opts = fetch_option(:send_options, raw_message) || {}
 
         message = JSON.dump(message) if options[:jsonify]
-        queue.send_message(send_opts.merge(dispatch_options, message_body: message))
+
+        send_opts.merge(dispatch_options, message_body: message)
+      end
+
+      def transmit(payload)
+        bulk_transmit([payload])
+      end
+
+      def bulk_transmit(payloads)
+        all_entries = payloads.map! do |payload|
+          {id: SecureRandom.uuid}.merge(payload)
+        end
+
+        failed_msgs = []
+
+        all_entries.each_slice(10) do |entries|
+          resp = sqs_client.send_message_batch(queue_url: endpoint, entries: entries)
+          failed_msgs.concat(resp.failed)
+        end
+
+        if failed_msgs.any?
+          all_sender_fault = failed_msgs.failed.all?(&:sender_fault)
+          raise  FatalError, "Error in dispatching: #{failed_msgs[0].message}" if all_sender_fault
+
+          raise "Some messages failed to send due to recoverable error #{failed_msgs[0].message}"
+        end
+
+        true
       end
 
       private

data/lib/hermes_messenger_of_the_gods/exceptions.rb

@@ -1,19 +1,9 @@
 # frozen_string_literal: true
 
-module HermesMessengerOfTheGods
-  if defined?(ActiveModel::ValidationError)
-    class ValidationError < ActiveModel::ValidationError; end
-  else
-    class ValidationError < StandardError
-      attr_reader :model
+require 'active_model/validations'
 
-      def initialize(model)
-        @model = model
-        errors = @model.errors.full_messages.join(', ')
-        super(errors)
-      end
-    end
-  end
+module HermesMessengerOfTheGods
+  class ValidationError < ActiveModel::ValidationError; end
 
   class MessageDispatchFailed < StandardError
     attr_accessor :exceptions

data/lib/hermes_messenger_of_the_gods/testing/array_endpoint.rb

@@ -4,8 +4,6 @@ module HermesMessengerOfTheGods
   module Endpoints
     class Local < Base
       class << self
-        attr_accessor :transmit_method
-
         def clear_queue!
           @received = nil
         end
@@ -21,20 +19,23 @@ module HermesMessengerOfTheGods
         self.class.received[endpoint]
       end
 
-      def transmit(msg, raw_msg, opts = {})
-        if self.class.transmit_method
-          self.class.transmit_method.call(self, msg, raw_msg)
-        else
-          do_transmit(msg, opts, raw_msg)
-        end
+      def to_transmit_payload(message, raw_message, dispatch_options = {})
+        { message: message, raw_message: raw_message, options: dispatch_options }
+      end
+
+      def transmit(payload)
+        bulk_transmit([payload])
       end
 
-      def do_transmit(msg, opts, raw_message = {})
-        pub_opts = fetch_option(:publish_options, raw_message) || {}
-        new_msg = { message: msg, options: opts.merge(pub_opts) }
-        received << new_msg
-        on_receive&.call(new_msg)
-        "Recorded msg ##{self.class.received[endpoint].length} for #{endpoint}"
+      def bulk_transmit(payloads)
+        payloads.each do |msg|
+          pub_opts = fetch_option(:publish_options, msg[:raw_message]) || {}
+
+          new_msg = { message: msg[:message], options: msg[:options].merge(pub_opts) }
+          received << new_msg
+          on_receive&.call(new_msg)
+          "Recorded msg ##{self.class.received[endpoint].length} for #{endpoint}"
+        end
       end
     end
   end
@@ -44,7 +45,6 @@ if defined?(RSpec)
   RSpec.configure do |config|
     config.after(:each) do
       HermesMessengerOfTheGods::Endpoints::Local.clear_queue!
-      HermesMessengerOfTheGods::Endpoints::Local.transmit_method = nil
     end
   end
 end

data/lib/hermes_messenger_of_the_gods/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HermesMessengerOfTheGods
-  VERSION = '3.0.0.rc1'
+  VERSION = '3.0.0.rc3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hermes_messenger_of_the_gods
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc3
 platform: ruby
 authors:
 - Brian Malinconico
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel