appstats 0.8.0 → 0.8.1

data/Gemfile.lock

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

data/lib/appstats.rb

@@ -10,10 +10,10 @@ require "#{File.dirname(__FILE__)}/appstats/context"
 require "#{File.dirname(__FILE__)}/appstats/tasks"
 require "#{File.dirname(__FILE__)}/appstats/logger"
 require "#{File.dirname(__FILE__)}/appstats/log_collector"
+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/parser"
 require "#{File.dirname(__FILE__)}/appstats/test_object"
 
 # required in the appstats.gemspec

data/lib/appstats/entry.rb

@@ -35,16 +35,16 @@ module Appstats
       "#{action} at #{occurred_at.strftime('%Y-%m-%d %H:%M:%S')}"
     end
     
-    def self.load_from_logger_file(filename)
+    def self.create_from_logger_file(filename)
       return false if filename.nil?
       return false unless File.exists?(filename)
       File.open(filename,"r").readlines.each do |line|
-        load_from_logger_entry(line.strip)
+        create_from_logger_string(line.strip)
       end
       true
     end
     
-    def self.load_from_logger_entry(action_and_contexts)
+    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)
@@ -59,6 +59,10 @@ module Appstats
       entry
     end
   
+    def self.create_from_logger(action,contexts = {})
+      return false if action.nil? || action.blank?
+      create_from_logger_string(Logger.entry_to_s(action,contexts))
+    end
     
     private
     

data/lib/appstats/log_collector.rb

@@ -102,7 +102,7 @@ module Appstats
         current_entries = 0
         begin
           File.open(log_collector.local_filename,"r").readlines.each do |line|
-            entry = Entry.load_from_logger_entry(line.strip)
+            entry = Entry.create_from_logger_string(line.strip)
             entry.log_collector = log_collector
             entry.save
             current_entries += 1

data/lib/appstats/query.rb

@@ -2,6 +2,9 @@
 module Appstats
   class Query
 
+    @@language_parser = Appstats::Parser.new(:rules => ":operation :action :date on :host where :contexts")
+    @@contexts_parser = Appstats::Parser.new(:rules => ":context", :repeating => true, :tokenize => "and or || && = <= >= <> != ( ) like")
+
     @@nill_query = "select 0 from appstats_entries LIMIT 1"
     @@default = "1=1"
     attr_accessor :query, :action, :host, :date_range, :query_to_sql, :contexts
@@ -33,7 +36,7 @@ module Appstats
     end
 
     def self.contexts_filter_to_sql(raw_input)
-      context_parser = Appstats::Parser.new(:rules => ":context", :repeating => true, :tokenize => "|| && = <= >= <> != ( )")
+      context_parser = @@contexts_parser.dup
       return @@default if (raw_input.blank? || !context_parser.parse(raw_input))
       sql = "EXISTS (select * from appstats_contexts where appstats_entries.id = appstats_contexts.appstats_entry_id and ("
       
@@ -54,10 +57,10 @@ module Appstats
         end
         if status == :next
           status = :waiting_comparator
-          sql += " (context_key='#{sqlclean(entry[:context])}'"
+          sql += " (context_key = '#{sqlclean(entry[:context])}'"
         else
           status = :next
-          sql += " and context_value#{comparator}'#{sqlclean(entry[:context])}')"
+          sql += " and context_value #{comparator} '#{sqlclean(entry[:context])}')"
         end
       end
       sql += ")" if status == :waiting_comparator
@@ -82,7 +85,7 @@ module Appstats
     
     def self.comparator?(raw_input)
       return false if raw_input.nil?
-      ["=","!=","<>",">","<",">=","<="].include?(raw_input)
+      ["=","!=","<>",">","<",">=","<=","like"].include?(raw_input)
     end
     
     private
@@ -97,7 +100,7 @@ module Appstats
         return nil_query if @query.nil?
         current_query = fix_legacy_structures(@query)
         
-        parser = Appstats::Parser.new(:rules => ":operation :action :date on :host where :contexts")
+        parser = @@language_parser.dup
         return nil_query unless parser.parse(current_query)
         
         @operation = parser.results[:operation]

data/lib/appstats/version.rb

@@ -1,3 +1,3 @@
 module Appstats
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/spec/entry_spec.rb

@@ -144,17 +144,17 @@ module Appstats
       
     end
     
-    describe "#load_from_logger_file" do
+    describe "#create_from_logger_file" do
       
       it "should handle nil" do
-        Entry.load_from_logger_file(nil).should == false
+        Entry.create_from_logger_file(nil).should == false
         Entry.count.should == @before_count
         Entry.count.should == @before_count
       end
       
       it "should handle unknown files" do
         File.exists?("should_not_exist.txt").should == false
-        Entry.load_from_logger_file("should_not_exist.txt").should == false
+        Entry.create_from_logger_file("should_not_exist.txt").should == false
         Entry.count.should == @before_count
       end
       
@@ -162,25 +162,25 @@ module Appstats
         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.create_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
+    describe "#create_from_logger_string" do
       
       it "should handle nil" do
-        Entry.load_from_logger_entry(nil).should == false
+        Entry.create_from_logger_string(nil).should == false
         Entry.count.should == @before_count
     
-        Entry.load_from_logger_entry("").should == false
+        Entry.create_from_logger_string("").should == false
         Entry.count.should == @before_count
       end
       
       it "should create an unknown for unknown entries" do
-        entry = Entry.load_from_logger_entry("blah")
+        entry = Entry.create_from_logger_string("blah")
         Entry.count.should == @before_count + 1
         entry.action.should == "UNKNOWN_ACTION"
         entry.raw_entry.should == "blah"
@@ -188,18 +188,18 @@ module Appstats
       end
       
       it "should understand an entry without contexts" do
-        entry = Entry.load_from_logger_entry("0.8.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.create_from_logger_string("0.8.1 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.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.8.1 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.8.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        entry = Entry.create_from_logger_string("0.8.1 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.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.8.1 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"
@@ -209,6 +209,24 @@ module Appstats
       end
       
     end
+    
+    describe "#create_from_logger" do
+
+      it "should handle nil" do
+        Entry.create_from_logger(nil).should == false
+        Entry.count.should == @before_count
+    
+        Entry.create_from_logger("").should == false
+        Entry.count.should == @before_count
+      end
+      
+      it "should create using the logger entry_to_s" do
+        entry = Entry.create_from_logger("blah")
+        Entry.count.should == @before_count + 1
+        entry.action.should == "blah"
+      end
+   
+    end
        
     describe "#log_collector" do
       

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.0 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
+        Appstats::Logger.raw_read.should == ["0.8.1 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.0 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
+        Appstats::Logger.raw_read.should == ["0.8.1 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.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.8.1 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.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.8.1 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.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.8.1 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.0 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.8.1 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.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
+         actual = Appstats::Logger.entry_to_hash("0.8.1 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.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.8.1 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.0 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.8.1 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.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.8.1 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.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.8.1 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.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.8.1 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.0 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.8.1 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.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.8.1 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.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.8.1 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.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.8.1 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.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.8.1 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.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.8.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
         actual = Appstats::Logger.entry_to_s("address:=\nsearch-n")
         actual.should == expected
       end

data/spec/query_spec.rb

@@ -74,6 +74,24 @@ module Appstats
         Appstats::Entry.create(:action => "myblahs")
         query.run.count.should == 2
       end
+      
+      it "should perform the action search" do
+        Appstats::Entry.create_from_logger("myblahs", :one => "11", :two => "222")
+        Appstats::Entry.create_from_logger("myblahs", :one => "111", :two => "22")
+
+        query = Appstats::Query.new(:query => "# myblahs where one=11")
+        result = query.run
+        result.count.should == 1
+
+        query = Appstats::Query.new(:query => "# myblahs where one=anything")
+        query.run.count.should == 0
+
+        query = Appstats::Query.new(:query => "# myblahs where one=11 && two=22")
+        query.run.count.should == 0
+
+        query = Appstats::Query.new(:query => "# myblahs where one=11 || two=22")
+        query.run.count.should == 2
+      end
     
     end
     
@@ -133,8 +151,8 @@ module Appstats
      describe "where clause" do
        
        it "should understand no quotes" do
-         expected_sql = "select count(*) from appstats_entries where action = 'login' and EXISTS (select * from appstats_contexts where appstats_entries.id = appstats_contexts.appstats_entry_id and ( (context_key='user' and context_value='aforward')))"
-         Appstats::Query.new(:query => "# logins where user=aforward").query_to_sql.should == expected_sql
+         expected_sql = "select count(*) from appstats_entries where action = 'login' and EXISTS (select * from appstats_contexts where appstats_entries.id = appstats_contexts.appstats_entry_id and ( (context_key = 'user' and context_value = 'aforward')))"
+         Appstats::Query.new(:query => "# logins where user = aforward").query_to_sql.should == expected_sql
        end
      end
     end
@@ -166,26 +184,39 @@ module Appstats
       end
       
       it "should translate a = b into EXISTS query" do
-        Appstats::Query.contexts_filter_to_sql("a=b").should == "#{@template} (context_key='a' and context_value='b')))"
-        Appstats::Query.contexts_filter_to_sql(" a =  b ").should == "#{@template} (context_key='a' and context_value='b')))"
+        Appstats::Query.contexts_filter_to_sql("a=b").should == "#{@template} (context_key = 'a' and context_value = 'b')))"
+        Appstats::Query.contexts_filter_to_sql(" a =  b ").should == "#{@template} (context_key = 'a' and context_value = 'b')))"
       end
           
       it "should ignore single quotes" do
-        Appstats::Query.contexts_filter_to_sql("'aaa'='bbbb'").should == "#{@template} (context_key='aaa' and context_value='bbbb')))"
-        Appstats::Query.contexts_filter_to_sql(" 'aaa' = 'bbbb'  ").should == "#{@template} (context_key='aaa' and context_value='bbbb')))"
+        Appstats::Query.contexts_filter_to_sql("'aaa'='bbbb'").should == "#{@template} (context_key = 'aaa' and context_value = 'bbbb')))"
+        Appstats::Query.contexts_filter_to_sql(" 'aaa' = 'bbbb'  ").should == "#{@template} (context_key = 'aaa' and context_value = 'bbbb')))"
       end
       
       it "should allow for searching for all entries of a certain context" do
-        Appstats::Query.contexts_filter_to_sql("aaa").should == "#{@template} (context_key='aaa')))"
+        Appstats::Query.contexts_filter_to_sql("aaa").should == "#{@template} (context_key = 'aaa')))"
       end
       
       it "should allow for searching for several entries of a certain context" do
-        Appstats::Query.contexts_filter_to_sql("aaa || bbb").should == "#{@template} (context_key='aaa') or (context_key='bbb')))"
+        Appstats::Query.contexts_filter_to_sql("aaa || bbb").should == "#{@template} (context_key = 'aaa') or (context_key = 'bbb')))"
       end
 
       it "should allow complex queries" do
-        Appstats::Query.contexts_filter_to_sql("user='andrew' || user='aforward'").should == "#{@template} (context_key='user' and context_value='andrew') or (context_key='user' and context_value='aforward')))"
+        Appstats::Query.contexts_filter_to_sql("user='andrew' || user='aforward'").should == "#{@template} (context_key = 'user' and context_value = 'andrew') or (context_key = 'user' and context_value = 'aforward')))"
       end
+
+      it "should support or" do
+        Appstats::Query.contexts_filter_to_sql("user='andrew' or user='aforward'").should == "#{@template} (context_key = 'user' and context_value = 'andrew') or (context_key = 'user' and context_value = 'aforward')))"
+      end
+
+      it "should support like" do
+        Appstats::Query.contexts_filter_to_sql("user like '%andrew%'").should == "#{@template} (context_key = 'user' and context_value like '%andrew%')))"
+      end
+
+      it "should support and" do
+        Appstats::Query.contexts_filter_to_sql("user='andrew' and user='aforward'").should == "#{@template} (context_key = 'user' and context_value = 'andrew') and (context_key = 'user' and context_value = 'aforward')))"
+      end
+
       
       it "should do simple 1 = 1 if invalid" do
         Appstats::Query.contexts_filter_to_sql("").should == "1=1"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appstats
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Andrew Forward
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 -05:00
+date: 2011-02-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency