rservicebus2 0.2.3 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e12a4225a0bdda2fdc600e0f5f1134dacf481343d7e9e3e3837b820ca1f8509
-  data.tar.gz: 02e285f84043c7f457db328a9fd74c1f7f62104531cae5b723ba301aca518a3f
+  metadata.gz: 5f94672750deba44e6495d728b6c45bbf0aba95efe35d18b6877359e27173da4
+  data.tar.gz: 27e94561da7ab338ee3ff5ac99f850f872900f2559bb56ce3dffd604c452173a
 SHA512:
-  metadata.gz: a2aefd96d740b7020284d95f36256fead951f895fab13e8eeb1440b674ebdb28a580a11ad75c4cbb1dbb270b1aef0ed901af1b94d03459252cfe33947b85aac1
-  data.tar.gz: 848e86f7d3c40f83cdb1f6d3459af1a5265f1e9272c7718da950c81457ff54983c0d00bc3997b0b0955df57798a53ff7be3650463458cdbe2b926c636053ddde
+  metadata.gz: ac819c545740eb82ecf1ae2b95286f837ae1189ba3eded36ddcc98680ce4b7dcc84b975d9c75ab48e62f99cef32a83d98fdf2ad195bab0012f2804392abb3289
+  data.tar.gz: c10528a4a06fc27f9e2c5541dd4d500a1ae2120cc0f89a4a66c165a09c6fb5eae014c04ab74735c29069c6b6f8ebfaf089c7f2f63d80cdc02fb7d4acf3f7cc7b

data/lib/rservicebus2/appresource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module RServiceBus2
@@ -8,7 +10,7 @@ module RServiceBus2
 
     # The method which actually connects to the resource.
     def connect(_uri)
-      fail 'Method, connect, needs to be implemented for resource'
+      raise 'Method, connect, needs to be implemented for resource'
     end
 
     def _connect
@@ -44,22 +46,19 @@ module RServiceBus2
       rescue StandardError => e
         puts '** AppResource. An error was raised while closing connection
               to, ' + @uri
-        puts 'Message: ' + e.message
+        puts "Message: #{e.message}"
         puts e.backtrace
       end
       _connect
     end
 
     # Transaction Semantics
-    def begin
-    end
+    def begin; end
 
     # Transaction Semantics
-    def commit
-    end
+    def commit; end
 
     # Transaction Semantics
-    def rollback
-    end
+    def rollback; end
   end
 end

data/lib/rservicebus2/appresource/awsdynamodb.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'aws-sdk-dynamodb'
+
+module RServiceBus2
+  # AppResourceAWSDynamoDb
+  class AppResourceAWSDynamoDb < AppResource
+    def connect(uri)
+      region = uri.host
+
+      Aws::DynamoDB::Client.new(region: region)
+    end
+
+    def finished; end
+  end
+end

data/lib/rservicebus2/appresource/awss3.rb

@@ -0,0 +1,16 @@
+require 'aws-sdk-s3'
+
+module RServiceBus2
+  # AppResourceAWSDynamoDb
+  class AppResourceAWSS3 < AppResource
+    # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+    def connect(uri)
+      region = uri.host
+
+      Aws::S3::Client.new(region: region)
+    end
+
+    def finished
+    end
+  end
+end

data/lib/rservicebus2/appresource/awssqs.rb

@@ -0,0 +1,25 @@
+require 'aws-sdk-sqs'
+require 'aws-sdk-sts'
+
+module RServiceBus2
+  # AppResourceAWSDynamoDb
+  class AppResourceAWSSQS < AppResource
+    def connect(uri)
+      queue_name = uri.path.sub('/', '')
+
+      region = uri.host
+
+      sts_client = Aws::STS::Client.new(region: region)
+      caller_identity_account = sts_client.get_caller_identity.account
+
+      queue_url = "https://sqs.#{region}.amazonaws.com/" \
+                  "#{caller_identity_account}/#{queue_name}"
+      {
+        client: Aws::SQS::Client.new(region: region),
+        url: queue_url
+      }
+    end
+
+    def finished; end
+  end
+end

data/lib/rservicebus2/appresource_configure.rb

@@ -31,6 +31,15 @@ module RServiceBus2
           when 'file'
             require 'rservicebus2/appresource/file'
             rm.add k.sub('RSB_', ''), AppResourceFile.new(host, uri)
+          when 'awsdynamodb'
+            require 'rservicebus2/appresource/awsdynamodb'
+            rm.add k.sub('RSB_', ''), AppResourceAWSDynamoDb.new(host, uri)
+          when 'awss3'
+            require 'rservicebus2/appresource/awss3'
+            rm.add k.sub('RSB_', ''), AppResourceAWSS3.new(host, uri)
+          when 'awssqs'
+            require 'rservicebus2/appresource/awssqs'
+            rm.add k.sub('RSB_', ''), AppResourceAWSSQS.new(host, uri)
           else
             abort("Scheme, #{uri.scheme}, not recognised when configuring
                   app resource, #{k}=#{v}")

data/lib/rservicebus2/circuitbreaker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   class MessageArrivedWhileCricuitBroken < StandardError
   end
@@ -42,7 +44,7 @@ module RServiceBus2
       message_arrived
 
       ## logFirstFailure
-      if @number_of_failures == 0
+      if @number_of_failures.zero?
         @number_of_failures = 1
         @time_of_first_failure = Time.now
         @time_to_break = @time_of_first_failure + @seconds_to_break
@@ -68,7 +70,7 @@ module RServiceBus2
     def message_arrived
       reset if !@time_to_break.nil? && Time.now > @time_to_break
 
-      fail MessageArrivedWhileCricuitBroken if @broken == true
+      raise MessageArrivedWhileCricuitBroken if @broken == true
     end
 
     def break_circuit

data/lib/rservicebus2/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Marshals configuration information for an rservicebus host
   class Config
@@ -19,7 +21,7 @@ module RServiceBus2
     end
 
     def get_value(name, default = nil)
-      value = (ENV[name].nil? || ENV[name] == '') ? default : ENV[name]
+      value = ENV[name].nil? || ENV[name] == '' ? default : ENV[name]
       log "Env value: #{name}: #{value}"
       value
     end
@@ -131,21 +133,19 @@ module RServiceBus2
     # Note. trailing slashs will be stripped
     # Expected format: <path 1>;<path 2>
     def load_working_dir_list
-      puts "Config.load_working_dir_list.1"
-      puts "Config.load_working_dir_list.2 #{@contract_list}"
       path_list = get_value('WORKING_DIR', './')
       return self if path_list.nil?
 
       path_list.split(';').each do |path|
         path = path.strip.chomp('/')
-        unless Dir.exist?("#{path}")
+        unless Dir.exist?(path.to_s)
           puts 'Error while processing working directory list'
           puts "*** path, #{path}, does not exist"
           abort
         end
         @handler_path_list << "#{path}/messagehandler" if Dir.exist?("#{path}/messagehandler")
         @saga_path_list << "#{path}/saga" if Dir.exist?("#{path}/saga")
-        @contract_list << "#{path}/contract.rb" if File.exist?( "#{path}/contract.rb" )
+        @contract_list << "#{path}/contract.rb" if File.exist?("#{path}/contract.rb")
         @lib_list << "#{path}/lib" if File.exist?("#{path}/lib")
       end
       self
@@ -154,14 +154,11 @@ module RServiceBus2
 
   # Class
   class ConfigFromEnv < Config
-    def initialize
-    end
   end
 
   # Class
   class ConfigFromSetter < Config
-    attr_writer :appName, :messageEndpointMappings, :handler_path_list, :errorQueueName, :maxRetries, :forward_received_messages_to, :beanstalkHost
-    def initialize
-    end
+    attr_writer :app_name, :message_endpoint_mappings, :handler_path_list, :error_queue_name, \
+                :max_retries, :forward_received_messages_to, :beanstalk_host
   end
 end

data/lib/rservicebus2/cron_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'parse-cron'
 
 module RServiceBus2
@@ -27,7 +29,8 @@ module RServiceBus2
       @msg_names.each do |n|
         list << n if Globber.new(name) =~ n
       end
-      fail NoMatchingMsgForCron, name if list.length == 0
+      raise NoMatchingMsgForCron, name if list.empty?
+
       list
     end
 
@@ -44,6 +47,7 @@ module RServiceBus2
       end
     end
 
+    # rubocop:disable Metrics/MethodLength
     def initialize(host, msg_names = [])
       @bus = host
       @msg_names = msg_names
@@ -61,6 +65,7 @@ module RServiceBus2
         end
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def run
       now = Time.now

data/lib/rservicebus2/endpointmapping.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Marshals data for message end points
   # Expected format: <msg mame 1>:<end point 1>;<msg mame 2>:<end point 2>
@@ -6,16 +8,18 @@ module RServiceBus2
       RServiceBus2.get_value(name)
     end
 
-    def log(string, _ver = false)
+    def log(string, _ver: false)
       RServiceBus2.log(string)
     end
 
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def configure_mapping(mapping)
       match = mapping.match(/(.+):(.+)/)
       if match.nil?
-        log 'Mapping string provided is invalid'
-        log "The entire mapping string is: #{mapping}"
-        log "*** Could not find ':' in mapping entry, #{line}"
+        log 'Mapping string provided is invalid\n' \
+            "The entire mapping string is: #{mapping}\n" \
+            "*** Could not find ':' in mapping entry, #{line}\n"
         exit
       end
 
@@ -23,16 +27,19 @@ module RServiceBus2
       @endpoints[match[1]] = match[2]
 
       @queue_name_list.each do |q|
-        if q != match[2] && q.downcase == match[2].downcase
-          log('*** Two queues specified with only case sensitive difference.')
-          log("*** #{q} != #{match[2]}")
-          log('*** If you meant these queues to be the same, please match case
-                and restart the bus.')
-        end
+        next unless q != match[2] && q.downcase == match[2].downcase
+
+        log('*** Two queues specified with only case sensitive difference.')
+        log("*** #{q} != #{match[2]}")
+        log('*** If you meant these queues to be the same, please match case
+              and restart the bus.')
       end
       @queue_name_list << match[2]
     end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
 
+    # rubocop:disable Metrics/MethodLength
     def configure(local_queue_name = nil)
       log('EndpointMapping.Configure')
 
@@ -40,9 +47,9 @@ module RServiceBus2
       @queue_name_list << local_queue_name unless local_queue_name.nil?
 
       unless get_value('MESSAGE_ENDPOINT_MAPPING').nil?
-        log('*** MESSAGE_ENDPOINT_MAPPING environment variable was detected')
-        log("*** You may have intended MESSAGE_ENDPOINT_MAPPINGS, note the 'S'
-              on the end")
+        log '*** MESSAGE_ENDPOINT_MAPPING environment variable was detected\n' \
+            "*** You may have intended MESSAGE_ENDPOINT_MAPPINGS, note the 'S'
+              on the end"
       end
 
       mappings = get_value('MESSAGE_ENDPOINT_MAPPINGS')
@@ -54,6 +61,7 @@ module RServiceBus2
 
       self
     end
+    # rubocop:enable Metrics/MethodLength
 
     def initialize
       @endpoints = {}
@@ -65,7 +73,7 @@ module RServiceBus2
       nil
     end
 
-    def get_subscription_endpoints
+    def subscription_endpoints
       @endpoints.keys.select { |el| el.end_with?('Event') }
     end
   end

data/lib/rservicebus2/errormessage.rb

@@ -1,5 +1,6 @@
-module RServiceBus2
+# frozen_string_literal: true
 
+module RServiceBus2
   # Error Message
   class ErrorMessage
     attr_reader :occurredat, :source_queue, :error_msg

data/lib/rservicebus2/handler_loader.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Given a directory, this class is responsible for finding
   #  msgnames,
   #  handlernames, and
   #  loading handlers
   class HandlerLoader
-    attr_reader :handlerList
+    # attr_reader :handlerList - 8 May 2021
 
     # Constructor
     #
@@ -22,12 +24,11 @@ module RServiceBus2
     # Cleans the given path to ensure it can be used for as a parameter for the require statement.
     # @param [String] file_path the path to be cleaned
     def get_require_path(file_path)
-      file_path = './' + file_path unless file_path.start_with?('/')
+      file_path = "./#{file_path}" unless file_path.start_with?('/')
 
       return file_path.sub('.rb', '') if File.exist?(file_path)
 
-      abort('Filepath, ' + file_path + ", given for messagehandler require
-        doesn't exist")
+      abort("Filepath, #{file_path}, given for messagehandler require doesn't exist")
     end
 
     # Instantiate the handler named in handlerName from the file name in
@@ -38,6 +39,7 @@ module RServiceBus2
     # @param [String] handler_name name of the handler to instantiate
     # @param [String] file_path the path to the file to be loaded
     # @return [RServiceBus2::Handler] the loader
+    # rubocop:disable Metrics/MethodLength
     def load_handler_from_file(handler_name, file_path)
       require_path = get_require_path(file_path)
 
@@ -45,22 +47,22 @@ module RServiceBus2
       begin
         handler = Object.const_get(handler_name).new
       rescue StandardError => e
-        puts 'Expected class name: ' + handler_name + ', not found after
-          require: ' + require_path
-        puts '**** Check in ' + file_path + ' that the class is named : ' +
-          handler_name
-        puts '( In case its not that )'
+        puts "Expected class name: #{handler_name}, not found after require: #{require_path}\n" \
+             "**** Check in #{file_path} that the class is named: #{handler_name}\n" \
+             '( In case its not that )'
         raise e
       end
 
       handler
     end
+    # rubocop:enable Metrics/MethodLength
 
     # Wrapper function
     #
     # @param [String] file_path
     # @param [String] handler_name
     # @returns [RServiceBus2::Handler] handler
+    # rubocop:disable Metrics/MethodLength
     def load_handler(msg_name, file_path, handler_name)
       if @list_of_loaded_paths.key?(file_path)
         RServiceBus2.log "Not reloading, #{file_path}"
@@ -68,29 +70,30 @@ module RServiceBus2
       end
 
       begin
-        RServiceBus2.rlog 'file_path: ' + file_path
-        RServiceBus2.rlog 'handler_name: ' + handler_name
+        RServiceBus2.rlog "file_path: #{file_path}"
+        RServiceBus2.rlog "handler_name: #{handler_name}"
 
         handler = load_handler_from_file(handler_name, file_path)
-        RServiceBus2.log 'Loaded Handler: ' + handler_name
+        RServiceBus2.log "Loaded Handler: #{handler_name}"
 
         @handler_manager.add_handler(msg_name, handler)
 
         @list_of_loaded_paths[file_path] = 1
       rescue StandardError => e
-        puts 'Exception loading handler from file: ' + file_path
+        puts "Exception loading handler from file: #{file_path}"
         puts e.message
         puts e.backtrace[0]
         abort
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     # This method is overloaded for unit tests
     #
     # @param [String] path directory to check
     # @return [Array] a list of paths to files found in the given path
     def get_list_of_files_for_dir(path)
-      list = Dir[path + '/*']
+      list = Dir["#{path}/*"]
       RServiceBus2.rlog "HandlerLoader.getListOfFilesForDir. path: #{path},
         list: #{list}"
       list
@@ -105,14 +108,14 @@ module RServiceBus2
     def load_handlers_from_second_level_path(msg_name, base_dir)
       get_list_of_files_for_dir(base_dir).each do |file_path|
         next if file_path.end_with?('.')
+        next unless !File.directory?(file_path) && File.extname(file_path) == '.rb'
 
-        ext_name = File.extname(file_path)
-        if !File.directory?(file_path) && ext_name == '.rb'
-          file_name = File.basename(file_path).sub('.rb', '')
-          handler_name = "message_handler_#{msg_name}_#{file_name}".gsub(/(?<=_|^)(\w)/){$1.upcase}.gsub(/(?:_)(\w)/,'\1') # Classify
+        file_name = File.basename(file_path).sub('.rb', '')
+        # Classify
+        handler_name = "message_handler_#{msg_name}_#{file_name}"
+                       .gsub(/(?<=_|^)(\w)/) { Regexp.last_match(1).upcase }.gsub(/(?:_)(\w)/, '\1')
 
-          load_handler(msg_name, file_path, handler_name)
-        end
+        load_handler(msg_name, file_path, handler_name)
       end
 
       self
@@ -130,22 +133,26 @@ module RServiceBus2
     # Load top level handlers from the given directory
     #
     # @param [String] baseDir directory to check - should not have trailing slash
+    # rubocop:disable Metrics/MethodLength
     def load_handlers_from_top_level_path(base_dir)
       RServiceBus2.rlog "HandlerLoader.loadHandlersFromTopLevelPath. baseDir: #{base_dir}"
       get_list_of_files_for_dir(base_dir).each do |file_path|
-        unless file_path.end_with?('.')
-          msg_name = get_msg_name(file_path)
-          if File.directory?(file_path)
-            load_handlers_from_second_level_path(msg_name, file_path)
-          else
-            handler_name = "message_handler_#{msg_name}".gsub(/(?<=_|^)(\w)/){$1.upcase}.gsub(/(?:_)(\w)/,'\1') # Classify
-            load_handler(msg_name, file_path, handler_name)
-          end
+        next if file_path.end_with?('.')
+
+        msg_name = get_msg_name(file_path)
+        if File.directory?(file_path)
+          load_handlers_from_second_level_path(msg_name, file_path)
+        else
+          # Classify
+          handler_name = "message_handler_#{msg_name}"
+                         .gsub(/(?<=_|^)(\w)/) { Regexp.last_match(1).upcase }.gsub(/(?:_)(\w)/, '\1')
+          load_handler(msg_name, file_path, handler_name)
         end
       end
 
       self
     end
+    # rubocop:enable Metrics/MethodLength
 
     # Entry point for loading handlers
     #

data/lib/rservicebus2/handler_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Given a directory, this class is responsible for finding
   #  msgnames,
@@ -20,10 +22,10 @@ module RServiceBus2
     # setBusAttributeIfRequested
     #
     # @param [RServiceBus2::Handler] handler
-    def set_bus_attribute_if_requested(handler)
+    def conditionally_set_bus_attribute(handler)
       if defined?(handler.bus)
         handler.bus = @host
-        RServiceBus2.log 'Bus attribute set for: ' + handler.class.name
+        RServiceBus2.log "Bus attribute set for: #{handler.class.name}"
       end
 
       self
@@ -32,10 +34,10 @@ module RServiceBus2
     # setStateAttributeIfRequested
     #
     # @param [RServiceBus2::Handler] handler
-    def set_state_attribute_if_requested(handler)
+    def conditionally_set_state_attribute(handler)
       if defined?(handler.state)
         handler.state = @state_manager.get(handler)
-        RServiceBus2.log 'Bus attribute set for: ' + handler.class.name
+        RServiceBus2.log "Bus attribute set for: #{handler.class.name}"
       end
 
       self
@@ -50,29 +52,29 @@ module RServiceBus2
       self
     end
 
+    # rubocop:disable Metrics/AbcSize
     def interrogate_handler_for_app_resources(handler)
-      RServiceBus2.rlog "Checking app resources for: #{handler.class.name}"
-      RServiceBus2.rlog "If your attribute is not getting set, check that it is in the 'attr_accessor' list"
+      RServiceBus2.rlog "Checking app resources for: #{handler.class.name}\n" \
+                        "If your attribute is not getting set, check that it is in the 'attr_accessor' list"
 
       @resource_list_by_handler_name[handler.class.name] = []
-      @resource_manager.get_all.each do |k, v|
+      @resource_manager.all.each do |k, _v|
         next unless handler.class.method_defined?(k)
 
         @resource_list_by_handler_name[handler.class.name] << k
-        RServiceBus2.log "Resource attribute, #{k}, found for: " +
-          handler.class.name
+        RServiceBus2.log "Resource attribute, #{k}, found for: #{handler.class.name}"
       end
-
-      self
     end
+    # rubocop:enable Metrics/AbcSize
 
     def add_handler(lc_msg_name, handler)
-      msg_name = lc_msg_name.gsub(/(?<=_|^)(\w)/){$1.upcase}.gsub(/(?:_)(\w)/,'\1') # Turn snake_case string to CamelCase
+      # Turn snake_case string to CamelCase
+      msg_name = lc_msg_name.gsub(/(?<=_|^)(\w)/) { Regexp.last_match(1).upcase }.gsub(/(?:_)(\w)/, '\1')
       @handler_list[msg_name] = [] if @handler_list[msg_name].nil?
-      return unless @handler_list[msg_name].index{ |x| x.class.name == handler.class.name }.nil?
+      return unless @handler_list[msg_name].index { |x| x.instance_of(handler) }.nil?
 
       @handler_list[msg_name] << handler
-      set_bus_attribute_if_requested(handler)
+      conditionally_set_bus_attribute(handler)
       check_if_state_attribute_requested(handler)
       interrogate_handler_for_app_resources(handler)
     end
@@ -86,28 +88,32 @@ module RServiceBus2
 
       list = []
       @handler_list[msg_name].each do |handler|
-        list = list + @resource_list_by_handler_name[handler.class.name] unless @resource_list_by_handler_name[handler.class.name].nil?
+        unless @resource_list_by_handler_name[handler.class.name].nil?
+          list += @resource_list_by_handler_name[handler.class.name]
+        end
       end
       list.uniq!
     end
 
-    def set_resources_for_handlers_needed_to_process_msg(msg_name)
+    # rubocop:disable Metrics/AbcSize
+    def conditionally_set_resources_for_handlers(msg_name)
       @handler_list[msg_name].each do |handler|
-        set_state_attribute_if_requested(handler)
-
+        conditionally_set_state_attribute(handler)
         next if @resource_list_by_handler_name[handler.class.name].nil?
+
         @resource_list_by_handler_name[handler.class.name].each do |k|
           handler.instance_variable_set("@#{k}", @resource_manager.get(k).get_resource)
-          RServiceBus2.rlog "App resource attribute, #{k}, set for: " + handler.class.name
+          RServiceBus2.rlog "App resource attribute, #{k}, set for: #{handler.class.name}"
         end
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     def get_handler_list_for_msg(msg_name)
       return [] if @handler_list[msg_name].nil?
 
-      list = get_list_of_resources_needed_to_process_msg(msg_name)
-      set_resources_for_handlers_needed_to_process_msg(msg_name)
+      # list = get_list_of_resources_needed_to_process_msg(msg_name)
+      conditionally_set_resources_for_handlers(msg_name)
 
       @handler_list[msg_name]
     end
@@ -116,16 +122,16 @@ module RServiceBus2
       @handler_list.key?(msg_name)
     end
 
-    def get_stats
+    def stats
       list = []
-      @handler_list.each do |k, v|
+      @handler_list.each do |_k, v|
         list << v.inspect
       end
 
       list
     end
 
-    def get_list_of_msg_names
+    def msg_names
       @handler_list.keys
     end
   end

data/lib/rservicebus2/host.rb

@@ -74,7 +74,7 @@ module RServiceBus2
     def send_subscriptions
       log 'Send Subscriptions'
 
-      @endpoint_mapping.get_subscription_endpoints.each do |event_name|
+      @endpoint_mapping.subscription_endpoints.each do |event_name|
         subscribe(event_name)
       end
 
@@ -109,7 +109,7 @@ module RServiceBus2
 
     # Thin veneer for Configuring Cron
     def configure_cron_manager
-      @cron_manager = CronManager.new(self, @handler_manager.get_list_of_msg_names)
+      @cron_manager = CronManager.new(self, @handler_manager.msg_names)
       self
     end
 

data/lib/rservicebus2/monitor/awss3.rb

@@ -0,0 +1,51 @@
+require 'aws-sdk-s3'
+
+module RServiceBus2
+  # Monitor S3 Bucket for objects
+  class MonitorAWSS3 < Monitor
+    def connect(uri)
+      @bucket_name = uri.path
+      @bucket_name[0] = ''
+
+      @region = uri.host
+
+      @s3_client = Aws::S3::Client.new(region: @region)
+      @input_filter = []
+    end
+
+    def process_content(content)
+      content
+    end
+
+    def process_path(object_key)
+      # content = read_content_from_object(object_key)
+      resp = @s3_client.get_object(bucket: @bucket_name, key: object_key)
+
+      # call #read or #string on the response body
+      content = resp.body.read
+      payload = process_content(content)
+
+      send(payload, URI.parse(CGI.escape("s3://#{@region}/#{@bucket_name}/#{object_key}")))
+
+      @s3_client.delete_object({ bucket: @bucket_name, key: object_key })
+
+      content
+    end
+
+    def look
+      file_processed = 0
+      max_files_processed = 2
+
+      objects = @s3_client.list_objects_v2( bucket: @bucket_name, max_keys: max_files_processed).contents
+
+      objects.each do |object|
+        RServiceBus2.log "Ready to process, #{object.key}"
+        process_path(object.key)
+
+        file_processed += 1
+        RServiceBus2.log "Processed #{file_processed} of #{objects.length}."
+        RServiceBus2.log "Allow system tick #{self.class.name}"
+      end
+    end
+  end
+end

data/lib/rservicebus2/monitor/awssqs.rb

@@ -0,0 +1,32 @@
+require 'aws-sdk-sqs'
+require 'aws-sdk-sts'
+
+module RServiceBus2
+  # Monitor S3 Bucket for objects
+  class MonitorAWSSQS < Monitor
+    def connect(uri)
+      queue_name = uri.path.sub('/', '')
+
+      region = uri.host
+
+      sts_client = Aws::STS::Client.new(region: region)
+      caller_identity_account = sts_client.get_caller_identity.account
+
+      @queue_url = "https://sqs.#{region}.amazonaws.com/" +
+                   "#{caller_identity_account}/#{queue_name}"
+      @sqs_client = Aws::SQS::Client.new(region: region)
+    end
+
+    def look
+      # TODO make max available as env variable
+      response = @sqs_client.receive_message(queue_url: @queue_url, max_number_of_messages: 1)
+      response.messages.each do |message|
+        send(message.body, URI.parse(CGI.escape(@queue_url)))
+        @sqs_client.delete_message({
+          queue_url: @queue_url,
+          receipt_handle: message.receipt_handle
+        })
+      end
+    end
+  end
+end

data/lib/rservicebus2/monitor_configure.rb

@@ -23,7 +23,7 @@ module RServiceBus2
       RServiceBus2.rlog "Checking app resources for: #{monitor.class.name}"
       RServiceBus2.rlog "If your attribute is not getting set, check that it is
         in the 'attr_accessor' list"
-      @resource_manager.get_all.each do |k, v|
+      @resource_manager.all.each do |k, v|
         next unless monitor.class.method_defined?(k)
 
         monitor.instance_variable_set("@#{k}", v.get_resource)
@@ -48,6 +48,12 @@ module RServiceBus2
           when 'dir'
             require 'rservicebus2/monitor/dir'
             monitor = MonitorDir.new(@host, name, uri)
+          when 'awss3'
+            require 'rservicebus2/monitor/awss3'
+            monitor = MonitorAWSS3.new(@host, name, uri)
+          when 'awssqs'
+            require 'rservicebus2/monitor/awssqs'
+            monitor = MonitorAWSSQS.new(@host, name, uri)
           when 'dirnotifier'
             require 'rservicebus2/monitor/dirnotifier'
             monitor = MonitorDirNotifier.new(@host, name, uri)

data/lib/rservicebus2/resource_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Coordinate Transactions across resources, handlers, and Sagas
   class ResourceManager
@@ -13,7 +15,7 @@ module RServiceBus2
       @app_resources[name] = res
     end
 
-    def get_all
+    def all
       @app_resources
     end
 
@@ -37,9 +39,8 @@ module RServiceBus2
     def commit(msg_name)
       @state_manager.commit
       @saga_storage.commit
-      RServiceBus2.rlog "HandlerManager.commitResourcesUsedToProcessMsg,
-        #{msg_name}"
-      @current_resources.each do |k, v|
+      RServiceBus2.rlog "HandlerManager.commitResourcesUsedToProcessMsg, #{msg_name}"
+      @current_resources.each do |_k, v|
         RServiceBus2.rlog "Commit resource, #{v.class.name}"
         v.commit
         v.finished
@@ -48,21 +49,15 @@ module RServiceBus2
 
     def rollback(msg_name)
       @saga_storage.rollback
-      RServiceBus2.rlog "HandlerManager.rollbackResourcesUsedToProcessMsg,
-        #{msg_name}"
-      @current_resources.each do |k, v|
-        begin
-          RServiceBus2.rlog "Rollback resource, #{v.class.name}"
-          v.rollback
-          v.finished
-        rescue StandardError => e1
-          puts "Caught nested exception rolling back, #{v.class.name}, for msg,
-            #{msg_name}"
-          puts '****'
-          puts e1.message
-          puts e1.backtrace
-          puts '****'
-        end
+      RServiceBus2.rlog "HandlerManager.rollbackResourcesUsedToProcessMsg, #{msg_name}"
+      @current_resources.each do |_k, v|
+        RServiceBus2.rlog "Rollback resource, #{v.class.name}"
+        v.rollback
+        v.finished
+      rescue StandardError => e
+        puts "Caught nested exception rolling back, #{v.class.name}, for msg,
+          #{msg_name}"
+        puts "****\n#{e.message}\n#{e.backtrace}\n'****"
       end
     end
   end

data/lib/rservicebus2/saga/manager.rb

@@ -44,7 +44,7 @@ module RServiceBus2
         is in the 'attr_accessor' list"
 
       @resource_list_by_saga_name[saga.class.name] = []
-      @resource_manager.get_all.each do |k, v|
+      @resource_manager.all.each do |k, v|
         if saga.class.method_defined?(k)
           @resource_list_by_saga_name[saga.class.name] << k
           RServiceBus2.log "Resource attribute, #{k}, found for: " +

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus2
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.8
 platform: ruby
 authors:
 - Guy Irvine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-25 00:00:00.000000000 Z
+date: 2021-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: uuidtools
+  name: beanstalk-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: json
+  name: fluiddb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 0.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 0.1.19
 - !ruby/object:Gem::Dependency
-  name: beanstalk-client
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
-  name: fluiddb
+  name: parse-cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.19
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.19
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
-  name: parse-cron
+  name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 2.2.0
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
@@ -104,6 +104,9 @@ files:
 - lib/rservicebus2.rb
 - lib/rservicebus2/agent.rb
 - lib/rservicebus2/appresource.rb
+- lib/rservicebus2/appresource/awsdynamodb.rb
+- lib/rservicebus2/appresource/awss3.rb
+- lib/rservicebus2/appresource/awssqs.rb
 - lib/rservicebus2/appresource/dir.rb
 - lib/rservicebus2/appresource/file.rb
 - lib/rservicebus2/appresource/fluiddb.rb
@@ -124,6 +127,8 @@ files:
 - lib/rservicebus2/message/subscription.rb
 - lib/rservicebus2/message/verboseoutput.rb
 - lib/rservicebus2/monitor.rb
+- lib/rservicebus2/monitor/awss3.rb
+- lib/rservicebus2/monitor/awssqs.rb
 - lib/rservicebus2/monitor/dir.rb
 - lib/rservicebus2/monitor/dirnotifier.rb
 - lib/rservicebus2/monitor/message.rb