rservicebus 0.1.58 → 0.1.59

data/lib/rservicebus.rb

@@ -52,6 +52,9 @@ require "rservicebus/Saga/Base.rb"
 
 require "rservicebus/SagaStorage"
 
+require "rservicebus/SendAtManager"
+
+
 module RServiceBus
 
 

data/lib/rservicebus/AppResource/SmbDir.rb

@@ -6,7 +6,7 @@ require "rservicebus/AppResource/Smb"
 
 	def connect(uri)
 		self.processUri
-                remote = SMB.opendir( s, "b" )
+        remote = SMB.opendir( s, "b" )
 		return remote	
 	end
 

data/lib/rservicebus/Host.rb

@@ -1,6 +1,6 @@
 module RServiceBus
-    
-    
+
+
     class NoHandlerFound<StandardError
     end
     class ClassNotFoundForMsg<StandardError
@@ -9,7 +9,7 @@ module RServiceBus
     end
     class PropertyNotSet<StandardError
     end
-    
+
     #Host process for rservicebus
     class Host
         attr_accessor :sagaData
@@ -42,7 +42,7 @@ module RServiceBus
         def log(string, ver=false)
             RServiceBus.log( string, ver )
         end
-        
+
         #Thin veneer for Configuring external resources
         #
         def configureAppResource
@@ -50,6 +50,14 @@ module RServiceBus
             return self;
         end
         
+        
+        #Thin veneer for Configuring SendAt
+        #
+        def configureSendAtManager
+            @sendAtManager = SendAtManager.new( self )
+            return self;
+        end
+
         #Thin veneer for Configuring state
         #
         def configureStateManager
@@ -64,12 +72,12 @@ module RServiceBus
             if string.nil? then
                 string = "dir:///tmp"
             end
-            
+
             uri = URI.parse( string )
             @sagaStorage = SagaStorage.Get( uri )
             return self;
         end
-        
+
         #Thin veneer for Configuring Cron
         #
         def configureCircuitBreaker
@@ -92,7 +100,7 @@ module RServiceBus
             
             return self
         end
-        
+
         #Subscriptions are specified by adding events to the
         #msg endpoint mapping
         def sendSubscriptions
@@ -195,6 +203,7 @@ module RServiceBus
             self.configureStatistics()
             .loadContracts()
             .loadLibs()
+            .configureSendAtManager()
             .configureStateManager()
             .configureSagaStorage()
 			.configureAppResource()
@@ -355,8 +364,11 @@ module RServiceBus
                     @cronManager.Run
                     self.sendQueuedMsgs
                     @queueForMsgsToBeSentOnComplete = nil
-                    
-                    
+
+
+                    @sendAtManager.Process
+
+
                     @circuitBreaker.Success
                     
                     rescue Exception => e
@@ -401,8 +413,8 @@ module RServiceBus
                     end
                     
                     
-                    if @sagaManager.Handle( @msg ) == false then
-                        raise NoHandlerFound.new( msgName ) if handlerList.length == 0
+                    if @sagaManager.Handle( @msg ) == false && handlerList.length == 0 then
+                        raise NoHandlerFound.new( msgName )
                     end
                     
                     
@@ -437,14 +449,14 @@ module RServiceBus
                 
                 @mq.send( queueName, serialized_object )
             end
-            
+
             #Sends a msg across the bus
             #
             # @param [RServiceBus::Message] msg msg to be sent
             # @param [String] queueName endpoint to which the msg will be sent
             def _SendNeedsWrapping( msg, queueName, correlationId )
                 RServiceBus.rlog "Bus._SendNeedsWrapping"
-                
+
                 rMsg = RServiceBus::Message.new( msg, @mq.localQueueName, correlationId )
                 if queueName.index( "@" ).nil? then
                     q = queueName
@@ -460,19 +472,23 @@ module RServiceBus
                 serialized_object = YAML::dump(rMsg)
                 self._SendAlreadyWrappedAndSerialised( serialized_object, q )
             end
-            
+
             def sendQueuedMsgs
                 @queueForMsgsToBeSentOnComplete.each do |row|
-                    self._SendNeedsWrapping( row["msg"], row["queueName"], row["correlationId"] )
+                    if row['timestamp'].nil? then
+                        self._SendNeedsWrapping( row["msg"], row["queueName"], row["correlationId"] )
+                    else
+                        @sendAtManager.Add( row )
+                    end
                 end
             end
-            
-            def queueMsgForSendOnComplete( msg, queueName )
+
+            def queueMsgForSendOnComplete( msg, queueName, timestamp=nil )
                 correlationId = sagaData.nil? ? nil : sagaData.correlationId
                 correlationId = @msg.correlationId.nil? ? correlationId : @msg.correlationId
-                @queueForMsgsToBeSentOnComplete << Hash["msg", msg, "queueName", queueName, "correlationId", correlationId]
+                @queueForMsgsToBeSentOnComplete << Hash["msg", msg, "queueName", queueName, "correlationId", correlationId, "timestamp",timestamp ]
             end
-            
+
             #Sends a msg back across the bus
             #Reply queues are specified in each msg. It works like
             #email, where the reply address can actually be anywhere
@@ -501,16 +517,16 @@ module RServiceBus
             #msg destination is specified at the infrastructure level
             #
             # @param [RServiceBus::Message] msg msg to be sent
-            def Send( msg )
+            def Send( msg, timestamp=nil )
                 RServiceBus.rlog "Bus.Send"
                 @stats.incTotalSent
-                
+
                 msgName = msg.class.name
                 queueName = self.getEndpointForMsg( msgName )
                 
-                self.queueMsgForSendOnComplete( msg, queueName )
+                self.queueMsgForSendOnComplete( msg, queueName, timestamp )
             end
-            
+
             #Sends an event to all subscribers across the bus
             #
             # @param [RServiceBus::Message] msg msg to be sent
@@ -524,7 +540,7 @@ module RServiceBus
                 end
                 
             end
-            
+
             #Sends a subscription request across the Bus
             #
             # @param [String] eventName event to be subscribes to

data/lib/rservicebus/Message.rb

@@ -7,7 +7,7 @@ module RServiceBus
     #This is the top level message that is passed around the bus
     class Message
         
-        attr_reader :returnAddress, :msgId, :remoteQueueName, :remoteHostName, :lastErrorSourceQueue, :lastErrorString, :correlationId
+        attr_reader :returnAddress, :msgId, :remoteQueueName, :remoteHostName, :lastErrorSourceQueue, :lastErrorString, :correlationId, :sendAt
         
         # Constructor
         #
@@ -54,6 +54,9 @@ module RServiceBus
             @remoteQueueName = queueName
         end
         
+        def sendAt( timestamp )
+            @sendAt = timestamp
+        end
         
         # @return [Object] The msg to be sent
         def msg

data/lib/rservicebus/ResourceManager.rb

@@ -31,7 +31,7 @@ module RServiceBus
                 r = @appResources[name]
                 r._connect
                 r.Begin
-                RServiceBus.rlog "Preparing resource: #{resourceName}. Begin"
+                RServiceBus.rlog "Preparing resource: #{name}. Begin"
             end
             @currentResources[name] = @appResources[name]
             return @appResources[name]

data/lib/rservicebus/Saga/Manager.rb

@@ -2,7 +2,7 @@ module RServiceBus
 
 
 class Saga_Manager
-    
+
 	def initialize( host, resourceManager, sagaStorage )
 		@handler = Hash.new
 		@startWith = Hash.new
@@ -103,6 +103,7 @@ class Saga_Manager
         return handled if handled == true
 
 
+        return false if rmsg.correlationId.nil?
         data = @sagaStorage.Get( rmsg.correlationId )
         return handled if data.nil?
         methodName = "Handle_#{msg.class.name}"

data/lib/rservicebus/SendAtManager.rb

@@ -0,0 +1,42 @@
+module RServiceBus
+    
+    require 'rservicebus/SendAtStorage'
+    
+    class SendAtManager
+
+
+        def initialize( bus )
+            #Check if the SendAt Dir has been specified
+            #If it has, make sure it exists, and is writable
+
+            string = RServiceBus.getValue( "SENDAT_URI" )
+            if string.nil? then
+                string = "file:///tmp/rservicebus-sendat"
+            end
+
+            uri = URI.parse( string )
+            @SendAtStorage = SendAtStorage.Get( uri )
+
+            @Bus = bus
+        end
+
+
+        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"] )
+                    @SendAtStorage.Delete( idx )
+                end
+            end
+        end
+
+        def Add( row )
+            @SendAtStorage.Add( row )
+        end
+
+
+    end
+
+
+end

data/lib/rservicebus/SendAtStorage.rb

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

data/lib/rservicebus/SendAtStorage/File.rb

@@ -0,0 +1,46 @@
+module RServiceBus
+    
+    class SendAtStorage_File
+        
+        def initialize( uri )
+            @list = self.load( uri.path )
+        end
+        def load( path )
+            return Array.new if !File.exists?( path )
+
+            content = IO.read( path )
+
+            return Array.new if content == ""
+
+            return YAML::load( content )
+        end
+
+
+        #Add
+        def Add( msg )
+            @list << msg
+            self.Save
+        end
+        
+        #GetAll
+        def GetAll
+            return @list
+        end
+        
+        #Delete
+        def Delete( idx )
+            @list.delete_at( idx )
+            self.Save
+        end
+        
+        #Finish
+        def Save
+            content = YAML::dump( @list )
+            IO.write( @uri.path, content )
+        end
+        
+        
+        
+    end
+    
+end

data/lib/rservicebus/SendAtStorage/InMemory.rb

@@ -0,0 +1,26 @@
+module RServiceBus
+    
+    class SendAtStorage_File
+        
+        def initialize( uri )
+            @list = Array.new
+        end
+
+        #Add
+        def Add( msg )
+            @list << msg
+        end
+
+        #GetAll
+        def GetAll
+            return @list
+        end
+
+        #Delete
+        def Delete( idx )
+            @list.delete_at( idx )
+        end
+
+    end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.58
+  version: 0.1.59
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70346625881440 !ruby/object:Gem::Requirement
+  requirement: &70127104314700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346625881440
+  version_requirements: *70127104314700
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70346625880860 !ruby/object:Gem::Requirement
+  requirement: &70127104313880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346625880860
+  version_requirements: *70127104313880
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70346625879800 !ruby/object:Gem::Requirement
+  requirement: &70127104309180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346625879800
+  version_requirements: *70127104309180
 - !ruby/object:Gem::Dependency
   name: fluiddb
-  requirement: &70346625879100 !ruby/object:Gem::Requirement
+  requirement: &70127104307000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346625879100
+  version_requirements: *70127104307000
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70346625878260 !ruby/object:Gem::Requirement
+  requirement: &70127104304900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346625878260
+  version_requirements: *70127104304900
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
@@ -129,6 +129,10 @@ files:
 - lib/rservicebus/SagaStorage/Dir.rb
 - lib/rservicebus/SagaStorage/InMemory.rb
 - lib/rservicebus/SagaStorage.rb
+- lib/rservicebus/SendAtManager.rb
+- lib/rservicebus/SendAtStorage/File.rb
+- lib/rservicebus/SendAtStorage/InMemory.rb
+- lib/rservicebus/SendAtStorage.rb
 - lib/rservicebus/StateManager.rb
 - lib/rservicebus/StateStorage/Dir.rb
 - lib/rservicebus/StateStorage.rb