request-log-analyzer 1.13.1 → 1.13.3

data/spec/integration/munin_plugins_rails_spec.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
 describe RequestLogAnalyzer, 'when harvesting like munin-plugins-rails the YAML output' do
-  
-  before(:each) do 
-    cleanup_temp_files!    
+
+  before(:each) do
+    cleanup_temp_files!
     run("#{log_fixture(:rails_1x)} --dump #{temp_output_file(:yaml)}")
-    @rla = YAML::load(File.read(temp_output_file(:yaml)))
+    @rla = YAML.load(File.read(temp_output_file(:yaml)))
   end
-  
+
   after(:each) do
     cleanup_temp_files!
   end
-  
-  it "should contain database times" do
-    @rla["Database time"].each do |item|
+
+  it 'should contain database times' do
+    @rla['Database time'].each do |item|
       item[1][:min].should_not be_nil
       item[1][:max].should_not be_nil
       item[1][:hits].should_not be_nil
@@ -21,8 +21,8 @@ describe RequestLogAnalyzer, 'when harvesting like munin-plugins-rails the YAML
     end
   end
 
-  it "should contain request times" do
-    @rla["Request duration"].each do |item|
+  it 'should contain request times' do
+    @rla['Request duration'].each do |item|
       item[1][:min].should_not be_nil
       item[1][:max].should_not be_nil
       item[1][:hits].should_not be_nil
@@ -30,24 +30,24 @@ describe RequestLogAnalyzer, 'when harvesting like munin-plugins-rails the YAML
     end
   end
 
-  it "should contain failed requests" do
-    @rla.keys.should include("Failed requests")
+  it 'should contain failed requests' do
+    @rla.keys.should include('Failed requests')
   end
 
-  it "should contain Process blockers" do
-    @rla.keys.should include("Process blockers (> 1 sec duration)")
+  it 'should contain Process blockers' do
+    @rla.keys.should include('Process blockers (> 1 sec duration)')
   end
 
-  it "should contain HTTP Methods" do
-    @rla["HTTP methods"]["GET"].should_not be_nil
+  it 'should contain HTTP Methods' do
+    @rla['HTTP methods']['GET'].should_not be_nil
   end
 
-  it "should contain HTTP Methods" do
-    @rla["HTTP methods"]["GET"].should_not be_nil
+  it 'should contain HTTP Methods' do
+    @rla['HTTP methods']['GET'].should_not be_nil
   end
 
-  it "should contain view rendering times" do
-    @rla["View rendering time"].each do |item|
+  it 'should contain view rendering times' do
+    @rla['View rendering time'].each do |item|
       item[1][:min].should_not be_nil
       item[1][:max].should_not be_nil
       item[1][:hits].should_not be_nil

data/spec/integration/scout_spec.rb

@@ -10,11 +10,11 @@ ensure
 end
 
 describe RequestLogAnalyzer, 'when using the rla API like the scout plugin' do
-  
+
   before(:each) do
     # prepare a place to capture the output
     sio = StringIO.new
-    
+
     # place an IO object where I want RequestLogAnalyzer to read from
     open(log_fixture(:rails_1x)) do |log|
       completed_count = 0
@@ -22,49 +22,49 @@ describe RequestLogAnalyzer, 'when using the rla API like the scout plugin' do
         completed_count += 1 if line =~ /\ACompleted\b/
         break if completed_count == 2  # skipping first two requests
       end
-      
+
       # trigger the log parse
       @stdout, @stderr = capture_stdout_and_stderr_with_warnings_on do
         RequestLogAnalyzer::Controller.build(
-          :output       => EmbeddedHTML,
-          :file         => sio,
-          :after        => Time.local(2008, 8, 14, 21, 16, 31),  # after 3rd req
-          :source_files => log,
-          :format        => RequestLogAnalyzer::FileFormat::Rails
+          output: EmbeddedHTML,
+          file: sio,
+          after: Time.local(2008, 8, 14, 21, 16, 31),  # after 3rd req
+          source_files: log,
+          format: RequestLogAnalyzer::FileFormat::Rails
         ).run!
       end
     end
-    
+
     # read the resulting output
     @analysis = sio.string
   end
-  
-  it "should generate an analysis" do
+
+  it 'should generate an analysis' do
     @analysis.should_not be_empty
   end
-  
-  it "should generate customized output using the passed Class" do
+
+  it 'should generate customized output using the passed Class' do
     credit = %r{<p>Powered by request-log-analyzer v\d+(?:\.\d+)+</p>\z}
     @analysis.should match(credit)
   end
-  
-  it "should skip requests before :after Time" do
-    @analysis.should_not include("PeopleController#show")
+
+  it 'should skip requests before :after Time' do
+    @analysis.should_not include('PeopleController#show')
   end
-  
-  it "should include requests after IO#pos and :after Time" do
-    @analysis.should include("PeopleController#picture")
+
+  it 'should include requests after IO#pos and :after Time' do
+    @analysis.should include('PeopleController#picture')
   end
-  
-  it "should skip requests before IO#pos" do
-    @analysis.should_not include("PeopleController#index")
+
+  it 'should skip requests before IO#pos' do
+    @analysis.should_not include('PeopleController#index')
   end
-  
-  it "should not print to $stdout" do
+
+  it 'should not print to $stdout' do
     @stdout.should be_empty
   end
-  
-  it "should not print to $stderr (with warnings on)" do
+
+  it 'should not print to $stderr (with warnings on)' do
     @stderr.should be_empty
   end
 
@@ -77,7 +77,7 @@ class EmbeddedHTML < RequestLogAnalyzer::Output::Base
   end
   alias_method :<<, :print
 
-  def puts(str = "")
+  def puts(str = '')
     @io << "#{str}<br/>\n"
   end
 
@@ -85,20 +85,20 @@ class EmbeddedHTML < RequestLogAnalyzer::Output::Base
     @io.puts(tag(:h2, title))
   end
 
-  def line(*font)  
+  def line(*_font)
     @io.puts(tag(:hr))
   end
 
   def link(text, url = nil)
     url = text if url.nil?
-    tag(:a, text, :href => url)
+    tag(:a, text, href: url)
   end
 
-  def table(*columns, &block)
-    rows = Array.new
+  def table(*columns, &_block)
+    rows = []
     yield(rows)
 
-    @io << tag(:table, :cellspacing => 0) do |content|
+    @io << tag(:table, cellspacing: 0) do |content|
       if table_has_header?(columns)
         content << tag(:tr) do
           columns.map { |col| tag(:th, col[:title]) }.join("\n")
@@ -110,9 +110,9 @@ class EmbeddedHTML < RequestLogAnalyzer::Output::Base
         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
@@ -130,23 +130,22 @@ class EmbeddedHTML < RequestLogAnalyzer::Output::Base
 
   def tag(tag, content = nil, attributes = nil)
     if block_given?
-      attributes = content.nil? ? "" : " " + content.map { |(key, value)| "#{key}=\"#{value}\"" }.join(" ")
-      content_string = ""
+      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(" ")
+      attributes = attributes.nil? ? '' : ' ' + attributes.map { |(key, value)| "#{key}=\"#{value}\"" }.join(' ')
       if content.nil?
         "<#{tag}#{attributes} />"
       else
         if content.class == Float
-          "<#{tag}#{attributes}><div class='color_bar' style=\"width:#{(content*200).floor}px;\"/></#{tag}>"
+          "<#{tag}#{attributes}><div class='color_bar' style=\"width:#{(content * 200).floor}px;\"/></#{tag}>"
         else
           "<#{tag}#{attributes}>#{content}</#{tag}>"
         end
       end
     end
-  end  
+  end
 end
-

data/spec/lib/helpers.rb

@@ -1,12 +1,11 @@
 module RequestLogAnalyzer::RSpec::Helpers
-
   # Create or return a new TestingFormat
   def testing_format
     @testing_format ||= TestingFormat.create
   end
 
   # Load a log file from the fixture folder
-  def log_fixture(name, extention = "log")
+  def log_fixture(name, extention = 'log')
     File.dirname(__FILE__) + "/../fixtures/#{name}.#{extention}"
   end
 
@@ -22,7 +21,7 @@ module RequestLogAnalyzer::RSpec::Helpers
 
   # Request loopback
   def request(fields, format = testing_format)
-    if fields.kind_of?(Array)
+    if fields.is_a?(Array)
       format.request(*fields)
     else
       format.request(fields)
@@ -33,7 +32,7 @@ module RequestLogAnalyzer::RSpec::Helpers
   # Used to call request-log-analyzer through binary
   def run(arguments)
     binary = "#{File.dirname(__FILE__)}/../../bin/request-log-analyzer"
-    arguments = arguments.join(' ') if arguments.kind_of?(Array)
+    arguments = arguments.join(' ') if arguments.is_a?(Array)
 
     output = []
     IO.popen("#{binary} #{arguments} 2>&1") do |pipe|
@@ -58,20 +57,20 @@ module RequestLogAnalyzer::RSpec::Helpers
   # Check if a given string can be found in the given file
   # Returns the line number if found, nil otherwise
   def find_string_in_file(string, file, options = {})
-    return nil unless File.exists?(file)
+    return nil unless File.exist?(file)
 
     line_counter = 0
 
-    File.open( file ) do |io|
-      io.each {|line|
+    File.open(file) do |io|
+      io.each do|line|
         line_counter += 1
         line.chomp!
 
         p line if options[:debug]
         return line_counter if line.include? string
-      }
+      end
     end
 
-    return nil
+    nil
   end
 end

data/spec/lib/macros.rb

@@ -1,9 +1,8 @@
 module RequestLogAnalyzer::RSpec::Macros
-
   def test_databases
     require 'yaml'
     hash = YAML.load(File.read("#{File.dirname(__FILE__)}/../database.yml"))
-    hash.inject({}) { |res, (name, h)| res[name] = h.map { |(k,v)| "#{k}=#{v}" }.join(';'); res  }
+    hash.reduce({}) { |res, (name, h)| res[name] = h.map { |(k, v)| "#{k}=#{v}" }.join(';'); res  }
   end
 
   # Create or return a new TestingFormat
@@ -12,7 +11,6 @@ module RequestLogAnalyzer::RSpec::Macros
   end
 
   def default_orm_class_names
-    ['Warning', 'Request', 'Source']
+    %w(Warning Request Source)
   end
-
 end

data/spec/lib/matchers.rb

@@ -1,7 +1,5 @@
 module RequestLogAnalyzer::RSpec::Matchers
-
   class HasLineDefinition
-
     def initialize(line_type)
       @line_type = line_type.to_sym
       @captures  = []
@@ -9,11 +7,11 @@ module RequestLogAnalyzer::RSpec::Matchers
 
     def and_capture(*captures)
       @captures += captures
-      return self
+      self
     end
-    
+
     alias_method :capturing, :and_capture
-    
+
     def description
       description = "have a #{@line_type.inspect} line definition"
       description << " that captures #{@captures.join(', ')}" unless @captures.empty?
@@ -21,7 +19,7 @@ module RequestLogAnalyzer::RSpec::Matchers
     end
 
     def matches?(file_format)
-      file_format = file_format.create if file_format.kind_of?(Class)
+      file_format = file_format.create if file_format.is_a?(Class)
       if ld = file_format.line_definitions[@line_type]
         @captures.all? { |c| ld.all_captured_variables.include?(c) }
       else
@@ -31,7 +29,6 @@ module RequestLogAnalyzer::RSpec::Matchers
   end
 
   class ParseLine
-    
     def initialize(line, line_description = nil)
       @line      = line
       @captures  = {}
@@ -41,39 +38,37 @@ module RequestLogAnalyzer::RSpec::Matchers
 
     def line_description
       @full_line_description ||= if @line_description
-        if @line_type && @line_description =~ /^(?:with|without|having|using) /
-          "a #{@line_type.inspect} line #{@line_description}"
-        else
-          @line_description
-        end
-      elsif @line_type 
-        "a #{@line_type.inspect} line"
+                                   if @line_type && @line_description =~ /^(?:with|without|having|using) /
+                                     "a #{@line_type.inspect} line #{@line_description}"
+                                   else
+                                     @line_description
+                                   end
+      elsif @line_type
+                                   "a #{@line_type.inspect} line"
       else
         "line #{@line.inspect}"
       end
     end
 
-    def failure_message
-      @failure_message
-    end
+    attr_reader :failure_message
 
     def as(line_type)
       @line_type = line_type
-      return self
+      self
     end
-    
+
     def and_capture(captures)
       @captures = captures
-      return self
+      self
     end
-    
+
     alias_method :capturing, :and_capture
 
     def fail(message)
       @failure_message = message
-      return false
+      false
     end
-    
+
     def description
       description = "parse #{line_description}"
       description << " as line type #{@line_type.inspect}" if @line_type
@@ -93,13 +88,13 @@ module RequestLogAnalyzer::RSpec::Matchers
           return fail("The line should match the #{@line_type.inspect} line definition, but matched #{@line_hash[:line_definition].name.inspect} instead.")
         end
       else
-        return fail("The line did not match any line definition.")
+        return fail('The line did not match any line definition.')
       end
     end
   end
 
   def have_line_definition(line_type)
-    return HasLineDefinition.new(line_type)
+    HasLineDefinition.new(line_type)
   end
 
   def parse_line(line, line_description = nil)

data/spec/lib/mocks.rb

@@ -1,5 +1,4 @@
 module RequestLogAnalyzer::RSpec::Mocks
-
   def mock_source
     source = double('RequestLogAnalyzer::Source::Base')
     source.stub(:file_format).and_return(testing_format)
@@ -15,10 +14,10 @@ module RequestLogAnalyzer::RSpec::Mocks
     source.stub(:finalize)
 
     source.stub(:each_request).
-      and_yield(testing_format.request(:field => 'value1')).
-      and_yield(testing_format.request(:field => 'value2'))
+      and_yield(testing_format.request(field: 'value1')).
+      and_yield(testing_format.request(field: 'value2'))
 
-    return source
+    source
   end
 
   def mock_io
@@ -26,7 +25,7 @@ module RequestLogAnalyzer::RSpec::Mocks
     mio.stub(:print)
     mio.stub(:puts)
     mio.stub(:write)
-    return mio
+    mio
   end
 
   def mock_output
@@ -36,7 +35,7 @@ module RequestLogAnalyzer::RSpec::Mocks
     output.stub(:footer)
     output.stub(:puts)
     output.stub(:<<)
-    output.stub(:colorize).and_return("Fancy text")
+    output.stub(:colorize).and_return('Fancy text')
     output.stub(:link)
     output.stub(:title)
     output.stub(:line)
@@ -44,8 +43,8 @@ module RequestLogAnalyzer::RSpec::Mocks
     output.stub(:table).and_yield([])
     output.stub(:io).and_return(mock_io)
     output.stub(:options).and_return({})
-    output.stub(:slice_results).and_return { |a| a } 
-    return output
+    output.stub(:slice_results) { |a| a }
+    output
   end
 
   def mock_database(*stubs)
@@ -53,8 +52,8 @@ module RequestLogAnalyzer::RSpec::Mocks
     database.stub(:connect)
     database.stub(:disconnect)
     database.stub(:connection).and_return(mock_connection)
-    stubs.each { |s| database.stub(s)}
-    return database
+    stubs.each { |s| database.stub(s) }
+    database
   end
 
   def mock_connection
@@ -67,6 +66,6 @@ module RequestLogAnalyzer::RSpec::Mocks
     connection.stub(:table_exists?).and_return(false)
     connection.stub(:create_table).and_yield(table_creator).and_return(true)
     connection.stub(:table_creator).and_return(table_creator)
-    return connection
+    connection
   end
 end