rservicebus 0.0.2 → 0.0.3

data/lib/rservicebus.rb

@@ -11,6 +11,7 @@ require "rservicebus/ErrorMessage"
 require "rservicebus/Message"
 require "rservicebus/Subscription"
 require "rservicebus/HandlerLoader"
+require "rservicebus/ConfigureAppResource"
 require "rservicebus/Host"
 
 

data/lib/rservicebus/Agent.rb

@@ -4,8 +4,8 @@ require 'beanstalk-client'
 class Agent
 	@beanstalk
 	
-	def initialize()
-		@beanstalk = Beanstalk::Pool.new(['localhost:11300'])
+	def initialize(url=['localhost:11300'])
+		@beanstalk = Beanstalk::Pool.new(url)
 	end
 
 	def sendMsg(messageObj, queueName, returnAddress=nil)

data/lib/rservicebus/ConfigureAppResource.rb

@@ -0,0 +1,53 @@
+require "uri"
+require "redis"
+
+class AppResource
+	@uri
+
+	def initialize( uri )
+		@uri = uri
+	end
+
+	def getResource
+		raise "Method, getResource, needs to be implemented for resource"
+	end
+end
+
+class RedisAppResource<AppResource
+
+	@connection
+
+	def initialize( uri )
+		super(uri)
+		@connection = Redis.new
+	end
+
+	def getResource
+		return @connection
+	end
+
+end
+
+class ConfigureAppResource
+
+	def getResources( env )
+		resources = Hash.new
+
+		env.each do |k,v|
+			if v.is_a?(String) and
+					k.start_with?( "RSB_" ) then
+				uri = URI.parse( v )
+				case uri.scheme
+					when "redis"
+						resources[k.sub( "RSB_", "" )] = RedisAppResource.new( uri )
+					else
+						abort("Scheme, #{uri.scheme}, not recognised when configuring app resource, #{k}=#{v}");
+				end
+			end
+					
+		end
+
+		return resources
+	end
+
+end

data/lib/rservicebus/HandlerLoader.rb

@@ -5,6 +5,7 @@ class HandlerLoader
 	attr_reader :messageName, :handler
 
 	@host
+	@appResources
 
 	@baseDir
 	@filepath
@@ -15,11 +16,9 @@ class HandlerLoader
 	@messageName
 	@handler
 
-	def initialize( baseDir, filePath, host )
+	def initialize( host, appResources )
 		@host = host
-
-		@baseDir = baseDir
-		@filePath = filePath
+		@appResources = appResources
 	end
 
 	def getMessageName( baseDir, fileName )
@@ -27,7 +26,7 @@ class HandlerLoader
 		if name.count( "/" ) == 0 then
 			return name.match( /(.+)\./ )[1]
 		end
-				
+
 		if name.count( "/" ) == 1 then
 			return name.match( /\/(.+)\./ )[1]
 		end
@@ -40,53 +39,72 @@ class HandlerLoader
 	end
 
 	def getRequirePath( filePath )
+		if !filePath.start_with?( "/" ) then
+			filePath = "./" + filePath
+		end
+		
 		if File.exists?( filePath ) then
 			return filePath.sub( ".rb", "")
 		end		
-		
-		if File.exists?( "./" + filePath ) then
-			return "./" + filePath.sub( ".rb", "")
-		end
 
 		abort( "Filepath, " + filePath + ", given for MessageHandler require doesn't exist" );
 	end
 
-	def parseFilepath
-		@requirePath = self.getRequirePath( @filePath )
-		@messageName = self.getMessageName( @baseDir, @filePath )
-		@handlerName = @filePath.sub( ".rb", "").sub( @baseDir, "MessageHandler" ).gsub( "/", "_" )
-
-		puts @handlerName
-		puts @filePath + ":" + @messageName + ":" + @handlerName
+	def getHandlerName( baseDir, filePath )
+		handlerName = filePath.sub( ".rb", "").sub( baseDir, "MessageHandler" ).gsub( "/", "_" )
+		return handlerName
 	end
 
-	def loadHandlerFromFile
-		require @requirePath
+	def loadHandlerFromFile( requirePath, handlerName, filePath )
+		require requirePath
 		begin
-			@handler = Object.const_get(@handlerName).new();
+			handler = Object.const_get(handlerName).new();
 		rescue Exception => e
-			puts "Expected class name: " + @handlerName + ", not found after require: " +  @requirePath
-			puts "**** Check in " + @filePath + " that the class is named : " + @handlerName
+			puts "Expected class name: " + handlerName + ", not found after require: " +  requirePath
+			puts "**** Check in " + filePath + " that the class is named : " + handlerName
 			puts "( In case its not that )"
 			raise e
 		end
+		
+		return handler
 	end
 	
-	def setBusAttributeIfRequested
-		if defined?( @handler.Bus ) then
-			@handler.Bus = @host
-			puts "Bus attribute set for: " + @handlerName
+	def setBusAttributeIfRequested( handler, handlerName )
+		if defined?( handler.Bus ) then
+			handler.Bus = @host
+			@host.log "Bus attribute set for: " + handlerName
+		end
+	end
+
+	def setAppResources( handler, handlerName, appResources )
+		@host.log "Checking app resources for: #{handlerName}", true
+		appResources.each do |k,v|
+			if handler.class.method_defined?( k ) then 
+				handler.instance_variable_set( "@#{k}", v.getResource() )
+				@host.log "App resource attribute, #{k}, set for: " + handlerName
+			end
 		end
 	end
 
-	def loadHandler()
+	def loadHandler(baseDir, filePath)
 		begin
-			self.parseFilepath
-			self.loadHandlerFromFile
-			self.setBusAttributeIfRequested
-			puts "Loaded Handler: " + @handlerName + ", for, " + @messageName
+			requirePath = self.getRequirePath( filePath )
+			messageName = self.getMessageName( baseDir, filePath )
+			handlerName = self.getHandlerName( baseDir, filePath )
+
+			@host.log "filePath: " + filePath, true
+			@host.log "requirePath: " + requirePath, true
+			@host.log "messageName: " + messageName, true
+			@host.log "handlerName: " + handlerName, true
+
+			handler = self.loadHandlerFromFile( requirePath, handlerName, filePath )
+			self.setBusAttributeIfRequested( handler, handlerName )
+			self.setAppResources( handler, handlerName, @appResources )
+			@host.log "Loaded Handler: " + handlerName + ", for, " + messageName
+
+			return messageName, handler
 		rescue Exception => e
-			puts "Exception loading handler from file: " + @filePath
+			puts "Exception loading handler from file: " + filePath
 			puts e.message
 			puts e.backtrace[0]
 

data/lib/rservicebus/Host.rb

@@ -11,7 +11,7 @@ class Host
 	@maxRetries
 
 	@localQueueName
-	
+
 	@forwardReceivedMessagesTo
 	@forwardReceivedMessagesToQueue
 	
@@ -22,6 +22,7 @@ class Host
 	@beanstalk
 
 	@verbose
+	@appResources
 
 	def log(string, ver=false)
 		type = ver ? "VERB" : "INFO"
@@ -81,8 +82,9 @@ class Host
 		if self.getValue( "CONTRACTS" ).nil? then
 			return self
 		end
-		
-		self.getValue( "CONTRACTS" ).split( ";" ) do |path|
+
+		self.getValue( "CONTRACTS" ).split( ";" ).each do |path|
+			self.log "Loading contracts from, #{path}"
 			require path
 		end
 		return self
@@ -96,16 +98,33 @@ class Host
 
 	def configureBeanstalk
 		beanstalkHost = self.getValue( "BEANSTALK", "localhost:11300" )
-		@beanstalk = Beanstalk::Pool.new([beanstalkHost])
+		begin
+			@beanstalk = Beanstalk::Pool.new([beanstalkHost])
+		rescue Exception => e
+			if e.message == "Beanstalk::NotConnected" then
+				puts "Error connecting to Beanstalk"
+				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, " + beanstalkHost
+				abort()
+			else
+				raise e
+			end
+		end
 
 		return self
 	end
 
+	def configureAppResource
+		@appResources = ConfigureAppResource.new.getResources( ENV )
+		return self;
+	end
+
 	def initialize()
 
-		self.loadHostSection()
-			.configureLogging()
+		self.configureLogging()
+			.loadHostSection()
 			.configureBeanstalk()
+			.configureAppResource()
 			.loadContracts()
 			.loadMessageEndpointMappings()
 			.loadHandlerPathList()
@@ -119,6 +138,7 @@ class Host
 	def loadHandlersFromPath(baseDir, subDir="")
 		log "Load Message Handlers from baseDir, " + baseDir + ", subDir, " + subDir
 		log "Checking, " + baseDir, true
+		handlerLoader = HandlerLoader.new( self, @appResources )
 
 		@handlerList = {};
 		Dir[baseDir + "/" + subDir + "*"].each do |filePath|
@@ -128,14 +148,13 @@ class Host
 				if File.directory?( filePath ) then
 					self.loadHandlersFromPath( filePath.sub( baseDir ) )
 				else
-					handlerLoader = HandlerLoader.new( baseDir, filePath, self )
-					handlerLoader.loadHandler
+					messageName, handler = handlerLoader.loadHandler( baseDir, filePath )
 
-					if !@handlerList.has_key?( handlerLoader.messageName ) then
-						@handlerList[handlerLoader.messageName] = Array.new
+					if !@handlerList.has_key?( messageName ) then
+						@handlerList[messageName] = Array.new
 					end
 
-					@handlerList[handlerLoader.messageName] << handlerLoader.handler;
+					@handlerList[messageName] << handler;
 				end
 			end
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-14 00:00:00.000000000 Z
 dependencies: []
 description: A ruby implementation of NServiceBus
 email: guy@guyirvine.com
@@ -20,6 +20,7 @@ extra_rdoc_files: []
 files:
 - lib/rservicebus/Agent.rb
 - lib/rservicebus/Config.rb
+- lib/rservicebus/ConfigureAppResource.rb
 - lib/rservicebus/ErrorMessage.rb
 - lib/rservicebus/HandlerLoader.rb
 - lib/rservicebus/helper_functions.rb