appstats 0.22.2 → 0.22.3

data/Gemfile.lock

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

data/Gemfile.lock.rails2

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

data/db/migrations/20110318203339_add_appstats_results_latest_flag.rb

@@ -3,11 +3,11 @@ class AddAppstatsResultsLatestFlag < ActiveRecord::Migration
     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")
+    Appstats.connection.update('update appstats_results set is_latest = false')
+    all = Appstats.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(',')})")
+    Appstats.connection.update("update appstats_results set is_latest = '1' where id in (#{ids.join(',')})")
   end
 
   def self.down

data/lib/appstats/action.rb

@@ -9,7 +9,7 @@ module Appstats
     def self.update_actions
       sql = "select distinct(action) from appstats_entries where action not in (select name from appstats_actions)"
       count = 0
-      ActiveRecord::Base.connection.execute(sql).each do |row| 
+      Appstats.connection.execute(sql).each do |row| 
         Appstats::Action.create(:name => row[0], :plural_name => row[0].pluralize, :status => 'derived')
         count += 1
       end

data/lib/appstats/action_context_key.rb

@@ -13,7 +13,7 @@ module Appstats
       where (action,context_key) not in (select action_name, context_key from appstats_action_context_keys)
       group by action,context_key"
       count = 0
-      ActiveRecord::Base.connection.execute(sql).each do |row| 
+      Appstats.connection.execute(sql).each do |row| 
         Appstats::ActionContextKey.create(:action_name => row[0], :context_key => row[1], :status => 'derived')
         count += 1
       end

data/lib/appstats/appstats_query.rb

@@ -44,7 +44,7 @@ module Appstats
     end
   
     def db_connection
-      ActiveRecord::Base.connection
+      Appstats.connection
     end
   
     def self.available_action?(action)

data/lib/appstats/context_key.rb

@@ -7,20 +7,20 @@ module Appstats
 
     def self.rename(old_key,new_key)
       sql = ["update appstats_context_keys set name = ?, updated_at = ? where name = ?",new_key,Time.now,old_key]
-      ActiveRecord::Base.connection.update(ActiveRecord::Base.send(:sanitize_sql_array, sql))
+      Appstats.connection.update(ActiveRecord::Base.send(:sanitize_sql_array, sql))
 
       sql = ["update appstats_contexts set context_key = ?, updated_at = ? where context_key = ?",new_key,Time.now,old_key]
-      ActiveRecord::Base.connection.update(ActiveRecord::Base.send(:sanitize_sql_array, sql))
+      Appstats.connection.update(ActiveRecord::Base.send(:sanitize_sql_array, sql))
 
       sql = ["update appstats_action_context_keys set context_key = ?, updated_at = ? where context_key = ?",new_key,Time.now,old_key]
-      ActiveRecord::Base.connection.update(ActiveRecord::Base.send(:sanitize_sql_array, sql))
+      Appstats.connection.update(ActiveRecord::Base.send(:sanitize_sql_array, sql))
 
     end
 
     def self.update_context_keys
       sql = "select distinct(context_key) from appstats_contexts where context_key not in (select name from appstats_context_keys)"
       count = 0
-      ActiveRecord::Base.connection.execute(sql).each do |row| 
+      Appstats.connection.execute(sql).each do |row| 
         Appstats::ContextKey.create(:name => row[0], :status => 'derived')
         count += 1
       end

data/lib/appstats/context_value.rb

@@ -8,7 +8,7 @@ module Appstats
     def self.update_context_values
       sql = "select distinct(context_value) from appstats_contexts where context_value not in (select name from appstats_context_values)"
       count = 0
-      ActiveRecord::Base.connection.execute(sql).each do |row| 
+      Appstats.connection.execute(sql).each do |row| 
         Appstats::ContextValue.create(:name => row[0], :status => 'derived')
         count += 1
       end

data/lib/appstats/host.rb

@@ -8,7 +8,7 @@ module Appstats
     def self.update_hosts
       sql = "select distinct(host) from appstats_log_collectors where host not in (select name from appstats_hosts)"
       count = 0
-      ActiveRecord::Base.connection.execute(sql).each do |row| 
+      Appstats.connection.execute(sql).each do |row| 
         Appstats::Host.create(:name => row[0], :status => 'derived')
         count += 1
       end

data/lib/appstats/query.rb

@@ -204,8 +204,8 @@ module Appstats
     private
     
       def db_connection
-        return ActiveRecord::Base.connection if @custom_query.nil?
-        @backup_config = ActiveRecord::Base.connection.instance_variable_get(:@config)
+        return Appstats.connection if @custom_query.nil?
+        @backup_config = Appstats.connection.instance_variable_get(:@config)
         custom_connection = @custom_query.db_connection
       end
     
@@ -220,7 +220,7 @@ module Appstats
           timer = FriendlyTimer.new
           results = yield db_connection
           timer.stop
-          db_config = ActiveRecord::Base.connection.instance_variable_get(:@config)
+          db_config = Appstats.connection.instance_variable_get(:@config)
           restore_connection
           data = { :results => results, :db_config => db_config, :duration => timer.duration }
           return data

data/lib/appstats/result.rb

@@ -69,11 +69,11 @@ module Appstats
     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")
+      connection.update('update appstats_results set is_latest = false')
+      all = 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(',')})")
+      connection.update("update appstats_results set is_latest = '1' where id in (#{ids.join(',')})")
     end
     
     def self.calculate_count_to_s(raw_count,data = {})
@@ -94,14 +94,14 @@ module Appstats
 
       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))
+        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))
+        first = 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))
+        connection.update(ActiveRecord::Base.send(:sanitize_sql_array, sql))
       end
 
       def self.add_commas(num)

data/lib/appstats/test_query.rb

@@ -14,7 +14,7 @@ module Appstats
         dbconfig = YAML::load(File.open('db/config.yml'))
         ActiveRecord::Base.establish_connection(dbconfig['development']).connection
       else
-        ActiveRecord::Base.connection
+        Appstats.connection
       end
     end
     
@@ -29,7 +29,7 @@ module Appstats
     end
     
     def db_connection
-      ActiveRecord::Base.connection
+      Appstats.connection
     end
     
   end
@@ -44,7 +44,7 @@ module Appstats
     end
     
     def db_connection
-      ActiveRecord::Base.connection
+      Appstats.connection
     end
     
   end
@@ -55,7 +55,7 @@ module Appstats
       attr_accessor :query
       def process_query; end
       def db_connection
-        ActiveRecord::Base.connection
+        Appstats.connection
       end
 
     end
@@ -72,7 +72,7 @@ module Appstats
 
 
     def db_connection
-      ActiveRecord::Base.connection
+      Appstats.connection
     end
     
   end
@@ -84,6 +84,6 @@ class YetAnotherTestQuery
   attr_accessor :query
   def process_query; end
   def db_connection
-    ActiveRecord::Base.connection
+    Appstats.connection
   end
 end

data/lib/appstats/test_unloaded_query.rb

@@ -4,6 +4,6 @@ class UnloadedQuery
   attr_accessor :query
   def process_query; end
   def db_connection
-    ActiveRecord::Base.connection
+    Appstats.connection
   end
 end

data/lib/appstats/version.rb

@@ -1,3 +1,3 @@
 module Appstats
-  VERSION = "0.22.2"
+  VERSION = "0.22.3"
 end

data/lib/appstats.rb

@@ -52,5 +52,8 @@ module Appstats
     Appstats::Action.respond_to?(:where)
   end
   
+  def self.connection
+    Appstats::Entry.new.connection
+  end
   
 end

data/lib/daemons/appstats_log_collector.rb

@@ -49,7 +49,7 @@ while($running) do
   end
 
   last_processed_at = Time.now
-  ActiveRecord::Base.connection.reconnect!
+  Appstats.connection.reconnect!
   appstats_config["remote_servers"].each do |remote_server|
     Appstats::LogCollector.find_remote_files(remote_server,remote_server[:path],remote_server[:template])
   end
@@ -65,5 +65,5 @@ while($running) do
   Appstats::ContextValue.update_context_values
   Appstats::ActionContextKey.update_action_context_keys
   Appstats::LogCollector.remove_remote_files(appstats_config["remote_servers"])
-  ActiveRecord::Base.connection.disconnect!
+  Appstats.connection.disconnect!
 end

data/spec/appstats_query_spec.rb

@@ -146,7 +146,7 @@ module Appstats
   
       it "should use the extract_env" do
         @appstats_query.query = Appstats::Query.new(:query => "# blahs on blah")
-        @appstats_query.db_connection.should == ActiveRecord::Base.connection
+        @appstats_query.db_connection.should == Appstats.connection
       end
   
     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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.create_from_logger_string("0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        entry = Entry.create_from_logger_string("0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.22.3 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.22.2 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb')
+        entry = Entry.create_from_logger_string('0.22.3 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.22.2 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb"
+        entry.raw_entry.should == "0.22.3 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.22.2 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb')
+        entry = Entry.create_from_logger_string('0.22.3 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.22.2 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb"
+        entry.raw_entry.should == "0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
+        Appstats::Logger.raw_read.should == ["0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=search : provider=one : provider=two"]
+        Appstats::Logger.raw_read.should == ["0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
+        Appstats::Logger.raw_read.should == ["0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.22.3 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.22.2 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.22.3 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.22.2 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.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.22.3 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.22.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.22.3 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.22.2 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.22.3 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.22.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
+         actual = Appstats::Logger.entry_to_hash("0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.22.3 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.22.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.22.3 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.22.2 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.22.3 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.22.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.22.3 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.22.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.22.3 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.22.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.22.3 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/query_spec.rb

@@ -558,7 +558,7 @@ module Appstats
           result.query_type.should == "Appstats::BadTestQuery"
           result.count.should == nil
     
-          ActiveRecord::Base.connection.current_database.should == YAML::load(File.open('db/config.yml'))["test"]["database"]
+          Appstats.connection.current_database.should == YAML::load(File.open('db/config.yml'))["test"]["database"]
         end
     
     

data/spec/result_spec.rb

@@ -249,7 +249,7 @@ module Appstats
         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')
+        Appstats.connection.update('update appstats_results set is_latest = null')
 
         old_result = Appstats::Result.create(:query => '# x')
         
@@ -278,7 +278,7 @@ module Appstats
         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.connection.update('update appstats_results set is_latest = null')
         
         Appstats::Result.fix_all_is_latest
         

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appstats
 version: !ruby/object:Gem::Version 
-  hash: 67
+  hash: 65
   prerelease: 
   segments: 
   - 0
   - 22
-  - 2
-  version: 0.22.2
+  - 3
+  version: 0.22.3
 platform: ruby
 authors: 
 - Andrew Forward
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 Z
+date: 2011-07-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails