rservicebus 0.1.74 → 0.1.75

data/lib/rservicebus/ResourceManager.rb

@@ -59,10 +59,10 @@ module RServiceBus
                     v.finished
                     rescue Exception => e1
                     puts "Caught nested exception rolling back, #{v.class.name}, for msg, #{msgName}"
-                    puts "****"
+                    puts '****'
                     puts e1.message
                     puts e1.backtrace
-                    puts "****"
+                    puts '****'
                 end
             end
             

data/lib/rservicebus/Saga/Manager.rb

@@ -20,14 +20,14 @@ class Saga_Manager
 	def GetMethodsByPrefix( saga, prefix )
         list = []
         saga.instance_methods.each do |name|
-            list.push name.to_s.sub( prefix, "" ) if name.to_s.slice( 0,prefix.length ) == prefix
+            list.push name.to_s.sub( prefix, '') if name.to_s.slice( 0,prefix.length ) == prefix
         end
         
         return list
 	end
     
 	def GetStartWithMethodNames( saga )
-		return self.GetMethodsByPrefix( saga, "StartWith_" )
+		return self.GetMethodsByPrefix( saga, 'StartWith_')
 	end
     
     # setBusAttributeIfRequested
@@ -36,7 +36,7 @@ class Saga_Manager
     def setBusAttributeIfRequested( saga )
         if defined?( saga.Bus ) then
             saga.Bus = @host
-            RServiceBus.log "Bus attribute set for: " + saga.class.name
+            RServiceBus.log 'Bus attribute set for: ' + saga.class.name
         end
         
         return self
@@ -76,12 +76,12 @@ class Saga_Manager
 
     
     def prepSaga( saga )
-        if !@resourceListBySagaName[saga.class.name].nil? then
-            @resourceListBySagaName[saga.class.name].each do |k,v|
-                saga.instance_variable_set( "@#{k}", @resourceManager.get(k).getResource() )
-                RServiceBus.rlog "App resource attribute, #{k}, set for: " + saga.class.name
-            end
+      unless @resourceListBySagaName[saga.class.name].nil? then
+        @resourceListBySagaName[saga.class.name].each do |k, v|
+          saga.instance_variable_set("@#{k}", @resourceManager.get(k).getResource())
+          RServiceBus.rlog "App resource attribute, #{k}, set for: " + saga.class.name
         end
+      end
 
     end
 
@@ -91,16 +91,16 @@ class Saga_Manager
         msg = rmsg.msg
 
         RServiceBus.log "SagaManager, started processing, #{msg.class.name}", true
-        if !@startWith[msg.class.name].nil? then
-            @startWith[msg.class.name].each do |saga|
-                data = Saga_Data.new( saga )
-                @sagaStorage.Set( data )
-
-                methodName = "StartWith_#{msg.class.name}"
-                self.ProcessMsg( saga, data, methodName, msg )
-                
-                handled = true
-            end
+        unless @startWith[msg.class.name].nil? then
+          @startWith[msg.class.name].each do |saga|
+            data = Saga_Data.new(saga)
+            @sagaStorage.Set(data)
+
+            methodName = "StartWith_#{msg.class.name}"
+            self.ProcessMsg(saga, data, methodName, msg)
+
+            handled = true
+          end
         end
         return handled if handled == true
 

data/lib/rservicebus/SagaLoader.rb

@@ -23,15 +23,15 @@ class SagaLoader
 #
 # @param [String] filePath the path to be cleaned
 	def getRequirePath( filePath )
-		if !filePath.start_with?( "/" ) then
-			filePath = "./" + filePath
-		end
+		unless filePath.start_with?('/') then
+      filePath = './' + filePath
+    end
 		
 		if File.exists?( filePath ) then
-			return filePath.sub( ".rb", "")
+			return filePath.sub( '.rb', '')
 		end		
 
-		abort( "Filepath, " + filePath + ", given for Saga require doesn't exist" );
+		abort( 'Filepath, ' + filePath + ", given for Saga require doesn't exist" );
 	end
 
 # Instantiate the saga named in sagaName from the file name in filePath
@@ -49,9 +49,9 @@ class SagaLoader
 		begin
 			saga = Object.const_get(sagaName);
 		rescue Exception => e
-			puts "Expected class name: " + sagaName + ", not found after require: " +  requirePath
-			puts "**** Check in " + filePath + " that the class is named : " + sagaName
-			puts "( In case its not that )"
+			puts 'Expected class name: ' + sagaName + ', not found after require: ' +  requirePath
+			puts '**** Check in ' + filePath + ' that the class is named : ' + sagaName
+			puts '( In case its not that )'
 			raise e
 		end
 
@@ -70,17 +70,17 @@ class SagaLoader
         end
 
 		begin
-			RServiceBus.rlog "filePath: " + filePath
-			RServiceBus.rlog "sagaName: " + sagaName
+			RServiceBus.rlog 'filePath: ' + filePath
+			RServiceBus.rlog 'sagaName: ' + sagaName
 
 			saga = self.loadSagaFromFile( sagaName, filePath )
-			RServiceBus.log "Loaded Saga: " + sagaName
+			RServiceBus.log 'Loaded Saga: ' + sagaName
 
             @sagaManager.RegisterSaga( saga )
 	
             @listOfLoadedPaths[filePath] = 1
 		rescue Exception => e
-			puts "Exception loading saga from file: " + filePath
+			puts 'Exception loading saga from file: ' + filePath
 			puts e.message
 			puts e.backtrace[0]
 
@@ -94,7 +94,7 @@ class SagaLoader
 # @param [String] path directory to check
 # @return [Array] a list of paths to files found in the given path
 	def getListOfFilesForDir( path )
-        list = Dir[path + "/*"];
+        list = Dir[path + '/*'];
 
         RServiceBus.rlog "SagaLoader.getListOfFilesForDir. path: #{path}, list: #{list}"
 
@@ -108,7 +108,7 @@ class SagaLoader
 		baseName = File.basename( filePath )
 		extName = File.extname( baseName )
 		
-        sagaName = baseName.sub( extName, "" )
+        sagaName = baseName.sub( extName, '')
 		
 		return "Saga_#{sagaName}"
 	end
@@ -121,11 +121,11 @@ class SagaLoader
         RServiceBus.rlog "SagaLoader.loadSagasFromPath. baseDir: #{baseDir}"
         
 		self.getListOfFilesForDir(baseDir).each do |filePath|
-			if !filePath.end_with?( "." ) then
-                
-				sagaName = self.getSagaName( filePath )
-                self.loadSaga( filePath, sagaName )
-			end
+      unless filePath.end_with?('.') then
+
+        sagaName = self.getSagaName(filePath)
+        self.loadSaga(filePath, sagaName)
+      end
 		end
         
 		return self

data/lib/rservicebus/SagaStorage.rb

@@ -4,11 +4,11 @@ module RServiceBus
         
         def SagaStorage.Get( uri )
             case uri.scheme
-                when "dir"
-                require "rservicebus/SagaStorage/Dir"
+                when 'dir'
+                require 'rservicebus/SagaStorage/Dir'
                 return SagaStorage_Dir.new( uri )
-                when "inmem"
-                require "rservicebus/SagaStorage/InMemory"
+                when 'inmem'
+                require 'rservicebus/SagaStorage/InMemory'
                 return SagaStorage_InMemory.new( uri )
                 else
                 abort("Scheme, #{uri.scheme}, not recognised when configuring SagaStorage, #{uri.to_s}");

data/lib/rservicebus/SagaStorage/Dir.rb

@@ -6,23 +6,23 @@ module RServiceBus
             @sagaDir = uri.path
 
             inputDir = Dir.new( @sagaDir )
-            if !File.writable?( @sagaDir ) then
-                puts "***** Directory is not writable, #{@sagaDir}."
-                puts "***** Make the directory, #{@sagaDir}, writable and try again."
-                puts "***** Or, set the Saga Directory explicitly by, SAGA_URI=<dir://path/to/saga>"
-                abort();
+            unless File.writable?(@sagaDir) then
+              puts "***** Directory is not writable, #{@sagaDir}."
+              puts "***** Make the directory, #{@sagaDir}, writable and try again."
+              puts '***** Or, set the Saga Directory explicitly by, SAGA_URI=<dir://path/to/saga>'
+              abort();
             end
             rescue Errno::ENOENT => e
             puts "***** Directory does not exist, #{@sagaDir}."
             puts "***** Create the directory, #{@sagaDir}, and try again."
             puts "***** eg, mkdir #{@sagaDir}"
-            puts "***** Or, set the Saga Directory explicitly by, SAGA_URI=<dir://path/to/saga>"
+            puts '***** Or, set the Saga Directory explicitly by, SAGA_URI=<dir://path/to/saga>'
             abort();
             rescue Errno::ENOTDIR => e
             puts "***** The specified path does not point to a directory, #{@sagaDir}."
             puts "***** Either repoint path to a directory, or remove, #{@sagaDir}, and create it as a directory."
             puts "***** eg, rm #{@sagaDir} && mkdir #{@sagaDir}"
-            puts "***** Or, set the Saga Directory explicitly by, SAGA_URI=<dir://path/to/saga>"
+            puts '***** Or, set the Saga Directory explicitly by, SAGA_URI=<dir://path/to/saga>'
             abort();
         end
         
@@ -35,14 +35,14 @@ module RServiceBus
         #Set
         def Set( data )
             path = self.getPath( data.correlationId )
-            @list << Hash["path", path, "data", data]
+            @list << Hash['path', path, 'data', data]
         end
         
         #Get
         def Get( correlationId )
             path = self.getPath( correlationId )
             data = self.load( path )
-            @list << Hash["path", path, "data", data]
+            @list << Hash['path', path, 'data', data]
             
             return data
         end
@@ -50,7 +50,7 @@ module RServiceBus
         #Finish
         def Commit
             @list.each do |e|
-                File.open( e['path'], "w" ) { |f| f.write( YAML::dump( e['data'] ) ) }
+                File.open( e['path'], 'w') { |f| f.write( YAML::dump( e['data'] ) ) }
             end
             @deleted.each do |correlationId|
                 File.unlink( self.getPath( correlationId ) )
@@ -72,11 +72,11 @@ module RServiceBus
         end
         
         def load( path )
-            return Hash.new if !File.exists?( path )
+            return Hash.new unless File.exists?(path)
             
             content = IO.read( path )
             
-            return Hash.new if content == ""
+            return Hash.new if content == ''
             
             return YAML::load( content )
         end

data/lib/rservicebus/SendAtManager.rb

@@ -9,9 +9,9 @@ module RServiceBus
             #Check if the SendAt Dir has been specified
             #If it has, make sure it exists, and is writable
 
-            string = RServiceBus.getValue( "SENDAT_URI" )
+            string = RServiceBus.getValue('SENDAT_URI')
             if string.nil? then
-                string = "file:///tmp/rservicebus-sendat"
+                string = 'file:///tmp/rservicebus-sendat'
             end
 
             uri = URI.parse( string )
@@ -24,8 +24,8 @@ module RServiceBus
         def Process
             now = DateTime.now
             @SendAtStorage.GetAll.each_with_index do |row,idx|
-                if row["timestamp"] > now then
-                    @Bus._SendNeedsWrapping( row["msg"], row["queueName"], row["correlationId"] )
+                if row['timestamp'] > now then
+                    @Bus._SendNeedsWrapping( row['msg'], row['queueName'], row['correlationId'] )
                     @SendAtStorage.Delete( idx )
                 end
             end

data/lib/rservicebus/SendAtStorage.rb

@@ -1,16 +1,16 @@
 module RServiceBus
 
-require "rservicebus/SendAtStorage"
+require 'rservicebus/SendAtStorage'
 
     class SendAtStorage
 
         def SendAtStorage.Get( uri )
             case uri.scheme
-                when "file"
-                require "rservicebus/SendAtStorage/File"
+                when 'file'
+                require 'rservicebus/SendAtStorage/File'
                 return SendAtStorage_File.new( uri )
-                when "inmem"
-                require "rservicebus/SendAtStorage/InMemory"
+                when 'inmem'
+                require 'rservicebus/SendAtStorage/InMemory'
                 return SendAtStorage_InMemory.new( uri )
                 else
                 abort("Scheme, #{uri.scheme}, not recognised when configuring SendAtStorage, #{uri.to_s}");

data/lib/rservicebus/SendAtStorage/File.rb

@@ -6,11 +6,11 @@ module RServiceBus
             @list = self.load( uri.path )
         end
         def load( path )
-            return Array.new if !File.exists?( path )
+            return Array.new unless File.exists?(path)
 
             content = IO.read( path )
 
-            return Array.new if content == ""
+            return Array.new if content == ''
 
             return YAML::load( content )
         end
@@ -36,7 +36,7 @@ module RServiceBus
         #Finish
         def Save
             content = YAML::dump( @list )
-            File.open( @uri.path, "w" ) { |f| f.write( YAML::dump( content ) ) }
+            File.open( @uri.path, 'w') { |f| f.write( YAML::dump( content ) ) }
         end
         
         

data/lib/rservicebus/StateManager.rb

@@ -9,9 +9,9 @@ module RServiceBus
             #Check if the State Dir has been specified
             #If it has, make sure it exists, and is writable
 
-            string = RServiceBus.getValue( "STATE_URI" )
+            string = RServiceBus.getValue('STATE_URI')
             if string.nil? then
-                string = "dir:///tmp"
+                string = 'dir:///tmp'
             end
 
             uri = URI.parse( string )

data/lib/rservicebus/StateStorage.rb

@@ -4,10 +4,10 @@ module RServiceBus
 
         def StateStorage.Get( uri )
             case uri.scheme
-                when "dir"
+                when 'dir'
                     require 'rservicebus/StateStorage/Dir.rb'
                     return StateStorage_Dir.new( uri )
-                    when "inmem"
+                    when 'inmem'
                     require 'rservicebus/StateStorage/InMemory.rb'
                     return StateStorage_InMemory.new( uri )
                 else

data/lib/rservicebus/StateStorage/Dir.rb

@@ -6,23 +6,23 @@ module RServiceBus
             @stateDir = uri.path
             
             inputDir = Dir.new( @stateDir )
-            if !File.writable?( @stateDir ) then
-                puts "***** Directory is not writable, #{@stateDir}."
-                puts "***** Make the directory, #{@stateDir}, writable and try again."
-                puts "***** Or, set the State Directory explicitly by, STATE_URI=<dir://path/to/state>"
-                abort();
+            unless File.writable?(@stateDir) then
+              puts "***** Directory is not writable, #{@stateDir}."
+              puts "***** Make the directory, #{@stateDir}, writable and try again."
+              puts '***** Or, set the State Directory explicitly by, STATE_URI=<dir://path/to/state>'
+              abort();
             end
             rescue Errno::ENOENT => e
             puts "***** Directory does not exist, #{@stateDir}."
             puts "***** Create the directory, #{@stateDir}, and try again."
             puts "***** eg, mkdir #{@stateDir}"
-            puts "***** Or, set the State Directory explicitly by, STATE_URI=<dir://path/to/state>"
+            puts '***** Or, set the State Directory explicitly by, STATE_URI=<dir://path/to/state>'
             abort();
             rescue Errno::ENOTDIR => e
             puts "***** The specified path does not point to a directory, #{@stateDir}."
             puts "***** Either repoint path to a directory, or remove, #{@stateDir}, and create it as a directory."
             puts "***** eg, rm #{@stateDir} && mkdir #{@stateDir}"
-            puts "***** Or, set the State Directory explicitly by, STATE_URI=<dir://path/to/state>"
+            puts '***** Or, set the State Directory explicitly by, STATE_URI=<dir://path/to/state>'
             abort();
         end
         
@@ -35,7 +35,7 @@ module RServiceBus
         def Get( handler )
             path = self.getPath( handler )
             hash = self.load( path )
-            @list << Hash["path", path, "hash", hash]
+            @list << Hash['path', path, 'hash', hash]
             
             return hash
         end
@@ -43,7 +43,7 @@ module RServiceBus
         #Finish
         def Commit
             @list.each do |e|
-                File.open( e['path'], "w" ) { |f| f.write( YAML::dump( e['hash'] ) ) }
+                File.open( e['path'], 'w') { |f| f.write( YAML::dump( e['hash'] ) ) }
             end
         end
         
@@ -55,11 +55,11 @@ module RServiceBus
         end
 
         def load( path )
-            return Hash.new if !File.exists?( path )
+            return Hash.new unless File.exists?(path)
             
             content = IO.read( path )
             
-            return Hash.new if content == ""
+            return Hash.new if content == ''
             
             return YAML::load( content )
         end

data/lib/rservicebus/StateStorage/InMemory.rb

@@ -14,7 +14,7 @@ module RServiceBus
         #Get
         def Get( handler )
             hash = @hash[handler.class.name]
-            @list << Hash["name", handler.class.name, "hash", hash]
+            @list << Hash['name', handler.class.name, 'hash', hash]
 
             return hash
         end

data/lib/rservicebus/StatisticManager.rb

@@ -17,8 +17,8 @@ class StatisticManager
 
 		@totalByMessageType = Hash.new
         
-        @output = !RServiceBus.getValue( "VERBOSE", nil ).nil?
-        @maxStatOutputCountdown = RServiceBus.getValue( "STAT_OUTPUT_COUNTDOWN", "1" ).to_i
+        @output = !RServiceBus.getValue( 'VERBOSE', nil ).nil?
+        @maxStatOutputCountdown = RServiceBus.getValue( 'STAT_OUTPUT_COUNTDOWN', '1').to_i
         @statOutputCountdown = 0
 	end
 

data/lib/rservicebus/SubscriptionManager.rb

@@ -24,12 +24,12 @@ class SubscriptionManager
 	end
 
 	def add( eventName, queueName )
-		RServiceBus.log "Adding subscription for, " + eventName + ", to, " + queueName
+		RServiceBus.log 'Adding subscription for, ' + eventName + ', to, ' + queueName
 		@subscriptions = @subscriptionStorage.add( eventName, queueName )
 	end
 
 	def remove( eventName, queueName )
-		raise "Method, remove, needs to be implemented for this subscription storage"
+		raise 'Method, remove, needs to be implemented for this subscription storage'
 	end
 end