rservicebus2 0.1.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3e35956ca7757e14c09a4d307c3a93350458d3b0
-  data.tar.gz: e548174aa8e07fdac56101959b236b871fc75ac1
+SHA256:
+  metadata.gz: 3e12a4225a0bdda2fdc600e0f5f1134dacf481343d7e9e3e3837b820ca1f8509
+  data.tar.gz: 02e285f84043c7f457db328a9fd74c1f7f62104531cae5b723ba301aca518a3f
 SHA512:
-  metadata.gz: dd37584311d230ecbe2f7b9e1336ce86b3b61ff2c0899c7d527118a17b3a7777c84b3f377aed74db04aef0a20a9f42c997c2aee6408118da9f644c137fe4e30e
-  data.tar.gz: 3685373828a0ae3e702e2bf70cb100e6bf2b37e18d9a02ddcb38adb48b82bd5b5cdfe897fd4e72a42d8053262a52a83443adc065730a949e020e44adc8c3e28e
+  metadata.gz: a2aefd96d740b7020284d95f36256fead951f895fab13e8eeb1440b674ebdb28a580a11ad75c4cbb1dbb270b1aef0ed901af1b94d03459252cfe33947b85aac1
+  data.tar.gz: 848e86f7d3c40f83cdb1f6d3459af1a5265f1e9272c7718da950c81457ff54983c0d00bc3997b0b0955df57798a53ff7be3650463458cdbe2b926c636053ddde

data/README.md

@@ -0,0 +1,50 @@
+# rservicebus2
+
+Use the examples directory as the starting point.
+
+## General Approach
+
+1. Convention over Configuration
+2. Configuration via Environment Variables
+3. Working examples provided for configuration
+
+## General Config
+
+### APPNAME
+1. Name of process
+2. Doubles as default queueName
+3. Defaults to directory name
+
+### MAX_RETRIES
+1. If an exception is generated while processing a message, the message can be
+retried. This allows the number of retries to be set.
+2. Defaults to 5
+
+### ERROR_QUEUE_NAME
+1. If an exception is generated while processing a message, the message can be
+retried. Once all retries are exhausted, the message will be put in the error queue.
+2. This allows the name of the queue to be set.
+3. Defaults to error
+
+### WORKING_DIR
+1. Where message handlers are looked for.
+2. Defaults to current directory
+
+### VERBOSE
+1. Send out more logging to track message processing
+
+### AUDIT_QUEUE_NAME
+1. When set, a copy of all messages sent and received will be add to this queue
+
+### RSBCRON_[msg name]
+1. An empty message will be created and sent based on the cron string
+
+## RSBMQ - Message queue
+1. Environment Variable Name: RSBMQ
+
+### Beanstalk
+
+### Redis
+
+### SQS
+RSBMQ=aws://[region]/[queue_name]

data/bin/send_empty_message

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rservicebus2'
-require 'rservicebus2/Agent'
+require 'rservicebus2/agent'
 
 abort "Usage: #{File.basename($0)} <Msg Name> <Queue Name> [Response Queue Name] [Beanstalk Host]" unless ARGV.length >=2 && ARGV.length <=4
 msg_name = ARGV[0]

data/lib/rservicebus2/config.rb

@@ -133,7 +133,7 @@ module RServiceBus2
     def load_working_dir_list
       puts "Config.load_working_dir_list.1"
       puts "Config.load_working_dir_list.2 #{@contract_list}"
-      path_list = get_value('WORKING_DIR')
+      path_list = get_value('WORKING_DIR', './')
       return self if path_list.nil?
 
       path_list.split(';').each do |path|

data/lib/rservicebus2/host.rb

@@ -43,8 +43,8 @@ module RServiceBus2
 
     # Thin veneer for Configuring state
     def configure_saga_storage
-      string = RServiceBus2.get_value('SAGA_URI')
-      string = 'dir:///tmp' if string.nil?
+      string = RServiceBus2.get_value('SAGA_URI', 'dir:///tmp/saga')
+      # string = 'dir:///tmp' if string.nil?
 
       uri = URI.parse(string)
       @saga_storage = SagaStorage.get(uri)

data/lib/rservicebus2/mq.rb

@@ -18,6 +18,15 @@ module RServiceBus2
       when 'beanstalk'
         require 'rservicebus2/mq/beanstalk'
         mq = MQBeanstalk.new(uri)
+      when 'file'
+        require 'rservicebus2/mq/file'
+        mq = MQFile.new(uri)
+      when 'redis'
+        require 'rservicebus2/mq/redis'
+        mq = MQRedis.new(uri)
+      when 'aws'
+        require 'rservicebus2/mq/aws'
+        mq = MQAWS.new(uri)
       else
         abort("Scheme, #{uri.scheme}, not recognised when configuring mq,
           #{string}")

data/lib/rservicebus2/mq/aws.rb

@@ -0,0 +1,85 @@
+require 'aws-sdk-sqs'
+require 'aws-sdk-sts'
+require 'rservicebus2/mq'
+
+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
+
+        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
+    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
+      @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
+        )
+
+        if response.messages.count.zero?
+          raise NoMsgToProcess
+        end
+
+        response.messages.each do |message|
+          @job = message
+        end
+      rescue StandardError => e
+        raise e
+      end
+      @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
+      })
+      @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}"
+      end
+
+      queue_url = 'https://sqs.' + @region + '.amazonaws.com/' +
+        @caller_identity_account + '/' + queue_name
+
+      @sqs_client.send_message(
+        queue_url: queue_url,
+        message_body: msg
+      )
+    end
+  end
+end

data/lib/rservicebus2/mq/file.rb

@@ -0,0 +1,59 @@
+require 'fileutils'
+require 'rservicebus2/mq'
+
+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
+
+      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
+
+    def subscribe(queue_name)
+      path = "#{@uri.path}/#{queue_name}"
+      FileUtils.mkdir_p(path)
+      @local_queue_name = queue_name
+    end
+
+    # Get next msg from queue
+    def pop
+      time = @timeout
+      while time > 0
+        files = Dir.glob("#{@uri.path}/#{@local_queue_name}/*.msg")
+        if files.length > 0
+          @file_path = files[0] 
+          @body = IO.read(@file_path)
+	  return @body
+        end
+	time -= 1
+	sleep(1)
+      end
+	
+      raise NoMsgToProcess if files.length == 0
+    end
+
+    def return_to_queue
+    end
+
+    def ack
+      FileUtils.rm @file_path
+    end
+
+    def send(queue_name, msg)
+      FileUtils.mkdir_p("#{@uri.path}/#{queue_name}")
+      IO.write("#{@uri.path}/#{queue_name}/#{rand()}.msg", msg)
+    end
+  end
+end

data/lib/rservicebus2/mq/redis.rb

@@ -0,0 +1,53 @@
+require 'redis'
+require 'rservicebus2/mq'
+
+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
+    end
+
+    # Connect to the queue
+    def subscribe( queuename )
+      @queuename = queuename
+    end
+
+    # Get next msg from queue
+    def pop
+      if @redis.llen( @queuename ) == 0 then
+        sleep @timeout
+        raise NoMsgToProcess.new
+      end
+
+      return @redis.lindex @queuename, 0
+    end
+
+    def returnToQueue
+    end
+
+    # "Commit" queue
+    def ack
+      @redis.lpop @queuename
+    end
+
+    # At least called in the Host rescue block, to ensure all network links are healthy
+    def send( queueName, msg )
+      @redis.rpush queueName, msg
+    end
+
+  end
+end

data/lib/rservicebus2/saga/manager.rb

@@ -24,7 +24,7 @@ module RServiceBus2
     end
 
     def get_start_with_method_names(saga)
-      get_methods_by_prefix(saga, 'startwith_')
+      get_methods_by_prefix(saga, 'start_with_')
     end
 
     # setBusAttributeIfRequested
@@ -63,7 +63,7 @@ module RServiceBus2
         @start_with[msg_name] = [] if @start_with[msg_name].nil?
         @start_with[msg_name] << s
 
-        RServiceBus2.log "Registered, #{saga.name}, to startwith, #{msg_name}", true
+        RServiceBus2.log "Registered, #{saga.name}, to start_with, #{msg_name}", true
       end
 
       @saga[saga.name] = s
@@ -88,12 +88,13 @@ module RServiceBus2
       msg_class_name = msg.class.name.downcase
 
       RServiceBus2.log "SagaManager, started processing, #{msg_class_name}", true
-      unless @start_with[msg_class_name].nil?
+      if @start_with.key?(msg_class_name)
+#      unless @start_with[msg_class_name].nil?
         @start_with[msg_class_name].each do |saga|
           data = SagaData.new(saga)
           @saga_storage.set(data)
 
-          method_name = "startwith_#{msg_class_name}"
+          method_name = "start_with_#{msg_class_name}"
           process_msg(saga, data, method_name, msg)
 
           handled = true
@@ -102,8 +103,10 @@ module RServiceBus2
       return handled if handled == true
 
       return false if rmsg.correlation_id.nil?
+
       data = @saga_storage.get(rmsg.correlation_id)
-      return handled if data.nil?
+      return false if data.nil?
+
       method_name = "handle_#{msg_class_name}"
       saga = @saga[data.saga_class_name]
       process_msg(saga, data, method_name, msg)

data/lib/rservicebus2/saga_loader.rb

@@ -16,21 +16,21 @@ module RServiceBus2
     # Cleans the given path to ensure it can be used for as a parameter for the
     #  require statement.
     # @param [String] file_path the path to be cleaned
-    def get_require_path(filePath)
+    def get_require_path(file_path)
       file_path = './' + file_path unless file_path.start_with?('/')
 
       return file_path.sub('.rb', '') if File.exist?(file_path)
 
-      abort('Filepath, ' + filePath + ", 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 filePath
+    # Instantiate the saga named in sagaName from the file name in file_path
     # Exceptions will be raised if encountered when loading sagas. This is a
     # load time activity, so sagas should load correctly. As much information
     # as possible is returned to enable the saga to be fixed, or configuration
     # corrected.
     # @param [String] sagaName name of the saga to instantiate
-    # @param [String] filePath the path to the file to be loaded
+    # @param [String] file_path the path to the file to be loaded
     # @return [RServiceBus2::Saga] the loader
     def load_saga_from_file(saga_name, file_path)
       require_path = get_require_path(file_path)
@@ -50,7 +50,7 @@ module RServiceBus2
     end
 
     # Wrapper function
-    # @param [String] filePath
+    # @param [String] file_path
     # @param [String] sagaName
     # @returns [RServiceBus2::Saga] saga
     def load_saga(file_path, saga_name)
@@ -97,7 +97,7 @@ module RServiceBus2
 
       saga_name = base_name.sub(ext_name, '')
 
-      "Saga_#{saga_name}"
+      "saga_#{saga_name}".gsub(/(?<=_|^)(\w)/){$1.upcase}.gsub(/(?:_)(\w)/,'\1')
     end
 
     # Entry point for loading Sagas
@@ -106,7 +106,7 @@ module RServiceBus2
       RServiceBus2.rlog "SagaLoader.loadSagasFromPath. base_dir: #{base_dir}"
 
       get_list_of_files_for_dir(base_dir).each do |file_path|
-        unless filePath.end_with?('.')
+        unless file_path.end_with?('.')
           saga_name = get_saga_name(file_path)
           load_saga(file_path, saga_name)
         end

data/lib/rservicebus2/saga_storage/dir.rb

@@ -75,7 +75,7 @@ module RServiceBus2
     end
 
     def load(path)
-      return {} unless File.exist?(path)
+      return nil unless File.exist?(path)
 
       content = IO.read(path)
 

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus2
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Guy Irvine
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-27 00:00:00.000000000 Z
+date: 2021-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: fluiddb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.19
 - !ruby/object:Gem::Dependency
   name: parse-cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
@@ -92,12 +92,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- bin/return_messages_to_source_queue
+- bin/rsb_ctl
+- bin/rservicebus2
+- bin/rservicebus2-create
+- bin/rservicebus2-init
+- bin/rservicebus2-transport
+- bin/send_empty_message
+- lib/rservicebus2.rb
 - lib/rservicebus2/agent.rb
+- lib/rservicebus2/appresource.rb
 - lib/rservicebus2/appresource/dir.rb
 - lib/rservicebus2/appresource/file.rb
 - lib/rservicebus2/appresource/fluiddb.rb
 - lib/rservicebus2/appresource/fluiddb2.rb
-- lib/rservicebus2/appresource.rb
 - lib/rservicebus2/appresource_configure.rb
 - lib/rservicebus2/audit.rb
 - lib/rservicebus2/circuitbreaker.rb
@@ -109,58 +119,52 @@ files:
 - lib/rservicebus2/handler_manager.rb
 - lib/rservicebus2/helper_functions.rb
 - lib/rservicebus2/host.rb
+- lib/rservicebus2/message.rb
 - lib/rservicebus2/message/statisticoutput.rb
 - lib/rservicebus2/message/subscription.rb
 - lib/rservicebus2/message/verboseoutput.rb
-- lib/rservicebus2/message.rb
+- lib/rservicebus2/monitor.rb
 - lib/rservicebus2/monitor/dir.rb
 - lib/rservicebus2/monitor/dirnotifier.rb
 - lib/rservicebus2/monitor/message.rb
 - lib/rservicebus2/monitor/xmldir.rb
-- lib/rservicebus2/monitor.rb
 - lib/rservicebus2/monitor_configure.rb
-- lib/rservicebus2/mq/beanstalk.rb
 - lib/rservicebus2/mq.rb
+- lib/rservicebus2/mq/aws.rb
+- lib/rservicebus2/mq/beanstalk.rb
+- lib/rservicebus2/mq/file.rb
+- lib/rservicebus2/mq/redis.rb
 - lib/rservicebus2/resource_manager.rb
 - lib/rservicebus2/saga/base.rb
 - lib/rservicebus2/saga/data.rb
 - lib/rservicebus2/saga/manager.rb
 - lib/rservicebus2/saga_loader.rb
+- lib/rservicebus2/saga_storage.rb
 - lib/rservicebus2/saga_storage/dir.rb
 - lib/rservicebus2/saga_storage/inmemory.rb
-- lib/rservicebus2/saga_storage.rb
 - lib/rservicebus2/sendat_manager.rb
+- lib/rservicebus2/sendat_storage.rb
 - lib/rservicebus2/sendat_storage/file.rb
 - lib/rservicebus2/sendat_storage/inmemory.rb
-- lib/rservicebus2/sendat_storage.rb
 - lib/rservicebus2/state_manager.rb
+- lib/rservicebus2/state_storage.rb
 - lib/rservicebus2/state_storage/dir.rb
 - lib/rservicebus2/state_storage/inmemory.rb
-- lib/rservicebus2/state_storage.rb
 - lib/rservicebus2/statistic_manager.rb
 - lib/rservicebus2/stats.rb
 - lib/rservicebus2/subscription_manager.rb
-- lib/rservicebus2/subscription_storage/file.rb
 - lib/rservicebus2/subscription_storage.rb
+- lib/rservicebus2/subscription_storage/file.rb
 - lib/rservicebus2/subscription_storage_configure.rb
-- lib/rservicebus2/test/bus.rb
 - lib/rservicebus2/test.rb
+- lib/rservicebus2/test/bus.rb
 - lib/rservicebus2/transporter.rb
 - lib/rservicebus2/usermessage/withpayload.rb
-- lib/rservicebus2.rb
-- bin/return_messages_to_source_queue
-- bin/rsb_ctl
-- bin/rservicebus2
-- bin/rservicebus2-create
-- bin/rservicebus2-init
-- bin/rservicebus2-transport
-- bin/send_empty_message
-- LICENSE
 homepage: http://rubygems.org/gems/rservicebus2
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,9 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: RServiceBus
 test_files: []