appstats 0.1.0 → 0.3.1

data/spec/entry_spec.rb

@@ -70,24 +70,24 @@ module Appstats
         entry.month.should == 01
         entry.day.should == 15
         entry.hour.should == 10
-        entry.minute.should == 11
-        entry.second.should == 12
+        entry.min.should == 11
+        entry.sec.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.min.should == 18
+        entry.sec.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
+        entry.min.should == nil
+        entry.sec.should == nil
         
       end
       
@@ -188,18 +188,18 @@ module Appstats
       end
       
       it "should understand an entry without contexts" do
-        entry = Entry.load_from_logger_entry("0.1.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.load_from_logger_entry("0.3.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.1.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.3.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.1.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        entry = Entry.load_from_logger_entry("0.3.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.1.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.3.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"
@@ -210,25 +210,25 @@ module Appstats
       
     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.1.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.3.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.1.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.3.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.1.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.3.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.1.0 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.3.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.1.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
+         actual = Appstats::Logger.entry_to_hash("0.3.1 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.1.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.3.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.1.0 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.3.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.1.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.3.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.1.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.3.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.1.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.3.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.1.0 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.3.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.1.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.3.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.1.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.3.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.1.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.3.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.1.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.3.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.1.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.3.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

@@ -0,0 +1,137 @@
+require 'spec_helper'
+
+module Appstats
+  describe Query do
+
+    describe "#initialize" do
+      
+      before(:each) do
+        @query = Appstats::Query.new
+      end
+      
+      it "should set input to nil" do
+        @query.input.should == nil
+      end
+      
+      it "should allow input on constructor" do
+        query = Appstats::Query.new(:input => "# logins")
+        query.input.should == "# logins"
+      end
+      
+    end
+    
+    describe "#run" do
+      
+      before(:each) do
+        Appstats::Entry.delete_all
+      end
+      
+      it "should return 0 if no results" do
+        query = Appstats::Query.new(:input => "# blahs")
+        query.run.should == 0
+      end
+
+      it "should track the count if available" do
+        Appstats::Entry.create(:action => "myblahs")
+        query = Appstats::Query.new(:input => "# myblahs")
+        query.run.should == 1
+        Appstats::Entry.create(:action => "myblahs")
+        query.run.should == 2
+      end
+      
+    end
+    
+    
+    describe "#to_sql" do
+      
+      before(:all) do
+        Appstats::Action.delete_all
+        Appstats::Action.create(:name => "login", :plural_name => "logins")
+      end
+      
+      it "should return understand nil" do
+        expected_sql = "select count(*) from appstats_entries"
+        Appstats::Query.new(:input => nil).to_sql.should == expected_sql
+        Appstats::Query.new(:input => "").to_sql.should == expected_sql
+        Appstats::Query.new.to_sql.should == expected_sql
+      end
+      
+      describe "actions" do
+        
+        it "should understand both singular and plural names" do
+          expected_sql = "select count(*) from appstats_entries where action = 'login'"
+          Appstats::Query.new(:input => "# logins").to_sql.should == expected_sql
+          Appstats::Query.new(:input => "# login").to_sql.should == expected_sql
+        end
+        
+        it "should use 'itself' if action not found" do
+          expected_sql = "select count(*) from appstats_entries where action = 'garblygook'"
+          Appstats::Query.new(:input => "# garblygook").to_sql.should == expected_sql
+        end
+        
+      end
+      
+      describe "date ranges" do
+        it "should understand since dates" do
+          expected_sql = "select count(*) from appstats_entries where action = 'login' and occurred_at >= '2010-01-15 00:00:00'"
+          Appstats::Query.new(:input => "# logins since 2010-01-15").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(:input => "# logins on server my.localnet").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(:input => "# logins between 2010-01-15 and 2010-01-31 on server your.localnet").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' )"
+        Appstats::Query.host_filter_to_sql("a").should == expected
+        Appstats::Query.host_filter_to_sql(" a  ").should == expected
+      end
+    
+      it "should ignore single quotes and spaces" do
+        Appstats::Query.host_filter_to_sql("bl'ah").should == "1=1"
+        Appstats::Query.host_filter_to_sql("bl ah").should == "1=1"
+      end
+      
+      it "should do simple 1=1 if invalid" do
+        Appstats::Query.host_filter_to_sql("").should == "1=1"
+        Appstats::Query.host_filter_to_sql(nil).should == "1=1"
+      end
+      
+    end
+    
+    describe "#context_filter_to_sql" do
+      
+      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
+      end
+    
+      it "should ignore single quotes" do
+        Appstats::Query.context_filter_to_sql("'a' = b").should == "1=1"
+      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"
+      end
+      
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appstats
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 17
   prerelease: 
   segments: 
   - 0
+  - 3
   - 1
-  - 0
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Andrew Forward
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 -05:00
+date: 2011-02-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -147,13 +147,19 @@ files:
 - db/migrations/20110204183259_create_log_collectors.rb
 - db/migrations/20110207200324_add_separated_entry_times.rb
 - db/migrations/20110207200431_add_indexes.rb
+- db/migrations/20110207213514_create_appstats_actions.rb
+- db/migrations/20110208210921_align_entry_time_names.rb
 - db/schema.rb
 - lib/appstats.rb
+- lib/appstats/action.rb
 - lib/appstats/code_injections.rb
 - lib/appstats/context.rb
+- lib/appstats/date_range.rb
 - lib/appstats/entry.rb
+- lib/appstats/entry_date.rb
 - lib/appstats/log_collector.rb
 - lib/appstats/logger.rb
+- lib/appstats/query.rb
 - lib/appstats/tasks.rb
 - lib/appstats/version.rb
 - lib/daemons/appstats_log_collector.rb
@@ -175,11 +181,15 @@ files:
 - script/console
 - script/destroy
 - script/generate
+- spec/action_spec.rb
 - spec/appstats_spec.rb
 - spec/context_spec.rb
+- spec/date_range_spec.rb
+- spec/entry_date_spec.rb
 - spec/entry_spec.rb
 - spec/log_collector_spec.rb
 - spec/logger_spec.rb
+- spec/query_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/aforward/appstats
@@ -216,9 +226,13 @@ signing_key:
 specification_version: 3
 summary: Provide usage statistics about how your application is being used
 test_files: 
+- spec/action_spec.rb
 - spec/appstats_spec.rb
 - spec/context_spec.rb
+- spec/date_range_spec.rb
+- spec/entry_date_spec.rb
 - spec/entry_spec.rb
 - spec/log_collector_spec.rb
 - spec/logger_spec.rb
+- spec/query_spec.rb
 - spec/spec_helper.rb