appstats 0.23.5 → 0.24.0

data/.gitignore

@@ -1,7 +1,6 @@
 pkg/*
 *.gem
 .bundle
-db/migrate
 doc
 config/appstats.yml
 config/initializers/appstats.rb

data/Gemfile.lock

@@ -1,85 +1,101 @@
 PATH
   remote: .
   specs:
-    appstats (0.23.5)
+    appstats (0.24.0)
       daemons
       net-scp
-      rails (>= 2.3.0)
+      rails (>= 3.2.1)
       redis
 
 GEM
   remote: http://rubygems.org/
   specs:
     Saikuro (1.1.0)
-    ZenTest (4.5.0)
-    abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    arel (2.0.9)
+    ZenTest (4.6.2)
+    actionmailer (3.2.1)
+      actionpack (= 3.2.1)
+      mail (~> 2.4.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      arel (~> 3.0.0)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.0)
     arrayfields (4.7.4)
-    autotest-fsevent (0.2.5)
+    autotest-fsevent (0.2.7)
       sys-uname
-    builder (2.1.2)
+    builder (3.0.0)
     chronic (0.3.0)
-    churn (0.0.13)
+    churn (0.0.15)
+      arrayfields (= 4.7.4)
       chronic (>= 0.2.3)
+      chronic (>= 0.2.3)
+      fattr (= 2.2.0)
+      hirb (= 0.5.0)
       hirb
+      jeweler (= 1.6.4)
+      json (= 1.6.1)
       json_pure
       main
-      ruby_parser (~> 2.0.4)
+      main (>= 4.6.0)
+      map (= 4.3.0)
+      ruby_parser (= 2.3.1)
+      ruby_parser (~> 2.3)
+      sexp_processor (= 3.0.7)
       sexp_processor (~> 3.0.3)
     colored (1.2)
-    daemons (1.1.4)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+    daemons (1.1.6)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
     fattr (2.2.0)
-    flay (1.4.2)
+    ffi (1.0.11)
+    flay (1.4.3)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    flog (2.5.1)
+    flog (2.5.3)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    guard (0.3.4)
+    git (1.2.5)
+    guard (1.0.0)
+      ffi (>= 0.5.0)
       thor (~> 0.14.6)
-    guard-rspec (0.3.1)
-      guard (>= 0.2.2)
-    haml (3.0.25)
-    hirb (0.4.3)
-    i18n (0.5.0)
-    json_pure (1.5.1)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    guard-rspec (0.6.0)
+      guard (>= 0.10.0)
+    hike (1.2.1)
+    hirb (0.5.0)
+    i18n (0.6.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    journey (1.0.1)
+    json (1.6.1)
+    json_pure (1.6.5)
+    mail (2.4.1)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    main (4.4.0)
-      arrayfields (>= 4.7.4)
-      fattr (>= 2.1.0)
+    main (4.7.1)
+    map (4.3.0)
     metric_fu (2.1.1)
       Saikuro (>= 1.1.0)
       activesupport (>= 2.0.0)
@@ -92,41 +108,48 @@ GEM
       reek (>= 1.2.6)
       roodi (>= 2.1.0)
       syntax
-    mime-types (1.16)
-    mysql (2.8.1)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    mysql2 (0.3.11)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.2.1)
-    polyglot (0.3.2)
-    rack (1.2.4)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    net-ssh (2.3.0)
+    polyglot (0.3.3)
+    progressbar (0.9.2)
+    rack (1.4.1)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
+    rails (3.2.1)
+      actionmailer (= 3.2.1)
+      actionpack (= 3.2.1)
+      activerecord (= 3.2.1)
+      activeresource (= 3.2.1)
+      activesupport (= 3.2.1)
       bundler (~> 1.0)
-      railties (= 3.0.7)
-    rails_best_practices (0.7.5)
+      railties (= 3.2.1)
+    rails_best_practices (1.7.2)
       activesupport
-      colored (~> 1.2)
-      erubis (~> 2.6.6)
-      haml (~> 3.0.18)
+      colored
+      erubis
       i18n
-      ruby-progressbar (~> 0.0.9)
-      ruby_parser (~> 2.0.4)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
+      progressbar
+      sexp_processor
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rb-fsevent (0.4.0)
-    rcov (0.9.9)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rb-fsevent (0.9.0)
+    rcov (1.0.0)
+    rdoc (3.12)
+      json (~> 1.4)
     redis (2.2.2)
     reek (1.2.8)
       ruby2ruby (~> 1.2)
@@ -134,31 +157,36 @@ GEM
       sexp_processor (~> 3.0)
     roodi (2.1.0)
       ruby_parser
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    ruby-progressbar (0.0.10)
-    ruby2ruby (1.2.5)
+    rspec-mocks (2.8.0)
+    ruby2ruby (1.3.1)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_parser (2.0.6)
+    ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.5)
-    standalone_migrations (0.4.7)
-      activerecord
+    sexp_processor (3.0.7)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
+    standalone_migrations (1.0.5)
+      activerecord (>= 3)
       rake
     syntax (1.0.0)
-    sys-uname (0.8.5)
+    sys-uname (0.9.0)
+      ffi (>= 1.0.0)
     thor (0.14.6)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.26)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby
@@ -169,7 +197,7 @@ DEPENDENCIES
   autotest-fsevent
   guard-rspec
   metric_fu
-  mysql
+  mysql2
   rake
   rb-fsevent
   rspec

data/Rakefile

@@ -17,16 +17,7 @@ require 'tasks/standalone_migrations'
 import 'lib/appstats/ci.rake'
 
 begin
-  MigratorTasks.new do |t|
-    t.migrations = "db/migrations"
-    t.config = "db/config.yml"
-    t.schema = "db/schema.rb"
-    t.env = "DB"
-    # TODO: figure out why this property went away
-    # t.default_env = "development"
-    t.verbose = true
-    t.log_level = Logger::ERROR
-  end
+  require 'tasks/standalone_migrations'
 rescue LoadError => e
   puts "gem install standalone_migrations to get db:migrate:* tasks! (Error: #{e})"
 end

data/appstats.gemspec

@@ -12,9 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{Provide usage statistics about how your application is being used}
   s.description = %q{Provide usage statistics about how your application is being used}
 
-  # Models are to be used in Rails 3 environment, but the logger can work with Rails 2 apps
-  # But, for testing appstats itself, you will need Rails 3
-  s.add_dependency('rails','>=2.3.0')
+  s.add_dependency('rails','>=3.2.1')
   s.add_dependency('daemons')
   s.add_dependency('net-scp')
   s.add_dependency('redis')
@@ -23,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec')
   s.add_development_dependency('ZenTest')
   s.add_development_dependency('standalone_migrations')
-  s.add_development_dependency('mysql')
+  s.add_development_dependency('mysql2')
   s.add_development_dependency('metric_fu')
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('autotest-fsevent') if RUBY_PLATFORM =~ /darwin/i

data/db/config.yml

@@ -1,5 +1,5 @@
 development:
-  adapter: mysql
+  adapter: mysql2
   database: appstats_development
   username: root
   password: 
@@ -9,7 +9,7 @@ development:
     adapter: memcached
     servers: localhost
 test:
-  adapter: mysql
+  adapter: mysql2
   database: appstats_test
   username: root
   password: 

data/lib/appstats/action.rb

@@ -1,7 +1,7 @@
 
 module Appstats
   class Action < ActiveRecord::Base
-    set_table_name "appstats_actions"
+    self.table_name = "appstats_actions"
     establish_connection "appstats_#{Rails.env}" if configurations.keys.include?("appstats_#{Rails.env}")
     
     attr_accessible :name, :plural_name, :status

data/lib/appstats/action_context_key.rb

@@ -1,7 +1,7 @@
 
 module Appstats
   class ActionContextKey < ActiveRecord::Base
-    set_table_name "appstats_action_context_keys"
+    self.table_name = "appstats_action_context_keys"
     establish_connection "appstats_#{Rails.env}" if configurations.keys.include?("appstats_#{Rails.env}")
     
     attr_accessible :action_name, :context_key, :status

data/lib/appstats/audit.rb

@@ -1,7 +1,7 @@
 
 module Appstats
   class Audit < ActiveRecord::Base
-    set_table_name "appstats_audits"
+    self.table_name = "appstats_audits"
     establish_connection "appstats_#{Rails.env}" if configurations.keys.include?("appstats_#{Rails.env}")
     
     attr_accessible :table_name, :column_type, :obj_name, :obj_attr, :obj_type, :obj_id, :action, :old_value, :new_value, :old_value_full, :new_value_full

data/lib/appstats/context.rb

@@ -1,7 +1,7 @@
 
 module Appstats
   class Context < ActiveRecord::Base
-    set_table_name "appstats_contexts"
+    self.table_name = "appstats_contexts"
     establish_connection "appstats_#{Rails.env}" if configurations.keys.include?("appstats_#{Rails.env}")
     
     belongs_to :entry, :class_name => "Appstats::Entry", :foreign_key => "appstats_entry_id"

data/lib/appstats/context_key.rb

@@ -1,6 +1,6 @@
 module Appstats
   class ContextKey < ActiveRecord::Base
-    set_table_name "appstats_context_keys"
+    self.table_name = "appstats_context_keys"
     establish_connection "appstats_#{Rails.env}" if configurations.keys.include?("appstats_#{Rails.env}")
     
     attr_accessible :name, :status

data/lib/appstats/context_value.rb

@@ -1,6 +1,6 @@
 module Appstats
   class ContextValue < ActiveRecord::Base
-    set_table_name "appstats_context_values"
+    self.table_name = "appstats_context_values"
     establish_connection "appstats_#{Rails.env}" if configurations.keys.include?("appstats_#{Rails.env}")
     
     attr_accessible :name, :status

data/lib/appstats/entry.rb

@@ -1,7 +1,7 @@
 
 module Appstats
   class Entry < ActiveRecord::Base
-    set_table_name "appstats_entries"
+    self.table_name = "appstats_entries"
     establish_connection "appstats_#{Rails.env}" if configurations.keys.include?("appstats_#{Rails.env}")
     
     has_many :contexts, :class_name => "Appstats::Context", :table_name => 'appstats_contexts', :foreign_key => 'appstats_entry_id', :order => 'context_key'

data/lib/appstats/host.rb

@@ -1,6 +1,6 @@
 module Appstats
   class Host < ActiveRecord::Base
-    set_table_name "appstats_hosts"
+    self.table_name = "appstats_hosts"
     establish_connection "appstats_#{Rails.env}" if configurations.keys.include?("appstats_#{Rails.env}")
     
     attr_accessible :name, :status

data/lib/appstats/log_collector.rb

@@ -3,7 +3,7 @@ require 'net/scp'
 
 module Appstats
   class LogCollector < ActiveRecord::Base
-    set_table_name "appstats_log_collectors"
+    self.table_name = "appstats_log_collectors"
     establish_connection "appstats_#{Rails.env}" if configurations.keys.include?("appstats_#{Rails.env}")
     
     @@downloaded_log_directory = nil

data/lib/appstats/result.rb

@@ -1,6 +1,6 @@
 module Appstats
   class Result < ActiveRecord::Base
-    set_table_name "appstats_results"
+    self.table_name = "appstats_results"
     establish_connection "appstats_#{Rails.env}" if configurations.keys.include?("appstats_#{Rails.env}")
 
     attr_accessible :name, :result_type, 

data/lib/appstats/result_job.rb

@@ -1,6 +1,6 @@
 module Appstats
   class ResultJob < ActiveRecord::Base
-    set_table_name "appstats_result_jobs"
+    self.table_name = "appstats_result_jobs"
     establish_connection "appstats_#{Rails.env}" if configurations.keys.include?("appstats_#{Rails.env}")
 
     attr_accessible :name, :frequency, :status, :query, :last_run_at, :query_type

data/lib/appstats/sub_result.rb

@@ -1,6 +1,6 @@
 module Appstats
   class SubResult < ActiveRecord::Base
-    set_table_name "appstats_sub_results"
+    self.table_name = "appstats_sub_results"
     establish_connection "appstats_#{Rails.env}" if configurations.keys.include?("appstats_#{Rails.env}")
 
     attr_accessible :context_filter, :count, :ratio_of_total

data/lib/appstats/tasks.rb

@@ -14,7 +14,7 @@ module Appstats
       here = File.expand_path(File.dirname(File.dirname(File.dirname((__FILE__)))))
       @base = base
       @vendor = "#{here}/vendor"
-      @gem_migrations = "#{here}/db/migrations"
+      @gem_migrations = "#{here}/db/migrate"
       @app_migrate = "#{base}/db/migrate"
       @config = "#{base}/db/config.yml"
       @schema = "#{base}/db/schema.rb"

data/lib/appstats/test_object.rb

@@ -1,6 +1,6 @@
 module Appstats
   class TestObject < ActiveRecord::Base
-    set_table_name "appstats_test_objects"
+    self.table_name = "appstats_test_objects"
     acts_as_appstatsable
     acts_as_auditable
 

data/lib/appstats/version.rb

@@ -1,3 +1,3 @@
 module Appstats
-  VERSION = "0.23.5"
+  VERSION = "0.24.0"
 end

data/lib/templates/appstats.yml

@@ -1,5 +1,5 @@
 database:
-  adapter: mysql
+  adapter: mysql2
   database: mystatsdb_production
   username: root
   password: 

data/spec/audit_spec.rb

@@ -90,6 +90,7 @@ module Appstats
         Audit.count.should == 15
         
         all = Audit.all
+        
         all[0].column_type.should == nil
         all[0].obj_type.should == nil
         
@@ -97,11 +98,11 @@ module Appstats
         all[1].column_type.should == "varchar(255)"
         all[1].obj_type.should == "string"
 
-        all[2].obj_attr.should == "created_at"
+        all[2].obj_attr.should == "blah_timestamp"
         all[2].column_type.should == "datetime"
         all[2].obj_type.should == "datetime"
 
-        all[3].obj_attr.should == "blah_timestamp"
+        all[3].obj_attr.should == "created_at"
         all[3].column_type.should == "datetime"
         all[3].obj_type.should == "datetime"
 
@@ -109,12 +110,12 @@ module Appstats
         all[4].column_type.should == "datetime"
         all[4].obj_type.should == "datetime"
 
-        all[5].obj_attr.should == "id"
-        all[5].column_type.should == "int(11)"
+        all[5].obj_attr.should == "blah_decimal"
+        all[5].column_type.should == "decimal(10,0)"
         all[5].obj_type.should == "integer"
 
-        all[6].obj_attr.should == "blah_decimal"
-        all[6].column_type.should == "decimal(10,0)"
+        all[6].obj_attr.should == "id"
+        all[6].column_type.should == "int(11)"
         all[6].obj_type.should == "integer"
 
         all[7].obj_attr.should == "blah_boolean"

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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.create_from_logger_string("0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        entry = Entry.create_from_logger_string("0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.24.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.23.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.24.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.23.5 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb"
+        entry.raw_entry.should == "0.24.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.23.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.24.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.23.5 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb"
+        entry.raw_entry.should == "0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
+        Appstats::Logger.raw_read.should == ["0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=search : provider=one : provider=two"]
+        Appstats::Logger.raw_read.should == ["0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
+        Appstats::Logger.raw_read.should == ["0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.24.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.23.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.24.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.23.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.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.24.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.23.5 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.24.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.23.5 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.24.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.23.5 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
+         actual = Appstats::Logger.entry_to_hash("0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.24.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.23.5 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.24.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.23.5 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.24.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.23.5 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.24.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.23.5 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.24.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.23.5 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.24.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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appstats
 version: !ruby/object:Gem::Version 
-  hash: 73
+  hash: 127
   prerelease: 
   segments: 
   - 0
-  - 23
-  - 5
-  version: 0.23.5
+  - 24
+  - 0
+  version: 0.24.0
 platform: ruby
 authors: 
 - Andrew Forward
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 Z
+date: 2012-01-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
-        - 2
         - 3
-        - 0
-        version: 2.3.0
+        - 2
+        - 1
+        version: 3.2.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -132,7 +132,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: mysql
+  name: mysql2
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -214,7 +214,6 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
-- Gemfile.lock.rails2
 - History.txt
 - README.rdoc
 - Rakefile
@@ -224,36 +223,36 @@ files:
 - config/daemons.yml
 - config/initializers/appstats.rb.example
 - db/config.yml
-- db/migrations/20110105221941_create_appstats_entries.rb
-- db/migrations/20110203151136_create_appstats_contexts.rb
-- db/migrations/20110203151635_rework_appstats_entries.rb
-- db/migrations/20110204183259_create_log_collectors.rb
-- db/migrations/20110207200324_add_separated_entry_times.rb
-- db/migrations/20110207200431_add_indexes.rb
-- db/migrations/20110207213514_create_appstats_actions.rb
-- db/migrations/20110208210921_align_entry_time_names.rb
-- db/migrations/20110210185911_create_appstats_test_object.rb
-- db/migrations/20110210225606_create_appstats_results.rb
-- db/migrations/20110215155830_create_appstats_hosts.rb
-- db/migrations/20110217215309_create_appstats_context_keys.rb
-- db/migrations/20110217220154_create_appstats_context_values.rb
-- db/migrations/20110217220357_add_additional_contexts_indexes.rb
-- db/migrations/20110217234136_add_appstats_results_contexts.rb
-- db/migrations/20110222215437_create_appstats_jobs.rb
-- db/migrations/20110223212232_add_appstats_entries_week_and_quarter.rb
-- db/migrations/20110225192624_add_appstats_log_collector_local_filename.rb
-- db/migrations/20110301170733_add_appstats_results_group_query_to_sql.rb
-- db/migrations/20110301170947_create_appstats_sub_results.rb
-- db/migrations/20110301195959_add_appstats_results_groups.rb
-- 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/migrations/20110321154125_add_appstats_results_query_duration_in_seconds.rb
-- db/migrations/20110330171745_create_appstats_action_contexts.rb
-- db/migrations/20110510141236_create_audits.rb
-- db/migrations/20110510173343_add_test_object_columns.rb
-- db/migrations/20120118173343_add_appstats_context_indexes.rb
+- db/migrate/20110105221941_create_appstats_entries.rb
+- db/migrate/20110203151136_create_appstats_contexts.rb
+- db/migrate/20110203151635_rework_appstats_entries.rb
+- db/migrate/20110204183259_create_log_collectors.rb
+- db/migrate/20110207200324_add_separated_entry_times.rb
+- db/migrate/20110207200431_add_indexes.rb
+- db/migrate/20110207213514_create_appstats_actions.rb
+- db/migrate/20110208210921_align_entry_time_names.rb
+- db/migrate/20110210185911_create_appstats_test_object.rb
+- db/migrate/20110210225606_create_appstats_results.rb
+- db/migrate/20110215155830_create_appstats_hosts.rb
+- db/migrate/20110217215309_create_appstats_context_keys.rb
+- db/migrate/20110217220154_create_appstats_context_values.rb
+- db/migrate/20110217220357_add_additional_contexts_indexes.rb
+- db/migrate/20110217234136_add_appstats_results_contexts.rb
+- db/migrate/20110222215437_create_appstats_jobs.rb
+- db/migrate/20110223212232_add_appstats_entries_week_and_quarter.rb
+- db/migrate/20110225192624_add_appstats_log_collector_local_filename.rb
+- db/migrate/20110301170733_add_appstats_results_group_query_to_sql.rb
+- db/migrate/20110301170947_create_appstats_sub_results.rb
+- db/migrate/20110301195959_add_appstats_results_groups.rb
+- db/migrate/20110301212017_add_appstats_results_query_type.rb
+- db/migrate/20110301230757_rename_appstats_results_query_as_sql_to_query_to_sql.rb
+- db/migrate/20110311214833_add_appstats_results_db_connection.rb
+- db/migrate/20110318203339_add_appstats_results_latest_flag.rb
+- db/migrate/20110321154125_add_appstats_results_query_duration_in_seconds.rb
+- db/migrate/20110330171745_create_appstats_action_contexts.rb
+- db/migrate/20110510141236_create_audits.rb
+- db/migrate/20110510173343_add_test_object_columns.rb
+- db/migrate/20120118173343_add_appstats_context_indexes.rb
 - db/schema.rb
 - doc/benchmarks/Benchmark.php
 - doc/benchmarks/Predis/Autoloader.php

data/Gemfile.lock.rails2

@@ -1,122 +0,0 @@
-PATH
-  remote: .
-  specs:
-    appstats (0.23.5)
-      daemons
-      net-scp
-      rails (>= 2.3.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    Saikuro (1.1.0)
-    ZenTest (4.5.0)
-    abstract (1.0.0)
-    actionmailer (2.3.11)
-      actionpack (= 2.3.11)
-    actionpack (2.3.11)
-      activesupport (= 2.3.11)
-      rack (~> 1.1.0)
-    activerecord (2.3.11)
-      activesupport (= 2.3.11)
-    activeresource (2.3.11)
-      activesupport (= 2.3.11)
-    activesupport (2.3.11)
-    arrayfields (4.7.4)
-    chronic (0.3.0)
-    churn (0.0.13)
-      chronic (>= 0.2.3)
-      hirb
-      json_pure
-      main
-      ruby_parser (~> 2.0.4)
-      sexp_processor (~> 3.0.3)
-    colored (1.2)
-    daemons (1.1.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    fattr (2.2.0)
-    flay (1.4.2)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    flog (2.5.1)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    haml (3.0.25)
-    hirb (0.4.3)
-    i18n (0.5.0)
-    json_pure (1.5.1)
-    main (4.4.0)
-      arrayfields (>= 4.7.4)
-      fattr (>= 2.1.0)
-    metric_fu (2.1.1)
-      Saikuro (>= 1.1.0)
-      activesupport (>= 2.0.0)
-      chronic (~> 0.3.0)
-      churn (>= 0.0.7)
-      flay (>= 1.2.1)
-      flog (>= 2.3.0)
-      rails_best_practices (>= 0.6.4)
-      rcov (>= 0.8.3.3)
-      reek (>= 1.2.6)
-      roodi (>= 2.1.0)
-      syntax
-    mysql (2.8.1)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.1.4)
-    rack (1.1.2)
-    rails (2.3.11)
-      actionmailer (= 2.3.11)
-      actionpack (= 2.3.11)
-      activerecord (= 2.3.11)
-      activeresource (= 2.3.11)
-      activesupport (= 2.3.11)
-      rake (>= 0.8.3)
-    rails_best_practices (0.7.5)
-      activesupport
-      colored (~> 1.2)
-      erubis (~> 2.6.6)
-      haml (~> 3.0.18)
-      i18n
-      ruby-progressbar (~> 0.0.9)
-      ruby_parser (~> 2.0.4)
-    rake (0.8.7)
-    rcov (0.9.9)
-    reek (1.2.8)
-      ruby2ruby (~> 1.2)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    roodi (2.1.0)
-      ruby_parser
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    ruby-progressbar (0.0.10)
-    ruby2ruby (1.2.5)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    ruby_parser (2.0.6)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.0.5)
-    standalone_migrations (0.4.5)
-      activerecord
-      rake
-    syntax (1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ZenTest
-  appstats!
-  metric_fu
-  mysql
-  rspec
-  standalone_migrations