ringbarker 0.0.1 → 0.0.2

data/README.txt

@@ -14,6 +14,7 @@ A simple parser for Rails logs.
 * Collects the fluff between Processing blocks too.
 * Does as little interpretation of the parsed requests as possible. This is left up to the client.
 * Needs better doco.
+* Needs Rails 2.0 format support.
 
 == SYNOPSIS:
 

data/lib/ringbarker.rb

@@ -2,5 +2,5 @@ $:.unshift File.dirname(__FILE__)
 require 'ringbarker/parser'
 
 module Ringbarker
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/ringbarker/entry.rb

@@ -17,14 +17,19 @@ class Ringbarker::Entry
   attr_reader :lines
   attr_reader :controller, :action, :verb, :ip
   attr_reader :session_id, :parameters, :http_code, :complete
-  attr_reader :fluff
+  attr_reader :fluff, :request_time, :requests_per_sec
+  attr_reader :index
+  
+  @@index = 0
   
   attr_accessor :requested_at
   
-  def initialize(lines=[],complete=false,fluff=false)
-    @lines = lines
+  def initialize(lines=[],complete=false,fluff=false)    
+    @lines = lines.dup
     @complete = complete
     @fluff = fluff
+    
+    @index = (@@index += 1)
   end
   
   def self.new_from_fluff(lines,requested_at)
@@ -34,12 +39,16 @@ class Ringbarker::Entry
   end
   
   def << line
+    next unless line
+    
     if @lines.empty?
       parse_header(line)
     elsif line.starts_with? 'Completed'
       parse_completed(line)
     elsif line.starts_with? 'Rendering'
       parse_rendering(line)
+    else
+      parse_details(line)
     end
     
     @lines << line
@@ -53,10 +62,14 @@ class Ringbarker::Entry
   def fluff?; @fluff; end
   
   
-  COMPLETED_RE = /(\d+) \w+ \[http:\/\/[^\]]+\]$/
+  COMPLETED_RE = /Completed in ([\d\.]+) \((\d+) reqs\/sec\) | DB: ([\d\.]+) \((\d)%\) | (\d+) \w+ \[http:\/\/[^\]]+\]$/
   def parse_completed line
     if m = line.match(COMPLETED_RE)
-      @http_code = m[1].to_i
+      @complete_line = line
+      
+      _,@request_time,@requests_per_sec,_,_,@http_code = *m
+      
+      @http_code = @http_code.to_i
       @complete = true
     end
   end
@@ -95,4 +108,9 @@ class Ringbarker::Entry
   def set_params(_,params)
     @parameters = params
   end
+  
+  # Completed in 0.08129 (12 reqs/sec) | DB: 3.66793 (4512%) | 302 Found [http://shotgun.syd.rsp.com.au/]
+  def complete_line
+    
+  end
 end

data/lib/ringbarker/parser.rb

@@ -1,4 +1,5 @@
 require 'ringbarker/entry'
+require 'pp'
 
 module Ringbarker
   class Parser
@@ -25,15 +26,33 @@ module Ringbarker
     
     def collect_fluff
       return if @fluff.empty?
+      
       @entries << Entry.new_from_fluff(@fluff,@last_time)
+      @last_time = Time.now.to_i
+      
       @fluff = []
     end
     
+    def cleanup
+      collect_fluff unless @current_entry
+      self
+    end
+    
     def cleanup_dequeue
       collect_fluff unless @current_entry
       dequeue
     end
     
+    def dump
+      puts "Parser"
+      puts "entries: #{@entries.inspect}"
+      puts "fluff: #{@fluff.inspect}"
+      puts "last_time: #{@last_time}"
+      
+      puts "current_entry: #{@current_entry.__id__}"
+      pp @current_entry
+    end
+    
     def dequeue
       deq = if @entries.empty?
               []

data/spec/entry_spec.rb

@@ -90,6 +90,21 @@ describe Ringbarker::Entry, "parsing a completed line" do
   end
 end
 
+describe Ringbarker::Entry, "parsing a regressed completed line" do
+  before do
+    @entry = Ringbarker::Entry.new
+    @entry.parse_completed  "Completed in 0.00026 (3890 reqs/sec) | DB: 0.00018 (69%) | 302 Found [http://test.host/payments;eway_callback?eWAYAuthCode=123456&ewayTrxnNumber=10004&eWAYoption3=&ewayTrxnStatus=True&eWAYresponseText=Transaction+Approved%28Test+CVN+Gateway%29&eWAYresponseCode=00&eWAYReturnAmount=%2426.10&ewayTrxnReference=1011869&eWAYoption1=&eWAYoption2=]\n"
+  end
+  
+  it "should have http code" do
+    @entry.http_code.should == 302
+  end
+  
+  it "should be complete" do
+    @entry.should be_complete
+  end
+end
+
 describe Ringbarker::Entry, "parsing a line beginning with completed" do
   before do
     @entry = Ringbarker::Entry.new
@@ -133,4 +148,6 @@ describe Ringbarker::Entry, "parsing a normal Rendered line" do
   it "should not be complete" do
     @entry.should_not be_complete
   end
-end
+end
+
+

data/spec/parser_spec.rb

@@ -1,5 +1,15 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
+module DataHelper
+  def datafile(file)
+    File.dirname(__FILE__)+'/data/'+file
+  end
+  
+  def data(file)
+    File.open(datafile(file))
+  end
+end
+
 
 describe Ringbarker do
   before do
@@ -109,4 +119,23 @@ describe Ringbarker, "with no entries, after dequeuing" do
   it "should have empty array of entries" do
     @parser.entries.should == []
   end
+end
+
+describe Ringbarker, "with no entries, after dequeuing" do
+  include DataHelper
+  
+  before do
+    @parser = Ringbarker::Parser.new
+    data('snippet.txt').each do |line|
+      @parser << line
+    end
+    
+    @parser.dump
+    @deq = @parser.dequeue
+    @parser.dump
+  end
+  
+  it "should have one entry dequeued" do
+    @deq.should have(1).item
+  end
 end

metadata

@@ -1,33 +1,36 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: ringbarker
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2007-09-19 00:00:00 +10:00
-summary: simple Rails log parser
-require_paths: 
-- lib
-email: lachie@smartbomb.com.au
-homepage: "    by Lachie Cox"
-rubyforge_project: rails-oceania
-description: "== FEATURES/PROBLEMS:  * Parses the Rails log. * Recognises Processing...Completed blocks. * Recognises Processing...exception...Rendering rescue blocks. * Collects the fluff between Processing blocks too. * Does as little interpretation of the parsed requests as possible. This is left up to the client. * Needs better doco.  == SYNOPSIS:  require 'rubygems' require 'ringbarker'  @parser = Ringbarker::Parser.new @entries = []"
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.0.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Lachie Cox
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-01-16 00:00:00 +11:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+    version: 
+description: "== FEATURES/PROBLEMS:  * Parses the Rails log. * Recognises Processing...Completed blocks. * Recognises Processing...exception...Rendering rescue blocks. * Collects the fluff between Processing blocks too. * Does as little interpretation of the parsed requests as possible. This is left up to the client. * Needs better doco. * Needs Rails 2.0 format support.  == SYNOPSIS:  require 'rubygems' require 'ringbarker'  @parser = Ringbarker::Parser.new @entries = []"
+email: lachie@smartbomb.com.au
+executables: 
+- ringbarker
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 files: 
 - History.txt
 - Manifest.txt
@@ -40,29 +43,33 @@ files:
 - spec/entry_spec.rb
 - spec/parser_spec.rb
 - spec/spec_helper.rb
-test_files: 
-- spec/entry_spec.rb
-- spec/parser_spec.rb
+has_rdoc: true
+homepage: "    by Lachie Cox"
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-executables: 
-- ringbarker
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
-    version: 
+rubyforge_project: rails-oceania
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: simple Rails log parser
+test_files: 
+- spec/entry_spec.rb
+- spec/parser_spec.rb