request-log-analyzer 1.3.7 → 1.4.0

data/lib/request_log_analyzer/output/fixed_width.rb

@@ -1,23 +1,23 @@
 # coding: utf-8
 module RequestLogAnalyzer::Output
-  
+
   # Fixed Width output class.
   # Outputs a fixed width ASCII or UF8 report.
   class FixedWidth < Base
-  
+
     # Mixin module. Will disable any colorizing.
     module Monochrome
       def colorize(text, *options)
         text
       end
     end
-  
+
     # Colorize module
     module Color
-    
+
       STYLES = { :normal => 0, :bold => 1, :underscore => 4, :blink => 5, :inverse => 7, :concealed => 8 }
       COLORS = { :black  => 0, :blue => 4, :green => 2, :cyan => 6, :red => 1, :purple => 5, :brown => 3, :white => 7 }
-    
+
       # Colorize text
       # <tt>text</tt> The text to colorize
       # Options
@@ -25,18 +25,18 @@ module RequestLogAnalyzer::Output
       #  * <tt>:color</tt> The foreground color to paint. Defined in Color::COLORS
       #  * <tt>:on</tt> Alias for :background
       #  * <tt>:style</tt> Font style, defined in Color::STYLES
-      # 
+      #
       # Returns ASCII colored string
       def colorize(text, *options)
-    
+
         font_style       = ''
         foreground_color = '0'
         background_color = ''
-      
+
         options.each do |option|
           if option.kind_of?(Symbol)
             foreground_color = "3#{COLORS[option]}" if COLORS.include?(option)
-            font_style       = "#{STYLES[option]};" if STYLES.include?(option)          
+            font_style       = "#{STYLES[option]};" if STYLES.include?(option)
           elsif option.kind_of?(Hash)
             options.each do |key, value|
               case key
@@ -50,16 +50,16 @@ module RequestLogAnalyzer::Output
         end
         return "\e[#{background_color}#{font_style}#{foreground_color}m#{text}\e[0m"
       end
-    
+
     end
-  
+
     attr_reader :characters
-  
+
     CHARACTERS = {
       :ascii => { :horizontal_line => '-', :vertical_line => '|', :block => '=' },
       :utf   => { :horizontal_line => '━', :vertical_line => '┃', :block => '░' }
     }
-  
+
     # Initialize a report
     # <tt>io</tt> iO Object (file, STDOUT, etc.)
     # <tt>options</tt>
@@ -71,25 +71,25 @@ module RequestLogAnalyzer::Output
       @options[:width]      ||= 80
       @options[:characters] ||= :utf
       @characters = CHARACTERS[@options[:characters]]
-    
+
       color_module = @options[:color] ? Color : Monochrome
-      (class << self; self; end).send(:include, color_module) 
+      (class << self; self; end).send(:include, color_module)
     end
-  
+
     # Write a string to the output object.
     # <tt>str</tt> The string to write.
     def print(str)
       @io << str
     end
-  
+
     alias :<< :print
-  
+
     # Write a string to the output object with a newline at the end.
     # <tt>str</tt> The string to write.
     def puts(str = '')
       @io << str << "\n"
     end
-  
+
     # Write the title of a report
     # <tt>title</tt> The title to write
     def title(title)
@@ -97,9 +97,9 @@ module RequestLogAnalyzer::Output
       puts colorize(title, :bold, :white)
       line(:green)
     end
-    
+
     # Write a line
-    def line(*font)  
+    def line(*font)
       puts colorize(characters[:horizontal_line] * @options[:width], *font)
     end
 
@@ -113,7 +113,7 @@ module RequestLogAnalyzer::Output
         "#{text} (#{colorize(url, :blue, :bold)})"
       end
     end
-    
+
     # Generate a header for a report
     def header
       if io.kind_of?(File)
@@ -123,7 +123,7 @@ module RequestLogAnalyzer::Output
         puts "Website: #{link('http://github.com/wvanbergen/request-log-analyzer')}"
       end
     end
-    
+
     # Generate a footer for a report
     def footer
       puts
@@ -132,12 +132,12 @@ module RequestLogAnalyzer::Output
       line(:green)
       puts "Thanks for using #{colorize('request-log-analyzer', :white, :bold)}!"
     end
-    
+
     # Generate a report table and push it into the output object.
     # <tt>*colums<tt> Columns hash
     # <tt>&block</tt>: A block yeilding the rows.
     def table(*columns, &block)
-    
+
       rows = Array.new
       yield(rows)
 
@@ -147,7 +147,7 @@ module RequestLogAnalyzer::Output
         result.each_with_index { |length, index| result[index] = ([length, lengths[index]].max rescue length) }
       end
       columns.each_with_index { |col, index| col[:actual_width] ||= max_cell_widths[index] }
-    
+
       # determine actual column width
       column_widths = columns.map do |column|
         if column[:width] == :rest
@@ -162,29 +162,28 @@ module RequestLogAnalyzer::Output
           column[:actual_width]
         end
       end
-     
+
       if column_widths.include?(nil)
         fill_column = columns[column_widths.index(nil)]
         width_left = options[:width] - ((columns.length - 1) * (style[:cell_separator] ? 3 : 1)) - column_widths.compact.inject(0) { |sum, col| sum + col}
-        column_widths[column_widths.index(nil)] = case fill_column[:type]
-          when :ratio; width_left # max out
-          else;        [width_left, fill_column[:actual_width]].min
-        end
+        column_widths[column_widths.index(nil)] = width_left
       end
-    
+
+      line(:green) if @style[:top_line]
+
       # Print table header
       if table_has_header?(columns)
         column_titles = []
         columns.each_with_index do |column, index|
-          width = column_widths[index]        
+          width = column_widths[index]
           alignment = (column[:align] == :right ? '' : '-')
           column_titles.push(colorize("%#{alignment}#{width}s" % column[:title].to_s[0...width], :bold))
         end
-      
+
         puts column_titles.join(style[:cell_separator] ? " #{characters[:vertical_line]} " : ' ')
         line(:green)
       end
-    
+
       # Print the rows
       rows.each do |row|
         row_values = []
@@ -195,12 +194,12 @@ module RequestLogAnalyzer::Output
             if width > 4
               if column[:treshold] && column[:treshold] < row[index].to_f
                 bar = ''
-                bar << characters[:block] * (width.to_f * column[:treshold]).round 
-                bar << colorize(characters[:block] * (width.to_f * (row[index].to_f - column[:treshold])).round, :red) 
-                row_values.push(bar) 
+                bar << characters[:block] * (width.to_f * column[:treshold]).round
+                bar << colorize(characters[:block] * (width.to_f * (row[index].to_f - column[:treshold])).round, :red)
+                row_values.push(bar)
               else
                 # Create a bar by combining block characters
-                row_values.push(characters[:block] * (width.to_f * row[index].to_f).round) 
+                row_values.push(characters[:block] * (width.to_f * row[index].to_f).round)
               end
             else
               # Too few characters for a ratio bar. Display nothing
@@ -213,9 +212,9 @@ module RequestLogAnalyzer::Output
             row_values.push(cell_value)
           end
         end
-        puts row_values.join(style[:cell_separator] ? " #{characters[:vertical_line]} " : ' ')      
+        puts row_values.join(style[:cell_separator] ? " #{characters[:vertical_line]} " : ' ')
       end
     end
-  
+
   end
 end

data/lib/request_log_analyzer/output/html.rb

@@ -1,12 +1,12 @@
 module RequestLogAnalyzer::Output
-  
+
   # HTML Output class. Generated a HTML-formatted report, including CSS.
   class HTML < Base
-  
+
     # def initialize(io, options = {})
     #   super(io, options)
     # end
-  
+
     # Print a string to the io object.
     def print(str)
       @io << str
@@ -26,10 +26,10 @@ module RequestLogAnalyzer::Output
 
     # Render a single line
     # <tt>*font</tt> The font.
-    def line(*font)  
+    def line(*font)
       @io.puts(tag(:hr))
     end
-    
+
     # Write a link
     # <tt>text</tt> The text in the link
     # <tt>url</tt> The url to link to.
@@ -44,29 +44,29 @@ module RequestLogAnalyzer::Output
     def table(*columns, &block)
       rows = Array.new
       yield(rows)
-    
+
       @io << tag(:table, {:id => 'mytable', :cellspacing => 0}) do |content|
         if table_has_header?(columns)
           content << tag(:tr) do
             columns.map { |col| tag(:th, col[:title]) }.join("\n")
           end
         end
-      
+
         odd = false
         rows.each do |row|
           odd = !odd
           content << tag(:tr) do
             if odd
-              row.map { |cell| tag(:td, cell, :class => 'alt') }.join("\n") 
+              row.map { |cell| tag(:td, cell, :class => 'alt') }.join("\n")
             else
-              row.map { |cell| tag(:td, cell) }.join("\n") 
+              row.map { |cell| tag(:td, cell) }.join("\n")
             end
           end
         end
       end
-    
+
     end
-  
+
     # Genrate HTML header and associated stylesheet
     def header
       @io << "<html>"
@@ -85,13 +85,13 @@ module RequestLogAnalyzer::Output
         a {
         	color: #c75f3e;
         }
-      
+
         .color_bar {
           border: 1px solid;
           height:10px;
         	background: #CAE8EA;
         }
-      
+
         #mytable {
         	width: 700px;
         	padding: 0;
@@ -101,7 +101,7 @@ module RequestLogAnalyzer::Output
 
         caption {
         	padding: 0 0 5px 0;
-        	width: 700px;	 
+        	width: 700px;	
         	font: italic 11px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
         	text-align: right;
         }
@@ -138,7 +138,7 @@ module RequestLogAnalyzer::Output
       @io << tag(:h1, 'Request-log-analyzer summary report')
       @io << tag(:p, "Version #{RequestLogAnalyzer::VERSION} - written by Willem van Bergen and Bart ten Brinke")
     end
-  
+
     # Generate a footer for a report
     def footer
       @io << tag(:hr) << tag(:h2, 'Thanks for using request-log-analyzer')
@@ -146,9 +146,9 @@ module RequestLogAnalyzer::Output
       @io << tag(:p, 'If you need an expert who can analyze your application, mail to ' + link('contact@railsdoctors.com', 'mailto:contact@railsdoctors.com') + ' or visit us at ' + link('http://railsdoctors.com', 'http://railsdoctors.com') + '.')
       @io << "</body></html>\n"
     end
-  
-    protected 
-  
+
+    protected
+
     # HTML tag writer helper
     # <tt>tag</tt> The tag to generate
     # <tt>content</tt> The content inside the tag
@@ -158,7 +158,7 @@ module RequestLogAnalyzer::Output
         attributes = content.nil? ? '' : ' ' + content.map { |(key, value)| "#{key}=\"#{value}\"" }.join(' ')
         content_string = ''
         content = yield(content_string)
-        content = content_string unless content_string.empty? 
+        content = content_string unless content_string.empty?
         "<#{tag}#{attributes}>#{content}</#{tag}>"
       else
         attributes = attributes.nil? ? '' : ' ' + attributes.map { |(key, value)| "#{key}=\"#{value}\"" }.join(' ')
@@ -172,6 +172,6 @@ module RequestLogAnalyzer::Output
           end
         end
       end
-    end  
+    end
   end
 end

data/lib/request_log_analyzer/request.rb

@@ -1,14 +1,14 @@
 module RequestLogAnalyzer
-  
-  # The Request class represents a parsed request from the log file. 
+
+  # The Request class represents a parsed request from the log file.
   # Instances are created by the LogParser and are passed to the different aggregators, so they
-  # can do their aggregating work. 
+  # can do their aggregating work.
   #
   # This class provides several methods to access the data that was parsed from the log files.
   # Request#first(field_name) returns the first (only) value corresponding to the given field
   # Request#every(field_name) returns all values corresponding to the given field name as array.
   class Request
-  
+
     module Converters
 
       # Default converter function, which converts the parsed strings to a native Ruby type
@@ -19,30 +19,29 @@ module RequestLogAnalyzer
         custom_converter_method = :"convert_#{capture_definition[:type]}"
         send(custom_converter_method, value, capture_definition)
       end
-      
+
       def convert_string(value, capture_definition);  value; end
-      def convert_decimal(value, capture_definition); value.to_f; end
       def convert_float(value, capture_definition);   value.to_f; end
       def convert_decimal(value, capture_definition); value.to_f; end
       def convert_int(value, capture_definition);     value.to_i; end
       def convert_integer(value, capture_definition); value.to_i; end
       def convert_sym(value, capture_definition);     value.to_sym; end
       def convert_symbol(value, capture_definition);  value.to_sym; end
-      
+
       # Converts :eval field, which should evaluate to a hash.
       def convert_eval(value, capture_definition)
-        eval(value).inject({}) { |h, (k, v)| h[k.to_sym] = v; h} 
+        eval(value).inject({}) { |h, (k, v)| h[k.to_sym] = v; h}
       rescue SyntaxError
         nil
       end
-      
-      # Slow default method to parse timestamps. 
+
+      # Slow default method to parse timestamps.
       # Reimplement this function in a file format specific Request class
       # to improve the timestamp parsing speed.
       def convert_timestamp(value, capture_definition)
         DateTime.parse(value).strftime('%Y%m%d%H%M%S').to_i
       end
-      
+
       # Converts traffic fields to (whole) bytes based on the given unit.
       def convert_traffic(value, capture_definition)
         case capture_definition[:unit]
@@ -56,7 +55,7 @@ module RequestLogAnalyzer
         else raise "Unknown traffic unit"
         end
       end
-      
+
       # Convert duration fields to float, and make sure the values are in seconds.
       def convert_duration(value, capture_definition)
         case capture_definition[:unit]
@@ -72,15 +71,15 @@ module RequestLogAnalyzer
     include Converters
 
     attr_reader :lines, :attributes, :file_format
-        
-    # Initializes a new Request object. 
+
+    # Initializes a new Request object.
     # It will apply the the provided FileFormat module to this instance.
     def initialize(file_format, attributes = {})
       @lines       = []
       @attributes  = attributes
       @file_format = file_format
     end
-    
+
     # Creates a new request that was parsed from the log with the given FileFormat. The hashes
     # that are passed to this function are added as lines to this request.
     def self.create(file_format, *hashes)
@@ -88,7 +87,7 @@ module RequestLogAnalyzer
       hashes.flatten.each { |hash| request << hash }
       return request
     end
-     
+
     # Adds another line to the request when it is parsed in the LogParser.
     #
     # The line should be provided as a hash with the attributes line_definition, :captures,
@@ -100,7 +99,7 @@ module RequestLogAnalyzer
       value_hash[:source] = parsed_line[:source]
       add_line_hash(value_hash)
     end
-    
+
     # Adds another line to the request using a plain hash.
     #
     # The line should be provides as a hash of the fields parsed from the line.
@@ -108,67 +107,67 @@ module RequestLogAnalyzer
       @lines << value_hash
       @attributes = value_hash.merge(@attributes)
     end
-    
+
     # Adds another line to the request. This method switches automatically between
     # the add_line_hash and add_parsed_line based on the keys of the provided hash.
     def <<(hash)
       hash[:line_definition] ? add_parsed_line(hash) : add_line_hash(hash)
     end
-    
+
     # Checks whether the given line type was parsed from the log file for this request
     def has_line_type?(line_type)
       return true if @lines.length == 1 && @lines[0][:line_type] == line_type.to_sym
       @lines.detect { |l| l[:line_type] == line_type.to_sym }
     end
-    
+
     alias :=~ :has_line_type?
-    
+
     # Returns the value that was captured for the "field" of this request.
     # This function will return the first value that was captured if the field
     # was captured in multiple lines
     def first(field)
       @attributes[field]
     end
-    
+
     alias :[] :first
-    
+
     # Returns an array of all the "field" values that were captured for this request
     def every(field)
       @lines.inject([]) { |result, fields| result << fields[field] if fields.has_key?(field); result }
-    end    
-    
-    # Returns true if this request does not yet contain any parsed lines. This should only occur 
+    end
+
+    # Returns true if this request does not yet contain any parsed lines. This should only occur
     # during parsing. An empty request should never be sent to the aggregators
     def empty?
       @lines.length == 0
     end
-    
+
     # Checks whether this request is completed. A completed request contains both a parsed header
-    # line and a parsed footer line. Not that calling this function in single line mode will always 
+    # line and a parsed footer line. Not that calling this function in single line mode will always
     # return false.
     def completed?
       header_found, footer_found = false, false
-      @lines.each do |line| 
+      @lines.each do |line|
         line_def = file_format.line_definitions[line[:line_type]]
         header_found = true if line_def.header
-        footer_found = true if line_def.footer        
+        footer_found = true if line_def.footer
       end
-      header_found && footer_found      
+      header_found && footer_found
     end
-    
+
     # This function is called before a Requests is yielded.
     def validate
     end
-    
-    # Returns the first timestamp encountered in a request. 
+
+    # Returns the first timestamp encountered in a request.
     def timestamp
       first(:timestamp)
     end
-    
+
     def first_lineno
       @lines.map { |line| line[:lineno] }.reject { |v| v.nil? }.min
     end
-    
+
     def last_lineno
       @lines.map { |line| line[:lineno] }.reject { |v| v.nil? }.max
     end