rservicebus 0.0.22 → 0.0.23

data/bin/{ReturnErroredMessagesToSourceQueue → ReturnErroredMessagesToSourceQueueBeanstalk}

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 
-require "amqp"
 require "yaml"
 
+require "beanstalk-client"
+
 require "rservicebus"
 
 host = 'localhost:11300'

data/bin/ReturnErroredMessagesToSourceQueueBunny

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+
+require "yaml"
+
+require "bunny"
+
+require "rservicebus"
+
+host = 'localhost:11300'
+errorQueueName = "error"
+
+bunny = Bunny.new(:host=>host)
+bunny.start
+direct_exchange = @bunny.exchange('rservicebus.agent')
+
+q = @bunny.queue(errorQueueName)
+
+number_of_messages = 0
+loop = true
+while loop do
+    msg = q.pop[:payload]
+    if msg == :queue_empty then
+        loop = false
+        else
+        number_of_messages++
+        
+        msg = YAML::load(msg)
+        
+		queueName = msg.getLastErrorMsg.sourceQueue
+        sq = bunny.queue(queueName)
+        sq.bind(@direct_exchange)
+        #q.publish( serialized_object )
+        
+        @direct_exchange.publish(msg)
+    end
+end
+    
+    
+    if count == 0 then
+        puts "Nothing waiting on the error queue"
+        else
+        
+        puts "Returned #{number_of_messages} to their source queue"
+        
+    end
+    

data/lib/rservicebus/Agent.rb

@@ -0,0 +1,20 @@
+module RServiceBus
+    
+    #A means for a stand-alone process to interact with the bus, without being a full
+    #rservicebus application
+    class Agent
+        
+        def getAgent( uri )
+            if uri.scheme == "beanstalk" then
+                require "rservicebus/Agent/Beanstalk"
+                return Agent_Beanstalk.new()
+                elsif uri.scheme == "bunny" then
+                require "rservicebus/Agent/Bunny"
+                return Agent_Bunny.new()
+                else
+                raise StandardError.new( "Scheme not recognised" )
+                
+            end
+        end
+    end
+end

data/lib/rservicebus/Agent/Bunny.rb

@@ -5,7 +5,7 @@ require 'bunny'
 #rservicebus application
 class Agent_Bunny
 	@bunny
-	
+
 	def initialize(host='localhost')
 		@bunny = Bunny.new(:host=>host)
         @bunny.start
@@ -20,7 +20,6 @@ class Agent_Bunny
 	def sendMsg(messageObj, queueName, returnAddress=nil)
 		msg = RServiceBus::Message.new( messageObj, returnAddress )
 		serialized_object = YAML::dump(msg)
-        
 
         q = @bunny.queue(queueName)
         q.bind(@direct_exchange)

data/lib/rservicebus/AppResource.rb

@@ -39,4 +39,4 @@ module RServiceBus
         end
         
     end
-end
+end

data/lib/rservicebus/Saga.rb

@@ -0,0 +1,141 @@
+module RServiceBus
+    
+    #Requirements for Saga.
+    #
+    #Technicalities
+    #correlation: how to tie two independant msgs together in a single saga
+    #
+    #Multiple messages - Any of which can start the saga
+    #Timeouts
+    #Persistent Data between calls
+    #Ability to "complete" a saga, but not compulsory to do so.
+    
+    
+    require "uri"
+    
+    
+    class Saga_Data_InMemory
+        
+        attr_reader :data_hash
+
+        @data_hash
+        
+        def initialize
+            @data_hash = Hash.new
+        end
+        
+        def get( saga, msg, mapping )
+            @data_hash[saga.class.name] = Hash.new if @data_hash[saga.class.name].nil?
+            @data_hash[saga.class.name][msg.class.name] = Array.new if @data_hash[saga.class.name][msg.class.name].nil?
+
+            if !mapping[msg.class.name].nil? then
+                mapping[msg.class.name].each do |msgFieldName,sagaFieldName|
+                    
+                    @data_hash[saga.class.name][msg.class.name].each do |data|
+                        if !data[sagaFieldName].nil? then
+                            return data if msg.instance_variable_get(msgFieldName) == data[sagaFieldName]
+                        end
+                    end
+                end
+            end
+
+            hash = Hash.new
+            @data_hash[saga.class.name][msg.class.name].push( hash )
+            return hash;
+        end
+        
+    end
+    
+    # Wrapper base class for resources used by applications, allowing rservicebus to configure the resource
+    # - dependency injection.
+    #
+    class Saga_Manager
+
+        #correlation strategy
+        #  correlation strategy return an instance of the saga.
+        #  that way, we can return an existing one, or create a new one
+        
+        # Start with sagaid
+        
+        #        def Handle_MsgName( msg, data )
+        
+        #        end
+        
+        def initialize
+            @sagas = Hash.new
+            @saga_data = Saga_Data_InMemory.new
+        end
+        
+        def getMsgNames( sagaClass )
+            list = []
+            sagaClass.instance_methods.each do |name|
+                list.push name.to_s.sub( "Handle_", "" ) if name.to_s.slice( 0,7 ) == "Handle_"
+            end
+            
+            return list
+        end
+        
+        def addSaga( sagaClass )
+            saga = sagaClass.new
+            hash = Hash["saga", saga, "mapping", saga.mapping]
+            self.getMsgNames( sagaClass ).each do |name|
+                sagas[name] = Array.new if sagas[name].nil?
+                @sagas[name].push( hash )
+            end
+        end
+
+        def Handle( msg )
+            return if @sagas[msg.class.name].nil?
+            
+            @sagas[msg.class.name].each do |hash|
+                saga = hash["saga"]
+                
+                data = @saga_data.get( saga, msg, hash["mapping"] )
+                
+                saga.data = data
+                saga.Handle( msg )
+            end
+            
+        end
+    end
+    
+    
+    class Saga
+        attr_accessor :data, :mapping
+        attr_reader :data
+        
+        @data
+        @mapping
+        
+        def initialize
+            @mapping = Hash.new
+            self.ConfigureHowToFindSaga
+        end
+        
+        def ConfigureHowToFindSaga()
+            throw StandardError.new( "ConfigureHowToFindSaga needs to be implemented" );
+        end
+        
+        def ConfigureMapping( msg, sagaFieldName, msgFieldName);
+            #            if !msg.has_attribute?( msgFieldName ) then
+            #    raise StandardError.new( "Msg, #{msg.name}, doesn't have a field named, #{msgFieldName}" )
+            #end
+            @mapping[msg.name] = Hash.new if @mapping[msg.name].nil?
+            @mapping[msg.name]["@" + msgFieldName] = sagaFieldName
+        end
+        
+        def complete
+        end
+        
+        def Handle( msg )
+            methodName = "Handle_#{msg.class.name}"
+            
+            self.send methodName, msg
+        end
+    end
+    
+    class Saga_Manager
+        
+        
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,18 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
 - rservicebus
-- ReturnErroredMessagesToSourceQueue
+- ReturnErroredMessagesToSourceQueueBeanstalk
+- ReturnErroredMessagesToSourceQueueBunny
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/rservicebus/Agent/Beanstalk.rb
 - lib/rservicebus/Agent/Bunny.rb
+- lib/rservicebus/Agent.rb
 - lib/rservicebus/AppResource/FluidDbMysql.rb
 - lib/rservicebus/AppResource/FluidDbMysql2.rb
 - lib/rservicebus/AppResource/FluidDbPgsql.rb
@@ -39,6 +41,7 @@ files:
 - lib/rservicebus/MQ/Beanstalk.rb
 - lib/rservicebus/MQ/Bunny.rb
 - lib/rservicebus/MQ.rb
+- lib/rservicebus/Saga.rb
 - lib/rservicebus/Stats.rb
 - lib/rservicebus/SubscriptionManager.rb
 - lib/rservicebus/SubscriptionStorage/Redis.rb
@@ -47,7 +50,8 @@ files:
 - lib/rservicebus/Test/Redis.rb
 - lib/rservicebus/Test.rb
 - lib/rservicebus.rb
-- bin/ReturnErroredMessagesToSourceQueue
+- bin/ReturnErroredMessagesToSourceQueueBeanstalk
+- bin/ReturnErroredMessagesToSourceQueueBunny
 - bin/rservicebus
 - LICENSE
 - README.md