appstats 0.8.3 → 0.9.0

data/Gemfile.lock

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

data/db/migrations/20110217215309_create_appstats_context_keys.rb

@@ -0,0 +1,13 @@
+class CreateAppstatsContextKeys < ActiveRecord::Migration
+  def self.up
+    create_table :appstats_context_keys do |t|
+      t.string :name
+      t.string :status
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :appstats_context_keys
+  end
+end

data/db/migrations/20110217220154_create_appstats_context_values.rb

@@ -0,0 +1,13 @@
+class CreateAppstatsContextValues < ActiveRecord::Migration
+  def self.up
+    create_table :appstats_context_values do |t|
+      t.string :name
+      t.string :status
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :appstats_context_values
+  end
+end

data/db/migrations/20110217220357_add_additional_contexts_indexes.rb

@@ -0,0 +1,11 @@
+class AddAdditionalContextsIndexes < ActiveRecord::Migration
+  def self.up
+    add_index :appstats_contexts, :context_key
+    add_index :appstats_contexts, :context_value
+  end
+
+  def self.down
+    remove_index :appstats_contexts, :context_key
+    remove_index :appstats_contexts, :context_value
+  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 => 20110215155830) do
+ActiveRecord::Schema.define(:version => 20110217220357) do
 
   create_table "appstats_actions", :force => true do |t|
     t.string   "name"
@@ -20,6 +20,20 @@ ActiveRecord::Schema.define(:version => 20110215155830) do
     t.datetime "updated_at"
   end
 
+  create_table "appstats_context_keys", :force => true do |t|
+    t.string   "name"
+    t.string   "status"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "appstats_context_values", :force => true do |t|
+    t.string   "name"
+    t.string   "status"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "appstats_contexts", :force => true do |t|
     t.string   "context_key"
     t.string   "context_value"
@@ -33,6 +47,8 @@ ActiveRecord::Schema.define(:version => 20110215155830) do
   add_index "appstats_contexts", ["context_key", "context_float"], :name => "index_appstats_contexts_on_context_key_and_context_float"
   add_index "appstats_contexts", ["context_key", "context_int"], :name => "index_appstats_contexts_on_context_key_and_context_int"
   add_index "appstats_contexts", ["context_key", "context_value"], :name => "index_appstats_contexts_on_context_key_and_context_value"
+  add_index "appstats_contexts", ["context_key"], :name => "index_appstats_contexts_on_context_key"
+  add_index "appstats_contexts", ["context_value"], :name => "index_appstats_contexts_on_context_value"
 
   create_table "appstats_entries", :force => true do |t|
     t.string   "action"

data/lib/appstats.rb

@@ -14,6 +14,8 @@ require "#{File.dirname(__FILE__)}/appstats/parser"
 require "#{File.dirname(__FILE__)}/appstats/query"
 require "#{File.dirname(__FILE__)}/appstats/result"
 require "#{File.dirname(__FILE__)}/appstats/host"
+require "#{File.dirname(__FILE__)}/appstats/context_key"
+require "#{File.dirname(__FILE__)}/appstats/context_value"
 require "#{File.dirname(__FILE__)}/appstats/test_object"
 
 # required in the appstats.gemspec

data/lib/appstats/context_key.rb

@@ -0,0 +1,18 @@
+module Appstats
+  class ContextKey < ActiveRecord::Base
+    set_table_name "appstats_context_keys"
+    
+    attr_accessible :name, :status
+
+    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::ContextKey.create(:name => row[0], :status => 'derived')
+        count += 1
+      end
+      count
+    end
+  
+  end
+end

data/lib/appstats/context_value.rb

@@ -0,0 +1,18 @@
+module Appstats
+  class ContextValue < ActiveRecord::Base
+    set_table_name "appstats_context_values"
+    
+    attr_accessible :name, :status
+
+    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::ContextValue.create(:name => row[0], :status => 'derived')
+        count += 1
+      end
+      count
+    end
+  
+  end
+end

data/lib/appstats/version.rb

@@ -1,3 +1,3 @@
 module Appstats
-  VERSION = "0.8.3"
+  VERSION = "0.9.0"
 end

data/lib/daemons/appstats_log_collector.rb

@@ -40,6 +40,8 @@ while($running) do
   Appstats::LogCollector.process_local_files
   Appstats::Action.update_actions
   Appstats::Host.update_hosts
+  Appstats::ContextKey.update_context_keys
+  Appstats::ContextValue.update_context_values
   ActiveRecord::Base.connection.disconnect!
   a_day_in_seconds = 60*60*24
   sleep a_day_in_seconds

data/spec/context_key_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+module Appstats
+  describe ContextKey do
+
+    before(:each) do
+      Appstats::Context.delete_all
+      Appstats::ContextKey.delete_all
+      @context_key = Appstats::ContextKey.new
+    end
+    
+    describe "#initialize" do
+
+      it "should set name to nil" do
+        @context_key.name.should == nil
+      end
+
+      it "should set status to nil" do
+        @context_key.status.should == nil
+      end
+      
+      it "should set on constructor" do
+        context_key = Appstats::ContextKey.new(:name => 'a', :status => 'c')
+        context_key.name.should == 'a'
+        context_key.status.should == 'c'
+      end
+    
+    end
+    
+    describe "#update_context_keys" do
+      
+      it "should do nothing if no events" do
+        Appstats::ContextKey.update_context_keys.should == 0
+        Appstats::ContextKey.count.should == 0
+      end
+      
+      it "should add entry context_key names" do
+        Appstats::Context.create(:context_key => 'a')
+        Appstats::ContextKey.update_context_keys.should == 1
+        Appstats::ContextKey.count.should == 1
+        
+        context_key = Appstats::ContextKey.last
+        context_key.name = 'a'
+        context_key.status = 'derived'
+      end
+      
+    end
+    
+
+  end
+end

data/spec/context_value_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+module Appstats
+  describe ContextValue do
+
+    before(:each) do
+      Appstats::Context.delete_all
+      Appstats::ContextValue.delete_all
+      @context_value = Appstats::ContextValue.new
+    end
+    
+    describe "#initialize" do
+
+      it "should set name to nil" do
+        @context_value.name.should == nil
+      end
+
+      it "should set status to nil" do
+        @context_value.status.should == nil
+      end
+      
+      it "should set on constructor" do
+        context_value = Appstats::ContextValue.new(:name => 'a', :status => 'c')
+        context_value.name.should == 'a'
+        context_value.status.should == 'c'
+      end
+    
+    end
+    
+    describe "#update_context_values" do
+      
+      it "should do nothing if no events" do
+        Appstats::ContextValue.update_context_values.should == 0
+        Appstats::ContextValue.count.should == 0
+      end
+      
+      it "should add entry context_value names" do
+        Appstats::Context.create(:context_value => 'a')
+        Appstats::ContextValue.update_context_values.should == 1
+        Appstats::ContextValue.count.should == 1
+        
+        context_value = Appstats::ContextValue.last
+        context_value.name = 'a'
+        context_value.status = 'derived'
+      end
+      
+    end
+    
+
+  end
+end

data/spec/entry_spec.rb

@@ -188,18 +188,18 @@ module Appstats
       end
       
       it "should understand an entry without contexts" do
-        entry = Entry.create_from_logger_string("0.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.create_from_logger_string("0.9.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.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.9.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.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        entry = Entry.create_from_logger_string("0.9.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.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.9.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"

data/spec/logger_spec.rb

@@ -115,7 +115,7 @@ module Appstats
       
       it "should accept numbers" do
         Appstats::Logger.entry(5, :blah => 6)   
-        Appstats::Logger.raw_read.should == ["0.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
+        Appstats::Logger.raw_read.should == ["0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
       end
 
     end
@@ -124,7 +124,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.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
+        Appstats::Logger.raw_read.should == ["0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
       end
       
     end
@@ -141,29 +141,29 @@ 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.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.9.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.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : 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.8.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.9.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.8.3 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.9.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.8.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
+         actual = Appstats::Logger.entry_to_hash("0.9.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
          actual.should == expected
        end
        
@@ -172,66 +172,66 @@ module Appstats
     describe "#entry_to_s" do
       
       it "should handle a statistics entry" do
-        expected = "0.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.9.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.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.9.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.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.9.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.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.9.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.8.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.9.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.8.3 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.9.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.8.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.9.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.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.9.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.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.9.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.8.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.9.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.8.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.9.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: 57
+  hash: 59
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 3
-  version: 0.8.3
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Andrew Forward
@@ -152,12 +152,17 @@ files:
 - 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/schema.rb
 - lib/appstats.rb
 - lib/appstats/action.rb
 - lib/appstats/acts_as_appstatsable.rb
 - lib/appstats/code_injections.rb
 - lib/appstats/context.rb
+- lib/appstats/context_key.rb
+- lib/appstats/context_value.rb
 - lib/appstats/date_range.rb
 - lib/appstats/entry.rb
 - lib/appstats/entry_date.rb
@@ -192,7 +197,9 @@ files:
 - spec/action_spec.rb
 - spec/acts_as_appstatsble_spec.rb
 - spec/appstats_spec.rb
+- spec/context_key_spec.rb
 - spec/context_spec.rb
+- spec/context_value_spec.rb
 - spec/date_range_spec.rb
 - spec/entry_date_spec.rb
 - spec/entry_spec.rb
@@ -242,7 +249,9 @@ test_files:
 - spec/action_spec.rb
 - spec/acts_as_appstatsble_spec.rb
 - spec/appstats_spec.rb
+- spec/context_key_spec.rb
 - spec/context_spec.rb
+- spec/context_value_spec.rb
 - spec/date_range_spec.rb
 - spec/entry_date_spec.rb
 - spec/entry_spec.rb