rservicebus 0.0.12 → 0.0.13

data/bin/rservicebus

@@ -8,8 +8,7 @@ require 'rubygems'
 require 'rservicebus'
 
 def run_rservicebus()
-	RServiceBus::Host.new()
-		.run()
+	RServiceBus::Host.new().run()
 end
 
 run_rservicebus

data/lib/rservicebus.rb

@@ -19,7 +19,6 @@ require "rservicebus/Message/Subscription"
 
 require "rservicebus/AppResource"
 require "rservicebus/AppResource/Redis"
-#require "rservicebus/AppResource/Mysql"
 
 require "rservicebus/SubscriptionManager"
 require "rservicebus/SubscriptionStorage"

data/lib/rservicebus/AppResource/FluidDbMysql.rb

@@ -0,0 +1,26 @@
+module RServiceBus
+    
+    require "FluidDb/Mysql"
+
+    #Implementation of an AppResource - Redis
+    class AppResource_FluidDbMysql<AppResource
+        
+        @connection
+
+        def initialize( uri )
+            super(uri)
+            host = uri.host
+            database = uri.path.sub( "/", "" )
+            
+            
+            @connection = FluidDb::Mysql.new( uri )
+            puts "AppResource_Mysql. Connected to, " + uri.to_s
+        end
+
+        def getResource
+            return @connection
+        end
+        
+    end
+    
+end

data/lib/rservicebus/AppResource/FluidDbMysql2.rb

@@ -0,0 +1,26 @@
+module RServiceBus
+    
+    require "FluidDb/Mysql2"
+    
+    #Implementation ofF an AppResource - Redis
+    class AppResource_FluidDbMysql2<AppResource
+        
+        @connection
+
+        def initialize( uri )
+            super(uri)
+            host = uri.host
+            database = uri.path.sub( "/", "" )
+            
+            
+            @connection = FluidDb::Mysql2.new( uri )
+            puts "AppResource_Mysql. Connected to, " + uri.to_s
+        end
+
+        def getResource
+            return @connection
+        end
+        
+    end
+    
+end

data/lib/rservicebus/AppResource/FluidDbPgsql.rb

@@ -0,0 +1,26 @@
+module RServiceBus
+    
+    require "FluidDb/Pgsql"
+    
+    #Implementation of an AppResource - Redis
+    class AppResource_FluidDbPgsql<AppResource
+        
+        @connection
+
+        def initialize( uri )
+            super(uri)
+            host = uri.host
+            database = uri.path.sub( "/", "" )
+            
+            
+            @connection = FluidDb::Pgsql.new( uri )
+            puts "AppResource_Mysql. Connected to, " + uri.to_s
+        end
+
+        def getResource
+            return @connection
+        end
+        
+    end
+    
+end

data/lib/rservicebus/Config.rb

@@ -2,11 +2,12 @@ module RServiceBus
 
 #Marshals configuration information for an rservicebus host
 class Config
-	attr_reader :appName, :messageEndpointMappings, :handlerPathList, :localQueueName, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :verbose, :beanstalkHost, :queueTimeout, :statOutputCountdown
+	attr_reader :appName, :messageEndpointMappings, :handlerPathList, :localQueueName, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :verbose, :beanstalkHost, :queueTimeout, :statOutputCountdown, :contractList, :libList
 
 	@appName
 	@messageEndpointMappings
 	@handlerPathList
+	@contractList
 
 	@localQueueName
 	@errorQueueName
@@ -70,14 +71,12 @@ class Config
 #	<path 1>;<path 2>
 	def loadHandlerPathList()
 		path = self.getValue( "MSGHANDLERPATH", "./MessageHandler" )
-		handlerPathList = Array.new
+		@handlerPathList = Array.new
 		path.split( ";" ).each do |path|
 			path = path.strip.chomp( "/" )
-			handlerPathList << path
+			@handlerPathList << path
 		end
 
-		@handlerPathList = handlerPathList
-
 		return self
 	end
 
@@ -93,10 +92,6 @@ class Config
 		return self
 	end
 
-	def performRequire( path )
-		require path
-	end
-
 	def ensureContractFileExists( path )
 		if !( File.exists?( path ) ||
 				File.exists?( "#{path}.rb" ) ) then
@@ -122,15 +117,44 @@ class Config
 		if self.getValue( "CONTRACTS", "./Contract" ).nil? then
 			return self
 		end
+        @contractList = Array.new
 
 		self.getValue( "CONTRACTS", "./Contract" ).split( ";" ).each do |path|
 			log "Loading contracts from, #{path}"
 			self.ensureContractFileExists( path )
-			self.performRequire( path )
+			@contractList << path
 		end
 		return self
 	end
 
+    #Marshals paths for lib
+    #
+    #Note. .rb extension is optional
+    #
+    #Expected format;
+    #	/one/two/Contracts
+	def loadLibs()
+        @libList = Array.new
+
+        path = self.getValue( "LIB" )
+        path = "./lib" if path.nil? and File.exists?( "./lib" )
+		if path.nil? then
+			return self
+		end
+
+		path.split( ";" ).each do |path|
+			log "Loading libs from, #{path}"
+			if !File.exists?( path ) then
+                puts "Error while processing libs"
+                puts "*** path, #{path}, should point to a ruby file, with extention .rb, or"
+                puts "*** path, #{path}, should point to a directory than conatins ruby files, that have extention .rb"
+                abort()
+                end
+			@libList << path
+		end
+		return self
+	end
+    
 	def configureLogging()
 		@verbose = !self.getValue( "VERBOSE", nil ).nil?
 
@@ -143,6 +167,34 @@ class Config
 		return self
 	end
 
+    #Marshals paths for working_dirs
+    #
+    #Note. trailing slashs will be stripped
+    #
+    #Expected format;
+    #	<path 1>;<path 2>
+	def loadWorkingDirList()
+		pathList = self.getValue( "WORKING_DIR" )
+        return self if pathList.nil?
+
+		pathList.split( ";" ).each do |path|
+            
+			path = path.strip.chomp( "/" )
+            if Dir.exists?( "#{path}/MessageHandler" ) then
+                @handlerPathList << "#{path}/MessageHandler"
+            end
+
+            if File.exists?( "#{path}/Contract.rb" ) then
+                @contractList << "#{path}/Contract.rb"
+            end
+
+            if File.exists?( "#{path}/lib" ) then
+                @libList << "#{path}/lib"
+            end
+		end
+
+		return self
+	end
 
 end
 

data/lib/rservicebus/ConfigureAppResource.rb

@@ -4,7 +4,7 @@ module RServiceBus
     
     #Configure AppResources for an rservicebus host
     class ConfigureAppResource
-        
+
         def getResources( env )
             resources = Hash.new
             
@@ -17,7 +17,18 @@ module RServiceBus
 						resources[k.sub( "RSB_", "" )] = AppResource_Redis.new( uri )
                         
                         when "mysql"
+                        require "rservicebus/AppResource/Mysql"
                         resources[k.sub( "RSB_", "" )] = AppResource_Mysql.new( uri )
+                        
+                        when "fluiddbmysql"
+                        require "rservicebus/AppResource/FluidDbMysql"
+                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbMysql.new( uri )
+                        when "fluiddbmysql2"
+                        require "rservicebus/AppResource/FluidDbMysql2"
+                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbMysql2.new( uri )
+                        when "fluiddbpgsql"
+                        require "rservicebus/AppResource/FluidDbPgsql"
+                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbPgsql.new( uri )
                         else
 						abort("Scheme, #{uri.scheme}, not recognised when configuring app resource, #{k}=#{v}");
                     end

data/lib/rservicebus/Host.rb

@@ -80,6 +80,33 @@ class Host
 		return self
 	end
 
+    
+	def loadContracts()
+		log "Load Contracts"
+        
+		@config.contractList.each do |path|
+            require path
+		end
+        
+		return self
+	end
+
+    def loadLibs()
+		log "Load Libs"
+        
+		@config.libList.each do |path|
+            if Dir.exists?( path ) then
+                path = path.strip.chomp( "/" )
+                path = path + "/**/*.rb"
+            end
+            Dir.glob( path ).each do |path|
+                require path
+            end
+		end
+        
+		return self
+	end
+
 	def configureSubscriptions
 		subscriptionStorage = SubscriptionStorage_Redis.new( @config.appName, "uri" )
 		@subscriptionManager = SubscriptionManager.new( subscriptionStorage )
@@ -102,12 +129,16 @@ class Host
 			.configureBeanstalk()
 			.loadContracts()
 			.loadMessageEndpointMappings()
-			.loadHandlerPathList();
+			.loadHandlerPathList()
+            .loadLibs()
+            .loadWorkingDirList();
 
 		self.configureStatistics()
 			.configureAppResource()
 			.connectToBeanstalk()
 			.loadHandlers()
+            .loadContracts()
+            .loadLibs()
 			.configureSubscriptions()
 			.sendSubscriptions()
 

metadata

@@ -1,34 +1,28 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rservicebus
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 12
-  version: 0.0.12
+version: !ruby/object:Gem::Version
+  version: 0.0.13
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Guy Irvine
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-03 00:00:00 +12:00
-default_executable: 
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies: []
-
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
-executables: 
+executables:
 - rservicebus
 - ReturnErroredMessagesToSourceQueue
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/rservicebus/Agent.rb
+- lib/rservicebus/AppResource/FluidDbMysql.rb
+- lib/rservicebus/AppResource/FluidDbMysql2.rb
+- lib/rservicebus/AppResource/FluidDbPgsql.rb
 - lib/rservicebus/AppResource/Mysql.rb
 - lib/rservicebus/AppResource/Redis.rb
 - lib/rservicebus/AppResource.rb
@@ -52,35 +46,29 @@ files:
 - bin/rservicebus
 - LICENSE
 - README.md
-has_rdoc: true
 homepage: http://rubygems.org/gems/rservicebus
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: RServiceBus
 test_files: []
-
+has_rdoc: