rservicebus2 0.2.15 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69007cfc230952eb00fdc713bc27b4d596eb7e59502331d7f30d22d52792c317
-  data.tar.gz: b48dab985640e9a8daf6a311f70a028031b69bdf0762013a10b83bffff29dda9
+  metadata.gz: 577432efc03536a99119146208b8fd418bd7641fc467f59f38564f4fdb477ca0
+  data.tar.gz: 85ade6550d036a70c0346f6d15bbc5d5376f49724b94bac7f48397e4ecd02bba
 SHA512:
-  metadata.gz: 6e9eed975d128ba3a8c664b246e1494d9f0dfbf6b5a38bcf7c5794e38949d264c54ecbcbabee7cdb707dc272a0476675da06c0451b23392a86fbf23481269492
-  data.tar.gz: 4934bf11567524616a8357d6d3f8d222b1b5a5b22a72021a3468b1c3a69c860f1f1ce7c58262f2c30a813c19b10ac0b60cb49d7b98107bc934d2d27274d48a4b
+  metadata.gz: df0fb5b6725e33976c7347765dceb6366c6b9c38bc8c215dee36ee984507e83ce1357861033a4389c38173ac02700df005314050bf3da740c5a6efc45c75a412
+  data.tar.gz: 80d4d9d00f7faa47c7b17b19ffe4a6e841b06b96952f52d3be3fe3df573780713685fbeff17dd5ceef6cb0d20fd9d34f01fea0c2545da20150683a8e0e4f3f89

data/bin/return_messages_to_source_queue

@@ -13,7 +13,8 @@ def return_msg(beanstalk, job, request_nbr)
 
   msg_name = payload.match('(\w*)', start_index)[1]
 
-  msg = YAML.load(payload)
+  msg = RServiceBus2.safe_load(payload)
+
   if msg.last_error_string.nil?
     puts "*** Requested msg, #{request_nbr}, does not have a sourceQueue to
           which it can be returned"

data/lib/rservicebus2/agent.rb

@@ -50,7 +50,7 @@ module RServiceBus2
     def check_for_reply(queue_name)
       @mq.subscribe(queue_name)
       body = @mq.pop
-      @msg = YAML.load(body)
+      @msg = RServiceBus2.safe_load(body)
       @mq.ack
       @msg.msg
     end

data/lib/rservicebus2/appresource.rb

@@ -33,7 +33,7 @@ module RServiceBus2
       finished
     end
 
-    # A notification that ocurs after getResource, to allow cleanup
+    # Allow for cleanup, outside of transaction semantics
     def finished
       @connection.close
     end
@@ -53,12 +53,18 @@ module RServiceBus2
     end
 
     # Transaction Semantics
-    def begin; end
+    def begin
+      RServiceBus2.rlog "#{self.class.name}. Default transaction.begin called"
+    end
 
     # Transaction Semantics
-    def commit; end
+    def commit
+      RServiceBus2.rlog "#{self.class.name}. Default transaction.commit called"
+    end
 
     # Transaction Semantics
-    def rollback; end
+    def rollback
+      RServiceBus2.rlog "#{self.class.name}. Default transaction.rollback called"
+    end
   end
 end

data/lib/rservicebus2/appresource/awsdynamodb.rb

@@ -11,6 +11,8 @@ module RServiceBus2
       Aws::DynamoDB::Client.new(region: region)
     end
 
-    def finished; end
+    def finished
+      RServiceBus2.rlog "#{self.class.name}. Finished"
+    end
   end
 end

data/lib/rservicebus2/appresource/awss3.rb

@@ -11,6 +11,8 @@ module RServiceBus2
       Aws::S3::Client.new(region: region)
     end
 
-    def finished; end
+    def finished
+      RServiceBus2.rlog "#{self.class.name}. Finished"
+    end
   end
 end

data/lib/rservicebus2/appresource/awssqs.rb

@@ -22,6 +22,8 @@ module RServiceBus2
       }
     end
 
-    def finished; end
+    def finished
+      RServiceBus2.rlog "#{self.class.name}. Finished"
+    end
   end
 end

data/lib/rservicebus2/appresource/fluiddb2.rb

@@ -18,8 +18,8 @@ module RServiceBus2
     def commit
       @connection.commit
     end
-    # Transaction Semantics
 
+    # Transaction Semantics
     def rollback
       @connection.rollback
     end

data/lib/rservicebus2/handler_loader.rb

@@ -140,14 +140,19 @@ module RServiceBus2
         next if file_path.end_with?('.')
 
         msg_name = get_msg_name(file_path)
+        RServiceBus2.add_to_permitted_classes(
+          msg_name.gsub(/(?<=_|^)(\w)/) { Regexp.last_match(1).upcase }.gsub(/(?:_)(\w)/, '\1')
+        )
+
         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)
+          next
         end
+
+        # 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
 
       self

data/lib/rservicebus2/helper_functions.rb

@@ -1,7 +1,27 @@
 # frozen_string_literal: true
 
+require 'csv'
+
 # Helper functions
 module RServiceBus2
+  DEFAULT_PERMITTED_CLASSES = 'RServiceBus2::Message,Time,UUIDTools::UUID,URI::Generic,URI::RFC3986_Parser,Symbol,Regexp'
+
+  def self.permitted_classes
+    permitted_classes_string = get_value('PERMITTED_CLASSES', DEFAULT_PERMITTED_CLASSES)
+    CSV.parse(permitted_classes_string)[0]
+  end
+
+  def self.add_to_permitted_classes(string)
+    ENV['PERMITTED_CLASSES'] = permitted_classes
+                               .push(string)
+                               .uniq
+                               .to_csv
+  end
+
+  def self.safe_load(body)
+    YAML.safe_load(body, permitted_classes: permitted_classes)
+  end
+
   def self.convert_dto_to_hash(obj)
     hash = {}
     obj.instance_variables.each do |var|

data/lib/rservicebus2/host.rb

@@ -162,7 +162,7 @@ module RServiceBus2
           body = @mq.pop
           begin
             @stats.inc_total_processed
-            @msg = YAML.load(body)
+            @msg = RServiceBus2.safe_load(body)
             case @msg.msg.class.name
             when 'RServiceBus2::MessageSubscription'
               @subscription_manager.add(@msg.msg.event_name,
@@ -252,18 +252,30 @@ module RServiceBus2
           message_loop = false
         rescue NoMsgToProcess => e
           # This exception is just saying there are no messages to process
-          @queue_for_msgs_to_be_sent_on_complete = []
-          @monitors.each(&:look)
-          send_queued_msgs
-          @queue_for_msgs_to_be_sent_on_complete = nil
-
-          @queue_for_msgs_to_be_sent_on_complete = []
-          @cron_manager.run
-          send_queued_msgs
-          @queue_for_msgs_to_be_sent_on_complete = nil
-
-          @send_at_manager.process
-          @circuit_breaker.success
+          begin
+            @queue_for_msgs_to_be_sent_on_complete = []
+            @monitors.each(&:look)
+            send_queued_msgs
+            @queue_for_msgs_to_be_sent_on_complete = nil
+
+            @queue_for_msgs_to_be_sent_on_complete = []
+            @cron_manager.run
+            send_queued_msgs
+            @queue_for_msgs_to_be_sent_on_complete = nil
+
+            @send_at_manager.process
+            @circuit_breaker.success
+          rescue StandardError => e
+            if e.message == 'SIGTERM' || e.message == 'SIGINT'
+              puts 'Exiting on request ...'
+              message_loop = false
+            else
+              puts '*** This is really unexpected.'
+              message_loop = false
+              puts "Message: #{e.message}"
+              puts e.backtrace
+            end
+          end
         rescue StandardError => e
           if e.message == 'SIGTERM' || e.message == 'SIGINT'
             puts 'Exiting on request ...'

data/lib/rservicebus2/message.rb

@@ -55,9 +55,9 @@ module RServiceBus2
 
     # @return [Object] The msg to be sent
     def msg
-      return YAML.load(Zlib::Inflate.inflate(@_msg)) if @compressed == true
+      return RServiceBus2.safe_load(Zlib::Inflate.inflate(@_msg)) if @compressed == true
 
-      YAML.load(@_msg)
+      RServiceBus2.safe_load(@_msg)
     rescue ArgumentError => e
       raise e if e.message.index('undefined class/module ').nil?
 

data/lib/rservicebus2/monitor.rb

@@ -36,7 +36,9 @@ module RServiceBus2
     end
 
     # A notification that allows cleanup
-    def finished; end
+    def finished
+      RServiceBus2.rlog "#{self.class.name}. Default Finished"
+    end
 
     # At least called in the Host rescue block, to ensure all network links
     #  are healthy

data/lib/rservicebus2/monitor/beanstalk.rb

@@ -12,7 +12,7 @@ module RServiceBus2
       CGI.parse(u.query)['timeout1']&.first || 5
     end
 
-    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
     def connect(uri)
       @uri = uri
       @timeout = deduce_timeout(uri)
@@ -36,7 +36,7 @@ module RServiceBus2
       puts e.message
       puts e.backtrace
     end
-    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength,Metrics/AbcSize
 
     def look
       job = @beanstalk.reserve @timeout

data/lib/rservicebus2/monitor/dir.rb

@@ -9,6 +9,7 @@ module RServiceBus2
 
   # rubocop:disable Metrics/ClassLength
   class MonitorDir < Monitor
+    # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
     def input_dir(uri)
       # Pass the path through the Dir object to check syntax on startup
       return Dir.new(uri.path) if File.writable?(uri.path)
@@ -27,44 +28,48 @@ module RServiceBus2
             "***** eg, rm #{uri.path} && mkdir #{uri.path}"
       abort
     end
+    # rubocop:enable Metrics/MethodLength,Metrics/AbcSize
 
-    def connect(uri)
-      @path = input_dir(uri).path
-      @input_filter = []
-
-      return if uri.query.nil?
+    def initialise_archive(parts)
+      return unless parts.key?('archive')
 
-      parts = CGI.parse(uri.query)
-      @querystringparts = parts
-      if parts.key?('archive')
-        archiveuri = URI.parse(parts['archive'][0])
-        unless File.directory?(archiveuri.path)
-          puts '***** Archive file name templating not yet supported.'
-          puts "***** Directory's only."
-          abort
-        end
-        @archivedir = archiveuri.path
+      archiveuri = URI.parse(parts['archive'][0])
+      unless File.directory?(archiveuri.path)
+        puts '***** Archive file name templating not yet supported.'
+        puts "***** Directory's only."
+        abort
       end
+      @archivedir = archiveuri.path
+    end
 
-      return unless parts.key?('input_filter')
-
+    def initialise_input_filter(parts)
       if parts['input_filter'].count > 1
-        puts 'Too many input_filters specified.'
-        puts '*** ZIP, or GZ are the only valid input_filters.'
+        puts 'Too many input_filters specified.\n*** ZIP, or GZ are the only valid input_filters.'
         abort
       end
 
-      if parts['input_filter'][0] == 'ZIP'
-      elsif parts['input_filter'][0] == 'GZ'
-      elsif parts['input_filter'][0] == 'TAR'
-      else
-        puts 'Invalid input_filter specified.'
-        puts '*** ZIP, or GZ are the only valid input_filters.'
+      unless %w[ZIP GZ TAR].include?(parts['input_filter'][0]).nil?
+        puts 'Invalid input_filter specified.\n' \
+             '*** ZIP, or GZ are the only valid input_filters.'
         abort
       end
+
       @input_filter << parts['input_filter'][0]
     end
 
+    def connect(uri)
+      @path = input_dir(uri).path
+      @input_filter = []
+
+      return if uri.query.nil?
+
+      parts = CGI.parse(uri.query)
+      @querystringparts = parts
+      initialise_archive(parts)
+
+      initialise_input_filter(parts) if parts.key?('input_filter')
+    end
+
     def process_content(content)
       content
     end
@@ -86,13 +91,14 @@ module RServiceBus2
     # rubocop:disable Metrics/MethodLength
     def read_content_from_file(file_path)
       content = ''
-      if @input_filter.length > 0
-        if @input_filter[0] == 'ZIP'
+      if @input_filter.length.positive?
+        case @input_filter[0]
+        when 'ZIP'
           content = read_content_from_zip_file(file_path)
-        elsif @input_filter[0] == 'GZ'
+        when 'GZ'
           content = read_content_from_gz_file(file_path)
-        elsif @input_filter[0] == 'TAR'
-          fail 'TAR reader not implemented'
+        else
+          raise "#{@input_filter[0]} reader not implemented."
         end
 
       else
@@ -101,13 +107,34 @@ module RServiceBus2
 
       content
     end
+    # rubocop:enable Metrics/MethodLength
+
+    def archive_file(file_path, content)
+      basename = File.basename(file_path)
+      new_file_path = "#{@archivedir}/#{basename}.#{Time.now.strftime('%Y%m%d%H%M%S%L')}.zip"
+      RServiceBus2.log "Writing to archive, #{new_file_path}"
+
+      Zip::ZipOutputStream.open(new_file_path) do |zos|
+        zos.put_next_entry(basename)
+        zos.puts content
+      end
+    end
 
     def process_path(file_path)
+      if File.file?(file_path) != true
+        RServiceBus2.log "Skipping directory, #{file_path}"
+        return
+      end
+
+      RServiceBus2.log "Ready to process, #{file_path}"
       content = read_content_from_file(file_path)
       payload = process_content(content)
 
-      send(payload, URI.parse(URI.encode("file://#{file_path}")))
-      content
+      send(payload, URI.parse(CGI.escape("file://#{file_path}")))
+
+      archive_file(file_path, content) unless @archivedir.nil?
+
+      File.unlink(file_path)
     end
 
     def look
@@ -116,28 +143,11 @@ module RServiceBus2
 
       file_list = Dir.glob("#{@path}/*")
       file_list.each do |file_path|
-        if File.file?(file_path) != true
-          RServiceBus2.log "Skipping directory, #{file_path}"
-          next
-        end
-        RServiceBus2.log "Ready to process, #{file_path}"
-        content = process_path(file_path)
-
-        unless @archivedir.nil?
-          basename = File.basename(file_path)
-          new_file_path = "#{@archivedir}/#{basename}.#{Time.now.strftime('%Y%m%d%H%M%S%L')}.zip"
-          RServiceBus2.log "Writing to archive, #{new_file_path}"
-
-          Zip::ZipOutputStream.open(new_file_path) do |zos|
-            zos.put_next_entry(basename)
-            zos.puts content
-          end
-        end
-        File.unlink(file_path)
+        process_path(file_path)
 
         file_processed += 1
-        RServiceBus2.log "Processed #{file_processed} of #{file_list.length}."
-        RServiceBus2.log "Allow system tick #{self.class.name}"
+        RServiceBus2.log "Processed #{file_processed} of #{file_list.length}.\nAllow system tick #{self.class.name}"
+
         break if file_processed >= max_files_processed
       end
     end

data/lib/rservicebus2/monitor/dirnotifier.rb

@@ -9,78 +9,70 @@ module RServiceBus2
   class MonitorDirNotifier < Monitor
     attr_reader :path, :processing_folder, :filter
 
-    def connect(uri)
-      # Pass the path through the Dir object to check syntax on startup
-      begin
-        open_folder uri.path
-        unless File.writable?(uri.path)
-          puts "***** Directory is not writable, #{uri.path}."
-          puts "***** Make the directory, #{uri.path}, writable and try again."
-          abort
-        end
-      rescue Errno::ENOENT
-        puts "***** Directory does not exist, #{uri.path}."
-        puts "***** Create the directory, #{uri.path}, and try again."
-        puts "***** eg, mkdir #{uri.path}"
-        abort
-      rescue Errno::ENOTDIR
-        puts "***** The specified path does not point to a directory,
-              #{uri.path}."
-        puts "***** Either repoint path to a directory, or remove, #{uri.path},
-              and create it as a directory."
-        puts "***** eg, rm #{uri.path} && mkdir #{uri.path}"
-        abort
-      end
+    def directory_not_writable(path, param_name)
+      "***** #{param_name} is not writable, #{path}.\n" \
+      "***** Make the directory, #{path}, writable and try again."
+    end
 
-      @path = uri.path
+    def directory_does_not_exist(path, param_name)
+      "***** #{param_name} does not exist, #{path}.\n" \
+      "***** Create the directory, #{path}, and try again.\n" \
+      "***** eg, mkdir #{path}"
+    end
+
+    def path_is_not_a_directory(path)
+      "***** The specified path does not point to a directory, #{path}.\n" \
+      "***** Either repoint path to a directory, or remove, #{path}, and create it as a directory.\n" \
+      "***** eg, rm #{path} && mkdir #{path}"
+    end
+
+    def processing_directory_not_specified(path)
+      '***** Processing Directory is not specified.' \
+      '***** Specify the Processing Directory as a query string in the Path URI' \
+      "***** eg, '/#{path}?processing=*ProcessingDir*'"
+    end
 
+    def validate_directory(path, param_name)
+      open_folder path
+      return if File.writable?(path)
+
+      puts directory_not_writable(path, param_name)
+      abort
+    rescue Errno::ENOENT
+      puts directory_does_not_exist(path, param_name)
+      abort
+    rescue Errno::ENOTDIR
+      puts path_is_not_a_directory(path)
+      abort
+    end
+
+    def validate_processing_directory(uri)
       if uri.query.nil?
-        puts '***** Processing Directory is not specified.'
-        puts '***** Specify the Processing Directory as a query string in the
-              Path URI'
-        puts "***** eg, '/#{uri.path}?processing=*ProcessingDir*"
+        puts processing_directory_not_specified(uri.path)
         abort
-      else
-        parts = CGI.parse(uri.query)
-
-        if parts.key? 'processing'
-          processing_uri = URI.parse parts['processing'][0]
-          begin
-            open_folder processing_uri.path
-            unless File.writable?(processing_uri.path)
-              puts "***** 1Processing Directory is not writable,
-                    #{processing_uri.path}."
-              puts "***** Make the directory, #{processing_uri.path},
-                    writable and try again."
-              abort
-            end
-          rescue Errno::ENOENT
-            puts "***** Processing Directory does not exist,
-                  #{processing_uri.path}."
-            puts "***** Create the directory, #{processing_uri.path}, and try
-                  again."
-            puts "***** eg, mkdir #{processing_uri.path}"
-            abort
-          rescue Errno::ENOTDIR
-            puts "***** Processing Directory does not point to a directory,
-                  #{processing_uri.path}."
-            puts "***** Either repoint path to a directory, or remove,
-                  #{processing_uri.path}, and create it as a directory."
-            puts "***** eg, rm #{processing_uri.path} && mkdir
-                  #{processing_uri.path}"
-            abort
-          end
-
-          @processing_folder = processing_uri.path
-        end
-
-        @filter = '*'
-        @filter = parts['filter'][0] if parts.key? 'filter'
       end
+
+      parts = CGI.parse(uri.query)
+      return unless parts.key? 'processing'
+
+      processing_uri = URI.parse parts['processing'][0]
+      validate_directory processing_uri.path, 'Processing Directory'
+      @processing_folder = processing_uri.path
+    end
+
+    def connect(uri)
+      # Pass the path through the Dir object to check syntax on startup
+
+      validate_directory uri, 'Directory'
+      @path = uri.path
+      validate_processing_directory(uri)
+
+      @filter = '*'
+      @filter = parts['filter'][0] if parts.key? 'filter'
     end
 
     def look
-      file_list = get_files
+      file_list = files
       file_list.each do |file_path|
         new_path = move_file(file_path, @processing_folder)
         send(nil, URI.parse("file://#{new_path}"))
@@ -97,8 +89,8 @@ module RServiceBus2
       Pathname.new(dest).join(filename)
     end
 
-    def get_files
-      Dir.glob(Pathname.new("#{@Path}").join(@Filter) ).select { |f| File.file?(f) }
+    def files
+      Dir.glob(Pathname.new(@path).join(@filter)).select { |f| File.file?(f) }
     end
   end
 end

data/lib/rservicebus2/mq/aws.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'aws-sdk-sqs'
 require 'aws-sdk-sts'
 require 'rservicebus2/mq'
@@ -6,75 +8,59 @@ module RServiceBus2
   # Beanstalk client implementation.
   class MQAWS < MQ
     # Connect to the broker
-    # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-    def connect(region, port)
-      begin
-        @max_job_size = 4_194_304
-        @region = region
+    def connect(region, _port)
+      @max_job_size = 4_194_304
+      @region = region
 
-        sts_client = Aws::STS::Client.new(region: region)
-        @caller_identity_account = sts_client.get_caller_identity.account
-      rescue StandardError => e
-        puts 'Error connecting to AWS'
-        puts "Host string, #{region}"
-        puts e.message
-        puts e.backtrace
-        abort
-      end
+      sts_client = Aws::STS::Client.new(region: region)
+      @caller_identity_account = sts_client.get_caller_identity.account
+    rescue StandardError => e
+      puts 'Error connecting to AWS'
+      puts "Host string, #{region}"
+      puts e.message
+      puts e.backtrace
+      abort
     end
 
     def subscribe(queuename)
       # For example:
       # 'https://sqs.us-east-1.amazonaws.com/111111111111/my-queue'
-      @queue_url = 'https://sqs.' + @region + '.amazonaws.com/' +
-        @caller_identity_account + '/' + queuename
+      @queue_url = "https://sqs.#{@region}.amazonaws.com/#{@caller_identity_account}/#{queuename}"
       @sqs_client = Aws::SQS::Client.new(region: @region)
     end
 
     # Get next msg from queue
     def pop
-      begin
-        response = @sqs_client.receive_message(
-          queue_url: @queue_url,
-          max_number_of_messages: 1
-        )
+      response = @sqs_client.receive_message(queue_url: @queue_url, max_number_of_messages: 1)
 
-        if response.messages.count.zero?
-          raise NoMsgToProcess
-        end
+      raise NoMsgToProcess if response.messages.count.zero?
 
-        response.messages.each do |message|
-          @job = message
-        end
-      rescue StandardError => e
-        raise e
+      response.messages.each do |message|
+        @job = message
       end
+    rescue StandardError => e
+      raise e
+    ensure
       @job.body
     end
 
     def return_to_queue
-#      @job.release if @job
       @job = nil
     end
 
     def ack
-      @sqs_client.delete_message({
-        queue_url: @queue_url,
-        receipt_handle: @job.receipt_handle
-      })
+      @sqs_client.delete_message({ queue_url: @queue_url, receipt_handle: @job.receipt_handle })
       @job = nil
     end
 
     def send(queue_name, msg)
       if msg.length > @max_job_size
-        puts '***Attempting to send a msg which will not fit on queue.'
-        puts "***Msg size, #{msg.length}, max msg size, #{@max_job_size}."
-        fail JobTooBigError, "Msg size, #{msg.length}, max msg size,
-              #{@max_job_size}"
+        puts '***Attempting to send a msg which will not fit on queue.' \
+             "***Msg size, #{msg.length}, max msg size, #{@max_job_size}."
+        raise JobTooBigError, "Msg size, #{msg.length}, max msg size, #{@max_job_size}"
       end
 
-      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.send_message(
         queue_url: queue_url,

data/lib/rservicebus2/mq/beanstalk.rb

@@ -16,19 +16,17 @@ module RServiceBus2
         @beanstalk = Beanstalk::Pool.new([string])
         @max_job_size = @beanstalk.stats['max-job-size']
         if @max_job_size < 4_194_304
-          puts "***WARNING: Lowest recommended.max-job-size is 4m, current
-                max-job-size, #{@max_job_size.to_f / (1024 * 1024)}m"
-          puts '***WARNING: Set the job size with the -z switch, eg
-                /usr/local/bin/beanstalkd -z 4194304'
+          puts '***WARNING: Lowest recommended.max-job-size is 4m, current ' \
+                "max-job-size, #{@max_job_size.to_f / (1024 * 1024)}m"
+          puts '***WARNING: Set the job size with the -z switch, eg ' \
+                '/usr/local/bin/beanstalkd -z 4194304'
         end
       rescue StandardError => e
         puts 'Error connecting to Beanstalk'
         puts "Host string, #{string}"
         if e.message == 'Beanstalk::NotConnected'
-          puts '***Most likely, beanstalk is not running. Start beanstalk,
-                  and try running this again.'
-          puts "***If you still get this error, check beanstalk is running
-                  at, #{string}"
+          puts '***Most likely, beanstalk is not running. Start beanstalk, and try running this again.'
+          puts "***If you still get this error, check beanstalk is running at, #{string}"
         else
           puts e.message
           puts e.backtrace

data/lib/rservicebus2/mq/file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'rservicebus2/mq'
 
@@ -5,18 +7,10 @@ module RServiceBus2
   # Beanstalk client implementation.
   class MQFile < MQ
     # Connect to the broker
-    # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-    
+
     def initialize(uri)
-      if uri.is_a? URI
-        @uri = uri
-      else
-        puts 'uri must be a valid URI'
-        abort
-      end
+      super
 
-      FileUtils.mkdir_p(@uri.path)
-      @local_queue_name = RServiceBus2.get_value('APPNAME', 'RServiceBus')
       FileUtils.mkdir_p("#{@uri.path}/#{@local_queue_name}")
       @timeout = RServiceBus2.get_value('QUEUE_TIMEOUT', '5').to_i
     end
@@ -28,24 +22,23 @@ module RServiceBus2
     end
 
     # Get next msg from queue
+    # rubocop:disable Metrics/MethodLength
     def pop
       time = @timeout
-      while time > 0
+      while time.positive?
         files = Dir.glob("#{@uri.path}/#{@local_queue_name}/*.msg")
-        if files.length > 0
-          @file_path = files[0] 
+        if files.positive?
+          @file_path = files[0]
           @body = IO.read(@file_path)
-	  return @body
+          return @body
         end
-	time -= 1
-	sleep(1)
+        time -= 1
+        sleep(1)
       end
-	
-      raise NoMsgToProcess if files.length == 0
-    end
 
-    def return_to_queue
+      raise NoMsgToProcess if files.length.zero?
     end
+    # rubocop:enable Metrics/MethodLength
 
     def ack
       FileUtils.rm @file_path
@@ -53,7 +46,7 @@ module RServiceBus2
 
     def send(queue_name, msg)
       FileUtils.mkdir_p("#{@uri.path}/#{queue_name}")
-      IO.write("#{@uri.path}/#{queue_name}/#{rand()}.msg", msg)
+      IO.write("#{@uri.path}/#{queue_name}/#{rand}.msg", msg)
     end
   end
 end

data/lib/rservicebus2/mq/redis.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'redis'
 require 'rservicebus2/mq'
 
@@ -5,38 +7,31 @@ module RServiceBus2
   # Redis client implementation.
   class MQRedis < MQ
     # Connect to the broker
-    # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
     def connect(host, port)
       port ||= 6379
       string = "#{host}:#{port}"
 
-      begin
-        @redis = Redis.new(:host => host, :port => port)
-
-      rescue Exception => e
-        puts e.message
-        puts 'Error connecting to Redis for mq'
-        puts "Host string, #{string}"
-        abort()
-      end
+      @redis = Redis.new(host: host, port: port)
+    rescue StandardError => e
+      puts e.message
+      puts 'Error connecting to Redis for mq'
+      puts "Host string, #{string}"
+      abort
     end
 
     # Connect to the queue
-    def subscribe( queuename )
+    def subscribe(queuename)
       @queuename = queuename
     end
 
     # Get next msg from queue
     def pop
-      if @redis.llen( @queuename ) == 0 then
+      if @redis.llen(@queuename).zero?
         sleep @timeout
-        raise NoMsgToProcess.new
+        raise NoMsgToProcess
       end
 
-      return @redis.lindex @queuename, 0
-    end
-
-    def returnToQueue
+      @redis.lindex @queuename, 0
     end
 
     # "Commit" queue
@@ -45,9 +40,8 @@ module RServiceBus2
     end
 
     # At least called in the Host rescue block, to ensure all network links are healthy
-    def send( queueName, msg )
-      @redis.rpush queueName, msg
+    def send(queue_name, msg)
+      @redis.rpush queue_name, msg
     end
-
   end
 end

data/lib/rservicebus2/saga_storage/dir.rb

@@ -81,7 +81,7 @@ module RServiceBus2
 
       return {} if content == ''
 
-      YAML.load(content)
+      RServiceBus2.safe_load(content)
     end
   end
 end

data/lib/rservicebus2/sendat_storage/file.rb

@@ -16,7 +16,7 @@ module RServiceBus2
 
       return [] if content == ''
 
-      YAML.load(content)
+      RServiceBus2.safe_load(content)
     end
 
     def add(msg)

data/lib/rservicebus2/state_storage/dir.rb

@@ -61,7 +61,7 @@ module RServiceBus2
 
       return {} if content == ''
 
-      YAML.load(content)
+      RServiceBus2.safe_load(content)
     end
   end
 end

data/lib/rservicebus2/subscription_storage/file.rb

@@ -7,11 +7,11 @@ module RServiceBus2
       RServiceBus2.log 'Load subscriptions'
       return {} unless File.exist?(@uri.path)
 
-      YAML.load(File.open(@uri.path))
+      RServiceBus2.safe_load(File.open(@uri.path))
     end
 
     def add(event_name, queue_name)
-      s = File.exist?(@uri.path) ? YAML.load(File.open(@uri.path)) : {}
+      s = File.exist?(@uri.path) ? RServiceBus2.safe_load(File.open(@uri.path)) : {}
       s[event_name] = [] if s[event_name].nil?
 
       s[event_name] << queue_name

data/lib/rservicebus2/transporter.rb

@@ -114,7 +114,7 @@ module RServiceBus2
     def process
       # Get the next job from the source queue
       job = @source.reserve @timeout
-      msg = YAML.load(job.body)
+      msg = RServiceBus2.safe_load(job.body)
 
       connect(msg.remote_host_name)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus2
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.21
 platform: ruby
 authors:
 - Guy Irvine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beanstalk-client