rservicebus 0.0.64 → 0.0.65

data/lib/rservicebus/AppResource.rb

@@ -17,13 +17,14 @@ module RServiceBus
 
         def _connect
             @connection = self.connect(@uri)
-            puts "#{self.class.name}. Connected to, #{@uri.to_s}" unless !ENV["QUIET"].nil?
+            @host.log "#{self.class.name}. Connected to, #{@uri.to_s}", true
         end
 
         # Resources are attached resources, and can be specified using the URI syntax.
         #
         # @param [String] uri a location for the resource to which we will attach, eg redis://127.0.0.1/foo
-        def initialize( uri )
+        def initialize( host, uri )
+            @host = host
             @uri = uri
             #Do a connect / disconnect loop on startup to validate the connection
             self._connect

data/lib/rservicebus/ConfigureAppResource.rb

@@ -5,7 +5,7 @@ module RServiceBus
     #Configure AppResources for an rservicebus host
     class ConfigureAppResource
 
-        def getResources( env )
+        def getResources( env, host )
             resources = Hash.new
 
             env.each do |k,v|
@@ -14,30 +14,30 @@ module RServiceBus
                     uri = URI.parse( v )
                     case uri.scheme
                         when "redis"
-						resources[k.sub( "RSB_", "" )] = AppResource_Redis.new( uri )
+						resources[k.sub( "RSB_", "" )] = AppResource_Redis.new( host, uri )
                         
                         when "mysql"
                         require "rservicebus/AppResource/Mysql"
-                        resources[k.sub( "RSB_", "" )] = AppResource_Mysql.new( uri )
+                        resources[k.sub( "RSB_", "" )] = AppResource_Mysql.new( host, uri )
                         
                         when "fluiddbmysql"
                         require "rservicebus/AppResource/FluidDbMysql"
-                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbMysql.new( uri )
+                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbMysql.new( host, uri )
                         when "fluiddbmysql2"
                         require "rservicebus/AppResource/FluidDbMysql2"
-                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbMysql2.new( uri )
+                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbMysql2.new( host, uri )
                         when "fluiddbpgsql"
                         require "rservicebus/AppResource/FluidDbPgsql"
-                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbPgsql.new( uri )
+                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbPgsql.new( host, uri )
                         when "fluiddbtinytds"
                         require "rservicebus/AppResource/FluidDbTinyTds"
-                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbTinyTds.new( uri )
+                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbTinyTds.new( host, uri )
                         when "dir"
                         require "rservicebus/AppResource/Dir"
-                        resources[k.sub( "RSB_", "" )] = AppResource_Dir.new( uri )
+                        resources[k.sub( "RSB_", "" )] = AppResource_Dir.new( host, uri )
                         when "file"
                         require "rservicebus/AppResource/File"
-                        resources[k.sub( "RSB_", "" )] = AppResource_File.new( uri )
+                        resources[k.sub( "RSB_", "" )] = AppResource_File.new( host, uri )
                         else
 						abort("Scheme, #{uri.scheme}, not recognised when configuring app resource, #{k}=#{v}");
                     end

data/lib/rservicebus/HandlerManager.rb

@@ -59,13 +59,13 @@ module RServiceBus
         #
         # @param [RServiceBus::Handler] handler
         ## @param [Hash] appResources As hash[k,v] where k is the name of a resource, and v is the resource
-        def setAppResources( handler )
+        def setAppResources_to_be_removed( handler )
             @host.log "Checking app resources for: #{handler.class.name}", true
             @host.log "If your attribute is not getting set, check that it is in the 'attr_accessor' list", true
             @appResources.each do |k,v|
                 if handler.class.method_defined?( k ) then
                     v._connect
-                    v.Begin
+                    #                    v.Begin
                     handler.instance_variable_set( "@#{k}", v.getResource() )
                     @host.log "App resource attribute, #{k}, set for: " + handler.class.name
                 end
@@ -89,7 +89,7 @@ module RServiceBus
                 next if @resourceListByHandlerName[handler.class.name].nil?
                 @resourceListByHandlerName[handler.class.name].each do |k|
                     handler.instance_variable_set( "@#{k}", @appResources[k].getResource() )
-                    @host.log "App resource attribute, #{k}, set for: " + handler.class.name
+                    @host.log "App resource attribute, #{k}, set for: " + handler.class.name, true
                 end
             end
             
@@ -100,10 +100,10 @@ module RServiceBus
 
             list = self.getListOfResourcesNeededToProcessMsg( msgName )
             list.each do |resourceName|
-                @host.log( "Preparing reousrce: #{resourceName}", true )
                 r = @appResources[resourceName]
                 r._connect
                 r.Begin
+                @host.log( "Preparing resource: #{resourceName}. Begin", true )
             end
             
             self.setResourcesForHandlersNeededToProcessMsg( msgName )

data/lib/rservicebus/Host.rb

@@ -45,7 +45,7 @@ module RServiceBus
         #Thin veneer for Configuring external resources
         #
         def configureAppResource
-            @appResources = ConfigureAppResource.new.getResources( ENV )
+            @appResources = ConfigureAppResource.new.getResources( ENV, self )
             return self;
         end
         
@@ -188,7 +188,7 @@ module RServiceBus
                 #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, true
                         statOutputCountdown = @config.statOutputCountdown
                         GC.start
                     end
@@ -267,10 +267,14 @@ module RServiceBus
                     rescue NoMsgToProcess => e
                     #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
                     
                     
                     rescue Exception => e

data/lib/rservicebus/Monitor/CsvPerLine.rb

@@ -18,18 +18,48 @@ module RServiceBus
             
         end
         
+        def checkSendHash
+            if !@QueryStringParts.nil? && @QueryStringParts.has_key?("hash") then
+                flag = @QueryStringParts["hash"][0]
+                return flag == "Y"
+            end
+            
+            return false
+        end
+        
+        
+        def SendArray( payload, uri )
+            payload.each do |csvline|
+                self.send( csvline, uri )
+            end
+        end
+
+        def SendHash( payload, uri )
+            headLine = payload.shift
+            payload.each do |csvline|
+                hash = Hash.new
+                csvline.each_with_index do |v,idx|
+                    hash[headLine[idx]] = v
+                end
+                self.send( hash, uri )
+            end
+        end
+
         def ProcessPath( filePath )
             uri = URI.parse( "file://#{filePath}" )
             
             content = IO.read( filePath )
             payload = CSV.parse( content )
             
-            self.checkPayloadForNumberOfColumns( payload )
             
-            payload.each do |csvline|
-                self.send( csvline, uri )
+            self.checkPayloadForNumberOfColumns( payload )
+            if self.checkSendHash then
+                self.SendHash( payload, uri )
+            else
+                self.SendArray( payload, uri )
             end
 
+
             return content
         end
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.64
+  version: 0.0.65
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com