rservicebus2 0.2.5 → 0.2.10

data/lib/rservicebus2/message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'zlib'
 require 'yaml'
 require 'uuidtools'
@@ -5,10 +7,12 @@ 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
@@ -26,7 +30,7 @@ module RServiceBus2
       @correlation_id = correlation_id
       @return_address = return_address
 
-      @createdat = DateTime.now
+      @createdat = Time.now
 
       @msg_id = UUIDTools::UUID.random_create
       @error_list = []
@@ -47,25 +51,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?
 

data/lib/rservicebus2/monitor.rb

@@ -26,7 +26,6 @@ module RServiceBus2
     def initialize(bus, name, uri)
       @bus = bus
       new_anonymous_class = Class.new(MonitorMessage)
-      puts "name: #{name}"
       Object.const_set(name, new_anonymous_class)
       @msg_type = Object.const_get(name)
 

data/lib/rservicebus2/monitor/awss3.rb

@@ -17,56 +17,34 @@ module RServiceBus2
       content
     end
 
-    # rubocop:disable Metrics/MethodLength
-    def read_content_from_file(file_path)
-      content = ''
-      if @input_filter.length > 0
-        if @input_filter[0] == 'ZIP'
-          content = read_content_from_zip_file(file_path)
-        elsif @input_filter[0] == 'GZ'
-          content = read_content_from_gz_file(file_path)
-        elsif @input_filter[0] == 'TAR'
-          fail 'TAR reader not implemented'
-        end
-
-      else
-        content = IO.read(file_path)
-      end
-
-      content
-    end
-
     def process_path(object_key)
       # content = read_content_from_object(object_key)
-      content = object_key
+      resp = @s3_client.get_object(bucket: @bucket_name, key: object_key)
+
+      # call #read or #string on the response body
+      content = resp.body.read
       payload = process_content(content)
 
-      send(payload, URI.parse(URI.encode("s3://#{@region}/#{@bucket_name}/#{object_key}")))
+      send(payload, URI.parse(CGI.escape("s3://#{@region}/#{@bucket_name}/#{object_key}")))
+
+      @s3_client.delete_object({ bucket: @bucket_name, key: object_key })
+
       content
     end
 
     def look
       file_processed = 0
-      max_files_processed = 1
+      max_files_processed = 2
 
-      objects = @s3_client.list_objects_v2(
-          bucket: @bucket_name,
-          max_keys: max_files_processed
-        ).contents
-
-      return if objects.count.zero?
+      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}"
         process_path(object.key)
-        # content = process_path(object.key)
-
-        # File.unlink(file_path)
 
         file_processed += 1
         RServiceBus2.log "Processed #{file_processed} of #{objects.length}."
         RServiceBus2.log "Allow system tick #{self.class.name}"
-        break if file_processed >= max_files_processed
       end
     end
   end

data/lib/rservicebus2/monitor/awssqs.rb

@@ -0,0 +1,32 @@
+require 'aws-sdk-sqs'
+require 'aws-sdk-sts'
+
+module RServiceBus2
+  # Monitor S3 Bucket for objects
+  class MonitorAWSSQS < Monitor
+    def connect(uri)
+      queue_name = uri.path.sub('/', '')
+
+      region = uri.host
+
+      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}"
+      @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
+        })
+      end
+    end
+  end
+end

data/lib/rservicebus2/monitor/dir.rb

@@ -124,7 +124,7 @@ module RServiceBus2
 
         unless @archivedir.nil?
           basename = File.basename(file_path)
-          new_file_path = "#{@archivedir}/#{basename}.#{DateTime.now.strftime('%Y%m%d%H%M%S%L')}.zip"
+          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|

data/lib/rservicebus2/monitor_configure.rb

@@ -23,10 +23,10 @@ module RServiceBus2
       RServiceBus2.rlog "Checking app resources for: #{monitor.class.name}"
       RServiceBus2.rlog "If your attribute is not getting set, check that it is
         in the 'attr_accessor' list"
-      @resource_manager.get_all.each do |k, v|
+      @resource_manager.all.each do |k, v|
         next unless monitor.class.method_defined?(k)
 
-        monitor.instance_variable_set("@#{k}", v.get_resource)
+        monitor.instance_variable_set("@#{k}", v.resource)
         @resource_list[monitor.class.name] = [] if
           @resource_list[monitor.class.name].nil?
         @resource_list[monitor.class.name] << v
@@ -51,6 +51,9 @@ module RServiceBus2
           when 'awss3'
             require 'rservicebus2/monitor/awss3'
             monitor = MonitorAWSS3.new(@host, name, uri)
+          when 'awssqs'
+            require 'rservicebus2/monitor/awssqs'
+            monitor = MonitorAWSSQS.new(@host, name, uri)
           when 'dirnotifier'
             require 'rservicebus2/monitor/dirnotifier'
             monitor = MonitorDirNotifier.new(@host, name, uri)

data/lib/rservicebus2/mq/beanstalk.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'beanstalk-client'
 require 'rservicebus2/mq'
 
@@ -34,6 +36,7 @@ module RServiceBus2
         abort
       end
     end
+    # rubocop:enable Metrics/AbcSize,Metrics/MethodLength
 
     def subscribe(queuename)
       @beanstalk.watch(queuename)
@@ -45,6 +48,7 @@ module RServiceBus2
         @job = @beanstalk.reserve @timeout
       rescue StandardError => e
         raise NoMsgToProcess if e.message == 'TIMED_OUT'
+
         raise e
       end
       @job.body
@@ -63,7 +67,7 @@ module RServiceBus2
       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,
+        raise JobTooBigError, "Msg size, #{msg.length}, max msg size,
               #{@max_job_size}"
       end
       @beanstalk.use(queue_name)

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/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,13 @@
+# 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)
+      puts "@list: #{@list.class.name}"
+      @path = uri.path
     end
 
     def load(path)
@@ -20,7 +25,7 @@ module RServiceBus2
       save
     end
 
-    def get_all
+    def all
       @list
     end
 
@@ -31,7 +36,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

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus2
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.10
 platform: ruby
 authors:
 - Guy Irvine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: uuidtools
+  name: beanstalk-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: json
+  name: fluiddb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 0.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 0.1.19
 - !ruby/object:Gem::Dependency
-  name: beanstalk-client
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
-  name: fluiddb
+  name: parse-cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.19
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.19
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
-  name: parse-cron
+  name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 2.2.0
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
@@ -106,6 +106,7 @@ files:
 - lib/rservicebus2/appresource.rb
 - lib/rservicebus2/appresource/awsdynamodb.rb
 - lib/rservicebus2/appresource/awss3.rb
+- lib/rservicebus2/appresource/awssqs.rb
 - lib/rservicebus2/appresource/dir.rb
 - lib/rservicebus2/appresource/file.rb
 - lib/rservicebus2/appresource/fluiddb.rb
@@ -127,6 +128,7 @@ files:
 - lib/rservicebus2/message/verboseoutput.rb
 - lib/rservicebus2/monitor.rb
 - lib/rservicebus2/monitor/awss3.rb
+- lib/rservicebus2/monitor/awssqs.rb
 - lib/rservicebus2/monitor/dir.rb
 - lib/rservicebus2/monitor/dirnotifier.rb
 - lib/rservicebus2/monitor/message.rb