appstats 0.17.5 → 0.18.0

data/Gemfile.lock

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

data/db/migrations/20110318203339_add_appstats_results_latest_flag.rb

@@ -0,0 +1,17 @@
+class AddAppstatsResultsLatestFlag < ActiveRecord::Migration
+  def self.up
+    add_column :appstats_results, :is_latest, :boolean
+    add_index :appstats_results, :is_latest
+    
+    ActiveRecord::Base.connection.update('update appstats_results set is_latest = false')
+    all = ActiveRecord::Base.connection.select_all("select concat(id,' ',max(updated_at)) as id_and_date from appstats_results group by query")
+    return if all.empty?
+    ids = all.each.collect { |e| e["id_and_date"].split[0] }.compact
+    ActiveRecord::Base.connection.update("update appstats_results set is_latest = '1' where id in (#{ids.join(',')})")
+  end
+
+  def self.down
+    remove_index :appstats_results, :is_latest
+    remove_column :appstats_results, :is_latest
+  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 => 20110311214833) do
+ActiveRecord::Schema.define(:version => 20110318203339) do
 
   create_table "appstats_actions", :force => true do |t|
     t.string   "name"
@@ -125,10 +125,12 @@ ActiveRecord::Schema.define(:version => 20110311214833) do
     t.string   "db_username"
     t.string   "db_name"
     t.string   "db_host"
+    t.boolean  "is_latest"
   end
 
   add_index "appstats_results", ["action"], :name => "index_appstats_results_on_action"
   add_index "appstats_results", ["host"], :name => "index_appstats_results_on_host"
+  add_index "appstats_results", ["is_latest"], :name => "index_appstats_results_on_is_latest"
   add_index "appstats_results", ["name"], :name => "index_appstats_results_on_name"
   add_index "appstats_results", ["page"], :name => "index_appstats_results_on_page"
 

data/lib/appstats/ci.rake

@@ -3,9 +3,8 @@ unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:
     desc "Perform a build on the CI server"
     task :build => ['config', 'create_logs']  do
       begin
-        Rake::Task['appstats:install:migrations'].invoke
-        Rake::Task['db:migrate'].invoke
-        Rake::Task['db:test:prepare'].invoke
+        Rake::Task['ci:db_setup'].invoke
+        # Rake::Task['db:test:prepare'].invoke
         Rake::Task['spec'].invoke
         Rake::Task['metrics:all'].invoke
         Rake::Task['ci:success'].invoke
@@ -15,6 +14,12 @@ unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:
       end
     end
 
+    # Creates a second database for testing the multi db access
+    task :db_setup => ['config','create_logs'] do
+      Rake::Task['appstats:install:migrations'].invoke
+      Rake::Task['db:migrate'].invoke
+    end
+
     desc "Setup the correct database configuration files"
     task :config do
       source_db_file = '/cenx/appstats/sensitive/config.yml'

data/lib/appstats/date_range.rb

@@ -149,6 +149,14 @@ module Appstats
         return range
       end
 
+      m = input.match(/^(.+)\s*(year|years|quarter|quarters|month|months|week|weeks|day|days)\s*ago$/)
+      unless m.nil?
+        range.from = EntryDate.parse(input)
+        range.format = :fixed_point
+        return range
+      end
+
+
       m = input.match(/^previous\s*(.+)\s*(year|quarter|month|week|day)s?$/)
       unless m.nil?
         range.from = EntryDate.parse(input)

data/lib/appstats/entry_date.rb

@@ -154,6 +154,37 @@ module Appstats
         t_parts = [:year,:month,:day]
       end
 
+      m = input.match(/^(\d*)\s*years?\s*ago/)
+      if m
+        t -= ago_date_offset(m).year
+        t_parts = [:year]
+      end
+
+      m = input.match(/^(\d*)\s*quarters?\s*ago/)
+      if m
+        t = t.beginning_of_quarter
+        ago_date_offset(m).times { t = (t - 1.day).beginning_of_quarter }
+        t_parts = [:year,:month,:quarter]
+      end
+
+      m = input.match(/^(\d*)\s*months?\s*ago/)
+      if m
+        t -= ago_date_offset(m).month
+        t_parts = [:year,:month]
+      end
+
+      m = input.match(/^(\d*)\s*weeks?\s*ago/)
+      if m
+        t = (t - ago_date_offset(m).week).beginning_of_week
+        t_parts = [:year,:month,:day,:week]
+      end
+
+      m = input.match(/^(\d*)\s*days?\s*ago/)
+      if m
+        t -= ago_date_offset(m).day
+        t_parts = [:year,:month,:day]
+      end
+
       unless t_parts.nil?
         t_parts.each do |label|
           if [:quarter,:week].include?(label)
@@ -191,6 +222,11 @@ module Appstats
         amount = match[2] == "" ? 1 : match[2].to_i + offset
         amount
       end
+      
+      # (\d*) (year|month|...) ago
+      def self.ago_date_offset(match)
+        match[1].to_i
+      end
   
   end
 end

data/lib/appstats/result.rb

@@ -3,9 +3,11 @@ module Appstats
     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, 
-      :db_username, :db_name, :db_host
+      :db_username, :db_name, :db_host, :is_latest
     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
       return "" if from_date.nil? && to_date.nil?
       
@@ -65,8 +67,28 @@ module Appstats
     end
     alias_method :eql?, :==
 
+    def self.fix_all_is_latest
+      ActiveRecord::Base.connection.update('update appstats_results set is_latest = false')
+      all = ActiveRecord::Base.connection.select_all("select concat(id,' ',max(updated_at)) as id_and_date from appstats_results group by query")
+      return if all.empty?
+      ids = all.each.collect { |e| e["id_and_date"].split[0] }.compact
+      ActiveRecord::Base.connection.update("update appstats_results set is_latest = '1' where id in (#{ids.join(',')})")
+    end
+
     private
 
+      def update_is_latest
+        sql = ["update appstats_results set is_latest = false where query = ?",query]
+        ActiveRecord::Base.connection.update(ActiveRecord::Base.send(:sanitize_sql_array, sql))
+        
+        sql = ["select id from appstats_results where query = ? order by updated_at DESC",query]
+        first = ActiveRecord::Base.connection.select_one(ActiveRecord::Base.send(:sanitize_sql_array, sql))
+        return if first.nil?
+        
+        sql = ["update appstats_results set is_latest = '1' where id = ?",first["id"]]
+        ActiveRecord::Base.connection.update(ActiveRecord::Base.send(:sanitize_sql_array, sql))
+      end
+
       def add_commas(num)
         num.to_s.gsub(/(\d)(?=\d{3}+(\.\d*)?$)/, '\1,')
       end

data/lib/appstats/version.rb

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

data/spec/date_range_spec.rb

@@ -147,6 +147,40 @@ module Appstats
                 
       end
 
+      describe "X (year|quarter|month|week|day)s ago" do
+
+        it "should understand last X years" do
+          DateRange.parse("  1 year ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2009), :to => nil, :format => :fixed_point )
+          DateRange.parse("  2 years ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2008), :to => nil, :format => :fixed_point )
+          DateRange.parse("  3 years ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2007), :to => nil, :format => :fixed_point )
+        end
+
+        it "should understand last X quarters" do
+          DateRange.parse("  1 quarter ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10, :quarter => 4), :to => nil, :format => :fixed_point )
+          DateRange.parse("  2 quarters ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 7, :quarter => 3), :to => nil, :format => :fixed_point )
+          DateRange.parse("  3 quarters ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 4, :quarter => 2), :to => nil, :format => :fixed_point )
+        end
+
+        it "should understand last X months" do
+          DateRange.parse("  1 month ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 12), :to => nil, :format => :fixed_point )
+          DateRange.parse("  2 months ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 11), :to => nil, :format => :fixed_point )
+          DateRange.parse("  3 months ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10), :to => nil, :format => :fixed_point )
+        end
+
+        it "should understand last X weeks" do
+          DateRange.parse("  1 week ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 4, :week => 1), :to => nil, :format => :fixed_point )
+          DateRange.parse("  2 weeks ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 12, :day => 28, :week => 52), :to => nil, :format => :fixed_point )
+          DateRange.parse("  3 weeks ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 12, :day => 21, :week => 51), :to => nil, :format => :fixed_point )
+        end
+
+        it "should understand last X days" do
+          DateRange.parse("  1 day ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 14), :to => nil, :format => :fixed_point )
+          DateRange.parse("  2 days ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 13), :to => nil, :format => :fixed_point )
+          DateRange.parse("  3 days ago  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 12), :to => nil, :format => :fixed_point )
+        end
+
+      end
+
       describe "last X (year|quarter|month|week|day)s" do
         
         it "should understand last X years" do

data/spec/entry_date_spec.rb

@@ -369,6 +369,40 @@ module Appstats
         EntryDate.parse("previous 3 days").should == EntryDate.new(:year => 2010, :month => 1, :day => 12)
       end
 
+      describe "X (year|quarter|month|week|day)s ago" do
+
+        it "should understand last X years" do
+          EntryDate.parse("  1 year ago  ").should == EntryDate.new(:year => 2009)
+          EntryDate.parse("  2 years ago  ").should == EntryDate.new(:year => 2008)
+          EntryDate.parse("  3 years ago  ").should == EntryDate.new(:year => 2007)
+        end
+
+        it "should understand last X quarters" do
+          EntryDate.parse("  1 quarter ago  ").should == EntryDate.new(:year => 2009, :month => 10, :quarter => 4)
+          EntryDate.parse("  2 quarters ago  ").should == EntryDate.new(:year => 2009, :month => 7, :quarter => 3)
+          EntryDate.parse("  3 quarters ago  ").should == EntryDate.new(:year => 2009, :month => 4, :quarter => 2)
+        end
+
+        it "should understand last X months" do
+          EntryDate.parse("  1 month ago  ").should == EntryDate.new(:year => 2009, :month => 12)
+          EntryDate.parse("  2 months ago  ").should == EntryDate.new(:year => 2009, :month => 11)
+          EntryDate.parse("  3 months ago  ").should == EntryDate.new(:year => 2009, :month => 10)
+        end
+
+        it "should understand last X weeks" do
+          EntryDate.parse("  1 week ago  ").should == EntryDate.new(:year => 2010, :month => 1, :day => 4, :week => 1)
+          EntryDate.parse("  2 weeks ago  ").should == EntryDate.new(:year => 2009, :month => 12, :day => 28, :week => 52)
+          EntryDate.parse("  3 weeks ago  ").should == EntryDate.new(:year => 2009, :month => 12, :day => 21, :week => 51)
+        end
+
+        it "should understand last X days" do
+          EntryDate.parse("  1 day ago  ").should == EntryDate.new(:year => 2010, :month => 1, :day => 14)
+          EntryDate.parse("  2 days ago  ").should == EntryDate.new(:year => 2010, :month => 1, :day => 13)
+          EntryDate.parse("  3 days ago  ").should == EntryDate.new(:year => 2010, :month => 1, :day => 12)
+        end
+
+      end
+
       it "should accept garbage input" do
         EntryDate.parse("1234asdf1234 1234fds123").should == EntryDate.new
       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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.create_from_logger_string("0.18.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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.18.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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        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.count.should == @before_count + 1
         entry.action.should == "address_filter"
-        entry.raw_entry.should == "0.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.18.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.17.5 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb')
+        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.count.should == @before_count + 1
         entry.action.should == "page-view"
-        entry.raw_entry.should == "0.17.5 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb"
+        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.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.17.5 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb')
+        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.count.should == @before_count + 1
         entry.action.should == "page-view"
-        entry.raw_entry.should == "0.17.5 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb"
+        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.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/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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
+        Appstats::Logger.raw_read.should == ["0.18.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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=search : provider=one : provider=two"]
+        Appstats::Logger.raw_read.should == ["0.18.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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=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"]
       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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.18.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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         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.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.17.5 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.18.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.17.5 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.18.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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.18.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.17.5 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.18.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.17.5 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.18.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.17.5 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: 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.should == expected
        end
        
@@ -203,66 +203,66 @@ module Appstats
     describe "#entry_to_s" do
       
       it "should handle a statistics entry" do
-        expected = "0.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.18.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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.18.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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.18.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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.18.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.17.5 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.18.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.17.5 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.18.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.17.5 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.18.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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.18.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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.18.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.17.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.18.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.17.5 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.18.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

data/spec/result_spec.rb

@@ -25,10 +25,12 @@ module Appstats
         @result.db_username.should == nil
         @result.db_name.should == nil
         @result.db_host.should == nil
+        @result.is_latest.should == nil
+        @result.is_latest?.should == false
       end
     
       it "should set on constructor" do
-        result = Appstats::Result.new(:name => 'a', :result_type => 'b', :query => 'c', :query_to_sql => 'd', :count => 10, :action => 'e', :host => 'f', :contexts => 'g', :from_date => Time.parse("2010-01-02"), :to_date => Time.parse("2010-02-03"), :group_by => "a,b", :query_type => 'h', :db_username => 'i', :db_name => 'j', :db_host => 'k')
+        result = Appstats::Result.new(:name => 'a', :result_type => 'b', :query => 'c', :query_to_sql => 'd', :count => 10, :action => 'e', :host => 'f', :contexts => 'g', :from_date => Time.parse("2010-01-02"), :to_date => Time.parse("2010-02-03"), :group_by => "a,b", :query_type => 'h', :db_username => 'i', :db_name => 'j', :db_host => 'k', :is_latest => true)
         result.name.should == 'a'
         result.result_type.should == 'b'
         result.query.should == 'c'
@@ -44,6 +46,8 @@ module Appstats
         result.db_username.should == "i"
         result.db_name.should == "j"
         result.db_host.should == "k"
+        result.is_latest?.should == true
+        result.is_latest.should == true
       end
     
     end
@@ -188,6 +192,59 @@ module Appstats
       
     end
     
+    describe "#after_save" do
+      
+      before(:each) do
+        Appstats::Result.delete_all
+      end
+
+      it "should only fix yourself" do
+        Time.stub!(:now).and_return(Time.parse('2011-09-21 23:15:20'))
+        new_result = Appstats::Result.create(:query => '# x')
+        another_new_result = Appstats::Result.create(:query => '# y')
+        Time.stub!(:now).and_return(Time.parse('2010-09-21 23:15:20'))
+        another_old_result = Appstats::Result.create(:query => '# y')
+        ActiveRecord::Base.connection.update('update appstats_results set is_latest = null')
+
+        old_result = Appstats::Result.create(:query => '# x')
+        
+        new_result.reload and old_result.reload and another_new_result.reload and another_old_result.reload
+        new_result.is_latest?.should == true
+        old_result.is_latest?.should == false
+        another_new_result.is_latest?.should == false
+        another_old_result.is_latest?.should == false
+      end
+      
+    end
+    
+    describe "#fix_all_is_latest" do
+      
+      before(:each) do
+        Appstats::Result.delete_all
+      end
+      
+      it "should work for no results" do
+        Appstats::Result.fix_all_is_latest
+      end
+      
+      it "should fix all resutls" do
+        Time.stub!(:now).and_return(Time.parse('2011-09-21 23:15:20'))
+        new_result = Appstats::Result.create(:query => '# x')
+        Time.stub!(:now).and_return(Time.parse('2010-09-21 23:15:20'))
+        old_result = Appstats::Result.create(:query => '# x')
+        another_result = Appstats::Result.create(:query => '# y')
+        ActiveRecord::Base.connection.update('update appstats_results set is_latest = null')
+        
+        Appstats::Result.fix_all_is_latest
+        
+        new_result.reload and old_result.reload and another_result.reload
+        new_result.is_latest?.should == true
+        old_result.is_latest?.should == false
+        another_result.is_latest?.should == true
+      end
+      
+    end
+    
     describe "#count_to_s" do
       
       it "should handle nil" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appstats
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 87
   prerelease: 
   segments: 
   - 0
-  - 17
-  - 5
-  version: 0.17.5
+  - 18
+  - 0
+  version: 0.18.0
 platform: ruby
 authors: 
 - Andrew Forward
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -04:00
+date: 2011-03-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -179,6 +179,7 @@ files:
 - db/migrations/20110301212017_add_appstats_results_query_type.rb
 - db/migrations/20110301230757_rename_appstats_results_query_as_sql_to_query_to_sql.rb
 - db/migrations/20110311214833_add_appstats_results_db_connection.rb
+- db/migrations/20110318203339_add_appstats_results_latest_flag.rb
 - db/schema.rb
 - lib/appstats.rb
 - lib/appstats/action.rb