rservicebus2 0.2.9 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cf46f6455ed14f25642855bd4839b0c910447bb07007bdb2dba0c9a65b7f4d0
-  data.tar.gz: 5ef71ec901e2d142d731d2dd8be176b297116ef8b6b07ab182c295496f1dfd85
+  metadata.gz: cb17f3e3c5855d25725fd906122c5880299c33ef25a585d445b1ca63eb3b0a79
+  data.tar.gz: b950f8c099a79b02837dc6c1382ae4f36eb20d6b35f9c7e06f3351ac11804803
 SHA512:
-  metadata.gz: 35999f1a63cf911f2dc2d2d9580dc3afd26f70203db43bf7c58ee079606bb318246e292ffd382ceadfe4747d37a826a0784b3407d611c1957d61b7ea266aef05
-  data.tar.gz: c19a66ce0e83b4c2ae617ed0e8b9827f91cf31c9820e7f0e8ba5f405f83792b097e5ed0bd9769faf331bd15c4bdfeaf9748cea40677c29e050f4f3d1d6e58815
+  metadata.gz: ebb2ef88679f5827b905fc50f604c41dacbaaecbf5878181c0ce46801d9cb24d8df060ef4c39ef37f6bfd130a7dc5c0724f135d3905941841ba0470eaee4eb4f
+  data.tar.gz: 57c5279177ead71990a756c142f5ac17b2306116e359d4e7edcad448180ad5523c3f8132e024dfbf034b7cb30c8e790788990c00c01a825650eacadc981b1cbc

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

@@ -33,8 +33,8 @@ module RServiceBus2
         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
 

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/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

@@ -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)
@@ -339,8 +339,8 @@ module RServiceBus2
         RServiceBus2.rlog "Sending, #{msg.class.name} to, #{queue_name}"
       else
         parts = queue_name.split('@')
-        r_msg.set_remote_queue_name(parts[0])
-        r_msg.set_remote_host_name(parts[1])
+        r_msg.remote_queue_name = parts[0]
+        r_msg.remote_host_name = parts[1]
         q = 'transport-out'
         RServiceBus2.rlog "Sending, #{msg.class.name} to, #{queue_name}, via #{q}"
       end
@@ -370,11 +370,11 @@ module RServiceBus2
     # Reply queues are specified in each msg. It works like
     # email, where the reply address can actually be anywhere
     # @param [RServiceBus2::Message] msg msg to be sent
-    def reply(msg)
+    def reply(msg, timestamp = nil)
       RServiceBus2.rlog "Reply with: #{msg.class.name} To: #{@msg.return_address}"
       @stats.inc_total_reply
 
-      queue_msg_for_send_on_complete(msg, @msg.return_address)
+      queue_msg_for_send_on_complete(msg, @msg.return_address, timestamp)
     end
 
     def get_endpoint_for_msg(msg_name)

data/lib/rservicebus2/message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'zlib'
 require 'yaml'
 require 'uuidtools'
@@ -5,15 +7,18 @@ require 'uuidtools'
 module RServiceBus2
   # This is the top level message that is passed around the bus
   class Message
-    attr_reader :return_address, :msg_id, :remote_queue_name, :remote_host_name,
+    attr_reader :return_address, :msg_id,
                 :last_error_source_queue, :last_error_string, :correlation_id,
                 :sendat, :error_list
 
+    attr_accessor :remote_host_name, :remote_queue_name, :send_at
+
     # Constructor
     #
     # @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
@@ -26,11 +31,12 @@ module RServiceBus2
       @correlation_id = correlation_id
       @return_address = return_address
 
-      @createdat = DateTime.now
+      @createdat = Time.now
 
       @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.
@@ -47,25 +53,11 @@ module RServiceBus2
       @error_list << RServiceBus2::ErrorMessage.new(source_queue, error_string)
     end
 
-    def set_remote_host_name(host_name)
-      @remote_host_name = host_name
-    end
-
-    def set_remote_queue_name(queue_name)
-      @remote_queue_name = queue_name
-    end
-
-    def send_at(timestamp)
-      @send_at = timestamp
-    end
-
     # @return [Object] The msg to be sent
     def msg
-      if @compressed == true
-        return YAML.load(Zlib::Inflate.inflate(@_msg))
-      else
-        return YAML.load( @_msg )
-      end
+      return YAML.load(Zlib::Inflate.inflate(@_msg)) if @compressed == true
+
+      YAML.load(@_msg)
     rescue ArgumentError => e
       raise e if e.message.index('undefined class/module ').nil?