rservicebus2 0.2.8 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f94672750deba44e6495d728b6c45bbf0aba95efe35d18b6877359e27173da4
-  data.tar.gz: 27e94561da7ab338ee3ff5ac99f850f872900f2559bb56ce3dffd604c452173a
+  metadata.gz: 51c1a3dd6e3b22da8216ba061cb1572a5dd29475353c0b10ea470bdda7d7e3f7
+  data.tar.gz: 3952dfc273048ca7cecd3dca0179891d8d9bcc341e137b3212ce611c10523681
 SHA512:
-  metadata.gz: ac819c545740eb82ecf1ae2b95286f837ae1189ba3eded36ddcc98680ce4b7dcc84b975d9c75ab48e62f99cef32a83d98fdf2ad195bab0012f2804392abb3289
-  data.tar.gz: c10528a4a06fc27f9e2c5541dd4d500a1ae2120cc0f89a4a66c165a09c6fb5eae014c04ab74735c29069c6b6f8ebfaf089c7f2f63d80cdc02fb7d4acf3f7cc7b
+  metadata.gz: 0ed0ba711726a1641c1c3fab6811843f826633caca5c3061d5d223731313cc0138f182842768bece201041001a081ba899261bbbde5a0415fdeadd4252127ef5
+  data.tar.gz: 3976c2ec0eb733817f5b364bd0ee788a9ce1d13c2ff48c08694c5df916441d38ba6bbbfa6f0e8822a1143f51a00b53fd037ef9194a5e1fde969c8f75b0672aa4

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/agent.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   class QueueNotFoundForMsg < StandardError
   end
@@ -22,17 +24,17 @@ module RServiceBus2
     # @param [Object] messageObj The msg to be sent
     # @param [String] queueName the name of the queue to be send the msg to
     # @param [String] returnAddress the name of a queue to send replies to
-    # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+    # rubocop:disable Metrics/MethodLength
     def send_msg(message_obj, queue_name, return_address = nil)
-      fail QueueNotFoundForMsg, message_obj.class.name if queue_name.nil?
+      raise QueueNotFoundForMsg, message_obj.class.name if queue_name.nil?
 
       msg = RServiceBus2::Message.new(message_obj, return_address)
       if queue_name.index('@').nil?
         q = queue_name
       else
         parts = queueName.split('@')
-        msg.set_remote_queue_name(parts[0])
-        msg.set_remote_host_name(parts[1])
+        msg.remote_queue_name = parts[0]
+        msg.remote_host_name = parts[1]
         q = 'transport-out'
       end
 
@@ -40,6 +42,7 @@ module RServiceBus2
 
       @mq.send(q, serialized_object)
     end
+    # rubocop:enable Metrics/MethodLength
 
     # Gives an agent the means to receive a reply
     #

data/lib/rservicebus2/appresource.rb

@@ -18,7 +18,7 @@ module RServiceBus2
       RServiceBus2.rlog "#{self.class.name}. Connected to, #{@uri}"
     end
 
-    def get_resource
+    def resource
       @connection
     end
 

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/appresource_configure.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module RServiceBus2
   # Configure AppResources for an rservicebus host
   class ConfigureAppResource
-    # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,CyclomaticComplexity
+    # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
     def get_resources(env, host, state_manager, saga_storage)
-      # rm = resource_manager
       rm = ResourceManager.new(state_manager, saga_storage)
+      # rubocop:disable Metrics/BlockLength
       env.each do |k, v|
         if v.is_a?(String) && k.start_with?('RSBFDB2_')
           uri = URI.parse(v)
@@ -15,8 +17,8 @@ module RServiceBus2
           k = k.sub('RSBFDB2_', '')
           rm.add k, AppResourceFluidDb2.new(host, uri)
         elsif v.is_a?(String) &&
-              (k.start_with?('RSBFDB_') || v.index('fluiddb') == 0)
-          v = v['fluiddb'.length..-1] if v.index('fluiddb') == 0
+              (k.start_with?('RSBFDB_') || v.start_with?('fluiddb'))
+          v = v['fluiddb'.length..-1] if v.start_with?('fluiddb')
           uri = URI.parse(v)
           require 'rservicebus2/appresource/fluiddb'
 
@@ -46,8 +48,10 @@ module RServiceBus2
           end
         end
       end
+      # rubocop:enable Metrics/BlockLength
 
       rm
     end
+    # rubocop:enable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
   end
 end

data/lib/rservicebus2/audit.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Audit Class
   class Audit
-    def initialize(mq)
-      @mq = mq
+    def initialize(message_queue)
+      @mq = message_queue
       audit_queue_name = RServiceBus2.get_value('AUDIT_QUEUE_NAME')
       if audit_queue_name.nil?
         @sent_messages_to = RServiceBus2.get_value('sent_messages_to')

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,33 +134,43 @@ 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
   end
 
   # Class
   class ConfigFromSetter < Config
     attr_writer :app_name, :message_endpoint_mappings, :handler_path_list, :error_queue_name, \
                 :max_retries, :forward_received_messages_to, :beanstalk_host
+
+    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/errormessage.rb

@@ -6,7 +6,7 @@ module RServiceBus2
     attr_reader :occurredat, :source_queue, :error_msg
 
     def initialize(source_queue, error_msg)
-      @occurredat = DateTime.now
+      @occurredat = Time.now
 
       @source_queue = source_queue
       @error_msg = error_msg

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Helper functions
 module RServiceBus2
   def self.convert_dto_to_hash(obj)
     hash = {}
@@ -15,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)
@@ -35,11 +38,12 @@ module RServiceBus2
   end
 
   def self.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
 
+  # rubocop:disable Metrics/MethodLength
   def self.send_msg(msg, response_queue = 'agent')
     require 'rservicebus2/endpointmapping'
     endpoint_mapping = EndpointMapping.new
@@ -50,15 +54,13 @@ module RServiceBus2
     agent = RServiceBus2::Agent.new
     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?
@@ -74,12 +76,15 @@ 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].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? ||
                     ENV[string] =~ (/(false|f|no|n|0)$/i)
-    fail ArgumentError, "invalid value for Environment Variable: \"#{string}\""
+
+    raise ArgumentError, "invalid value for Environment Variable: \"#{string}\""
   end
+  # rubocop:enable Metrics/CyclomaticComplexity
 end