rservicebus 0.0.18 → 0.0.21

data/lib/rservicebus.rb

@@ -1,15 +1,19 @@
+#Add the currently running directory to the start of the load path
+#$:.unshift File.dirname(__FILE__) + '/../../lib'
+
 require "rubygems"
-require 'beanstalk-client'
 require "yaml"
 require "uuidtools"
 require "redis"
 require "json"
 
 require "rservicebus/helper_functions"
-require "rservicebus/Agent"
+require "rservicebus/Agent/Beanstalk"
+require "rservicebus/Agent/Bunny"
 require "rservicebus/ErrorMessage"
 require "rservicebus/HandlerLoader"
 require "rservicebus/ConfigureAppResource"
+require "rservicebus/ConfigureMQ"
 require "rservicebus/Host"
 require "rservicebus/Config"
 require "rservicebus/Stats"

data/lib/rservicebus/{Agent.rb → Agent/Beanstalk.rb}

@@ -3,7 +3,7 @@ require 'beanstalk-client'
 
 #A means for a stand-alone process to interact with the bus, without being a full
 #rservicebus application
-class Agent
+class Agent_Beanstalk
 	@beanstalk
 	
 	def initialize(url=['localhost:11300'])

data/lib/rservicebus/Agent/Bunny.rb

@@ -0,0 +1,49 @@
+module RServiceBus
+require 'bunny'
+
+#A means for a stand-alone process to interact with the bus, without being a full
+#rservicebus application
+class Agent_Bunny
+	@bunny
+	
+	def initialize(host='localhost')
+		@bunny = Bunny.new(:host=>host)
+        @bunny.start
+        @direct_exchange = @bunny.exchange('rservicebus.agent')
+	end
+
+# Put a msg on the bus
+#
+# @param [Object] messageObj The msg to be sent
+# @param [String] queueName the name of the queue to be send the msg to
+# @param [String] returnAddress the name of a queue to send replies to
+	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)
+        #q.publish( serialized_object )
+
+        @direct_exchange.publish(serialized_object)
+	end
+
+# Gives an agent a mean to receive replies
+#
+# @param [String] queueName the name of the queue to monitor for messages
+	def checkForReply( queueName )
+        q = @bunny.queue(queueName)
+
+        loop = true
+        while loop do
+            msg = q.pop[:payload]
+            loop = ( msg == :queue_empty )
+        end
+
+		@msg = YAML::load(msg)
+		return @msg.msg
+	end
+end
+
+end

data/lib/rservicebus/Config.rb

@@ -2,7 +2,7 @@ module RServiceBus
 
 #Marshals configuration information for an rservicebus host
 class Config
-	attr_reader :appName, :messageEndpointMappings, :handlerPathList, :localQueueName, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :verbose, :beanstalkHost, :queueTimeout, :statOutputCountdown, :contractList, :libList, :auditQueueName
+	attr_reader :appName, :messageEndpointMappings, :handlerPathList, :localQueueName, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :verbose, :queueTimeout, :statOutputCountdown, :contractList, :libList, :auditQueueName, :mqHost
 
 	@appName
 	@messageEndpointMappings
@@ -17,7 +17,7 @@ class Config
 
 	@verbose
 	
-	@beanstalkHost
+	@mq
 
 	@queueTimeout
 
@@ -163,9 +163,8 @@ class Config
 		return self
 	end
 
-	def configureBeanstalk
-		@beanstalkHost = self.getValue( "BEANSTALK", "localhost:11300" )
-
+	def configureMq
+		@mqHost = self.getValue( "MQ", "beanstalk://localhost" )
 		return self
 	end
 

data/lib/rservicebus/ConfigureMQ.rb

@@ -0,0 +1,29 @@
+module RServiceBus
+    
+    require "uri"
+    
+    #Configure AppResources for an rservicebus host
+    class ConfigureMQ
+        
+        def get( string, timeout )
+
+            uri = URI.parse( string )
+            case uri.scheme
+                when "beanstalk"
+                require "rservicebus/MQ/Beanstalk"
+                mq = MQ_Beanstalk.new( uri, timeout )
+
+                when "bunny"
+                require "rservicebus/MQ/Bunny"
+                mq = MQ_Bunny.new( uri, timeout )
+
+                else
+                abort("Scheme, #{uri.scheme}, not recognised when configuring mq, #{string}");
+            end
+            
+            return mq
+        end
+        
+    end
+    
+end

data/lib/rservicebus/Host.rb

@@ -1,5 +1,9 @@
 module RServiceBus
     
+    
+    class NoMsgToProcess<StandardError
+    end
+    
     #Host process for rservicebus
     class Host
         
@@ -10,7 +14,7 @@ module RServiceBus
         
         @subscriptions
         
-        @beanstalk
+        @mq
         
         @appResources
         
@@ -33,21 +37,8 @@ module RServiceBus
             return self;
         end
         
-        def connectToBeanstalk
-            begin
-                @beanstalk = Beanstalk::Pool.new([@config.beanstalkHost])
-                rescue Exception => e
-                puts "Error connecting to Beanstalk"
-                puts "Host string, #{@config.beanstalkHost}"
-                if e.message == "Beanstalk::NotConnected" then
-                    puts "***Most likely, beanstalk is not running. Start beanstalk, and try running this again."
-                    puts "***If you still get this error, check beanstalk is running at, " + @config.beanstalkHost
-                    else
-                    puts e.message
-                    puts e.backtrace
-                end
-                abort()
-            end
+        def connectToMq
+            @mq = ConfigureMQ.new.get( @config.mqHost + "/" + @config.localQueueName, @config.queueTimeout )
             
             return self
         end
@@ -82,7 +73,6 @@ module RServiceBus
             return self
         end
         
-        
         def loadContracts()
             log "Load Contracts"
             
@@ -122,13 +112,12 @@ module RServiceBus
             return self
         end
         
-        
         def initialize()
             
             @config = ConfigFromEnv.new
 			.configureLogging()
 			.loadHostSection()
-			.configureBeanstalk()
+			.configureMq()
 			.loadContracts()
 			.loadMessageEndpointMappings()
 			.loadHandlerPathList()
@@ -137,7 +126,7 @@ module RServiceBus
             
             self.configureStatistics()
 			.configureAppResource()
-			.connectToBeanstalk()
+			.connectToMq()
 			.loadHandlers()
             .loadContracts()
             .loadLibs()
@@ -151,7 +140,6 @@ module RServiceBus
             log "Starting the Host"
             
             log "Watching, " + @config.localQueueName
-            @beanstalk.watch( @config.localQueueName )
             if !@config.forwardReceivedMessagesTo.nil? then
                 log "Forwarding all received messages to: " + @config.forwardReceivedMessagesTo.to_s
             end
@@ -165,20 +153,19 @@ module RServiceBus
             log "Waiting for messages. To exit press CTRL+C"
             statOutputCountdown = 0
             messageLoop = true
-            
+
             while messageLoop do
                 retries = @config.maxRetries
                 #Popping a msg off the queue should not be in the message handler, as it affects retry
                 begin
                     if statOutputCountdown == 0 then
-                        log @stats.getForReporting
+                        #                        log @stats.getForReporting
                         statOutputCountdown = @config.statOutputCountdown-1
                         else
                         statOutputCountdown = statOutputCountdown - 1
                     end
-                    job = @beanstalk.reserve @config.queueTimeout
+                    body = @mq.pop
                     begin
-                        body = job.body
                         @stats.incTotalProcessed
                         @msg = YAML::load(body)
                         if @msg.msg.class.name == "RServiceBus::Message_Subscription" then
@@ -190,10 +177,12 @@ module RServiceBus
                                 self._SendAlreadyWrappedAndSerialised(body,@config.forwardReceivedMessagesTo)
                             end
                         end
-                        job.delete
+                        @mq.ack
                         rescue Exception => e
                         sleep 0.5
-                        
+
+                        puts e.message
+                        puts e.backtrace
                         
                         @handlerList[@msg.msg.class.name].each do |handler|
                             @resourceByHandlerNameList[handler.class.name].each do |resource|
@@ -223,140 +212,141 @@ module RServiceBus
                         @msg.addErrorMsg( @config.localQueueName, errorString )
                         serialized_object = YAML::dump(@msg)
                         self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
-                        job.delete
+                        @mq.ack
                     end
                     rescue SystemExit, Interrupt
                     puts "Exiting on request ..."
                     messageLoop = false
+
+                    rescue NoMsgToProcess => e
+                    #This exception is just saying there are no messages to process
+                    statOutputCountdown = 0
                     rescue Exception => e
-                    if e.message == "TIMED_OUT" then
-                        #This exception is just saying there are no messages to process
-                        statOutputCountdown = 0
-                        elsif e.message == "SIGTERM" then
-                        puts "Exiting on request ..."
-                        messageLoop = false
-                        else
-                        puts "*** This is really unexpected."
-                        messageLoop = false
-                        puts "Message: " + e.message
-                        puts e.backtrace
-                    end
+                    if e.message == "SIGTERM" then
+                    puts "Exiting on request ..."
+                    messageLoop = false
+                    else
+                    puts "*** This is really unexpected."
+                    messageLoop = false
+                    puts "Message: " + e.message
+                    puts e.backtrace
                 end
             end
             end
+        end
+        
+        #Send the current msg to the appropriate handlers
+        def HandleMessage()
+            msgName = @msg.msg.class.name
+            handlerList = @handlerList[msgName]
             
-            #Send the current msg to the appropriate handlers
-            def HandleMessage()
-                msgName = @msg.msg.class.name
-                handlerList = @handlerList[msgName]
-                
-                if handlerList == nil then
-                    log "No handler found for: " + msgName
-                    raise "No Handler Found"
-                    else
-                    log "Handler found for: " + msgName, true
-                    handlerList.each do |handler|
-                        begin
-                            handler.Handle( @msg.msg )
-                            rescue Exception => e
-                            log "An error occured in Handler: " + handler.class.name
-                            log e.message + ". " + e.backtrace[0]
-                            raise e
-                        end
+            if handlerList == nil then
+                log "No handler found for: " + msgName
+                puts "No handler found for: " + msgName
+                puts YAML::dump(@msg)
+                raise "No Handler Found"
+                else
+                log "Handler found for: " + msgName, true
+                handlerList.each do |handler|
+                    begin
+                        handler.Handle( @msg.msg )
+                        rescue Exception => e
+                        log "An error occured in Handler: " + handler.class.name
+                        log e.message + ". " + e.backtrace[0]
+                        raise e
                     end
                 end
             end
+        end
+        
+        #Sends a msg across the bus
+        #
+        # @param [String] serialized_object serialized RServiceBus::Message
+        # @param [String] queueName endpoint to which the msg will be sent
+        def _SendAlreadyWrappedAndSerialised( serialized_object, queueName )
+            log "Bus._SendAlreadyWrappedAndSerialised", true
             
-            #Sends a msg across the bus
-            #
-            # @param [String] serialized_object serialized RServiceBus::Message
-            # @param [String] queueName endpoint to which the msg will be sent
-            def _SendAlreadyWrappedAndSerialised( serialized_object, queueName )
-                log "Bus._SendAlreadyWrappedAndSerialised", true
-                
-                if !@config.auditQueueName.nil? then
-                    @beanstalk.use( @config.auditQueueName )
-                    @beanstalk.put( serialized_object )
-                end
-                
-                @beanstalk.use( queueName )
-                @beanstalk.put( serialized_object )
+            if !@config.auditQueueName.nil? then
+                @mq.send( @config.auditQueueName, 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 )
-                log "Bus._SendNeedsWrapping", true
-                
-                rMsg = RServiceBus::Message.new( msg, @config.localQueueName )
-                serialized_object = YAML::dump(rMsg)
-                log "Sending: " + msg.class.name + " to: " + queueName, true
-                self._SendAlreadyWrappedAndSerialised( serialized_object, queueName )
-            end
+            @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 )
+            log "Bus._SendNeedsWrapping", true
             
-            #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
-            #
-            # @param [RServiceBus::Message] msg msg to be sent
-            def Reply( msg )
-                log "Reply with: " + msg.class.name + " To: " + @msg.returnAddress, true
-                @stats.incTotalReply
-                
-                self._SendNeedsWrapping( msg, @msg.returnAddress )
-            end
+            rMsg = RServiceBus::Message.new( msg, @config.localQueueName )
+            serialized_object = YAML::dump(rMsg)
+            log "Sending: " + msg.class.name + " to: " + queueName, true
+            self._SendAlreadyWrappedAndSerialised( serialized_object, queueName )
+        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
+        #
+        # @param [RServiceBus::Message] msg msg to be sent
+        def Reply( msg )
+            log "Reply with: " + msg.class.name + " To: " + @msg.returnAddress, true
+            @stats.incTotalReply
             
+            self._SendNeedsWrapping( msg, @msg.returnAddress )
+        end
+        
+        
+        #Send a msg across the bus
+        #msg destination is specified at the infrastructure level
+        #
+        # @param [RServiceBus::Message] msg msg to be sent
+        def Send( msg )
+            log "Bus.Send", true
+            @stats.incTotalSent
             
-            #Send a msg across the bus
-            #msg destination is specified at the infrastructure level
-            #
-            # @param [RServiceBus::Message] msg msg to be sent
-            def Send( msg )
-                log "Bus.Send", true
-                @stats.incTotalSent
-                
-                msgName = msg.class.name
-                if !@config.messageEndpointMappings.has_key?( msgName ) then
-                    log "No end point mapping found for: " + msgName
-                    log "**** Check in RServiceBus.yml that the section MessageEndpointMappings contains an entry named : " + msgName
-                    raise "No end point mapping found for: " + msgName
-                end
-                
-                queueName = @config.messageEndpointMappings[msgName]
-                
-                self._SendNeedsWrapping( msg, queueName )
+            msgName = msg.class.name
+            if !@config.messageEndpointMappings.has_key?( msgName ) then
+                log "No end point mapping found for: " + msgName
+                log "**** Check in RServiceBus.yml that the section MessageEndpointMappings contains an entry named : " + msgName
+                raise "No end point mapping found for: " + msgName
             end
             
-            #Sends an event to all subscribers across the bus
-            #
-            # @param [RServiceBus::Message] msg msg to be sent
-            def Publish( msg )
-                log "Bus.Publish", true
-                @stats.incTotalPublished
-                
-                subscriptions = @subscriptionManager.get(msg.class.name)
-                subscriptions.each do |subscriber|
-                    self._SendNeedsWrapping( msg, subscriber )
-                end
-                
-            end
+            queueName = @config.messageEndpointMappings[msgName]
+            
+            self._SendNeedsWrapping( msg, queueName )
+        end
+        
+        #Sends an event to all subscribers across the bus
+        #
+        # @param [RServiceBus::Message] msg msg to be sent
+        def Publish( msg )
+            log "Bus.Publish", true
+            @stats.incTotalPublished
             
-            #Sends a subscription request across the Bus
-            #
-            # @param [String] eventName event to be subscribes to
-            def Subscribe( eventName )
-                log "Bus.Subscribe: " + eventName, true
-                
-                
-                queueName = @config.messageEndpointMappings[eventName]
-                subscription = Message_Subscription.new( eventName )
-                
-                
-                self._SendNeedsWrapping( subscription, queueName )
+            subscriptions = @subscriptionManager.get(msg.class.name)
+            subscriptions.each do |subscriber|
+                self._SendNeedsWrapping( msg, subscriber )
             end
             
         end
         
+        #Sends a subscription request across the Bus
+        #
+        # @param [String] eventName event to be subscribes to
+        def Subscribe( eventName )
+            log "Bus.Subscribe: " + eventName, true
+            
+            
+            queueName = @config.messageEndpointMappings[eventName]
+            subscription = Message_Subscription.new( eventName )
+            
+            
+            self._SendNeedsWrapping( subscription, queueName )
+        end
+        
     end
+    
+end

data/lib/rservicebus/MQ.rb

@@ -0,0 +1,73 @@
+module RServiceBus
+    
+    require "uri"
+    
+    # Wrapper base class for Queue implementations available to the applications, allowing rservicebus to instatiate and configure
+    # queue implementations at startup
+    # - dependency injection.
+    #
+    class MQ
+        @uri
+        
+        # Resources are attached resources, and can be specified using the URI syntax.
+        #
+        # @param [URI] uri the type and location of queue, eg bunny://127.0.0.1/foo
+        # @param [Integer] timeout the amount of time to wait for a msg to arrive
+        def initialize( uri, timeout )
+            @timeout = timeout
+            if uri.is_a? URI then
+                @uri = uri
+                else
+                puts "uri must be a valid URI"
+                abort()
+            end
+            
+            host = uri.host
+            port = uri.port
+            queue = uri.path.sub( "/", "" )
+            
+            if ( queue == "" )
+                puts "Queue name must be supplied "
+                puts "*** uri, #{uri}, needs to contain a queue name"
+                puts "*** the structure is scheme://host[:port]/queuename"
+                abort()
+            end
+
+            self.connect(uri.host, uri.port)
+            self.subscribe( queue )
+        end
+        
+        # Connect to the broker
+        #
+        def connect( host, port )
+            raise "Method, connect, needs to be implemented"
+        end
+        
+        # Connect to the queue
+        #
+        def subscribe( queuename )
+            raise "Method, subscribe, needs to be implemented"
+        end
+        
+        # Get next msg from queue
+        def pop
+            raise "Method, pop, needs to be implemented"
+        end
+        
+        # "Commit" queue
+        def ack
+            raise "Method, ack, needs to be implemented"
+        end
+        
+        # At least called in the Host rescue block, to ensure all network links are healthy
+        def send( queueName, msg )
+            begin
+                @connection.close
+                rescue
+                puts "AppResource. An error was raised while closing connection to, " + @uri.to_s
+            end
+            
+        end
+        
+    end
+end

data/lib/rservicebus/MQ/Beanstalk.rb

@@ -0,0 +1,64 @@
+module RServiceBus
+    
+    require "beanstalk-client"
+    require "rservicebus/MQ"
+    
+    # Beanstalk client implementation.
+    #
+    class MQ_Beanstalk<MQ
+        
+        # Connect to the broker
+        #
+        def connect( host, port )
+            port ||= 11300
+            string = "#{host}:#{port}"
+            
+            begin
+                @beanstalk = Beanstalk::Pool.new([string])
+                rescue Exception => e
+                puts "Error connecting to Beanstalk"
+                puts "Host string, #{string}"
+                if e.message == "Beanstalk::NotConnected" then
+                    puts "***Most likely, beanstalk is not running. Start beanstalk, and try running this again."
+                    puts "***If you still get this error, check beanstalk is running at, #{string}"
+                    else
+                    puts e.message
+                    puts e.backtrace
+                end
+                abort()
+            end
+        end
+        
+        # Connect to the queue
+        #
+        def subscribe( queuename )
+            @beanstalk.watch( queuename )
+        end
+        
+        # Get next msg from queue
+        def pop
+            begin
+                @job = @beanstalk.reserve @timeout
+                rescue Exception => e
+                if e.message == "TIMED_OUT" then
+                    raise NoMsgToProcess.new
+                end
+                raise e
+            end
+            return @job.body
+        end
+        
+        # "Commit" queue
+        def ack
+            @job.delete
+            @job = nil;
+        end
+        
+        # At least called in the Host rescue block, to ensure all network links are healthy
+        def send( queueName, msg )
+            @beanstalk.use( queueName )
+            @beanstalk.put( msg )
+        end
+        
+    end
+end

data/lib/rservicebus/MQ/Bunny.rb

@@ -0,0 +1,54 @@
+module RServiceBus
+    
+    require "bunny"
+    require "rservicebus/MQ"
+    
+    # RabbitMQ client implementation.
+    #
+    class MQ_Bunny<MQ
+        @uri
+        
+        # Connect to the broker
+        #
+        def connect( host, port )
+            port ||= 5672
+            
+            @bunny = Bunny.new(:host=>host, :port=>port)
+            @bunny.start
+            @pop_exch = @bunny.exchange('rservicebus.pop')
+            @send_exch = @bunny.exchange('rservicebus.send')
+        end
+
+        # Connect to the queue
+        #
+        def subscribe( queueName )
+            @queue = @bunny.queue( queueName )
+            @queue.bind( @pop_exch );
+        end
+
+        # Get next msg from queue
+        def pop
+            msg = @queue.pop(:ack => true)[:payload]
+
+            if msg == :queue_empty then
+                raise NoMsgToProcess.new
+            end
+
+            return msg
+        end
+        
+        # "Commit" the pop to the queue
+        def ack
+            @queue.ack
+        end
+
+        # Send a msg to a queue
+        def send( queueName, msg )
+            queue = @bunny.queue(queueName)
+            queue.bind(@send_exch)
+            @send_exch.publish(msg)
+            queue.unbind(@send_exch)
+        end
+        
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
@@ -19,7 +19,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rservicebus/Agent.rb
+- lib/rservicebus/Agent/Beanstalk.rb
+- lib/rservicebus/Agent/Bunny.rb
 - lib/rservicebus/AppResource/FluidDbMysql.rb
 - lib/rservicebus/AppResource/FluidDbMysql2.rb
 - lib/rservicebus/AppResource/FluidDbPgsql.rb
@@ -28,12 +29,16 @@ files:
 - lib/rservicebus/AppResource.rb
 - lib/rservicebus/Config.rb
 - lib/rservicebus/ConfigureAppResource.rb
+- lib/rservicebus/ConfigureMQ.rb
 - lib/rservicebus/ErrorMessage.rb
 - lib/rservicebus/HandlerLoader.rb
 - lib/rservicebus/helper_functions.rb
 - lib/rservicebus/Host.rb
 - lib/rservicebus/Message/Subscription.rb
 - lib/rservicebus/Message.rb
+- lib/rservicebus/MQ/Beanstalk.rb
+- lib/rservicebus/MQ/Bunny.rb
+- lib/rservicebus/MQ.rb
 - lib/rservicebus/Stats.rb
 - lib/rservicebus/SubscriptionManager.rb
 - lib/rservicebus/SubscriptionStorage/Redis.rb