rservicebus2 0.2.10 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd8b2dfcd1227fbfa6285ecee4096a893a6f034c9bb7106564da2423a7344c8e
-  data.tar.gz: de0f4dbbf5ac8f3b683485577a73f4f40d19f10705b2d487e13dbf2acd637ef4
+  metadata.gz: 69007cfc230952eb00fdc713bc27b4d596eb7e59502331d7f30d22d52792c317
+  data.tar.gz: b48dab985640e9a8daf6a311f70a028031b69bdf0762013a10b83bffff29dda9
 SHA512:
-  metadata.gz: a0214102bf52760d3b773ef194cde8718ba6113637f65e4791329109b3ba3fbe05ab9b94e4f9dffc0d39d55f9e2530d5ddfd64629b9ed6916f5cf2b9ee4d38f2
-  data.tar.gz: 329306b143ee14af68664432dfa7d541f82ef55d1695dd16f77ebb03dd3ffbd28a7bd19f1c6a116d2220bfad302903da6569b717b36e91980bb334eb1f2773d8
+  metadata.gz: 6e9eed975d128ba3a8c664b246e1494d9f0dfbf6b5a38bcf7c5794e38949d264c54ecbcbabee7cdb707dc272a0476675da06c0451b23392a86fbf23481269492
+  data.tar.gz: 4934bf11567524616a8357d6d3f8d222b1b5a5b22a72021a3468b1c3a69c860f1f1ce7c58262f2c30a813c19b10ac0b60cb49d7b98107bc934d2d27274d48a4b

data/lib/rservicebus2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Add the currently running directory to the start of the load path
 # $:.unshift File.dirname(__FILE__) + '/../../lib'
 
@@ -19,7 +21,6 @@ require 'rservicebus2/mq'
 require 'rservicebus2/host'
 require 'rservicebus2/config'
 require 'rservicebus2/endpointmapping'
-require 'rservicebus2/stats'
 require 'rservicebus2/statistic_manager'
 require 'rservicebus2/audit'
 
@@ -45,10 +46,10 @@ require 'rservicebus2/monitor_configure'
 
 require 'rservicebus2/agent'
 
-require 'rservicebus2/saga_loader.rb'
-require 'rservicebus2/saga/manager.rb'
-require 'rservicebus2/saga/data.rb'
-require 'rservicebus2/saga/base.rb'
+require 'rservicebus2/saga_loader'
+require 'rservicebus2/saga/manager'
+require 'rservicebus2/saga/data'
+require 'rservicebus2/saga/base'
 
 require 'rservicebus2/saga_storage'
 

data/lib/rservicebus2/appresource/awss3.rb

@@ -1,16 +1,16 @@
+# frozen_string_literal: true
+
 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
+    def finished; end
   end
 end

data/lib/rservicebus2/appresource/awssqs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'aws-sdk-sqs'
 require 'aws-sdk-sts'
 

data/lib/rservicebus2/appresource/dir.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # AppResourceDir
   class AppResourceDir < AppResource
@@ -26,5 +28,6 @@ module RServiceBus2
 
       input_dir
     end
+    # rubocop:enable Metrics/AbcSize,Metrics/MethodLength
   end
 end

data/lib/rservicebus2/appresource/file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # App Resource File
   class AppResourceFile < AppResource

data/lib/rservicebus2/appresource/fluiddb.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'FluidDb/Db'
+
 module RServiceBus2
   # Implementation of an AppResource - FluidDb
   class AppResourceFluidDb < AppResource

data/lib/rservicebus2/appresource/fluiddb2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fluiddb2'
 
 module RServiceBus2
@@ -16,8 +18,8 @@ module RServiceBus2
     def commit
       @connection.commit
     end
-
     # Transaction Semantics
+
     def rollback
       @connection.rollback
     end

data/lib/rservicebus2/config.rb

@@ -2,6 +2,7 @@
 
 module RServiceBus2
   # Marshals configuration information for an rservicebus host
+  # rubocop:disable Metrics/ClassLength
   class Config
     attr_reader :app_name, :message_endpoint_mappings, :handler_path_list,
                 :saga_path_list, :error_queue_name, :max_retries,
@@ -49,6 +50,7 @@ module RServiceBus2
       self
     end
 
+    # rubocop:disable Metrics/MethodLength
     def load_host_section
       @app_name = get_value('APPNAME', 'RServiceBus2')
       @error_queue_name = get_value('ERROR_QUEUE_NAME', 'error')
@@ -68,6 +70,7 @@ module RServiceBus2
 
       self
     end
+    # rubocop:enable Metrics/MethodLength
 
     def ensure_contract_file_exists(path)
       unless File.exist?(path) || File.exist?("#{path}.rb")
@@ -75,11 +78,11 @@ module RServiceBus2
         puts "*** path, #{path}, provided does not exist as a file"
         abort
       end
-      unless File.extname(path) == '' || File.extname(path) == '.rb'
-        puts 'Error while processing contracts'
-        puts "*** path, #{path}, should point to a ruby file, with extention .rb"
-        abort
-      end
+      return if File.extname(path) == '.rb'
+
+      puts 'Error while processing contracts'
+      puts "*** path, #{path}, should point to a ruby file, with extention .rb"
+      abort
     end
 
     # Marshals paths for contracts
@@ -102,6 +105,16 @@ module RServiceBus2
     # Marshals paths for lib
     # Note. .rb extension is optional
     # Expected format: /one/two/contracts
+    def load_lib(path)
+      log "Loading libs from, #{path}"
+      return path if File.exist?(path)
+
+      puts 'Error while processing libs'
+      puts "*** path, #{path}, should point to a ruby file, with extention .rb, or"
+      puts "*** path, #{path}, should point to a directory than conatins ruby files, that have extention .rb"
+      abort
+    end
+
     def load_libs
       @lib_list = []
 
@@ -109,18 +122,7 @@ module RServiceBus2
       paths = './lib' if paths.nil? && File.exist?('./lib')
       return self if paths.nil?
 
-      paths.split(';').each do |path|
-        log "Loading libs from, #{path}"
-        unless File.exist?(path)
-          puts 'Error while processing libs'
-          puts "*** path, #{path}, should point to a ruby file, with extention
-                .rb, or"
-          puts "*** path, #{path}, should point to a directory than conatins
-                ruby files, that have extention .rb"
-          abort
-        end
-        @lib_list << path
-      end
+      paths.split(';').each { |path| @lib_list << load_lib(path) }
       self
     end
 
@@ -132,29 +134,35 @@ module RServiceBus2
     # Marshals paths for working_dirs
     # Note. trailing slashs will be stripped
     # Expected format: <path 1>;<path 2>
+    def load_working_dir_path(path)
+      path = path.strip.chomp('/')
+      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")
+      @lib_list << "#{path}/lib" if File.exist?("#{path}/lib")
+    end
+
     def load_working_dir_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.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")
-        @lib_list << "#{path}/lib" if File.exist?("#{path}/lib")
+        load_working_dir_path(path)
       end
       self
     end
   end
+  # rubocop:enable Metrics/ClassLength
 
   # Class
+  # rubocop:disable Lint/MissingSuper
   class ConfigFromEnv < Config
-    def initialize; end;
+    def initialize; end
   end
 
   # Class
@@ -162,6 +170,7 @@ module RServiceBus2
     attr_writer :app_name, :message_endpoint_mappings, :handler_path_list, :error_queue_name, \
                 :max_retries, :forward_received_messages_to, :beanstalk_host
 
-    def initialize; end;
+    def initialize; end
   end
+  # rubocop:enable Lint/MissingSuper
 end

data/lib/rservicebus2/endpointmapping.rb

@@ -12,8 +12,7 @@ module RServiceBus2
       RServiceBus2.log(string)
     end
 
-    # rubocop:disable Metrics/AbcSize
-    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
     def configure_mapping(mapping)
       match = mapping.match(/(.+):(.+)/)
       if match.nil?
@@ -36,8 +35,7 @@ module RServiceBus2
       end
       @queue_name_list << match[2]
     end
-    # rubocop:enable Metrics/AbcSize
-    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     # rubocop:disable Metrics/MethodLength
     def configure(local_queue_name = nil)

data/lib/rservicebus2/handler_manager.rb

@@ -102,7 +102,7 @@ module RServiceBus2
         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)
+          handler.instance_variable_set("@#{k}", @resource_manager.get(k).resource)
           RServiceBus2.rlog "App resource attribute, #{k}, set for: #{handler.class.name}"
         end
       end

data/lib/rservicebus2/helper_functions.rb

@@ -18,10 +18,10 @@ module RServiceBus2
     return if check_environment_variable('TESTING')
 
     type = ver ? 'VERB' : 'INFO'
-    if check_environment_variable('VERBOSE') || !ver
-      timestamp = Time.new.strftime('%Y-%m-%d %H:%M:%S')
-      puts "[#{type}] #{timestamp} :: #{string}"
-    end
+    return unless check_environment_variable('VERBOSE') || !ver
+
+    timestamp = Time.new.strftime('%Y-%m-%d %H:%M:%S')
+    puts "[#{type}] #{timestamp} :: #{string}"
   end
 
   def self.rlog(string)
@@ -43,6 +43,7 @@ module RServiceBus2
     value
   end
 
+  # rubocop:disable Metrics/MethodLength
   def self.send_msg(msg, response_queue = 'agent')
     require 'rservicebus2/endpointmapping'
     endpoint_mapping = EndpointMapping.new
@@ -54,13 +55,12 @@ module RServiceBus2
     Audit.new(agent).audit_to_queue(msg)
     agent.send_msg(msg, queue_name, response_queue)
   rescue QueueNotFoundForMsg => e
-    msg = "\n"
-    msg = "#{msg}*** Queue not found for, #{e.message}\n"
-    msg = "#{msg}*** Ensure you have an environment variable set for this
-            Message Type, eg, \n"
-    msg = "#{msg}*** MESSAGE_ENDPOINT_MAPPINGS=#{e.message}:<QueueName>\n"
-    raise StandardError, msg
+    raise StandardError, '' \
+      "*** Queue not found for, #{e.message}\n" \
+      "*** Ensure you have an environment variable set for this Message Type, eg, \n" \
+      "*** MESSAGE_ENDPOINT_MAPPINGS=#{e.message}:<QueueName>\n"
   end
+  # rubocop:enable Metrics/MethodLength
 
   def self.check_for_reply(queue_name)
     ENV['RSBMQ'] = 'beanstalk://localhost' if ENV['RSBMQ'].nil?
@@ -76,9 +76,9 @@ module RServiceBus2
       #{caller[0]}. #{string}"
   end
 
+  # rubocop:disable Metrics/CyclomaticComplexity
   def self.check_environment_variable(string)
-    return false if ENV[string].nil?
-    return false if ENV[string] == ''
+    return false if ENV[string].nil? || ENV[string] == ''
     return true if ENV[string] == true || ENV[string] =~ (/(true|t|yes|y|1)$/i)
     return false if ENV[string] == false ||
                     ENV[string].nil? ||
@@ -86,4 +86,5 @@ module RServiceBus2
 
     raise ArgumentError, "invalid value for Environment Variable: \"#{string}\""
   end
+  # rubocop:enable Metrics/CyclomaticComplexity
 end

data/lib/rservicebus2/host.rb

@@ -119,7 +119,7 @@ module RServiceBus2
       configure_saga_storage
       configure_app_resource
       @circuit_breaker = CircuitBreaker.new(self)
-      @monitors = ConfigureMonitor.new(self, @resource_manager).get_monitors(ENV)
+      @monitors = ConfigureMonitor.new(self, @resource_manager).monitors(ENV)
       load_handlers
       load_sagas
       @cron_manager = CronManager.new(self, @handler_manager.msg_names)

data/lib/rservicebus2/message.rb

@@ -18,6 +18,7 @@ module RServiceBus2
     # @param [Object] msg The msg to be sent
     # @param [Object] returnAddress A queue to which the destination message
     #  handler can send replies
+    # rubocop:disable Metrics/MethodLength
     def initialize(msg, return_address, correlation_id = nil)
       if RServiceBus2.check_environment_variable('RSBMSG_COMPRESS')
         @compressed = true
@@ -35,6 +36,7 @@ module RServiceBus2
       @msg_id = UUIDTools::UUID.random_create
       @error_list = []
     end
+    # rubocop:enable Metrics/MethodLength
 
     # If an error occurs while processing the message, this method allows details of the error to held
     # next to the msg.

data/lib/rservicebus2/message/statisticoutput.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   class MessageStatisticOutputOn
   end

data/lib/rservicebus2/message/subscription.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Class to hold message subscriptions
   class MessageSubscription

data/lib/rservicebus2/message/verboseoutput.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   class MessageVerboseOutputOn
   end

data/lib/rservicebus2/monitor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Monitor
   class Monitor
@@ -5,12 +7,12 @@ 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
 
     # The method which actually connects to the resource.
     def look
-      fail 'Method, Look, needs to be implemented for the Monitor'
+      raise 'Method, Look, needs to be implemented for the Monitor'
     end
 
     def _connect
@@ -34,8 +36,7 @@ module RServiceBus2
     end
 
     # A notification that allows cleanup
-    def finished
-    end
+    def finished; end
 
     # At least called in the Host rescue block, to ensure all network links
     #  are healthy
@@ -43,9 +44,8 @@ module RServiceBus2
       begin
         finished
       rescue StandardError => e
-        puts '** Monitor. An error was raised while closing connection to, ' +
-          @uri
-        puts 'Message: ' + e.message
+        puts "** Monitor. An error was raised while closing connection to, #{@uri}"
+        puts "Message: #{e.message}"
         puts e.backtrace
       end
 

data/lib/rservicebus2/monitor/awss3.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'aws-sdk-s3'
 
 module RServiceBus2
@@ -36,7 +38,7 @@ module RServiceBus2
       file_processed = 0
       max_files_processed = 2
 
-      objects = @s3_client.list_objects_v2( bucket: @bucket_name, max_keys: max_files_processed).contents
+      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}"

data/lib/rservicebus2/monitor/awssqs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'aws-sdk-sqs'
 require 'aws-sdk-sts'
 
@@ -12,20 +14,20 @@ module RServiceBus2
       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}"
+      @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
-        })
+        @sqs_client.delete_message(
+          {
+            queue_url: @queue_url,
+            receipt_handle: message.receipt_handle
+          }
+        )
       end
     end
   end