rservicebus2 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fada1aee3a7884d50bf77a55981556c5b813ddcf
-  data.tar.gz: dd63dae7e3e5dcac2d0fc9d316202edb38eab16a
+  metadata.gz: e7e4478dcfd17cf33e195c10a8e26aa9394e6b0f
+  data.tar.gz: 5f712faee16f86b3ed2f56289ffced68781e5c94
 SHA512:
-  metadata.gz: d0bfe746cdd9d90688a6dbea40589db4c9fdd99054fd38406eaaa87f46756d969422d6ca5d404622c7989638385ca0c6aff37fb34e95b02ce84caa4f689f193e
-  data.tar.gz: c7f3ea7b8960d47ce837cffb3d085c64665cd0c053b531ccd7baecc146720597ca261a05166ccec26e2e74f6d92fea7d34506d3a8fe6d58b8cfc5be3f36d074b
+  metadata.gz: c730bfeb3dd50ceb5dc8aab7f2fcc7663c2539229fcf12a87c6da81855b8d3d626104710a83a01b13a09bca2e3d042f8f125e8f12d2bbe17738b15c3d7ef9b43
+  data.tar.gz: aeb9173b91dfeaeefa82a67fba42dbcf9401ad20d7560e559e7b12e271e391d9e2474805f1a860c2845aa2416006ad7b8f0c4f15f9dd2c42dc56069b08fc63f1

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/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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus2
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Guy Irvine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-15 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools