rservicebus 0.0.26 → 0.0.27

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, :queueTimeout, :statOutputCountdown, :contractList, :libList, :forwardSentMessagesTo, :mqHost
+	attr_reader :appName, :messageEndpointMappings, :handlerPathList, :localQueueName, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :subscriptionUri, :verbose, :queueTimeout, :statOutputCountdown, :contractList, :libList, :forwardSentMessagesTo, :mqHost
 
 	@appName
 	@messageEndpointMappings
@@ -14,6 +14,7 @@ class Config
 	@forwardSentMessagesTo
 	@maxRetries
 	@forwardReceivedMessagesTo
+    @subscriptionUri
 
 	@verbose
 	
@@ -90,6 +91,7 @@ class Config
 		@forwardReceivedMessagesTo = self.getValue( "FORWARD_RECEIVED_MESSAGES_TO" )
 		@queueTimeout = self.getValue( "QUEUE_TIMEOUT", "5" ).to_i
 		@statOutputCountdown = self.getValue( "STAT_OUTPUT_COUNTDOWN", "100" ).to_i
+        @subscriptionUri = self.getValue( "SUBSCRIPTION_URI", "redis://127.0.0.1:6379/" )
 
 		return self
 	end

data/lib/rservicebus/ConfigureSubscriptionStorage.rb

@@ -0,0 +1,24 @@
+module RServiceBus
+    
+    require "uri"
+    
+    #Configure SubscriptionStorage for an rservicebus host
+    class ConfigureSubscriptionStorage
+        
+        def get( appName, uri_string )
+            uri = URI.parse( uri_string )
+            
+            case uri.scheme
+                when "redis"
+                require "rservicebus/SubscriptionStorage/Redis"
+                s = SubscriptionStorage_Redis.new( appName, uri )
+                
+                else
+                abort("Scheme, #{uri.scheme}, not recognised when configuring subscription storage, #{uri_string}");
+            end
+            return s
+        end
+        
+    end
+    
+end

data/lib/rservicebus/Host.rb

@@ -98,9 +98,9 @@ module RServiceBus
         end
         
         def configureSubscriptions
-            subscriptionStorage = SubscriptionStorage_Redis.new( @config.appName, "uri" )
+            subscriptionStorage = ConfigureSubscriptionStorage.new.get( @config.appName, @config.subscriptionUri )
             @subscriptionManager = SubscriptionManager.new( subscriptionStorage )
-            
+
             return self
         end
         

data/lib/rservicebus/SubscriptionStorage/Redis.rb

@@ -9,7 +9,8 @@ class SubscriptionStorage_Redis<SubscriptionStorage
 
 	def initialize( appName, uri )
 		super(appName, uri)
-		@redis = Redis.new
+        port = uri.port.nil? ? 6379 : uri.port
+		@redis = Redis.new( :host=>uri.host, :port=>port )
 	end
 
 	def getAll
@@ -43,7 +44,7 @@ class SubscriptionStorage_Redis<SubscriptionStorage
 		else
 			subscriptions = YAML::load(content)
 		end
-		
+
 		if subscriptions[eventName].nil? then
 			subscriptions[eventName] = Array.new
 		end

data/lib/rservicebus.rb

@@ -24,7 +24,7 @@ require "rservicebus/AppResource/Redis"
 
 require "rservicebus/SubscriptionManager"
 require "rservicebus/SubscriptionStorage"
-require "rservicebus/SubscriptionStorage/Redis"
+require "rservicebus/ConfigureSubscriptionStorage"
 
 
 module RServiceBus

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-10-28 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
@@ -35,6 +35,7 @@ files:
 - lib/rservicebus/Config.rb
 - lib/rservicebus/ConfigureAppResource.rb
 - lib/rservicebus/ConfigureMQ.rb
+- lib/rservicebus/ConfigureSubscriptionStorage.rb
 - lib/rservicebus/ErrorMessage.rb
 - lib/rservicebus/HandlerLoader.rb
 - lib/rservicebus/helper_functions.rb