appstats 0.0.16 → 0.1.0

data/Gemfile.lock

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

data/db/migrations/20110207200324_add_separated_entry_times.rb

@@ -0,0 +1,19 @@
+class AddSeparatedEntryTimes < ActiveRecord::Migration
+  def self.up
+    add_column :appstats_entries, :year, :int
+    add_column :appstats_entries, :month, :int
+    add_column :appstats_entries, :day, :int
+    add_column :appstats_entries, :hour, :int
+    add_column :appstats_entries, :minute, :int
+    add_column :appstats_entries, :second, :int
+  end
+
+  def self.down
+    remove_column :appstats_entries, :year
+    remove_column :appstats_entries, :month
+    remove_column :appstats_entries, :day
+    remove_column :appstats_entries, :hour
+    remove_column :appstats_entries, :minute
+    remove_column :appstats_entries, :second
+  end
+end

data/db/migrations/20110207200431_add_indexes.rb

@@ -0,0 +1,27 @@
+class AddIndexes < ActiveRecord::Migration
+  def self.up
+    add_index :appstats_log_collectors, :host
+    add_index :appstats_entries, :action
+    add_index :appstats_entries, :year, :name => "index_entries_by_year"
+    add_index :appstats_entries, [:year,:month], :name => "index_entries_by_month"
+    add_index :appstats_entries, [:year,:month,:day], :name => "index_entries_by_day"
+    add_index :appstats_entries, [:year,:month,:day,:hour], :name => "index_entries_by_hour"
+    add_index :appstats_entries, [:year,:month,:day,:hour,:minute], :name => "index_entries_by_minute"
+    add_index :appstats_contexts, [:context_key,:context_value]
+    add_index :appstats_contexts, [:context_key,:context_int]
+    add_index :appstats_contexts, [:context_key,:context_float]
+  end
+
+  def self.down
+    remove_index :appstats_log_collectors, :host
+    remove_index :appstats_entries, :action
+    remove_index :appstats_entries, :name => "index_entries_by_year"
+    remove_index :appstats_entries, :name => "index_entries_by_month"
+    remove_index :appstats_entries, :name => "index_entries_by_day"
+    remove_index :appstats_entries, :name => "index_entries_by_hour"
+    remove_index :appstats_entries, :name => "index_entries_by_minute"
+    remove_index :appstats_contexts, [:context_key,:context_value]
+    remove_index :appstats_contexts, [:context_key,:context_int]
+    remove_index :appstats_contexts, [:context_key,:context_float]
+  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 => 20110204183259) do
+ActiveRecord::Schema.define(:version => 20110207200431) do
 
   create_table "appstats_contexts", :force => true do |t|
     t.string   "context_key"
@@ -22,6 +22,10 @@ ActiveRecord::Schema.define(:version => 20110204183259) do
     t.datetime "updated_at"
   end
 
+  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"
+
   create_table "appstats_entries", :force => true do |t|
     t.string   "action"
     t.datetime "occurred_at"
@@ -29,8 +33,21 @@ ActiveRecord::Schema.define(:version => 20110204183259) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "appstats_log_collector_id"
+    t.integer  "year"
+    t.integer  "month"
+    t.integer  "day"
+    t.integer  "hour"
+    t.integer  "minute"
+    t.integer  "second"
   end
 
+  add_index "appstats_entries", ["action"], :name => "index_appstats_entries_on_action"
+  add_index "appstats_entries", ["year", "month", "day", "hour", "minute"], :name => "index_entries_by_minute"
+  add_index "appstats_entries", ["year", "month", "day", "hour"], :name => "index_entries_by_hour"
+  add_index "appstats_entries", ["year", "month", "day"], :name => "index_entries_by_day"
+  add_index "appstats_entries", ["year", "month"], :name => "index_entries_by_month"
+  add_index "appstats_entries", ["year"], :name => "index_entries_by_year"
+
   create_table "appstats_log_collectors", :force => true do |t|
     t.string   "host"
     t.string   "filename"
@@ -39,4 +56,6 @@ ActiveRecord::Schema.define(:version => 20110204183259) do
     t.datetime "updated_at"
   end
 
+  add_index "appstats_log_collectors", ["host"], :name => "index_appstats_log_collectors_on_host"
+
 end

data/lib/appstats/entry.rb

@@ -7,6 +7,27 @@ module Appstats
     belongs_to :log_collector, :foreign_key => "appstats_log_collector_id"
     
     attr_accessible :action, :occurred_at, :raw_entry
+
+    before_destroy :remove_dependencies
+  
+    def occurred_at=(value)
+      self[:occurred_at] = value
+      if value.nil?
+        self[:year] = nil
+        self[:month] = nil
+        self[:day] = nil
+        self[:hour] = nil
+        self[:minute] = nil
+        self[:second] = nil
+      else
+        self[:year] = value.year
+        self[:month] = value.month
+        self[:day] = value.day
+        self[:hour] = value.hour
+        self[:minute] = value.min
+        self[:second] = value.sec
+      end
+    end
   
     def to_s
       return "No Entry" if action.nil? || action == ''
@@ -38,5 +59,14 @@ module Appstats
       entry
     end
   
+    
+    private
+    
+      def remove_dependencies
+        contexts.each do |context|
+          context.destroy
+        end
+      end
+  
   end
 end

data/lib/appstats/version.rb

@@ -1,3 +1,3 @@
 module Appstats
-  VERSION = "0.0.16"
+  VERSION = "0.1.0"
 end

data/spec/entry_spec.rb

@@ -4,9 +4,16 @@ module Appstats
   describe Entry do
 
     before(:each) do
+      @before_count = Entry.count
+      Appstats::Logger.reset
       @time = Time.parse('2010-01-02 10:20:30')
-      @entry = Appstats::Entry.new
       Time.stub!(:now).and_return(@time)
+
+      @entry = Appstats::Entry.new
+    end
+    
+    after(:each) do
+      File.delete(Appstats::Logger.filename) if File.exists?(Appstats::Logger.filename)
     end
 
     describe "#initialize" do
@@ -32,6 +39,60 @@ module Appstats
     
     end
     
+    describe "#destroy" do
+      
+      it "should remove itself" do
+        e = Entry.create
+        id = e.id
+        e.destroy
+        Entry.exists?(id).should == false
+      end
+      
+      it "should remove all contexts" do
+        e = Entry.create
+        c = Context.new and c.entry = e and c.save.should == true
+        
+        id1 = e.id
+        id2 = c.id
+        
+        e.destroy
+        
+        Entry.exists?(id1).should == false
+        Context.exists?(id2).should == false
+      end
+    end
+    
+    describe "#occurred_at" do
+      
+      it "should update the individual parts" do
+        entry = Appstats::Entry.new(:action => 'a', :occurred_at => Time.parse("2010-01-15 10:11:12"), :raw_entry => 'b')
+        entry.year.should == 2010
+        entry.month.should == 01
+        entry.day.should == 15
+        entry.hour.should == 10
+        entry.minute.should == 11
+        entry.second.should == 12
+        
+        entry.occurred_at = Time.parse("2011-02-16 17:18:19")
+        entry.year.should == 2011
+        entry.month.should == 02
+        entry.day.should == 16
+        entry.hour.should == 17
+        entry.minute.should == 18
+        entry.second.should == 19
+        
+        entry.occurred_at = nil
+        entry.year.should == nil
+        entry.month.should == nil
+        entry.day.should == nil
+        entry.hour.should == nil
+        entry.minute.should == nil
+        entry.second.should == nil
+        
+      end
+      
+    end
+    
     describe "#contexts" do
       
       it "should have none by default" do
@@ -41,16 +102,18 @@ module Appstats
       it "should be able add contexts" do
         context = Appstats::Context.new(:context_key => 'a', :context_value => 'one')
         context.save.should == true
+        @entry.save.should == true
         @entry.contexts<< context
         @entry.save.should == true
         @entry.reload
         @entry.contexts.size.should == 1
         @entry.contexts[0].should == context
       end
-      
+    
       it "should alphabetize them" do
         zzz = Appstats::Context.create(:context_key => 'zzz', :context_value => 'one')
         aaa = Appstats::Context.create(:context_key => 'aaa', :context_value => 'one')
+        @entry.save.should == true
         @entry.contexts<< zzz
         @entry.contexts<< aaa
         @entry.save.should == true
@@ -62,10 +125,6 @@ module Appstats
 
     describe "#to_s" do
     
-      before(:each) do
-        @entry = Appstats::Entry.new
-      end
-    
       it "should return no entry if no action" do
         @entry.to_s.should == 'No Entry'
         @entry.action = ''
@@ -87,16 +146,6 @@ module Appstats
     
     describe "#load_from_logger_file" do
       
-      before(:each) do
-        @before_count = Entry.count
-        Appstats::Logger.reset
-        Time.stub!(:now).and_return(Time.parse('2010-09-21 23:15:20'))
-      end
-
-      after(:each) do
-        File.delete(Appstats::Logger.filename) if File.exists?(Appstats::Logger.filename)
-      end
-
       it "should handle nil" do
         Entry.load_from_logger_file(nil).should == false
         Entry.count.should == @before_count
@@ -112,24 +161,20 @@ module Appstats
       it "should handle appstat files" do
         Appstats::Logger.entry("test_action")
         Appstats::Logger.entry("another_test_action")
+        @before_count = Entry.count
         Entry.load_from_logger_file(Appstats::Logger.filename).should == true
         Entry.count.should == @before_count + 2
         Entry.last.action.should == "another_test_action"
       end
-      
+
     end
     
-    
     describe "#load_from_logger_entry" do
       
-      before(:each) do
-        @before_count = Entry.count
-      end
-      
       it "should handle nil" do
         Entry.load_from_logger_entry(nil).should == false
         Entry.count.should == @before_count
-
+    
         Entry.load_from_logger_entry("").should == false
         Entry.count.should == @before_count
       end
@@ -143,18 +188,18 @@ module Appstats
       end
       
       it "should understand an entry without contexts" do
-        entry = Entry.load_from_logger_entry("0.0.16 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.load_from_logger_entry("0.1.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.0.16 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.1.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.load_from_logger_entry("0.0.16 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        entry = Entry.load_from_logger_entry("0.1.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.0.16 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.1.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"
@@ -164,26 +209,26 @@ module Appstats
       end
       
     end
-   
-    describe "#log_collector" do
-      
-      before(:each) do
-        @log_collector = Appstats::LogCollector.new(:host => "a")
-        @log_collector.save.should == true
-      end
-      
-      it "should have a log_collector" do
-        @entry.log_collector.should == nil
-        @entry.log_collector = @log_collector
-        @entry.save.should == true
-        @entry.reload
-        @entry.log_collector.should == @log_collector
-        
-        @entry = Entry.last
-        @entry.log_collector.should == @log_collector
-      end
-      
-    end    
+       
+    # describe "#log_collector" do
+    #   
+    #   before(:each) do
+    #     @log_collector = Appstats::LogCollector.new(:host => "a")
+    #     @log_collector.save.should == true
+    #   end
+    #   
+    #   it "should have a log_collector" do
+    #     @entry.log_collector.should == nil
+    #     @entry.log_collector = @log_collector
+    #     @entry.save.should == true
+    #     @entry.reload
+    #     @entry.log_collector.should == @log_collector
+    #     
+    #     @entry = Entry.last
+    #     @entry.log_collector.should == @log_collector
+    #   end
+    #   
+    # end    
 
   end
 end

data/spec/logger_spec.rb

@@ -127,29 +127,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.0.16 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.1.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.0.16 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.1.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.0.16 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.1.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.0.16 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.1.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.0.16 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
+         actual = Appstats::Logger.entry_to_hash("0.1.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
          actual.should == expected
        end
        
@@ -158,66 +158,66 @@ module Appstats
     describe "#entry_to_s" do
       
       it "should handle a statistics entry" do
-        expected = "0.0.16 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.1.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.0.16 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.1.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.0.16 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.1.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.0.16 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.1.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.0.16 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.1.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.0.16 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.1.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.0.16 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.1.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.0.16 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.1.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.0.16 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.1.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.0.16 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.1.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.0.16 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.1.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: 63
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 16
-  version: 0.0.16
+  version: 0.1.0
 platform: ruby
 authors: 
 - Andrew Forward
@@ -145,6 +145,8 @@ files:
 - 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/schema.rb
 - lib/appstats.rb
 - lib/appstats/code_injections.rb
@@ -154,7 +156,6 @@ files:
 - lib/appstats/logger.rb
 - lib/appstats/tasks.rb
 - lib/appstats/version.rb
-- lib/daemons/appstats_log_collector
 - lib/daemons/appstats_log_collector.rb
 - lib/daemons/appstats_log_collector_ctl
 - lib/templates/appstats_config.rb