request-log-analyzer 1.10.1 → 1.11.0

data/spec/unit/source/log_parser_spec.rb

@@ -11,7 +11,7 @@ describe RequestLogAnalyzer::Source::LogParser, :requests do
   end
 
   it "should have a valid language" do
-    @log_parser.file_format.should be_valid
+    @log_parser.file_format.should be_well_formed
   end
 
   it "should set the :source for every parsed line" do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 10
-  - 1
-  version: 1.10.1
+  - 11
+  - 0
+  version: 1.11.0
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -04:00
+date: 2011-04-27 00:00:00 -04:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,7 +95,6 @@ files:
 - lib/cli/database_console_init.rb
 - lib/cli/progressbar.rb
 - lib/cli/tools.rb
-- lib/mixins/gets_memory_protection.rb
 - lib/request_log_analyzer.rb
 - lib/request_log_analyzer/aggregator.rb
 - lib/request_log_analyzer/aggregator/database_inserter.rb
@@ -132,12 +131,10 @@ files:
 - lib/request_log_analyzer/log_processor.rb
 - lib/request_log_analyzer/mailer.rb
 - lib/request_log_analyzer/output.rb
-- lib/request_log_analyzer/output/fancy_html.rb
 - lib/request_log_analyzer/output/fixed_width.rb
 - lib/request_log_analyzer/output/html.rb
 - lib/request_log_analyzer/request.rb
 - lib/request_log_analyzer/source.rb
-- lib/request_log_analyzer/source/database_loader.rb
 - lib/request_log_analyzer/source/log_parser.rb
 - lib/request_log_analyzer/tracker.rb
 - lib/request_log_analyzer/tracker/duration.rb

data/lib/mixins/gets_memory_protection.rb

@@ -1,80 +0,0 @@
-class File
-  alias_method :gets_original, :gets
-  # The size of the reads we will use to add to the line buffer.
-  MAX_READ_SIZE=1024*100
-
-  # 
-  # This method returns the next line of the File.
-  # 
-  # It works by moving the file pointer forward +MAX_READ_SIZE+ at a time, 
-  # storing seen lines in <tt>@line_buffer</tt>.  Once the buffer contains at 
-  # least two lines (ensuring we have seen on full line) or the file pointer 
-  # reaches the end of the File, the last line from the buffer is returned.  
-  # When the buffer is exhausted, this will throw +nil+ (from the empty Array).
-  #
-  # Read portions of the file that do not contain the +sep_string+ are not added to 
-  # the buffer. This prevents <tt>@line_buffer<tt> from growing signficantly when parsing
-  # large lines.
-  #
-  def gets(sep_string = $/)
-    @read_size ||= MAX_READ_SIZE
-    # A buffer to hold lines read, but not yet returned.
-    @line_buffer ||= Array.new
-        
-    # Record where we are.
-    @current_pos ||= pos
-    
-    # Last Position in the file
-    @last_pos ||= nil
-    if @last_pos.nil? 
-      seek(0, IO::SEEK_END)
-      @last_pos = pos
-      seek(@current_pos, IO::SEEK_SET)
-    end
-    
-    # 
-    # If we have more than one line in the buffer or we have reached the
-    # beginning of the file, send the last line in the buffer to the caller.  
-    # (This may be +nil+, if the buffer has been exhausted.)
-    #
-    if @line_buffer.size > 2 or @current_pos >= @last_pos
-      self.lineno += 1
-      return @line_buffer.shift 
-    end
-    
-    sep = 
-    
-    chunk = String.new
-    while chunk and chunk !~ /#{sep_string}/   
-      chunk = read(@read_size)
-    end
-    
-    # Appends new lines to the last element of the buffer
-    line_buffer_pos = @line_buffer.any? ? @line_buffer.size-1 : 0
-    
-    if chunk
-      @line_buffer[line_buffer_pos] = @line_buffer[line_buffer_pos].to_s<< chunk
-    else
-      # at the end
-      return @line_buffer.shift
-    end
-    
-    # 
-    # Divide the last line of the buffer based on +sep_string+ and #flatten!
-    # those new lines into the buffer.
-    # 
-    @line_buffer[line_buffer_pos] = @line_buffer[line_buffer_pos].scan(/.*?#{Regexp.escape(sep_string)}|.+/)
-    @line_buffer.flatten!
-
-    # 
-    # If we made it this far, we need to read more data to try and find the 
-    # end of a line or the end of the file.  Move the file pointer
-    # forward a step, to give us new bytes to read.
-    #
-    @current_pos += @read_size
-    seek(@current_pos, IO::SEEK_SET)
-    
-    # We have more data now, so try again to read a line...
-    gets(sep_string)
-  end
-end

data/lib/request_log_analyzer/output/fancy_html.rb

@@ -1,44 +0,0 @@
-begin 
-  require 'rubygems'
-  require 'gchart'
-rescue LoadError
-  $stderr.puts "The FancyHTML output format requires the googlechart gem:"
-  $stderr.puts "  (sudo) gem install googlecharts"
-end
-
-module RequestLogAnalyzer::Output
-  
-  class FancyHTML < HTML
-    
-    def report_tracker(tracker)
-      case tracker
-      when RequestLogAnalyzer::Tracker::HourlySpread then report_hourly_spread(tracker)
-      else tracker.report(self)
-      end
-    end
-    
-    def report_hourly_spread(tracker)
-      title tracker.title
-      puts tag(:img, nil, :width => '700', :height => '120', :src =>
-          Gchart.sparkline(:data => tracker.hour_frequencies, :size => '700x120', :line_colors => '0077CC',
-                           :axis_with_labels => 'x,y', :axis_labels => [x_axis_labels(tracker),y_axis_labels(tracker)]))
-    end
-    
-    def x_axis_labels(tracker)
-      frmt = '%H:%M'
-      x_axis_labels = []
-      num_labels    = 5
-      start         = tracker.first_timestamp
-      step          = tracker.timespan / (num_labels - 1)
-      for i in 0...num_labels do
-        x_axis_labels << (start + step * i).strftime(frmt)
-      end
-      x_axis_labels
-    end
-    
-    def y_axis_labels(tracker)
-      sorted_frequencies = tracker.hour_frequencies.sort
-      [sorted_frequencies.first, sorted_frequencies.last]
-    end
-  end
-end

data/lib/request_log_analyzer/source/database_loader.rb

@@ -1,87 +0,0 @@
-require 'rubygems'
-require 'activerecord'
-
-module RequestLogAnalyzer::Source
-
-  # Active Resource hook
-  class Request < ActiveRecord::Base
-    has_many :completed_lines
-    has_many :processing_lines
-    def convert(file_format)
-      send_attributes = self.attributes
-      send_attributes.merge!(self.completed_lines.first.attributes) if self.completed_lines.first
-      send_attributes.merge!(self.processing_lines.first.attributes) if self.processing_lines.first
-      return RequestLogAnalyzer::Request.new(file_format, send_attributes)
-    end
-  end
-
-  class CompletedLine < ActiveRecord::Base
-    belongs_to :request
-  end
-
-  class ProcessingLine < ActiveRecord::Base
-    belongs_to :request
-  end
-
-  # The Database class gets log data from the database.
-  class DatabaseLoader < Base
-
-    attr_reader :source_files, :file_format, :requests
-
-    # Initializes the log file parser instance.
-    # It will apply the language specific FileFormat module to this instance. It will use the line
-    # definitions in this module to parse any input that it is given (see parse_io).
-    #
-    # <tt>format</tt>:: The current file format instance
-    # <tt>options</tt>:: A hash of options that are used by the parser
-    def initialize(format, options = {})
-      super(format, options)
-      @source_files     = options[:source_files]
-      @parsed_requests  = 0
-      @requests         = []
-    end
-
-    # Reads the input, which can either be a file, sequence of files or STDIN to parse
-    # lines specified in the FileFormat. This lines will be combined into Request instances,
-    # that will be yielded. The actual parsing occurs in the parse_io method.
-    # <tt>options</tt>:: A Hash of options that will be pased to parse_io.
-    def each_request(options = {}, &block) # :yields: request
-      ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => @source_files)
-
-      @progress_handler.call(:started, @source_files) if @progress_handler
-        RequestLogAnalyzer::Source::Request.find(:all).each do |request|
-          @parsed_requests += 1
-          @progress_handler.call(:progress, @parsed_requests) if @progress_handler
-
-          yield request.convert(self.file_format)
-        end
-
-      @progress_handler.call(:finished, @source_files) if @progress_handler
-    end
-
-    # Add a block to this method to install a progress handler while parsing.
-    # <tt>proc</tt>:: The proc that will be called to handle progress update messages
-    def progress=(proc)
-      @progress_handler = proc
-    end
-
-    # Add a block to this method to install a warning handler while parsing,
-    # <tt>proc</tt>:: The proc that will be called to handle parse warning messages
-    def warning=(proc)
-      @warning_handler = proc
-    end
-
-    # This method is called by the parser if it encounteres any parsing problems.
-    # It will call the installed warning handler if any.
-    #
-    # By default, RequestLogAnalyzer::Controller will install a warning handler
-    # that will pass the warnings to each aggregator so they can do something useful
-    # with it.
-    #
-    # <tt>type</tt>:: The warning type (a Symbol)
-    # <tt>message</tt>:: A message explaining the warning
-    def warn(type, message)
-      @warning_handler.call(type, message, @current_io.lineno) if @warning_handler
-    end
-  end
-end