appstats 0.20.2 → 0.20.6

data/Gemfile.lock

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

data/lib/appstats/context_key.rb

@@ -4,6 +4,18 @@ module Appstats
     
     attr_accessible :name, :status
 
+    def self.rename(old_key,new_key)
+      sql = ["update appstats_context_keys set name = ?, updated_at = ? where name = ?",new_key,Time.now,old_key]
+      ActiveRecord::Base.connection.update(ActiveRecord::Base.send(:sanitize_sql_array, sql))
+
+      sql = ["update appstats_contexts set context_key = ?, updated_at = ? where context_key = ?",new_key,Time.now,old_key]
+      ActiveRecord::Base.connection.update(ActiveRecord::Base.send(:sanitize_sql_array, sql))
+
+      sql = ["update appstats_action_context_keys set context_key = ?, updated_at = ? where context_key = ?",new_key,Time.now,old_key]
+      ActiveRecord::Base.connection.update(ActiveRecord::Base.send(:sanitize_sql_array, sql))
+
+    end
+
     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

data/lib/appstats/parser.rb

@@ -194,14 +194,40 @@ module Appstats
         @tokenize_regex = nil
         @tokenize_regex_no_spaces = nil
         return if @raw_tokenize.blank?
+        is_multi_work_token = false
+        current_token = nil
         @raw_tokenize.split(" ").each do |token|
-          current_token = token.upcase
+
+          start_token = token.starts_with?("'")
+          end_token = is_multi_work_token and token.ends_with?("'")
+          mid_token = !start_token && !end_token && is_multi_work_token
+          add_token = false
+          
+          if start_token
+            current_token = token.upcase[1..-1]
+            is_multi_work_token = true
+          elsif mid_token
+            current_token = "#{current_token}#{token.upcase}"
+          elsif end_token
+            current_token = "#{current_token}#{token.upcase.chop}"
+            is_multi_work_token = false
+            add_token = true
+          else
+            current_token = token.upcase
+            add_token = true
+          end
+
           current_token.gsub!("(",'\(')
           current_token.gsub!(")",'\)')
           current_token.gsub!("|",'\|')
-          @tokenize_no_spaces<< current_token
-          current_token = "\\s+#{current_token}(\\s|$)" unless current_token.match(/.*[a-z].*/i).nil?
-          @tokenize<< current_token
+          
+          if add_token
+            @tokenize_no_spaces<< current_token
+            current_token = "\\s+#{current_token}(\\s|$)" unless current_token.match(/.*[a-z].*/i).nil?  
+            @tokenize<< current_token
+          else is_multi_work_token
+             current_token = "#{current_token}\\s+"
+          end
         end
         @tokenize_regex_no_spaces = @tokenize_no_spaces.join("|")
         @tokenize_regex = @tokenize.join("|")

data/lib/appstats/query.rb

@@ -3,7 +3,7 @@ module Appstats
   class Query
 
     @@parser_template = Appstats::Parser.new(:rules => ":operation :action :date on :host where :contexts group by :group_by")
-    @@contexts_parser_template = Appstats::Parser.new(:rules => ":context", :repeating => true, :tokenize => "and or || && = <= >= <> < > != ( ) like")
+    @@contexts_parser_template = Appstats::Parser.new(:rules => ":context", :repeating => true, :tokenize => "( ) and or || && = <= >= <> < > != like 'not like' in")
     @@group_by_parser_template = Appstats::Parser.new(:rules => ":filter", :repeating => true, :tokenize => ",")
 
     @@nill_query = "select 0 from appstats_entries LIMIT 1"
@@ -35,6 +35,19 @@ module Appstats
       
     end
     
+    def find(job_frequency_if_not_available = 'once')
+      result = Appstats::Result.where("query = ? and is_latest = 1",@query).first
+      if result.nil?
+        if job_frequency_if_not_available.nil?
+          result = run
+        else
+          job_frequency_if_not_available = "once" if job_frequency_if_not_available == true
+          Appstats::ResultJob.create(:name => "Missing Query#find requested", :frequency => job_frequency_if_not_available, :query => @query, :query_type => @query_type)
+        end
+      end
+      result
+    end
+    
     def run
       result = Appstats::Result.new(:name => @name, :result_type => @result_type, :query => @query, :query_to_sql => @query_to_sql, :action => @action, :host => @host, :from_date => @date_range.from_date, :to_date => @date_range.to_date, :contexts => @contexts, :query_type => @query_type)
       unless @group_by.empty?
@@ -130,12 +143,12 @@ module Appstats
         if status == :next
           status = :waiting_comparator
           @parsed_contexts<< { :context_key => entry[:context] }
-          sql += " (context_key = '#{Query.sqlclean(entry[:context])}'"
+          sql += " (context_key = #{Query.sqlquote(entry[:context])}"
         else
           status = :next
           @parsed_contexts.last[:context_value] = entry[:context]
           @parsed_contexts.last[:comparator] = comparator
-          sql += " and context_value #{comparator} '#{Query.sqlclean(entry[:context])}')"
+          sql += " and context_value #{comparator} #{Query.sqlquote(entry[:context],comparator)})"
         end
       end
       sql += ")" if status == :waiting_comparator
@@ -150,6 +163,15 @@ module Appstats
       input
     end
     
+    def self.sqlquote(raw_input,comparator = '=')
+      return "NULL" if raw_input.nil?
+      if ["in"].include?(comparator)
+        return "(" + raw_input.split(",").collect { |x| sqlquote(x) }.join (",") + ")"
+      else
+        return "'#{sqlclean(raw_input)}'"  
+      end
+    end
+    
     def self.sqlclean(raw_input)
       return raw_input if raw_input.blank?
       m = raw_input.match(/^['"](.*)['"]$/)
@@ -164,7 +186,7 @@ module Appstats
     end
     
     def self.comparators
-      ["=","!=","<>",">","<",">=","<=","like"]
+      ["=","!=","<>",">","<",">=","<=","like","not like","in"]
     end
     
     private
@@ -243,7 +265,7 @@ module Appstats
 
         unless @group_by.empty?
           query_to_sql_with_id = @query_to_sql.sub("count(*) as num","id")
-          group_as_sql = @group_by.collect { |g| "'#{Query.sqlclean(g)}'" }.join(',')
+          group_as_sql = @group_by.collect { |g| "#{Query.sqlquote(g)}" }.join(',')
           @group_query_to_sql = "select context_key_filter, context_value_filter, count(*) as num from (select group_concat(appstats_contexts.context_key) as context_key_filter, group_concat(appstats_contexts.context_value) as context_value_filter, appstats_entry_id from appstats_contexts where context_key in (#{group_as_sql}) and appstats_entry_id in ( #{query_to_sql_with_id} ) group by appstats_entry_id) results group by context_value_filter"
         end
 

data/lib/appstats/version.rb

@@ -1,3 +1,3 @@
 module Appstats
-  VERSION = "0.20.2"
+  VERSION = "0.20.6"
 end

data/spec/context_key_spec.rb

@@ -46,6 +46,39 @@ module Appstats
       
     end
     
+    describe "#rename" do
+    
+      it "should update the ContextKey" do
+        context_key = Appstats::ContextKey.create(:name => 'a', :status => 'c')
+        Appstats::ContextKey.rename('a','aaa')
+        context_key.reload
+        context_key.name.should == 'aaa'
+      end
+
+      it "should update all Contexts" do
+        context = Appstats::Context.create(:context_key => 'b')
+        context2 = Appstats::Context.create(:context_key => 'notb')
+        Appstats::ContextKey.rename('b','bbb')
+        context.reload and context2.reload
+        
+        context.context_key.should == 'bbb'
+        context2.context_key.should == 'notb'
+      end
+      
+      it "should update ActionContextKeys" do
+        action = Appstats::ActionContextKey.create(:action_name => 'a', :context_key => 'b', :status => 'c')
+        action2 = Appstats::ActionContextKey.create(:action_name => 'a', :context_key => 'notb', :status => 'c')
+
+        Appstats::ContextKey.rename('b','bbb')
+        action.reload and action2.reload
+        
+        action.context_key.should == 'bbb'
+        action2.context_key.should == 'notb'
+      end
+    
+     
+    end
+    
 
   end
 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.create_from_logger_string("0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        entry = Entry.create_from_logger_string("0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.20.6 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.20.2 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb')
+        entry = Entry.create_from_logger_string('0.20.6 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.20.2 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb"
+        entry.raw_entry.should == "0.20.6 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.20.2 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb')
+        entry = Entry.create_from_logger_string('0.20.6 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.20.2 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb"
+        entry.raw_entry.should == "0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
+        Appstats::Logger.raw_read.should == ["0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=search : provider=one : provider=two"]
+        Appstats::Logger.raw_read.should == ["0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
+        Appstats::Logger.raw_read.should == ["0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.20.6 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.20.2 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.20.6 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.20.2 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.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.20.6 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.20.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.20.6 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.20.2 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.20.6 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.20.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
+         actual = Appstats::Logger.entry_to_hash("0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.20.6 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.20.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.20.6 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.20.2 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.20.6 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.20.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.20.6 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.20.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.20.6 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.20.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.20.6 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/parser_spec.rb

@@ -19,7 +19,7 @@ module Appstats
          @parser.constants.should == []
          @parser.constants_no_spaces.should == []
        end
-       
+      
        it "should set rules from constructor" do
          parser = Parser.new(:rules => ":name or :bust", :tokenize => "a bb c", :repeating => true)
          parser.raw_rules.should == ":name or :bust"
@@ -31,6 +31,13 @@ module Appstats
          parser.constants.should == ["\\s+OR(\\s|$)"]
          parser.constants_no_spaces.should == ["OR"]
        end
+
+       it "should tokenize multi words" do
+         parser = Parser.new(:rules => ":name or :bust", :tokenize => "a 'not a'", :repeating => true)
+         parser.tokenize.should == ["\\s+A(\\s|$)","\\s+NOT\\s+A(\\s|$)"]
+         parser.tokenize_no_spaces.should == ["A","NOT\\s+A"]
+       end
+
      
        it "should espace tokens as required" do
          parser = Parser.new(:tokenize => "( ) abc |")
@@ -48,8 +55,7 @@ module Appstats
        it "should end on constant if tokens present" do
          Parser.new(:rules => ":name", :tokenize => ")").rules.should == [ { :rule => :name, :stop => :end } ]
        end
-     
-       
+
        it "should handle one variable" do
          Parser.new(:rules => ":name").rules.should == [ { :rule => :name, :stop => :end } ]
        end
@@ -355,6 +361,19 @@ module Appstats
         parser.parse("( ( a = b ) )").should == true
         parser.raw_results.should == [ "(", "(", { :context_key => "a"}, "=", { :context_value => "b"}, ")", ")" ]
       end
+
+      it "should handle tokens with spaces" do
+        parser = Parser.new(:rules => ":context", :repeating => true, :tokenize => "like 'not like'")
+        parser.parse("a  not like  b").should == true
+        parser.raw_results.should == [ { :context => "a"}, "not like", { :context => "b"} ]
+      end
+
+      it "should handle tokens with many spaces" do
+        parser = Parser.new(:rules => ":context", :repeating => true, :tokenize => "like 'not like'")
+        parser.parse("a  not   like  b").should == true
+        parser.raw_results.should == [ { :context => "a"}, "not   like", { :context => "b"} ]
+      end
+
     
       it "should tokenize letters only if spaces between them" do
         parser = Appstats::Parser.new(:rules => ":one :two", :tokenize => "( aa a1 )")

data/spec/query_spec.rb

@@ -120,13 +120,105 @@ module Appstats
         
       end
     
+    end
+    
+    describe "#find" do
+      
+      before(:each) do
+        Appstats::Entry.delete_all
+        Appstats::Result.delete_all
+      end
+      
+      describe "run right away" do
+
+        it "should run the query if it has not been run yet" do
+          Appstats::Entry.create(:action => "myblahs")
+
+          Time.stub!(:now).and_return(Time.parse("2010-09-20"))
+          query = Appstats::Query.new(:query => "# myblahs")
+          query.find(nil).count.should == 1
+
+          Appstats::Entry.create(:action => "myblahs")
+          query.find(nil).count.should == 1
+
+          Time.stub!(:now).and_return(Time.parse("2010-09-21")) 
+          query = Appstats::Query.new(:query => "# myblahs")
+          query.run.count.should == 2
+
+          query = Appstats::Query.new(:query => "# myblahs")
+          query.find(nil).count.should == 2
+        end
+                
+      end
+      
+      describe "do not run right away" do
+
+        it "should return nil no result available" do
+          Appstats::Entry.create(:action => "myblahs")
+          
+          query = Appstats::Query.new(:query => "# myblahs")
+          query.find.should == nil
+
+          query = Appstats::Query.new(:query => "# myblahs")
+          query.run.count.should == 1
+
+          query = Appstats::Query.new(:query => "# myblahs")
+          query.find.count.should == 1
+        end
+        
+        it "should schedule the query to be run" do
+          
+          query = Query.new(:query => "# x", :query_type => "Appstats::TestQuery")
+          query.find.should == nil
+
+          job = Appstats::ResultJob.last
+          job.name.should == "Missing Query#find requested"
+          job.frequency.should == 'once'
+          job.query.should == "# x"
+          job.query_type.should == "Appstats::TestQuery"
+        end
+
+        it "should allow scheduling to be set" do
+          
+          query = Query.new(:query => "# myblahs")
+          query.find('daily').should == nil
+
+          job = Appstats::ResultJob.last
+          job.name.should == "Missing Query#find requested"
+          job.frequency.should == 'daily'
+          job.query.should == "# myblahs"
+          job.query_type.should == nil
+        end
+        
+      end
+      
+      
+      
     end
     
     describe "#run" do
       
       before(:each) do
         Appstats::Entry.delete_all
+        Appstats::Result.delete_all
       end
+
+      it "should update is_latest accordingly" do
+        Appstats::Entry.create(:action => "myblahs")
+
+        Time.stub!(:now).and_return(Time.parse("2010-09-20"))
+        query = Appstats::Query.new(:query => "# myblahs")
+        result = query.run
+        result.is_latest.should == true
+
+        Time.stub!(:now).and_return(Time.parse("2010-09-21"))
+        query = Appstats::Query.new(:query => "# myblahs")
+        result2 = query.run
+        result.reload
+        result.is_latest.should == false
+        result2.is_latest.should == true
+      end
+      
       
       describe "core search" do
         it "should return 0 if no results" do
@@ -267,6 +359,8 @@ module Appstats
         before(:each) do
           Appstats::Entry.delete_all
           Appstats::Context.delete_all
+          Appstats::Result.delete_all
+          Appstats::SubResult.delete_all
         end
         
         it "should not create sub results if no group_by" do
@@ -600,6 +694,14 @@ module Appstats
       it "should support like" do
         Appstats::Query.new(:query => "# logins where user like '%andrew%'").contexts_filter_to_sql.should == "#{@template} (context_key = 'user' and context_value like '%andrew%')))"
       end
+
+      it "should support not like" do
+        Appstats::Query.new(:query => "# logins where user not like '%andrew%'").contexts_filter_to_sql.should == "#{@template} (context_key = 'user' and context_value not like '%andrew%')))"
+      end
+
+      it "should support in" do
+        Appstats::Query.new(:query => "# logins where user_id in 1,2,3").contexts_filter_to_sql.should == "#{@template} (context_key = 'user_id' and context_value in ('1','2','3'))))"
+      end
     
       it "should support and" do
         Appstats::Query.new(:query => "# logins where user='andrew' and user='aforward'").contexts_filter_to_sql.should == "#{@template} (context_key = 'user' and context_value = 'andrew') and (context_key = 'user' and context_value = 'aforward')))"
@@ -613,6 +715,23 @@ module Appstats
       
     end
     
+    describe "#sqlquote" do
+      
+      it "should handle nil" do
+        Appstats::Query.sqlquote(nil).should == "NULL"
+        Appstats::Query.sqlquote('').should == "''" 
+      end
+      
+      it "should handle simple data" do
+        Appstats::Query.sqlquote("blah").should == "'blah'"
+      end
+    
+      it "should handle IN comparator" do
+        Appstats::Query.sqlquote("1,2,3","in").should == "('1','2','3')"
+      end
+    
+    end
+    
     describe "#sqlize" do
       
       it "should handle nil" do
@@ -669,7 +788,7 @@ module Appstats
     describe "#comparators" do
     
       it "should be a list " do
-        Appstats::Query.comparators.should == ["=","!=","<>",">","<",">=","<=","like"]
+        Appstats::Query.comparators.should == ["=","!=","<>",">","<",">=","<=","like","not like","in"]
       end
     
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appstats
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 67
   prerelease: 
   segments: 
   - 0
   - 20
-  - 2
-  version: 0.20.2
+  - 6
+  version: 0.20.6
 platform: ruby
 authors: 
 - Andrew Forward
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -04:00
+date: 2011-04-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency