appstats 0.12.2 → 0.12.4

data/Gemfile.lock

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

data/lib/appstats/entry.rb

@@ -51,13 +51,20 @@ module Appstats
     def self.create_from_logger_string(action_and_contexts)
       return false if action_and_contexts.nil? || action_and_contexts == ''
       hash = Logger.entry_to_hash(action_and_contexts)
-      entry = Appstats::Entry.new(:action => hash[:action], :raw_entry => action_and_contexts)
+      
+      action_name = hash[:action].kind_of?(Array) ? hash[:action][0] : hash[:action]
+      entry = Appstats::Entry.new(:action => action_name, :raw_entry => action_and_contexts)
       entry.occurred_at = Time.parse(hash[:timestamp]) unless hash[:timestamp].nil?
       hash.each do |key,value|
-        next if key == :action
         next if key == :timestamp
-        context = Appstats::Context.create(:context_key => key, :context_value => value)
-        entry.contexts<< context
+        all_values = value.kind_of?(Array) ? value : [value]
+        if key == :action
+          all_values = all_values[1..-1]
+        end
+        all_values.each do |value|
+          context = Appstats::Context.create(:context_key => key, :context_value => value)
+          entry.contexts<< context
+        end
       end
       entry.save
       entry

data/lib/appstats/log_collector.rb

@@ -6,6 +6,7 @@ module Appstats
     set_table_name "appstats_log_collectors"
   
     attr_accessible :host, :filename, :status
+    has_many :entries, :table_name => 'appstats_entries', :foreign_key => 'appstats_log_collector_id', :order => 'action'
 
     def local_filename
       File.expand_path("#{File.dirname(__FILE__)}/../../log/appstats_remote_log_#{id}.log")
@@ -19,6 +20,16 @@ module Appstats
       "#{m[1]}#{prefix}#{m[2]}"
     end
 
+    def unprocess_entries
+      return false unless ["processed","destroyed"].include?(status)
+      entries.each do |entry|
+        entry.destroy
+      end
+      status = "downloaded"
+      save
+      true
+    end
+
     def self.should_process(last_time)
       return true if last_time.nil?
       Time.now.day > last_time.day

data/lib/appstats/logger.rb

@@ -50,14 +50,25 @@ module Appstats
       return hash if action_and_contexts.nil?
       setup = action_and_contexts.match(/(.*?) setup\[(.*?),(.*?),(.*?)\] (.*? .*?) (.*)/)
       return hash if setup.nil?
+      hash.delete(:action)
       hash.delete(:raw_input)
       full, version, section_delimiter, assign_delimiter, newline_delimiter, timestamp, input = setup.to_a
       
       hash[:timestamp] = timestamp
       input.split(section_delimiter).each do |pair|
         key,value = pair.strip.split(assign_delimiter)
-        hash[key.to_sym] = value
+        key_symbol = key.to_sym
+        if hash[key_symbol].nil?
+          hash[key.to_sym] = value  
+        elsif hash[key_symbol].kind_of?(String)
+          hash[key.to_sym] = [ hash[key_symbol], value ]
+        else
+          all_values = hash[key_symbol]
+          all_values<< value
+          hash[key.to_sym] = all_values
+        end
       end
+      hash[:action] = "UNKNOWN_ACTION" if hash[:action].nil?
       hash
     end
     

data/lib/appstats/version.rb

@@ -1,3 +1,3 @@
 module Appstats
-  VERSION = "0.12.2"
+  VERSION = "0.12.4"
 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.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.create_from_logger_string("0.12.4 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.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.12.4 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.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        entry = Entry.create_from_logger_string("0.12.4 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.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.12.4 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"
@@ -213,6 +213,34 @@ module Appstats
         entry.contexts[1].context_value = "Live"
       end
       
+      it "should handle 'action' as a context" do
+        entry = Entry.create_from_logger_string('0.12.4 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.12.4 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"
+        entry.contexts[0].context_value = "save_ovcen"
+        entry.contexts[1].context_key = "app_name"
+        entry.contexts[1].context_value = "cdb"
+        
+      end
+      
+      it "should handle multiple of the same 'context'" do
+        entry = Entry.create_from_logger_string('0.12.4 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.12.4 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"
+        entry.contexts[0].context_value = "market"
+        entry.contexts[1].context_key = "app_name"
+        entry.contexts[1].context_value = "cdb"
+        
+      end      
+      
     end
     
     describe "#create_from_logger" do

data/spec/log_collector_spec.rb

@@ -380,6 +380,79 @@ module Appstats
       end
     end
     
+    describe "#entries" do
+      
+      it "should return 0 for new log_collectors" do
+        @log_collector.entries.empty?.should == true
+      end
+      
+      it "should return entries" do
+        @log_collector.status = "processed"
+        entry = Entry.new
+        entry.log_collector = @log_collector
+        entry.save
+
+        @log_collector.reload
+        @log_collector.entries.size.should == 1
+
+        entry = Entry.new
+        entry.log_collector = @log_collector
+        entry.save
+
+        @log_collector.reload
+        @log_collector.entries.size.should == 2
+      end
+      
+    end
+    
+    describe "#unprocess_entries" do
+      
+      before(:each) do
+        @log_collector.save.should == true
+      end
+      
+      it "should ignore if not processed or destroyed" do
+        @log_collector.status = "blah"
+        @log_collector.unprocess_entries.should == false
+      end
+      
+      it "should reset status back to downloaded" do
+        @log_collector.status = "processed"
+        @log_collector.unprocess_entries.should == true
+        @log_collector.reload
+        @log_collector.status = "downloaded"
+      end
+
+      it "should delete all entries" do
+        @log_collector.status = "processed"
+        entry = Entry.new
+        entry.log_collector = @log_collector
+        entry.save
+        entry_id = entry.id
+        
+        @log_collector.unprocess_entries.should == true
+        @log_collector.reload
+        Entry.exists?(entry_id).should == false
+      end
+
+      it "should delete all contexts" do
+        @log_collector.status = "processed"
+        entry = Entry.new
+        entry.log_collector = @log_collector
+        entry.save
+        
+        context = Context.new
+        context.entry = entry
+        context.save
+        context_id = context.id
+        
+        @log_collector.unprocess_entries.should == true
+        @log_collector.reload
+        Context.exists?(context_id).should == false
+      end
+      
+    end
+    
     
   end
 end

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.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
+        Appstats::Logger.raw_read.should == ["0.12.4 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.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
+        Appstats::Logger.raw_read.should == ["0.12.4 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
       end
       
     end
@@ -141,29 +141,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.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.12.4 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.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.12.4 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.12.4 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.12.4 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.12.4 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.12.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.12.4 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.12.2 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.12.4 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.12.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
+         actual = Appstats::Logger.entry_to_hash("0.12.4 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
          actual.should == expected
        end
        
@@ -172,66 +190,66 @@ module Appstats
     describe "#entry_to_s" do
       
       it "should handle a statistics entry" do
-        expected = "0.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.12.4 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.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.12.4 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.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.12.4 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.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.12.4 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.12.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.12.4 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.12.2 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.12.4 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.12.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.12.4 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.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.12.4 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.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.12.4 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.12.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.12.4 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.12.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.12.4 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: 43
+  hash: 39
   prerelease: false
   segments: 
   - 0
   - 12
-  - 2
-  version: 0.12.2
+  - 4
+  version: 0.12.4
 platform: ruby
 authors: 
 - Andrew Forward
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -05:00
+date: 2011-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency