appstats 0.7.0 → 0.8.0

data/spec/query_spec.rb

@@ -19,11 +19,11 @@ module Appstats
       end
       
     end
-
+    
     describe "#input" do
     
       it "should set the inputs to nil if input invalid" do
-        query = Appstats::Query.new(:query => "# myblahs today on server xyz.localnet")
+        query = Appstats::Query.new(:query => "# myblahs today on xyz.localnet")
         query.query = nil
         query.action.should == nil
         query.host.should == nil
@@ -32,12 +32,26 @@ module Appstats
       end
     
       it "should set the action and host" do
-        query = Appstats::Query.new(:query => "# myblahs today on server xyz.localnet")
+        query = Appstats::Query.new(:query => "# myblahs today on xyz.localnet")
         query.action.should == "myblahs"
         query.host.should == "xyz.localnet"
         query.date_range.should == DateRange.parse("today")
       end
     
+      it "should understand the short hand 'on' instead of 'on server'" do
+        query = Appstats::Query.new(:query => "# myblahs on xyz.localnet")
+        query.action.should == "myblahs"
+        query.host.should == "xyz.localnet"
+        query.date_range.should == DateRange.new
+      end
+    
+      it "should understand the old 'on server' instead of new 'on'" do
+        query = Appstats::Query.new(:query => "# myblahs on server xyz.localnet")
+        query.action.should == "myblahs"
+        query.host.should == "xyz.localnet"
+        query.date_range.should == DateRange.new
+      end
+    
     end
     
     describe "#run" do
@@ -52,7 +66,7 @@ module Appstats
         result.new_record?.should == false
         result.should == Appstats::Result.new(:result_type => :on_demand, :query => "# blahs", :query_as_sql => query.query_to_sql, :count => 0, :action => "blahs")
       end
-
+    
       it "should track the count if available" do
         Appstats::Entry.create(:action => "myblahs")
         query = Appstats::Query.new(:query => "# myblahs")
@@ -60,7 +74,7 @@ module Appstats
         Appstats::Entry.create(:action => "myblahs")
         query.run.count.should == 2
       end
-
+    
     end
     
     
@@ -72,7 +86,7 @@ module Appstats
       end
       
       it "should return understand nil" do
-        expected_sql = "select count(*) from appstats_entries"
+        expected_sql = "select 0 from appstats_entries LIMIT 1"
         Appstats::Query.new(:query => nil).query_to_sql.should == expected_sql
         Appstats::Query.new(:query => "").query_to_sql.should == expected_sql
         Appstats::Query.new.query_to_sql.should == expected_sql
@@ -99,28 +113,36 @@ module Appstats
           Appstats::Query.new(:query => "# logins since 2010-01-15").query_to_sql.should == expected_sql
         end
       end
-
+    
       describe "server_name" do
         
-        it "should on server_name" do
-          expected_sql = "select count(*) from appstats_entries where action = 'login' and exists (select * from appstats_log_collectors where appstats_entries.appstats_log_collector_id = appstats_log_collectors.id and host = 'my.localnet')"
-          Appstats::Query.new(:query => "# logins on server my.localnet").query_to_sql.should == expected_sql
+        it "should on_name" do
+          expected_sql = "select count(*) from appstats_entries where action = 'login' and EXISTS (select * from appstats_log_collectors where appstats_entries.appstats_log_collector_id = appstats_log_collectors.id and host = 'my.localnet' )"
+          Appstats::Query.new(:query => "# logins on my.localnet").query_to_sql.should == expected_sql
         end
-
+    
       end
       
       describe "date range and server_name" do
-        it "should understand  dates and 'on server'" do
-          expected_sql = "select count(*) from appstats_entries where action = 'login' and (occurred_at >= '2010-01-15 00:00:00' and occurred_at <= '2010-01-31 23:59:59') and exists (select * from appstats_log_collectors where appstats_entries.appstats_log_collector_id = appstats_log_collectors.id and host = 'your.localnet')"
-          Appstats::Query.new(:query => "# logins between 2010-01-15 and 2010-01-31 on server your.localnet").query_to_sql.should == expected_sql
+        it "should understand  dates and 'on'" do
+          expected_sql = "select count(*) from appstats_entries where action = 'login' and (occurred_at >= '2010-01-15 00:00:00' and occurred_at <= '2010-01-31 23:59:59') and EXISTS (select * from appstats_log_collectors where appstats_entries.appstats_log_collector_id = appstats_log_collectors.id and host = 'your.localnet' )"
+          Appstats::Query.new(:query => "# logins between 2010-01-15 and 2010-01-31 on your.localnet").query_to_sql.should == expected_sql
         end
       end
+    
+     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
+       end
+     end
     end
     
     describe "#host_filter_to_sql" do
     
       it "should translate blah into EXISTS query" do
-        expected = "EXISTS (select * from appstats_log_collectors where appstats_entries.appstats_log_collector_id = id and host = 'a' )"
+        expected = "EXISTS (select * from appstats_log_collectors where appstats_entries.appstats_log_collector_id = appstats_log_collectors.id and host = 'a' )"
         Appstats::Query.host_filter_to_sql("a").should == expected
         Appstats::Query.host_filter_to_sql(" a  ").should == expected
       end
@@ -137,23 +159,150 @@ module Appstats
       
     end
     
-    describe "#context_filter_to_sql" do
+    describe "#contexts_filter_to_sql" do
+      
+      before(:each) do
+        @template = "EXISTS (select * from appstats_contexts where appstats_entries.id = appstats_contexts.appstats_entry_id and ("
+      end
       
       it "should translate a = b into EXISTS query" do
-        expected = "EXISTS (select * from appstats_contexts where appstats_entries.id = appstats_contexts.appstats_entry_id and context_key='a' and context_value='b' )"
-        Appstats::Query.context_filter_to_sql("a = b").should == expected
+        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.context_filter_to_sql("'a' = b").should == "1=1"
+        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')))"
+      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')))"
+      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')))"
       end
       
       it "should do simple 1 = 1 if invalid" do
-        Appstats::Query.context_filter_to_sql("blah").should == "1=1"
-        Appstats::Query.context_filter_to_sql("").should == "1=1"
-        Appstats::Query.context_filter_to_sql(nil).should == "1=1"
+        Appstats::Query.contexts_filter_to_sql("").should == "1=1"
+        Appstats::Query.contexts_filter_to_sql(nil).should == "1=1"
+      end
+      
+    end
+    
+    describe "#sqlize" do
+      
+      it "should handle nil" do
+        Appstats::Query.sqlize(nil).should == nil
+        Appstats::Query.sqlize('').should == ''  
+      end
+      
+      it "should understand &&" do
+        Appstats::Query.sqlize("&&").should == "and"
+      end
+
+      it "should understand ||" do
+        Appstats::Query.sqlize("||").should == "or"
+      end
+
+      it "should understand !=" do
+        Appstats::Query.sqlize("!=").should == "<>"
+      end
+      
+      it "should set everything else as-is" do
+        Appstats::Query.sqlize("blah").should == "blah"
       end
       
     end
+    
+    describe "#sqlclean" do
+      
+      it "should handle nil" do
+        Appstats::Query.sqlclean(nil).should == nil
+        Appstats::Query.sqlclean('').should == ''  
+      end
+      
+      it "should remove exterior quotes" do
+        Appstats::Query.sqlclean("'a'").should == "a"
+        Appstats::Query.sqlclean("'bbb'").should == "bbb"
+        Appstats::Query.sqlclean('"a"').should == "a"
+        Appstats::Query.sqlclean('"bbb"').should == "bbb"
+      end
+      
+      it "should handle normal text" do
+        Appstats::Query.sqlclean('abc').should == 'abc'
+      end
+
+      it "should handle slashes" do
+        Appstats::Query.sqlclean('a\b').should == 'a\\\\b'
+      end
+
+      it "should handle single quotes" do
+        Appstats::Query.sqlclean("a'b").should == "a''b"
+      end      
+      
+    end
+    
+    describe "#comparator?" do
+
+      it "should not consider nil" do
+        Appstats::Query.comparator?(nil).should == false
+        Appstats::Query.comparator?("").should == false
+      end
+
+      
+      it "should not consider &&" do
+        Appstats::Query.comparator?("&&").should == false
+      end
+
+      it "should not consider ||" do
+        Appstats::Query.comparator?("||").should == false
+      end
+
+      it "should not consider and" do
+        Appstats::Query.comparator?("and").should == false
+      end
+      
+      it "should not consider or" do
+        Appstats::Query.comparator?("or").should == false
+      end
+
+      it "should consider =" do
+        Appstats::Query.comparator?("=").should == true
+      end
+
+      it "should consider !=" do
+        Appstats::Query.comparator?("!=").should == true
+      end
+      
+      it "should consider <>" do
+        Appstats::Query.comparator?("<>").should == true
+      end
+
+      it "should consider >" do
+        Appstats::Query.comparator?(">").should == true
+      end
+
+      it "should consider <" do
+        Appstats::Query.comparator?("<").should == true
+      end
+
+      it "should consider >=" do
+        Appstats::Query.comparator?(">=").should == true
+      end
+
+      it "should consider <=" do
+        Appstats::Query.comparator?("<=").should == true
+      end
+      
+      
+    end
+    
+    
+    
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appstats
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Andrew Forward
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -05:00
+date: 2011-02-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,6 +151,7 @@ files:
 - db/migrations/20110208210921_align_entry_time_names.rb
 - db/migrations/20110210185911_create_appstats_test_object.rb
 - db/migrations/20110210225606_create_appstats_results.rb
+- db/migrations/20110215155830_create_appstats_hosts.rb
 - db/schema.rb
 - lib/appstats.rb
 - lib/appstats/action.rb
@@ -160,8 +161,10 @@ files:
 - lib/appstats/date_range.rb
 - lib/appstats/entry.rb
 - lib/appstats/entry_date.rb
+- lib/appstats/host.rb
 - lib/appstats/log_collector.rb
 - lib/appstats/logger.rb
+- lib/appstats/parser.rb
 - lib/appstats/query.rb
 - lib/appstats/result.rb
 - lib/appstats/tasks.rb
@@ -193,8 +196,10 @@ files:
 - spec/date_range_spec.rb
 - spec/entry_date_spec.rb
 - spec/entry_spec.rb
+- spec/host_spec.rb
 - spec/log_collector_spec.rb
 - spec/logger_spec.rb
+- spec/parser_spec.rb
 - spec/query_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
@@ -241,8 +246,10 @@ test_files:
 - spec/date_range_spec.rb
 - spec/entry_date_spec.rb
 - spec/entry_spec.rb
+- spec/host_spec.rb
 - spec/log_collector_spec.rb
 - spec/logger_spec.rb
+- spec/parser_spec.rb
 - spec/query_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb