rservicebus 0.0.74 → 0.0.75

data/lib/rservicebus/Config.rb

@@ -39,32 +39,6 @@ module RServiceBus
             return value
         end
         
-        #Marshals data for message end points
-        #
-        #Expected format;
-        #	<msg mame 1>:<end point 1>;<msg mame 2>:<end point 2>
-        def loadMessageEndpointMappings()
-            mapping = self.getValue( "MESSAGE_ENDPOINT_MAPPINGS" )
-            
-            messageEndpointMappings=Hash.new
-            if !mapping.nil? then
-                mapping.split( ";" ).each do |line|
-                    match = line.match( /(.+):(.+)/ )
-                    if match.nil? then
-                        log "Mapping string provided is invalid"
-                        log "The entire mapping string is: #{mapping}"
-                        log "*** Could not find ':' in mapping entry, #{line}"
-                        exit()
-                    end
-                    messageEndpointMappings[match[1]] = match[2]
-                end
-            end
-            
-            @messageEndpointMappings=messageEndpointMappings
-            
-            return self
-        end
-        
         #Marshals paths for message handlers
         #
         #Note. trailing slashs will be stripped

data/lib/rservicebus/ConfigureMonitor.rb

@@ -62,6 +62,10 @@ module RServiceBus
                         require "rservicebus/Monitor/Dir"
 						monitor = Monitor_Dir.new( @host, name, uri )
                         
+                        when "dirnotifier"
+                        require "rservicebus/Monitor/DirNotifier"
+						monitor = Monitor_DirNotifier.new( @host, name, uri )
+
                         when "csvperlinedir"
                         require "rservicebus/Monitor/CsvPerLine"
 						monitor = Monitor_CsvPerLineDir.new( @host, name, uri )

data/lib/rservicebus/EndpointMapping.rb

@@ -0,0 +1,52 @@
+module RServiceBus
+    
+    #Marshals data for message end points
+    #
+    #Expected format;
+    #	<msg mame 1>:<end point 1>;<msg mame 2>:<end point 2>
+    class EndpointMapping
+        
+        def configureMapping( mapping )
+            match = mapping.match( /(.+):(.+)/ )
+            if match.nil? then
+                log "Mapping string provided is invalid"
+                log "The entire mapping string is: #{mapping}"
+                log "*** Could not find ':' in mapping entry, #{line}"
+                exit()
+            end
+            
+            RServiceBus.log( "EndpointMapping.configureMapping: #{match[1]}, #{match[2]}", true )
+            @endpoints[match[1]] = match[2]
+            
+        end
+        
+        def Configure
+            RServiceBus.log( "EndpointMapping.Configure" )
+            mappings = RServiceBus.getValue( "MESSAGE_ENDPOINT_MAPPINGS" )
+            return self if mappings.nil?
+            
+            mappings.split( ";" ).each do |mapping|
+                self.configureMapping( mapping )
+            end
+            
+            return self
+        end
+        
+        def initialize
+            @endpoints=Hash.new
+        end
+        
+        def get( msgName )
+            if @endpoints.has_key?( msgName ) then
+                return @endpoints[msgName]
+            end
+            
+            return nil;
+        end
+        
+        def getSubscriptionEndpoints
+            return @endpoints.keys.select { |el| el.end_with?( "Event" ) }
+        end
+    end
+    
+end

data/lib/rservicebus/Host.rb

@@ -68,15 +68,9 @@ module RServiceBus
         #msg endpoint mapping
         def sendSubscriptions
             log "Send Subscriptions"
-            @config.messageEndpointMappings.each do |eventName,queueName|
-                log "Checking, " + eventName + " for Event", true
-                if eventName.end_with?( "Event" ) then
-                    log eventName + ", is an event. About to send subscription to, " + queueName, true
-                    self.Subscribe( eventName )
-                    log "Subscribed to, " + eventName + " at, " + queueName
-                end
-            end
-            
+
+            @endpointMapping.getSubscriptionEndpoints.each { |eventName| self.Subscribe( eventName ) }
+
             return self
         end
         
@@ -90,7 +84,7 @@ module RServiceBus
             @config.handlerPathList.each do |path|
                 @handlerLoader.loadHandlersFromPath(path)
             end
-
+            
             return self
         end
         
@@ -142,11 +136,12 @@ module RServiceBus
 			.loadHostSection()
 			.configureMq()
 			.loadContracts()
-			.loadMessageEndpointMappings()
 			.loadHandlerPathList()
             .loadLibs()
             .loadWorkingDirList();
             
+            @endpointMapping = EndpointMapping.new.Configure
+            
             self.configureStatistics()
             .loadContracts()
             .loadLibs()
@@ -156,6 +151,7 @@ module RServiceBus
 			.connectToMq()
 			.configureSubscriptions()
 			.sendSubscriptions()
+
             
             return self
         end
@@ -166,7 +162,7 @@ module RServiceBus
             log "Starting the Host"
             
             log "Watching, #{@config.localQueueName}"
-	    $0 = "rservicebus - #{@config.localQueueName}"
+            $0 = "rservicebus - #{@config.localQueueName}"
             if !@config.forwardReceivedMessagesTo.nil? then
                 log "Forwarding all received messages to: " + @config.forwardReceivedMessagesTo.to_s
             end
@@ -270,11 +266,11 @@ module RServiceBus
                     #This exception is just saying there are no messages to process
                     statOutputCountdown = 0
                     @queueForMsgsToBeSentOnComplete = Array.new
-
+                    
                     @monitors.each do |o|
                         o.Look
                     end
-
+                    
                     self.sendQueuedMsgs
                     @queueForMsgsToBeSentOnComplete = nil
                     
@@ -373,11 +369,22 @@ module RServiceBus
             def Reply( msg )
                 log "Reply with: " + msg.class.name + " To: " + @msg.returnAddress, true
                 @stats.incTotalReply
-                
+
                 self.queueMsgForSendOnComplete( msg, @msg.returnAddress )
             end
             
-            
+            def getEndpointForMsg( msgName )
+                queueName = @endpointMapping.get( msgName )
+                return queueName unless queueName.nil?
+                
+                return @config.localQueueName if @handlerManager.canMsgBeHandledLocally(msgName)
+                
+                log "No end point mapping found for: " + msgName
+                log "**** Check environment variable MessageEndpointMappings contains an entry named : " + msgName
+                raise "No end point mapping found for: " + msgName
+            end
+
+
             #Send a msg across the bus
             #msg destination is specified at the infrastructure level
             #
@@ -385,17 +392,9 @@ module RServiceBus
             def Send( msg )
                 log "Bus.Send", true
                 @stats.incTotalSent
-
+                
                 msgName = msg.class.name
-                if @config.messageEndpointMappings.has_key?( msgName ) then
-                    queueName = @config.messageEndpointMappings[msgName]
-                    elsif @handlerManager.canMsgBeHandledLocally(msgName) then
-                    queueName = @config.localQueueName
-                    else
-                    log "No end point mapping found for: " + msgName
-                    log "**** Check environment variable MessageEndpointMappings contains an entry named : " + msgName
-                    raise "No end point mapping found for: " + msgName
-                end
+                queueName = self.getEndpointForMsg( msgName )
                 
                 self.queueMsgForSendOnComplete( msg, queueName )
             end
@@ -419,8 +418,8 @@ module RServiceBus
             # @param [String] eventName event to be subscribes to
             def Subscribe( eventName )
                 log "Bus.Subscribe: " + eventName, true
-                
-                queueName = @config.messageEndpointMappings[eventName]
+
+                queueName = self.getEndpointForMsg( eventName )
                 subscription = Message_Subscription.new( eventName )
                 
                 self._SendNeedsWrapping( subscription, queueName )

data/lib/rservicebus/Monitor/DirNotifier.rb

@@ -0,0 +1,47 @@
+require 'cgi'
+require 'zip/zip'
+require 'zlib'
+
+module RServiceBus
+    
+    class Monitor_DirNotifier<Monitor
+        
+        @Path
+        
+        def connect(uri)
+            #Pass the path through the Dir object to check syntax on startup
+            begin
+                inputDir = Dir.new( uri.path )
+                if !File.writable?( uri.path ) then
+                    puts "***** Directory is not writable, #{uri.path}."
+                    puts "***** Make the directory, #{uri.path}, writable and try again."
+                    abort()
+                end
+                rescue Errno::ENOENT => e
+                    puts "***** Directory does not exist, #{uri.path}."
+                    puts "***** Create the directory, #{uri.path}, and try again."
+                    puts "***** eg, mkdir #{uri.path}"
+                    abort();
+                rescue Errno::ENOTDIR => e
+                puts "***** The specified path does not point to a directory, #{uri.path}."
+                puts "***** Either repoint path to a directory, or remove, #{uri.path}, and create it as a directory."
+                puts "***** eg, rm #{uri.path} && mkdir #{uri.path}"
+                abort();
+            end
+            
+            @Path = inputDir.path
+            
+        end
+
+        def Look
+            
+            fileList = Dir.glob( "#{@Path}/*" )
+            fileList.each do |filePath|
+                self.send( nil, URI.parse( "file://#{filePath}" ) )
+
+            end
+            
+        end
+        
+    end
+end

data/lib/rservicebus/Monitor.rb

@@ -36,11 +36,10 @@ module RServiceBus
             Object.const_set( name, newAnonymousClass )
             @MsgType = Object.const_get( name )
             
-            
             @uri = uri
             self._connect
         end
-        
+
         # A notification that allows cleanup
         def finished
         end

data/lib/rservicebus/helper_functions.rb

@@ -1,30 +1,37 @@
 module RServiceBus
-
+    
 	def RServiceBus.convertDTOToHash( obj )
-		hash = {}; 
+		hash = {};
 		obj.instance_variables.each {|var| hash[var.to_s.delete("@")] = obj.instance_variable_get(var) }
-
+        
 		return hash
 	end
-
+    
 	def RServiceBus.convertDTOToJson( obj )
 		hash = RServiceBus.convertDTOToHash(obj)
-	
+        
 		return hash.to_json
 	end
 
 	def RServiceBus.log(string, ver=false)
 		type = ver ? "VERB" : "INFO"
-#		if @config.verbose || !ver then
-			timestamp = Time.new.strftime( "%Y-%m-%d %H:%M:%S" )
-			puts "[#{type}] #{timestamp} :: #{string}"
-#		end
+        #		if @config.verbose || !ver then
+        timestamp = Time.new.strftime( "%Y-%m-%d %H:%M:%S" )
+        puts "[#{type}] #{timestamp} :: #{string}"
+        #		end
 	end
-
+    
     def RServiceBus.createAnonymousClass( name_for_class )
         newAnonymousClass = Class.new(Object)
         Object.const_set( name_for_class, newAnonymousClass )
         return Object.const_get( name_for_class ).new
     end
     
+    def RServiceBus.getValue( name, default=nil )
+        value = ( ENV[name].nil?  || ENV[name] == ""  ) ? default : ENV[name];
+        log "Env value: #{name}: #{value}"
+        return value
+    end
+
+    
 end

data/lib/rservicebus.rb

@@ -19,6 +19,7 @@ require "rservicebus/ConfigureAppResource"
 require "rservicebus/ConfigureMQ"
 require "rservicebus/Host"
 require "rservicebus/Config"
+require "rservicebus/EndpointMapping"
 require "rservicebus/Stats"
 
 require "rservicebus/Message"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.74
+  version: 0.0.75
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
@@ -41,6 +41,7 @@ files:
 - lib/rservicebus/ConfigureMonitor.rb
 - lib/rservicebus/ConfigureMQ.rb
 - lib/rservicebus/ConfigureSubscriptionStorage.rb
+- lib/rservicebus/EndpointMapping.rb
 - lib/rservicebus/ErrorMessage.rb
 - lib/rservicebus/HandlerLoader.rb
 - lib/rservicebus/HandlerManager.rb
@@ -51,6 +52,7 @@ files:
 - lib/rservicebus/Monitor/CsvDir.rb
 - lib/rservicebus/Monitor/CsvPerLine.rb
 - lib/rservicebus/Monitor/Dir.rb
+- lib/rservicebus/Monitor/DirNotifier.rb
 - lib/rservicebus/Monitor/Message.rb
 - lib/rservicebus/Monitor/XmlDir.rb
 - lib/rservicebus/Monitor.rb