rservicebus2 0.0.2 → 0.0.3

data/lib/{rservicebus → rservicebus2}/message/subscription.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Class to hold message subscriptions
   class MessageSubscription
     attr_reader :event_name

data/lib/{rservicebus → rservicebus2}/message/verboseoutput.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   class MessageVerboseOutputOn
   end
 

data/lib/{rservicebus → rservicebus2}/monitor.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Monitor
   class Monitor
     attr_accessor :bus

data/lib/{rservicebus → rservicebus2}/monitor/csvdir.rb

@@ -1,14 +1,14 @@
-require 'rservicebus/Monitor/Dir'
+require 'rservicebus2/Monitor/Dir'
 require 'csv'
 
-module RServiceBus
+module RServiceBus2
   # Pull files and pre-parse as csv
   class MonitorCsvDir < MonitorDir
     def check_payload_for_number_of_columns(payload)
-      return if @QueryStringParts.nil?
-      return unless @QueryStringParts.key?('cols')
+      return if @query_string_parts.nil?
+      return unless @query_string_parts.key?('cols')
 
-      cols = @QueryStringParts['cols'][0].to_i
+      cols = @query_string_parts['cols'][0].to_i
       payload.each_with_index do |row, idx|
         if row.length != cols
           fail "Expected number of columns, #{cols}, Actual number of columns,
@@ -18,8 +18,8 @@ module RServiceBus
     end
 
     def check_send_hash
-      if !@QueryStringParts.nil? && @QueryStringParts.key?('hash')
-        flag = @QueryStringParts['hash'][0]
+      if !@query_string_parts.nil? && @query_string_parts.key?('hash')
+        flag = @query_string_parts['hash'][0]
         return flag == 'Y'
       end
 

data/lib/{rservicebus → rservicebus2}/monitor/dir.rb

@@ -2,7 +2,7 @@ require 'cgi'
 require 'zip/zip'
 require 'zlib'
 
-module RServiceBus
+module RServiceBus2
   # Monitor Directory for files
   class MonitorDir < Monitor
     def connect(uri)

data/lib/{rservicebus → rservicebus2}/monitor/dirnotifier.rb

@@ -2,10 +2,10 @@ require 'cgi'
 require 'fileutils'
 require 'pathname'
 
-module RServiceBus
+module RServiceBus2
   # Monitor for Directory
   class MonitorDirNotifier < Monitor
-    attr_reader :Path, :ProcessingFolder, :Filter
+    attr_reader :path, :processing_folder, :filter
     def connect(uri)
       # Pass the path through the Dir object to check syntax on startup
       begin
@@ -46,25 +46,25 @@ module RServiceBus
             open_folder processing_uri.path
             unless File.writable?(processing_uri.path)
               puts "***** Processing Directory is not writable,
-                    #{processingUri.path}."
-              puts "***** Make the directory, #{processingUri.path},
+                    #{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,
-                  #{processingUri.path}."
-            puts "***** Create the directory, #{processingUri.path}, and try
+                  #{processing_uri.path}."
+            puts "***** Create the directory, #{processing_uri.path}, and try
                   again."
-            puts "***** eg, mkdir #{processingUri.path}"
+            puts "***** eg, mkdir #{processing_uri.path}"
             abort
           rescue Errno::ENOTDIR
             puts "***** Processing Directory does not point to a directory,
-                  #{processingUri.path}."
+                  #{processing_uri.path}."
             puts "***** Either repoint path to a directory, or remove,
-                  #{processingUri.path}, and create it as a directory."
-            puts "***** eg, rm #{processingUri.path} && mkdir
-                  #{processingUri.path}"
+                  #{processing_uri.path}, and create it as a directory."
+            puts "***** eg, rm #{processing_uri.path} && mkdir
+                  #{processing_uri.path}"
             abort
           end
 

data/lib/{rservicebus → rservicebus2}/monitor/message.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Monitor Message
   class MonitorMessage
     attr_reader :payload, :uri

data/lib/{rservicebus → rservicebus2}/monitor/xmldir.rb

@@ -1,7 +1,7 @@
-require 'rservicebus/monitor/dir'
+require 'rservicebus2/monitor/dir'
 require 'xmlsimple'
 
-module RServiceBus
+module RServiceBus2
   # Monitor Dir for XML files
   class MonitorXmlDir < MonitorDir
     def process_content(content)

data/lib/{rservicebus → rservicebus2}/monitor_configure.rb

@@ -1,7 +1,7 @@
-require 'rservicebus/monitor'
-require 'rservicebus/monitor/message'
+require 'rservicebus2/monitor'
+require 'rservicebus2/monitor/message'
 
-module RServiceBus
+module RServiceBus2
   # Configure Monitors for an rservicebus host
   class ConfigureMonitor
     # Constructor
@@ -46,16 +46,16 @@ module RServiceBus
           monitor = nil
           case uri.scheme
           when 'csvdir'
-            require 'rservicebus/monitor/csvdir'
+            require 'rservicebus2/monitor/csvdir'
             monitor = MonitorCsvDir.new(@host, name, uri)
           when 'xmldir'
-            require 'rservicebus/monitor/xmldir'
+            require 'rservicebus2/monitor/xmldir'
             monitor = MonitorXmlDir.new(@host, name, uri)
           when 'dir'
-            require 'rservicebus/monitor/dir'
+            require 'rservicebus2/monitor/dir'
             monitor = MonitorDir.new(@host, name, uri)
           when 'dirnotifier'
-            require 'rservicebus/monitor/dirnotifier'
+            require 'rservicebus2/monitor/dirnotifier'
             monitor = MonitorDirNotifier.new(@host, name, uri)
           else
             abort("Scheme, #{uri.scheme}, not recognised when configuring

data/lib/{rservicebus → rservicebus2}/mq.rb

@@ -1,6 +1,6 @@
 require 'uri'
 
-module RServiceBus
+module RServiceBus2
   class JobTooBigError < StandardError
   end
 
@@ -11,12 +11,12 @@ module RServiceBus
     attr_reader :local_queue_name
 
     def self.get
-      mq_string = RServiceBus.get_value('RSBMQ', 'beanstalk://localhost')
+      mq_string = RServiceBus2.get_value('RSBMQ', 'beanstalk://localhost')
       uri = URI.parse(mq_string)
 
       case uri.scheme
       when 'beanstalk'
-        require 'rservicebus/MQ/Beanstalk'
+        require 'rservicebus2/MQ/Beanstalk'
         mq = MQBeanstalk.new(uri)
       else
         abort("Scheme, #{uri.scheme}, not recognised when configuring mq,

data/lib/{rservicebus → rservicebus2}/mq/beanstalk.rb

@@ -1,7 +1,7 @@
 require 'beanstalk-client'
-require 'rservicebus/MQ'
+require 'rservicebus2/MQ'
 
-module RServiceBus
+module RServiceBus2
   # Beanstalk client implementation.
   class MQBeanstalk < MQ
     # Connect to the broker

data/lib/{rservicebus → rservicebus2}/resource_manager.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Coordinate Transactions across resources, handlers, and Sagas
   class ResourceManager
     # Constructor
@@ -28,7 +28,7 @@ module RServiceBus
         r = @app_resources[name]
         r._connect
         r.begin
-        RServiceBus.rlog "Preparing resource: #{name}. Begin"
+        RServiceBus2.rlog "Preparing resource: #{name}. Begin"
       end
       @current_resources[name] = @app_resources[name]
       @app_resources[name]
@@ -37,10 +37,10 @@ module RServiceBus
     def commit(msg_name)
       @state_manager.commit
       @saga_storage.commit
-      RServiceBus.rlog "HandlerManager.commitResourcesUsedToProcessMsg,
+      RServiceBus2.rlog "HandlerManager.commitResourcesUsedToProcessMsg,
         #{msg_name}"
       @current_resources.each do |k, v|
-        RServiceBus.rlog "Commit resource, #{v.class.name}"
+        RServiceBus2.rlog "Commit resource, #{v.class.name}"
         v.commit
         v.finished
       end
@@ -48,16 +48,16 @@ module RServiceBus
 
     def rollback(msg_name)
       @saga_storage.rollback
-      RServiceBus.rlog "HandlerManager.rollbackResourcesUsedToProcessMsg,
+      RServiceBus2.rlog "HandlerManager.rollbackResourcesUsedToProcessMsg,
         #{msg_name}"
       @current_resources.each do |k, v|
         begin
-          RServiceBus.rlog "Rollback resource, #{v.class.name}"
+          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,
-            #{msgName}"
+            #{msg_name}"
           puts '****'
           puts e1.message
           puts e1.backtrace

data/lib/{rservicebus → rservicebus2}/saga/base.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Sags Base Class
   class SagaBase
     attr_accessor :data

data/lib/{rservicebus → rservicebus2}/saga/data.rb

@@ -1,7 +1,7 @@
-module RServiceBus
+module RServiceBus2
   # Saga Data
   class SagaData
-    attr_reader :correlationId, :sagaClassName
+    attr_reader :correlation_id, :saga_class_name
     attr_accessor :finished
 
     def initialize(saga)

data/lib/{rservicebus → rservicebus2}/saga/manager.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Saga Manager
   class SagaManager
     def initialize(host, resource_manager, saga_storage)
@@ -14,16 +14,17 @@ module RServiceBus
 
     def get_methods_by_prefix(saga, prefix)
       list = []
+      d_prefix = prefix.downcase
       saga.instance_methods.each do |name|
-        list.push name.to_s.sub(prefix, '') if
-          name.to_s.slice(0, prefix.length) == prefix
+        d_name = name.downcase
+        list.push d_name.to_s.sub(d_prefix, '') if d_name.to_s.slice(0, d_prefix.length) == d_prefix
       end
 
-      list
+      list.uniq # This takes care of a very rare uppercase / lowercase issue
     end
 
     def get_start_with_method_names(saga)
-      get_methods_by_prefix(saga, 'StartWith_')
+      get_methods_by_prefix(saga, 'startwith_')
     end
 
     # setBusAttributeIfRequested
@@ -31,22 +32,22 @@ module RServiceBus
     def set_bus_attribute_if_requested(saga)
       if defined?(saga.bus)
         saga.bus = @host
-        RServiceBus.log 'Bus attribute set for: ' + saga.class.name
+        RServiceBus2.log 'Bus attribute set for: ' + saga.class.name
       end
 
       self
     end
 
-    def interrogateSagaForAppResources(saga)
-      RServiceBus.rlog "Checking app resources for: #{saga.class.name}"
-      RServiceBus.rlog "If your attribute is not getting set, check that it
+    def interrogate_saga_for_app_resources(saga)
+      RServiceBus2.rlog "Checking app resources for: #{saga.class.name}"
+      RServiceBus2.rlog "If your attribute is not getting set, check that it
         is in the 'attr_accessor' list"
 
       @resource_list_by_saga_name[saga.class.name] = []
       @resource_manager.get_all.each do |k, v|
         if saga.class.method_defined?(k)
           @resource_list_by_saga_name[saga.class.name] << k
-          RServiceBus.log "Resource attribute, #{k}, found for: " +
+          RServiceBus2.log "Resource attribute, #{k}, found for: " +
             saga.class.name
         end
       end
@@ -62,7 +63,7 @@ module RServiceBus
         @start_with[msg_name] = [] if @start_with[msg_name].nil?
         @start_with[msg_name] << s
 
-        RServiceBus.log "Registered, #{saga.name}, to StartWith, #{msg_name}"
+        RServiceBus2.log "Registered, #{saga.name}, to startwith, #{msg_name}", true
       end
 
       @saga[saga.name] = s
@@ -76,7 +77,7 @@ module RServiceBus
 
       @resource_list_by_saga_name[saga.class.name].each do |k, v|
         saga.instance_variable_set("@#{k}", @resource_manager.get(k).get_resource)
-        RServiceBus.rlog "App resource attribute, #{k}, set for: " + saga.class.name
+        RServiceBus2.rlog "App resource attribute, #{k}, set for: " + saga.class.name
       end
     end
 
@@ -84,14 +85,15 @@ module RServiceBus
       @resources_used = {}
       handled = false
       msg = rmsg.msg
+      msg_class_name = msg.class.name.downcase
 
-      RServiceBus.log "SagaManager, started processing, #{msg.class.name}", true
-      unless @start_with[msg.class.name].nil?
-        @start_with[msg.class.name].each do |saga|
-          data = Saga_Data.new(saga)
+      RServiceBus2.log "SagaManager, started processing, #{msg_class_name}", true
+      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 = "startwith_#{msg_class_name}"
           process_msg(saga, data, method_name, msg)
 
           handled = true
@@ -102,25 +104,21 @@ module RServiceBus
       return false if rmsg.correlation_id.nil?
       data = @saga_storage.get(rmsg.correlation_id)
       return handled if data.nil?
-      method_name = "handle_#{msg.class.name}"
+      method_name = "handle_#{msg_class_name}"
       saga = @saga[data.saga_class_name]
       process_msg(saga, data, method_name, msg)
 
-      return true
+      true
     end
 
-    def process_msg(saga, data, methodName, msg)
+    def process_msg(saga, data, method_name, msg)
       @host.saga_data = data
       saga.data = data
       prep_saga(saga)
 
-      if saga.class.method_defined?(method_name)
-        saga.send method_name, msg
-      end
+      saga.send(method_name, msg) if saga.class.method_defined?(method_name)
 
-      if data.finished == true
-        @saga_storage.delete data.correlation_id
-      end
+      @saga_storage.delete(data.correlation_id) if data.finished == true
 
       @host.saga_data = nil
     end

data/lib/{rservicebus → rservicebus2}/saga_loader.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Given a directory, this class is responsible loading Sagas
   class SagaLoader
     attr_reader :saga_list
@@ -55,16 +55,16 @@ module RServiceBus
     # @returns [RServiceBus::Saga] saga
     def load_saga(file_path, saga_name)
       if @list_of_loaded_paths.key?(file_path)
-        RServiceBus.log "Not reloading, #{file_path}"
+        RServiceBus2.log "Not reloading, #{file_path}"
         return
       end
 
       begin
-        RServiceBus.rlog 'file_path: ' + file_path
-        RServiceBus.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)
-        RServiceBus.log 'Loaded Saga: ' + saga_name
+        RServiceBus2.log 'Loaded Saga: ' + saga_name
 
         @saga_manager.register_saga(saga)
 
@@ -83,7 +83,7 @@ module RServiceBus
     def get_list_of_files_for_dir(path)
       list = Dir[path + '/*']
 
-      RServiceBus.rlog "SagaLoader.getListOfFilesForDir. path: #{path},
+      RServiceBus2.rlog "SagaLoader.getListOfFilesForDir. path: #{path},
         list: #{list}"
 
       list
@@ -103,7 +103,7 @@ module RServiceBus
     # Entry point for loading Sagas
     # @param [String] base_dir directory to check - should not have trailing slash
     def load_sagas_from_path(base_dir)
-      RServiceBus.rlog "SagaLoader.loadSagasFromPath. base_dir: #{base_dir}"
+      RServiceBus2.rlog "SagaLoader.loadSagasFromPath. base_dir: #{base_dir}"
 
       get_list_of_files_for_dir(base_dir).each do |file_path|
         unless filePath.end_with?('.')

data/lib/{rservicebus → rservicebus2}/saga_storage.rb

@@ -1,13 +1,13 @@
-module RServiceBus
+module RServiceBus2
   # Saga Storage
   class SagaStorage
     def self.get(uri)
       case uri.scheme
       when 'dir'
-        require 'rservicebus/saga_storage/dir'
+        require 'rservicebus2/saga_storage/dir'
         return SagaStorageDir.new(uri)
       when 'inmem'
-        require 'rservicebus/saga_storage/inmemory'
+        require 'rservicebus2/saga_storage/inmemory'
         return SagaStorageInMemory.new(uri)
       else
         abort("Scheme, #{uri.scheme}, not recognised when configuring

data/lib/{rservicebus → rservicebus2}/saga_storage/dir.rb

@@ -1,11 +1,10 @@
-module RServiceBus
-
+module RServiceBus2
   # Saga Storage Dir
   class SagaStorageDir
     def initialize(uri)
       @saga_dir = uri.path
 
-      input_dir = Dir.new(@saga_dir)
+      Dir.new(@saga_dir)
       unless File.writable?(@saga_dir)
         puts "***** Directory is not writable, #{@saga_dir}."
         puts "***** Make the directory, #{@saga_dir}, writable and try again."