rservicebus 0.0.46 → 0.0.47

data/lib/rservicebus/Monitor/CsvDir.rb

@@ -1,11 +1,30 @@
 require 'rservicebus/Monitor/Dir'
 require 'csv'
 
-class Monitor_CsvDir<Monitor_Dir
+module RServiceBus
     
-
-    def ProcessContent( content )
-        return CSV.parse( content )
+    class Monitor_CsvDir<Monitor_Dir
+        
+        
+        def checkPayloadForNumberOfColumns( payload )
+            if @QueryStringParts.has_key?("cols") then
+                
+                cols = @QueryStringParts["cols"][0].to_i
+                payload.each_with_index do |row, idx|
+                    if row.length != cols then
+                        raise "Expected number of columns, #{cols}, Actual number of columns, #{row.length}, on line, #{idx}"
+                    end
+                end
+            end
+            
+        end
+        
+        def ProcessContent( content )
+            payload = CSV.parse( content )
+            self.checkPayloadForNumberOfColumns( payload )
+            return payload
+        end
+        
     end
-
-end
+    
+end

data/lib/rservicebus/Monitor/CsvPerLine.rb

@@ -1,18 +1,39 @@
 require 'rservicebus/Monitor/Dir'
 require 'csv'
 
-class Monitor_CsvPerLineDir<Monitor_Dir
+module RServiceBus
     
-
-    def ProcessPath( filePath )
-        uri = URI.parse( "file://#{filePath}" )
+    class Monitor_CsvPerLineDir<Monitor_Dir
+        
         
-        content = IO.read( filePath )
-        CSV.parse( content ).each do |csvline|
-            self.send( csvline, uri )
+        def checkPayloadForNumberOfColumns( payload )
+            if @QueryStringParts.has_key?("cols") then
+                
+                cols = @QueryStringParts["cols"][0].to_i
+                payload.each_with_index do |row, idx|
+                    if row.length != cols then
+                        raise "Expected number of columns, #{cols}, Actual number of columns, #{row.length}, on line, #{idx}"
+                    end
+                end
+            end
+            
         end
         
-        return content
-    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 )
+            end
 
+            return content
+        end
+        
+    end
+    
 end

data/lib/rservicebus/Monitor/Dir.rb

@@ -3,131 +3,136 @@ require 'cgi'
 require 'zip/zip'
 require 'zlib'
 
-class Monitor_Dir<Monitor
+module RServiceBus
     
-    @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
+    class Monitor_Dir<Monitor
         
-        return if uri.query.nil?
-        parts = CGI.parse(uri.query)
-        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
+        @Path
+        @ArchiveDir
+        @InputFilter
+        @QueryStringParts
         
-        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();
+        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)
+            @QueryStringParts = parts
+            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
             
-            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();
+            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
-            @InputFilter << parts["inputfilter"][0]
+            
+            
         end
         
+        def ProcessContent( content )
+            return content
+        end
         
-    end
-    
-    def ProcessContent( content )
-        return content
-    end
-    
-    def ReadContentFromZipFile( filePath )
-        zip = Zip::ZipInputStream::open(filePath)
-        entry = zip.get_next_entry
-        content = zip.read
-        zip.close
+        def ReadContentFromZipFile( filePath )
+            zip = Zip::ZipInputStream::open(filePath)
+            entry = zip.get_next_entry
+            content = zip.read
+            zip.close
+            
+            return entry, content
+        end
         
-        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
+        def ReadContentFromGzFile( filePath )
+            gz = Zlib::GzipReader.open(filePath)
+            return gz.read
         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 )
+        
+        def ReadContentFromTarFile( filePath )
+            content = ""
+            Gem::Package::TarReader.new( filePath ).each do |entry|
+                content = entry.read
+                return content
             end
-            
-            else
-            content = IO.read( filePath )
         end
         
-        return content
-    end
-    
-    def ProcessPath( filePath )
-        content = self.ReadContentFromFile( filePath )
-        payload = self.ProcessContent( content )
+        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
         
-        self.send( payload, URI.parse( "file://#{filePath}" ) )
-        return content
-    end
-    
-    def Look
-        fileProcessed = 0
-        maxFilesProcessed = 10
+        def ProcessPath( filePath )
+            content = self.ReadContentFromFile( filePath )
+            payload = self.ProcessContent( content )
+            
+            self.send( payload, URI.parse( "file://#{filePath}" ) )
+            return content
+        end
         
-        fileList = Dir.glob( "#{@Path}/*" )
-        fileList.each do |filePath|
-            @Bus.log "Ready to process, #{filePath}", true
-            content = self.ProcessPath( filePath )
+        def Look
+            fileProcessed = 0
+            maxFilesProcessed = 10
             
-            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
+            fileList = Dir.glob( "#{@Path}/*" )
+            fileList.each do |filePath|
+                @Bus.log "Ready to process, #{filePath}", true
+                content = self.ProcessPath( filePath )
                 
-                Zip::ZipOutputStream.open(newFilePath) {
-                    |zos|
-                    zos.put_next_entry(basename)
-                    zos.puts content
-                }
+                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
+                    
+                    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
-            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
-    
 end

data/lib/rservicebus/Monitor/Message.rb

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

data/lib/rservicebus/Monitor/XmlDir.rb

@@ -1,11 +1,15 @@
 require 'rservicebus/Monitor/Dir'
 require 'xmlsimple'
 
-class Monitor_XmlDir<Monitor_Dir
-
-
-    def ProcessContent( content )
-        return XmlSimple.xml_in( content )
+module RServiceBus
+    
+    class Monitor_XmlDir<Monitor_Dir
+        
+        
+        def ProcessContent( content )
+            return XmlSimple.xml_in( content )
+        end
+        
     end
-
+    
 end

data/lib/rservicebus/Monitor.rb

@@ -1,64 +1,67 @@
-class Monitor
-
-    attr_accessor :Bus
-
-    @Bus
-    @uri
-    @connection
-    @MsgType
+module RServiceBus
     
-    # The method which actually connects to the resource.
-    #
-    def connect(uri)
-        raise "Method, connect, needs to be implemented for resource"
-    end
-    
-    # The method which actually connects to the resource.
-    #
-    def Look
-        raise "Method, Look, needs to be implemented for the Monitor"
-    end
-
-    def _connect
-        @connection = self.connect(@uri)
-        @Bus.log "#{self.class.name}. Connected to, #{@uri.to_s}" unless !ENV["QUIET"].nil?
-    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( bus, name, uri )
-        @Bus = bus
-        #        @MsgType = Object.const_get( name )
-        newAnonymousClass = Class.new(Monitor_Message)
-        Object.const_set( name, newAnonymousClass )
-        @MsgType = Object.const_get( name )
+    class Monitor
         
-
-        @uri = uri
-        self._connect
-    end
-    
-    # A notification that allows cleanup
-    def finished
-    end
-    
-    # At least called in the Host rescue block, to ensure all network links are healthy
-    def reconnect
-        begin
-            self.finished
-            rescue Exception => e
-            puts "** Monitor. An error was raised while closing connection to, " + @uri.to_s
-            puts "Message: " + e.message
-            puts e.backtrace
+        attr_accessor :Bus
+        
+        @Bus
+        @uri
+        @connection
+        @MsgType
+        
+        # The method which actually connects to the resource.
+        #
+        def connect(uri)
+            raise "Method, connect, needs to be implemented for resource"
         end
         
-        self._connect
-    end
-    
-    def send( payload, uri )
-        msg = @MsgType.new( payload, uri )
-
-        @Bus.Send( msg )
+        # The method which actually connects to the resource.
+        #
+        def Look
+            raise "Method, Look, needs to be implemented for the Monitor"
+        end
+        
+        def _connect
+            @connection = self.connect(@uri)
+            @Bus.log "#{self.class.name}. Connected to, #{@uri.to_s}" unless !ENV["QUIET"].nil?
+        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( bus, name, uri )
+            @Bus = bus
+            #        @MsgType = Object.const_get( name )
+            newAnonymousClass = Class.new(Monitor_Message)
+            Object.const_set( name, newAnonymousClass )
+            @MsgType = Object.const_get( name )
+            
+            
+            @uri = uri
+            self._connect
+        end
+        
+        # A notification that allows cleanup
+        def finished
+        end
+        
+        # At least called in the Host rescue block, to ensure all network links are healthy
+        def reconnect
+            begin
+                self.finished
+                rescue Exception => e
+                puts "** Monitor. An error was raised while closing connection to, " + @uri.to_s
+                puts "Message: " + e.message
+                puts e.backtrace
+            end
+            
+            self._connect
+        end
+        
+        def send( payload, uri )
+            msg = @MsgType.new( payload, uri )
+            
+            @Bus.Send( msg )
+        end
     end
 end

metadata

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