rservicebus2 0.2.7 → 0.2.12

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

@@ -5,7 +5,7 @@ module RServiceBus2
     attr_accessor :finished
 
     def initialize(saga)
-      @createdat = DateTime.now
+      @createdat = Time.now
       @correlation_id = UUIDTools::UUID.random_create
       @saga_class_name = saga.class.name
       @finished = false

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: " +
@@ -76,7 +76,7 @@ module RServiceBus2
       return if @resource_list_by_saga_name[saga.class.name].nil?
 
       @resource_list_by_saga_name[saga.class.name].each do |k, v|
-        saga.instance_variable_set("@#{k}", @resource_manager.get(k).get_resource)
+        saga.instance_variable_set("@#{k}", @resource_manager.get(k).resource)
         RServiceBus2.rlog "App resource attribute, #{k}, set for: " + saga.class.name
       end
     end

data/lib/rservicebus2/saga_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Given a directory, this class is responsible loading Sagas
   class SagaLoader
@@ -17,11 +19,11 @@ module RServiceBus2
     #  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 Saga require doesn't exist")
+      abort("Filepath, #{file_path}, given for Saga require doesn't exist")
     end
 
     # Instantiate the saga named in sagaName from the file name in file_path
@@ -32,6 +34,8 @@ module RServiceBus2
     # @param [String] sagaName name of the saga to instantiate
     # @param [String] file_path the path to the file to be loaded
     # @return [RServiceBus2::Saga] the loader
+
+    # rubocop:disable Metrics/MethodLength
     def load_saga_from_file(saga_name, file_path)
       require_path = get_require_path(file_path)
 
@@ -39,52 +43,51 @@ module RServiceBus2
       begin
         saga = Object.const_get(saga_name)
       rescue StandardError => e
-        puts 'Expected class name: ' + saga_name + ', not found after require:
-          ' + require_path
-        puts '**** Check in ' + file_path + ' that the class is named : ' +
-          saga_name
-        puts '( In case its not that )'
+        puts "Expected class name: #{saga_name}, not found after require: #{require_path}" \
+             "**** Check in #{file_path} that the class is named: #{saga_name}" \
+             '( In case its not that )'
         raise e
       end
       saga
     end
+    # rubocop:enable Metrics/MethodLength
 
     # Wrapper function
     # @param [String] file_path
     # @param [String] sagaName
     # @returns [RServiceBus2::Saga] saga
+
+    # rubocop:disable Metrics/MethodLength
     def load_saga(file_path, saga_name)
       if @list_of_loaded_paths.key?(file_path)
         RServiceBus2.log "Not reloading, #{file_path}"
         return
       end
 
-      begin
-        RServiceBus2.rlog 'file_path: ' + file_path
-        RServiceBus2.rlog 'saga_name: ' + saga_name
+      RServiceBus2.rlog "file_path: #{file_path}"
+      RServiceBus2.rlog "saga_name: #{saga_name}"
 
-        saga = load_saga_from_file(saga_name, file_path)
-        RServiceBus2.log 'Loaded Saga: ' + saga_name
+      saga = load_saga_from_file(saga_name, file_path)
+      RServiceBus2.log "Loaded Saga: #{saga_name}"
 
-        @saga_manager.register_saga(saga)
+      @saga_manager.register_saga(saga)
 
-        @list_of_loaded_paths[file_path] = 1
-      rescue StandardError => e
-        puts 'Exception loading saga from file: ' + file_path
-        puts e.message
-        puts e.backtrace[0]
-        abort
-      end
+      @list_of_loaded_paths[file_path] = 1
+    rescue StandardError => e
+      puts "Exception loading saga from file: #{file_path}"
+      puts e.message
+      puts e.backtrace[0]
+      abort
     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 "SagaLoader.getListOfFilesForDir. path: #{path},
-        list: #{list}"
+      RServiceBus2.rlog "SagaLoader.getListOfFilesForDir. path: #{path}, list: #{list}"
 
       list
     end
@@ -97,7 +100,7 @@ module RServiceBus2
 
       saga_name = base_name.sub(ext_name, '')
 
-      "saga_#{saga_name}".gsub(/(?<=_|^)(\w)/){$1.upcase}.gsub(/(?:_)(\w)/,'\1')
+      "saga_#{saga_name}".gsub(/(?<=_|^)(\w)/) { Regexp.last_match(1).upcase }.gsub(/(?:_)(\w)/, '\1')
     end
 
     # Entry point for loading Sagas

data/lib/rservicebus2/saga_storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Saga Storage
   class SagaStorage
@@ -5,13 +7,12 @@ module RServiceBus2
       case uri.scheme
       when 'dir'
         require 'rservicebus2/saga_storage/dir'
-        return SagaStorageDir.new(uri)
+        SagaStorageDir.new(uri)
       when 'inmem'
         require 'rservicebus2/saga_storage/inmemory'
-        return SagaStorageInMemory.new(uri)
+        SagaStorageInMemory.new(uri)
       else
-        abort("Scheme, #{uri.scheme}, not recognised when configuring
-          SagaStorage, #{uri}")
+        abort("Scheme, #{uri.scheme}, not recognised when configuring SagaStorage, #{uri}")
       end
     end
   end

data/lib/rservicebus2/sendat_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rservicebus2/sendat_storage'
 
 module RServiceBus2
@@ -16,9 +18,9 @@ module RServiceBus2
     end
 
     def process
-      now = DateTime.now
-      @sendat_storage.get_all.each_with_index do |row, idx|
-        next if row['timestamp'] <= now
+      now = Time.now
+      @sendat_storage.all.each_with_index do |row, idx|
+        next if now <= row['timestamp']
 
         @bus._send_needs_wrapping(row['msg'], row['queue_name'],
                                   row['correlation_id'])

data/lib/rservicebus2/sendat_storage.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
 
 module RServiceBus2
   # Send At Storage
   class SendAtStorage
+    # rubocop:disable Metrics/MethodLength
     def self.get(uri)
       case uri.scheme
       when 'file'
         require 'rservicebus2/sendat_storage/file'
-        return SendAtStorageFile.new(uri)
+        SendAtStorageFile.new(uri)
       when 'inmem'
         require 'rservicebus2/sendat_storage/inmemory'
-        return SendAtStorageInMemory.new(uri)
+        SendAtStorageInMemory.new(uri)
       else
         abort("Scheme, #{uri.scheme}, not recognised when configuring
           SendAtStorage, #{uri}")
       end
     end
-
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/rservicebus2/sendat_storage/file.rb

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Send at storage file
   class SendAtStorageFile
     def initialize(uri)
+      RServiceBus2.log "SendAtStorageFile configured: #{uri.path}"
       @list = load(uri.path)
+      @path = uri.path
     end
 
     def load(path)
@@ -20,7 +24,7 @@ module RServiceBus2
       save
     end
 
-    def get_all
+    def all
       @list
     end
 
@@ -31,7 +35,7 @@ module RServiceBus2
 
     def save
       content = YAML.dump(@list)
-      File.open(@uri.path, 'w') { |f| f.write(YAML.dump(content)) }
+      File.open(@path, 'w') { |f| f.write(content) }
     end
   end
 end

data/lib/rservicebus2/sendat_storage/inmemory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Send at storage in memory
   class SendAtStorageInMemory

data/lib/rservicebus2/state_manager.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'rservicebus2/state_storage'
 
 module RServiceBus2
-
   # State Manager
   class StateManager
     def required
@@ -16,15 +17,15 @@ module RServiceBus2
     end
 
     def begin
-      @state_storage.begin unless @state_storage.nil?
+      @state_storage&.begin
     end
 
     def get(handler)
-      @state_storage.get(handler) unless @state_storage.nil?
+      @state_storage&.get(handler)
     end
 
     def commit
-      @state_storage.commit unless @state_storage.nil?
+      @state_storage&.commit
     end
   end
 end

data/lib/rservicebus2/state_storage.rb

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # State Storage
   class StateStorage
     def self.get(uri)
       case uri.scheme
       when 'dir'
-        require 'rservicebus2/state_storage/dir.rb'
-        return StateStorageDir.new(uri)
+        require 'rservicebus2/state_storage/dir'
+        StateStorageDir.new(uri)
       when 'inmem'
-        require 'rservicebus2/state_storage/inmemory.rb'
-        return StateStorageInMemory.new(uri)
+        require 'rservicebus2/state_storage/inmemory'
+        StateStorageInMemory.new(uri)
       else
-        abort("Scheme, #{uri.scheme}, not recognised when configuring
-          StateStorage, #{uri}")
+        abort("Scheme, #{uri.scheme}, not recognised when configuring StateStorage, #{uri}")
       end
     end
   end

data/lib/rservicebus2/statistic_manager.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Used to collect various run time stats for runtime reporting
   class StatisticManager
     attr_accessor :output
 
+    # rubocop:disable Metrics/MethodLength
     def initialize(host)
       @host = host
       @hash = {}
@@ -20,6 +23,7 @@ module RServiceBus2
         RServiceBus2.get_value('STAT_OUTPUT_COUNTDOWN', '1').to_i
       @stat_output_countdown = 0
     end
+    # rubocop:enable Metrics/MethodLength
 
     def inc_total_processed
       @total_processed += 1
@@ -51,7 +55,7 @@ module RServiceBus2
       @total_by_message_type[class_name] += 1
     end
 
-    def get_for_reporting_2
+    def internal_formatted_reporting
       return unless @written == false
 
       @written = true
@@ -63,7 +67,7 @@ module RServiceBus2
       types
     end
 
-    def get_for_reporting_9
+    def formatted_reporting
       "T:#{@total_processed};" \
       "E:#{@total_errored};" \
       "S:#{@total_sent};" \
@@ -72,7 +76,7 @@ module RServiceBus2
     end
 
     def report
-      @host.log(get_for_reporting_9) if @output
+      @host.log(formatted_reporting) if @output
     end
 
     def tick

data/lib/rservicebus2/subscription_manager.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Subscription Manager
   class SubscriptionManager
     def initialize(subscription_storage)
       @subscription_storage = subscription_storage
-      @subscriptions = @subscription_storage.get_all
+      @subscriptions = @subscription_storage.all
     end
 
     # Get subscriptions for given eventName
@@ -11,7 +13,8 @@ module RServiceBus2
       subscriptions = @subscriptions[event_name]
       if subscriptions.nil?
         RServiceBus2.log "No subscribers for event, #{event_name}"
-        RServiceBus2.log "If there should be, ensure you have the appropriate evironment variable set, eg MESSAGE_ENDPOINT_MAPPINGS=#{event_name}:<Queue Name>"
+        RServiceBus2.log 'If there should be, ensure you have the appropriate evironment variable set, ' \
+                          "eg MESSAGE_ENDPOINT_MAPPINGS=#{event_name}:<Queue Name>"
         return []
       end
 
@@ -19,13 +22,12 @@ module RServiceBus2
     end
 
     def add(event_name, queue_name)
-      RServiceBus2.log 'Adding subscription for, ' +
-        event_name + ', to, ' + queue_name
+      RServiceBus2.log "Adding subscription for, #{event_name}, to, #{queue_name}"
       @subscriptions = @subscription_storage.add(event_name, queue_name)
     end
 
     def remove(_event_name, _queue_name)
-      fail 'Method, remove, needs to be implemented for this subscription storage'
+      raise 'Method, remove, needs to be implemented for this subscription storage'
     end
   end
 end

data/lib/rservicebus2/subscription_storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module RServiceBus2
@@ -14,8 +16,8 @@ module RServiceBus2
     end
 
     # Get a list of all subscription, as an Array
-    def get_all
-      fail 'Method, get_all, needs to be implemented for SubscriptionStorage'
+    def all
+      raise 'Method, all, needs to be implemented for SubscriptionStorage'
     end
 
     # Add a new subscription
@@ -23,7 +25,7 @@ module RServiceBus2
     #  has asked for notification
     # @param [String] queue_name the queue to which the event should be sent
     def add(_event_name, _queue_name)
-      fail 'Method, add, needs to be implemented for this subscription storage'
+      raise 'Method, add, needs to be implemented for this subscription storage'
     end
 
     # Remove an existing subscription
@@ -32,8 +34,7 @@ module RServiceBus2
     #  has asked for notification
     # @param [String] queue_name the queue to which the event should be sent
     def remove(_event_name, _queue_name)
-      fail 'Method, remove, needs to be implemented for this subscription
-        storage'
+      raise 'Method, remove, needs to be implemented for this subscription storage'
     end
   end
 end