rservicebus 0.0.44 → 0.0.46

data/lib/rservicebus/Host.rb

@@ -240,8 +240,8 @@ module RServiceBus
                             end
                             
                             errorString = e.message + ". " + e.backtrace.join( ". " )
-                            log errorString
-                            
+                            #                            log errorString
+
                             @msg.addErrorMsg( @config.localQueueName, errorString )
                             serialized_object = YAML::dump(@msg)
                             self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
@@ -284,8 +284,8 @@ module RServiceBus
                 
                 if handlerList == nil then
                     log "No handler found for: " + msgName
-                    puts "No handler found for: " + msgName
-                    puts YAML::dump(@msg)
+                    #                    puts "No handler found for: " + msgName
+                    #                    puts YAML::dump(@msg)
                     raise "No Handler Found"
                     
                     else
@@ -295,7 +295,7 @@ module RServiceBus
                             handler.Handle( @msg.msg )
                             rescue Exception => e
                             log "An error occured in Handler: " + handler.class.name
-                            log e.message + ". " + e.backtrace[0]
+                            #log e.message + ". " + e.backtrace[0]
                             raise e
                         end
                     end

data/lib/rservicebus/Monitor/CsvDir.rb

@@ -4,8 +4,8 @@ require 'csv'
 class Monitor_CsvDir<Monitor_Dir
     
 
-    def ProcessPath( path )
-        return CSV.read( path )
+    def ProcessContent( content )
+        return CSV.parse( content )
     end
 
 end

data/lib/rservicebus/Monitor/CsvPerLine.rb

@@ -4,10 +4,15 @@ require 'csv'
 class Monitor_CsvPerLineDir<Monitor_Dir
     
 
-    def ProcessFile( file )
-        CSV.read( file ).each do |csvline|
-            self.send( csvline )
+    def ProcessPath( filePath )
+        uri = URI.parse( "file://#{filePath}" )
+        
+        content = IO.read( filePath )
+        CSV.parse( content ).each do |csvline|
+            self.send( csvline, uri )
         end
+        
+        return content
     end
 
 end

data/lib/rservicebus/Monitor/Dir.rb

@@ -1,52 +1,131 @@
+require 'rubygems/package'
 require 'cgi'
+require 'zip/zip'
+require 'zlib'
 
 class Monitor_Dir<Monitor
     
     @Path
     @ArchiveDir
+    @InputFilter
     
     def connect(uri)
         #Pass the path through the Dir object to check syntax on startup
         inputDir = Dir.new( uri.path )
         @Path = inputDir.path
+        @InputFilter = Array.new
         
         return if uri.query.nil?
         parts = CGI.parse(uri.query)
-        return if parts["archive"].nil?
+        if parts.has_key?("archive") then
+            archiveUri = URI.parse( parts["archive"][0] )
+            if !File.directory?( archiveUri.path ) then
+                puts "***** Archive file name templating not yet supported."
+                puts "***** Directory's only."
+                abort()
+            end
+            @ArchiveDir = archiveUri.path
+        end
         
-        archiveUri = URI.parse( parts["archive"][0] )
-        if !File.directory?( archiveUri.path ) then
-            puts "***** Archive file name templating not yet supported."
-            puts "***** Directory's only."
-            abort()
+        if parts.has_key?("inputfilter") then
+            if parts["inputfilter"].count > 1 then
+                puts "Too many inputfilters specified."
+                puts "*** ZIP, or GZ are the only valid inputfilters."
+                abort();
+            end
+            
+            if parts["inputfilter"][0] == "ZIP" then
+                elsif parts["inputfilter"][0] == "GZ" then
+                elsif parts["inputfilter"][0] == "TAR" then
+                else
+                puts "Invalid inputfilter specified."
+                puts "*** ZIP, or GZ are the only valid inputfilters."
+                abort();
+            end
+            @InputFilter << parts["inputfilter"][0]
         end
         
-        @ArchiveDir = archiveUri.path
         
     end
     
-    def ProcessPath( path )
-        return IO.read( path )
+    def ProcessContent( content )
+        return content
     end
     
-    def ProcessFile( file )
-        payload = self.ProcessPath( file )
+    def ReadContentFromZipFile( filePath )
+        zip = Zip::ZipInputStream::open(filePath)
+        entry = zip.get_next_entry
+        content = zip.read
+        zip.close
         
-        self.send( payload )
+        return entry, content
+    end
+
+    def ReadContentFromGzFile( filePath )
+        gz = Zlib::GzipReader.open(filePath)
+        return gz.read
+    end
+
+    def ReadContentFromTarFile( filePath )
+        content = ""
+        Gem::Package::TarReader.new( filePath ).each do |entry|
+            content = entry.read
+            return content
+        end
+    end
+    
+    def ReadContentFromFile( filePath )
+        content = ""
+        if @InputFilter.length > 0 then
+            if @InputFilter[0] == 'ZIP' then
+                entry, content = self.ReadContentFromZipFile( filePath )
+                elsif @InputFilter[0] == 'GZ' then
+                content = self.ReadContentFromGzFile( filePath )
+                elsif @InputFilter[0] == 'TAR' then
+                content = self.ReadContentFromTarFile( filePath )
+            end
+            
+            else
+            content = IO.read( filePath )
+        end
+        
+        return content
+    end
+    
+    def ProcessPath( filePath )
+        content = self.ReadContentFromFile( filePath )
+        payload = self.ProcessContent( content )
+        
+        self.send( payload, URI.parse( "file://#{filePath}" ) )
+        return content
     end
     
     def Look
-        Dir.glob( "#{@Path}/*" ).each do |file|
-            self.ProcessFile( file )
-
-            if @ArchiveDir.nil? then
-                File.unlink( file )
-                else
-                basename = File.basename( file )
-                newFilePath = @ArchiveDir + "/" + basename + "." + DateTime.now.strftime( "%Y%m%d%H%M%S%L")
+        fileProcessed = 0
+        maxFilesProcessed = 10
+        
+        fileList = Dir.glob( "#{@Path}/*" )
+        fileList.each do |filePath|
+            @Bus.log "Ready to process, #{filePath}", true
+            content = self.ProcessPath( filePath )
+            
+            if !@ArchiveDir.nil? then
+                basename = File.basename( filePath )
+                newFilePath = @ArchiveDir + "/" + basename + "." + DateTime.now.strftime( "%Y%m%d%H%M%S%L") + ".zip"
                 @Bus.log "Writing to archive, #{newFilePath}", true
-                File.rename( file, newFilePath )
+                
+                Zip::ZipOutputStream.open(newFilePath) {
+                    |zos|
+                    zos.put_next_entry(basename)
+                    zos.puts content
+                }
             end
+            File.unlink( filePath )
+            
+            fileProcessed = fileProcessed + 1
+            @Bus.log "Processed #{fileProcessed} of #{fileList.length}.", true
+            @Bus.log "Allow system tick #{self.class.name}", true
+            return if fileProcessed >= maxFilesProcessed
         end
         
     end

data/lib/rservicebus/Monitor/Message.rb

@@ -1,10 +1,12 @@
 class Monitor_Message
-    attr_reader :payload
+    attr_reader :payload, :uri
 
     @payload
+    @uri
 
-    def initialize( payload )
+    def initialize( payload, uri )
         @payload = payload
+        @uri = uri
     end
     
 end

data/lib/rservicebus/Monitor/XmlDir.rb

@@ -4,9 +4,8 @@ require 'xmlsimple'
 class Monitor_XmlDir<Monitor_Dir
 
 
-    def ProcessPath( path )
-        #        return Nokogiri::XML( File.open(path) )
-        return XmlSimple.xml_in( path )
+    def ProcessContent( content )
+        return XmlSimple.xml_in( content )
     end
 
 end

data/lib/rservicebus/Monitor.rb

@@ -56,8 +56,8 @@ class Monitor
         self._connect
     end
     
-    def send( payload )
-        msg = @MsgType.new( payload )
+    def send( payload, uri )
+        msg = @MsgType.new( payload, uri )
 
         @Bus.Send( msg )
     end

metadata

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