appstats 0.18.0 → 0.19.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    appstats (0.18.0)
+    appstats (0.19.0)
       daemons
       net-scp
       rails (>= 2.3.0)

data/db/migrations/20110321154125_add_appstats_results_query_duration_in_seconds.rb

@@ -0,0 +1,11 @@
+class AddAppstatsResultsQueryDurationInSeconds < ActiveRecord::Migration
+  def self.up
+    add_column :appstats_results, :query_duration_in_seconds, :float
+    add_column :appstats_results, :group_query_duration_in_seconds, :float
+  end
+
+  def self.down
+    remove_column :appstats_results, :query_duration_in_seconds
+    remove_column :appstats_results, :group_query_duration_in_seconds
+  end
+end

data/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110318203339) do
+ActiveRecord::Schema.define(:version => 20110321154125) do
 
   create_table "appstats_actions", :force => true do |t|
     t.string   "name"
@@ -126,6 +126,8 @@ ActiveRecord::Schema.define(:version => 20110318203339) do
     t.string   "db_name"
     t.string   "db_host"
     t.boolean  "is_latest"
+    t.float    "query_duration_in_seconds"
+    t.float    "group_query_duration_in_seconds"
   end
 
   add_index "appstats_results", ["action"], :name => "index_appstats_results_on_action"

data/lib/appstats.rb

@@ -16,6 +16,7 @@ require "#{File.dirname(__FILE__)}/appstats/result"
 require "#{File.dirname(__FILE__)}/appstats/sub_result"
 require "#{File.dirname(__FILE__)}/appstats/result_job"
 require "#{File.dirname(__FILE__)}/appstats/host"
+require "#{File.dirname(__FILE__)}/appstats/friendly_timer"
 require "#{File.dirname(__FILE__)}/appstats/context_key"
 require "#{File.dirname(__FILE__)}/appstats/context_value"
 require "#{File.dirname(__FILE__)}/appstats/test_object"

data/lib/appstats/friendly_timer.rb

@@ -0,0 +1,52 @@
+
+module Appstats
+  class FriendlyTimer
+
+    attr_accessor :duration, :start_time, :stop_time
+    
+    def initialize(data = {})
+      @duration = data[:duration]
+      start
+    end
+    
+    def start
+      @start_time = Time.now
+      @start_time
+    end
+    
+    def stop
+      @stop_time = Time.now
+      update_duration_as_required
+      @stop_time
+    end
+  
+    def duration_to_s
+      FriendlyTimer.calculate_duration_to_s(duration)
+    end
+    
+    def self.calculate_duration_to_s(duration_in_seconds)
+      return "N/A" if duration_in_seconds.nil?
+      
+      #TODO use sortable hash if ruby 1.9.2
+      times = [ 60*60*24*365.0, 60*60*24.0, 60*60.0, 60.0, 1.0, 0.001]
+      names = [ 'year','day','hour','minute','second', 'millisecond']
+      
+      times.each_with_index do |factor,index|
+        adjusted_time = duration_in_seconds / factor
+        next if (adjusted_time < 1 && factor != 0.001)
+        adjusted_time = (adjusted_time * 100).round / 100.0
+        adjusted_time = adjusted_time.round if adjusted_time == adjusted_time.round
+        name = adjusted_time == 1 ? names[index] : names[index].pluralize
+        return "#{adjusted_time} #{name}"
+      end      
+    end
+  
+    private
+    
+      def update_duration_as_required
+        return if @start_time.nil? || @stop_time.nil?
+        @duration = @stop_time - @start_time
+      end
+  
+  end
+end

data/lib/appstats/query.rb

@@ -47,6 +47,7 @@ module Appstats
       data = run_query { |conn| conn.select_one(@query_to_sql)["num"].to_i }
       unless data.nil?
         result.count = data[:results]
+        result.query_duration_in_seconds = data[:duration]
         result.db_username = data[:db_config][:username]
         result.db_name = data[:db_config][:database]
         result.db_host = data[:db_config][:host]
@@ -55,6 +56,7 @@ module Appstats
 
       unless @group_by.empty?
         data = run_query { |conn| conn.select_all(@group_query_to_sql) }
+        result.group_query_duration_in_seconds = data[:duration] unless data.nil?
         all_sub_results = data.nil? ? [] : data[:results]
         all_sub_results.each do |data|
           if data["context_key_filter"].nil? || data["context_value_filter"].nil? || data["num"].nil?
@@ -70,6 +72,7 @@ module Appstats
           sub_result.result = result
           sub_result.save
         end
+        result.save
       end
       result.reload
       result
@@ -162,10 +165,12 @@ module Appstats
     
       def run_query
         begin
+          timer = FriendlyTimer.new
           results = yield db_connection
+          timer.stop
           db_config = ActiveRecord::Base.connection.instance_variable_get(:@config)
           restore_connection
-          data = { :results => results, :db_config => db_config }
+          data = { :results => results, :db_config => db_config, :duration => timer.duration }
         rescue Exception => e
           restore_connection
           Appstats.log(:error,"Something bad occurred during Appstats::#{query_type}#run_query")

data/lib/appstats/result.rb

@@ -2,10 +2,12 @@ module Appstats
   class Result < ActiveRecord::Base
     set_table_name "appstats_results"
 
-    attr_accessible :name, :result_type, :query, :query_to_sql, :count, :action, :host, :from_date, :to_date, :contexts, :group_by, :query_type, 
+    attr_accessible :name, :result_type, 
+      :query, :query_to_sql, :count, :query_type, :query_duration_in_seconds, :group_query_duration_in_seconds,
+      :action, :host, :from_date, :to_date, :contexts, :group_by,  
       :db_username, :db_name, :db_host, :is_latest
-    has_many :sub_results, :table_name => 'appstats_subresults', :foreign_key => 'appstats_result_id', :order => 'count DESC'
 
+    has_many :sub_results, :table_name => 'appstats_subresults', :foreign_key => 'appstats_result_id', :order => 'count DESC'
     after_save :update_is_latest
 
     def date_to_s
@@ -48,6 +50,14 @@ module Appstats
       "#{host} (host), #{db_host} (db_host)"
     end
     
+    def query_duration_to_s
+      FriendlyTimer.calculate_duration_to_s(query_duration_in_seconds)
+    end
+    
+    def group_query_duration_to_s
+      FriendlyTimer.calculate_duration_to_s(group_query_duration_in_seconds)
+    end
+    
     def count_to_s(data = {})
       return "--" if count.nil?
       if data[:format] == :short_hand

data/lib/appstats/version.rb

@@ -1,3 +1,3 @@
 module Appstats
-  VERSION = "0.18.0"
+  VERSION = "0.19.0"
 end

data/spec/entry_spec.rb

@@ -193,18 +193,18 @@ module Appstats
       end
       
       it "should understand an entry without contexts" do
-        entry = Entry.create_from_logger_string("0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.create_from_logger_string("0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
         Entry.count.should == @before_count + 1
         entry.action.should == "address_search"
-        entry.raw_entry.should == "0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
         entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
       end
       
       it "should understand contexts" do
-        entry = Entry.create_from_logger_string("0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        entry = Entry.create_from_logger_string("0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
         Entry.count.should == @before_count + 1
         entry.action.should == "address_filter"
-        entry.raw_entry.should == "0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
         entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
         entry.contexts.size.should == 2
         entry.contexts[0].context_key = "app_name"
@@ -214,10 +214,10 @@ module Appstats
       end
       
       it "should handle 'action' as a context" do
-        entry = Entry.create_from_logger_string('0.18.0 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb')
+        entry = Entry.create_from_logger_string('0.19.0 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb')
         Entry.count.should == @before_count + 1
         entry.action.should == "page-view"
-        entry.raw_entry.should == "0.18.0 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb"
+        entry.raw_entry.should == "0.19.0 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb"
         entry.occurred_at.should == Time.parse("2011-02-24 12:59:57")
         entry.contexts.size.should == 2
         entry.contexts[0].context_key = "action"
@@ -228,10 +228,10 @@ module Appstats
       end
       
       it "should handle multiple of the same 'context'" do
-        entry = Entry.create_from_logger_string('0.18.0 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb')
+        entry = Entry.create_from_logger_string('0.19.0 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb')
         Entry.count.should == @before_count + 1
         entry.action.should == "page-view"
-        entry.raw_entry.should == "0.18.0 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb"
+        entry.raw_entry.should == "0.19.0 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb"
         entry.occurred_at.should == Time.parse("2011-02-24 12:59:57")
         entry.contexts.size.should == 2
         entry.contexts[0].context_key = "app_name"

data/spec/friendly_timer_spec.rb

@@ -0,0 +1,174 @@
+require 'spec_helper'
+
+module Appstats
+  describe FriendlyTimer do
+
+    before(:each) do
+      @before_now = Time.parse("2010-09-21 10:11:10")
+      @now = Time.parse("2010-09-21 10:11:12")
+      Time.stub!(:now).and_return(@now)
+      @obj = Appstats::FriendlyTimer.new
+    end
+    
+    describe "#initialize" do
+      
+      it "should set duration to nil" do
+        @obj.duration.should == nil
+        @obj.start_time.should == @now
+        @obj.stop_time.should == nil
+      end
+
+      it "should support constructor values" do
+        obj = Appstats::FriendlyTimer.new(:duration => 12.34)
+        obj.duration.should == 12.34
+      end
+      
+    end
+    
+    describe "#start" do
+      
+      it "should set start_time to now" do
+        @obj.start.should == @now
+        @obj.start_time.should == @now
+      end
+      
+    end
+
+    describe "#stop" do
+      
+      it "should set stop_time to now" do
+        @obj.stop.should == @now
+        @obj.stop_time.should == @now
+      end
+
+      it "should leave duration alone if start time nil" do
+        @obj.start_time = nil
+        @obj.stop
+        @obj.duration.should == nil
+      end
+      
+      it "should update the duration if start time set" do
+        Time.stub!(:now).and_return(@before_now)
+        @obj.start
+        Time.stub!(:now).and_return(@now)
+        @obj.stop
+        @obj.duration.should == 2
+      end
+      
+    end
+
+    describe "#calculate_duration_to_s" do
+      
+      it "should support nil" do
+        Appstats::FriendlyTimer.calculate_duration_to_s(nil).should == "N/A"
+      end
+
+      it "only two decimal places" do
+        Appstats::FriendlyTimer.calculate_duration_to_s(19.342).should == '19.34 seconds'
+      end
+
+      it "milliseconds" do
+        Appstats::FriendlyTimer.calculate_duration_to_s(0.34).should == '340 milliseconds'
+      end
+
+      it "seconds" do
+        Appstats::FriendlyTimer.calculate_duration_to_s(9.34).should == '9.34 seconds'
+      end
+
+      it "minutes" do
+        Appstats::FriendlyTimer.calculate_duration_to_s(1.12*60).should == '1.12 minutes'
+      end
+
+      it "hours" do
+        Appstats::FriendlyTimer.calculate_duration_to_s(1.5*60*60).should == '1.5 hours'
+      end
+
+      it "days" do
+        Appstats::FriendlyTimer.calculate_duration_to_s(2.8*60*60*24).should == '2.8 days'
+      end
+
+      it "years" do
+        Appstats::FriendlyTimer.calculate_duration_to_s(9.8*60*60*24*365).should == '9.8 years'
+      end
+
+      it "second" do
+        Appstats::FriendlyTimer.calculate_duration_to_s(1).should == '1 second'
+      end
+
+      it "minute" do
+        Appstats::FriendlyTimer.calculate_duration_to_s(60).should == '1 minute'
+      end
+
+      it "hour" do
+        Appstats::FriendlyTimer.calculate_duration_to_s(1*60*60).should == '1 hour'
+      end
+
+      it "day" do
+        Appstats::FriendlyTimer.calculate_duration_to_s(1*60*60*24).should == '1 day'
+      end
+
+      it "year" do
+        Appstats::FriendlyTimer.calculate_duration_to_s(1*60*60*24*365).should == '1 year'
+      end      
+    end
+
+    describe "#duration_to_s" do
+      
+      it "should support nil" do
+        obj = Appstats::FriendlyTimer.new
+        obj.duration_to_s.should == "N/A"
+      end
+      
+      it "only two decimal places" do
+        Appstats::FriendlyTimer.new(:duration => 19.342).duration_to_s.should == '19.34 seconds'
+      end
+      
+      it "milliseconds" do
+        Appstats::FriendlyTimer.new(:duration => 0.34).duration_to_s.should == '340 milliseconds'
+      end
+
+      it "seconds" do
+        Appstats::FriendlyTimer.new(:duration => 9.34).duration_to_s.should == '9.34 seconds'
+      end
+
+      it "minutes" do
+        Appstats::FriendlyTimer.new(:duration => 1.12*60).duration_to_s.should == '1.12 minutes'
+      end
+
+      it "hours" do
+        Appstats::FriendlyTimer.new(:duration => 1.5*60*60).duration_to_s.should == '1.5 hours'
+      end
+
+      it "days" do
+        Appstats::FriendlyTimer.new(:duration => 2.8*60*60*24).duration_to_s.should == '2.8 days'
+      end
+
+      it "years" do
+        Appstats::FriendlyTimer.new(:duration => 9.8*60*60*24*365).duration_to_s.should == '9.8 years'
+      end
+
+      it "second" do
+        Appstats::FriendlyTimer.new(:duration => 1).duration_to_s.should == '1 second'
+      end
+
+      it "minute" do
+        Appstats::FriendlyTimer.new(:duration => 60).duration_to_s.should == '1 minute'
+      end
+
+      it "hour" do
+        Appstats::FriendlyTimer.new(:duration => 1*60*60).duration_to_s.should == '1 hour'
+      end
+
+      it "day" do
+        Appstats::FriendlyTimer.new(:duration => 1*60*60*24).duration_to_s.should == '1 day'
+      end
+
+      it "year" do
+        Appstats::FriendlyTimer.new(:duration => 1*60*60*24*365).duration_to_s.should == '1 year'
+      end
+
+
+      
+    end
+  end
+end

data/spec/logger_spec.rb

@@ -122,12 +122,12 @@ module Appstats
       
       it "should accept numbers" do
         Appstats::Logger.entry(5, :blah => 6)   
-        Appstats::Logger.raw_read.should == ["0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
+        Appstats::Logger.raw_read.should == ["0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
       end
 
       it "should accept arrays" do
         Appstats::Logger.entry('search', :provider => [ 'one', 'two' ])   
-        Appstats::Logger.raw_read.should == ["0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=search : provider=one : provider=two"]
+        Appstats::Logger.raw_read.should == ["0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=search : provider=one : provider=two"]
       end
 
 
@@ -137,7 +137,7 @@ module Appstats
 
       it "should look similar to regular entry" do
         Appstats::Logger.exception_entry(RuntimeError.new("blah"),:on => "login")   
-        Appstats::Logger.raw_read.should == ["0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
+        Appstats::Logger.raw_read.should == ["0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
       end
       
     end
@@ -154,47 +154,47 @@ module Appstats
     
        it "should handle a statistics entry" do
          expected = { :action => "address_search", :timestamp => "2010-09-21 23:15:20" }
-         actual = Appstats::Logger.entry_to_hash("0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
          actual.should == expected
        end
        
        it "should handle contexts" do
          expected = { :action => "address_filter", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
-         actual = Appstats::Logger.entry_to_hash("0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
          actual.should == expected
        end
 
        it "should handle multiple actions" do
          expected = { :action => ["address_filter", "blah"], :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
-         actual = Appstats::Logger.entry_to_hash("0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : action=blah : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : action=blah : app_name=Market : server=Live")
          actual.should == expected
        end
 
        it "should handle multiple of same context" do
          expected = { :action => "address_filter", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => ['Sin','Market'] }
-         actual = Appstats::Logger.entry_to_hash("0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Sin : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Sin : app_name=Market : server=Live")
          actual.should == expected
        end
 
        it "should handle no actions" do
          expected = { :action => "UNKNOWN_ACTION", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
-         actual = Appstats::Logger.entry_to_hash("0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 app_name=Market : server=Live")
          actual.should == expected
        end
     
        it "should handle actions with the delimiter (and change the delimiter)" do
          expected = { :action => "address:=search-n", :timestamp => "2010-09-21 23:15:20" }
-         actual = Appstats::Logger.entry_to_hash("0.18.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.19.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
          actual.should == expected
     
          expected = { :action => "address::search==--n", :timestamp => "2010-09-21 23:15:20" }
-         actual = Appstats::Logger.entry_to_hash("0.18.0 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.19.0 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
          actual.should == expected
        end
     
        it "should handle contexts with the delimiter (and change the delimiter)" do
          expected = { :action => "address", :timestamp => "2010-09-21 23:15:20", :server => "market:eval=-n" }
-         actual = Appstats::Logger.entry_to_hash("0.18.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
+         actual = Appstats::Logger.entry_to_hash("0.19.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
          actual.should == expected
        end
        
@@ -203,66 +203,66 @@ module Appstats
     describe "#entry_to_s" do
       
       it "should handle a statistics entry" do
-        expected = "0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
         actual = Appstats::Logger.entry_to_s("address_search")
         actual.should == expected
       end
       
       it "should handle numbers" do
-        expected = "0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
         actual = Appstats::Logger.entry_to_s(1,:note => 2.2)
         actual.should == expected
       end
       
       it "should handle default contexts" do
         Appstats::Logger.default_contexts[:app_name] = "market"
-        expected = "0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
         actual = Appstats::Logger.entry_to_s("address_search")
         actual.should == expected
       end
       
       it "should handle contexts (and sort them by symbol)" do
-        expected = "0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
         actual = Appstats::Logger.entry_to_s("address_filter", { :server => "Live", :app_name => 'Market' })
         actual.should == expected
       end
 
       it "should handle actions with the delimiter (and change the delimiter)" do
-        expected = "0.18.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.19.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
         actual = Appstats::Logger.entry_to_s("address:=search-n")
         actual.should == expected
 
-        expected = "0.18.0 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.19.0 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
         actual = Appstats::Logger.entry_to_s("address::search==--n")
         actual.should == expected
       end
 
       it "should handle contexts with the delimiter (and change the delimiter)" do
-        expected = "0.18.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.19.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
         actual = Appstats::Logger.entry_to_s("address", :server => 'market:eval=-n')
         actual.should == expected
       end
 
       it "should ignore spaces" do
-        expected = "0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
         actual = Appstats::Logger.entry_to_s("address search")
         actual.should == expected
       end
       
       it "should convert newlines in action" do
-        expected = "0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
         actual = Appstats::Logger.entry_to_s("address_\nsearch")
         actual.should == expected
       end
 
       it "should convert newlines in context" do
-        expected = "0.18.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.19.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
         actual = Appstats::Logger.entry_to_s("address_search",:blah => "some\nlong\nstatement")
         actual.should == expected
       end
       
       it "should convert newlines based on the delimiter" do
-        expected = "0.18.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.19.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
         actual = Appstats::Logger.entry_to_s("address:=\nsearch-n")
         actual.should == expected
       end