appstats 0.13.4 → 0.14.0

data/Gemfile.lock

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

data/db/migrations/20110301170733_add_appstats_results_group_query_to_sql.rb

@@ -0,0 +1,9 @@
+class AddAppstatsResultsGroupQueryToSql < ActiveRecord::Migration
+  def self.up
+    add_column :appstats_results, :group_query_to_sql, :text
+  end
+
+  def self.down
+    remove_column :appstats_results, :group_query_to_sql, :text
+  end
+end

data/db/migrations/20110301170947_create_appstats_sub_results.rb

@@ -0,0 +1,19 @@
+class CreateAppstatsSubResults < ActiveRecord::Migration
+  def self.up
+    create_table :appstats_sub_results do |t|
+      t.integer :appstats_result_id
+      t.string :context_filter
+      t.integer :count
+      t.float :ratio_of_total
+      t.timestamps
+    end
+    
+    add_index :appstats_sub_results, :context_filter
+  end
+
+  def self.down
+    remove_index :appstats_sub_results, :context_filter
+    
+    drop_table :appstats_sub_results
+  end
+end

data/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110225192624) do
+ActiveRecord::Schema.define(:version => 20110301170947) do
 
   create_table "appstats_actions", :force => true do |t|
     t.string   "name"
@@ -118,6 +118,7 @@ ActiveRecord::Schema.define(:version => 20110225192624) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.text     "contexts"
+    t.text     "group_query_to_sql"
   end
 
   add_index "appstats_results", ["action"], :name => "index_appstats_results_on_action"
@@ -125,6 +126,17 @@ ActiveRecord::Schema.define(:version => 20110225192624) do
   add_index "appstats_results", ["name"], :name => "index_appstats_results_on_name"
   add_index "appstats_results", ["page"], :name => "index_appstats_results_on_page"
 
+  create_table "appstats_sub_results", :force => true do |t|
+    t.integer  "appstats_result_id"
+    t.string   "context_filter"
+    t.integer  "count"
+    t.float    "ratio_of_total"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "appstats_sub_results", ["context_filter"], :name => "index_appstats_sub_results_on_context_filter"
+
   create_table "appstats_test_objects", :force => true do |t|
     t.string   "name"
     t.datetime "created_at"

data/lib/appstats.rb

@@ -13,6 +13,7 @@ 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/sub_result"
 require "#{File.dirname(__FILE__)}/appstats/result_job"
 require "#{File.dirname(__FILE__)}/appstats/host"
 require "#{File.dirname(__FILE__)}/appstats/context_key"

data/lib/appstats/query.rb

@@ -2,12 +2,13 @@
 module Appstats
   class Query
 
-    @@parser_template = Appstats::Parser.new(:rules => ":operation :action :date on :host where :contexts")
+    @@parser_template = Appstats::Parser.new(:rules => ":operation :action :date on :host where :contexts group by :groups")
     @@contexts_parser_template = Appstats::Parser.new(:rules => ":context", :repeating => true, :tokenize => "and or || && = <= >= <> != ( ) like")
+    @@groups_parser_template = Appstats::Parser.new(:rules => ":filter", :repeating => true, :tokenize => ",")
 
     @@nill_query = "select 0 from appstats_entries LIMIT 1"
     @@default = "1=1"
-    attr_accessor :name, :query, :action, :host, :date_range, :query_to_sql, :contexts
+    attr_accessor :name, :query, :action, :host, :date_range, :query_to_sql, :contexts, :groups, :group_query_to_sql
 
     def initialize(data = {})
       @name = data[:name]
@@ -24,6 +25,17 @@ module Appstats
       result = Appstats::Result.new(:name => @name, :result_type => @result_type, :query => @query, :query_as_sql => @query_to_sql, :action => @action, :host => @host, :from_date => @date_range.from_date, :to_date => @date_range.to_date, :contexts => @contexts)
       result.count = ActiveRecord::Base.connection.select_one(@query_to_sql)["count(*)"].to_i
       result.save
+      
+      unless @groups.empty?
+        all_sub_results = ActiveRecord::Base.connection.select_all(@group_query_to_sql)
+        all_sub_results.each do |data|
+          ratio_of_total = data["num"].to_f / result.count
+          sub_result = Appstats::SubResult.new(:context_filter => data["context_filter"], :count => data["num"], :ratio_of_total => ratio_of_total)
+          sub_result.result = result
+          sub_result.save
+        end
+      end
+      result.reload
       result
     end
     
@@ -101,6 +113,15 @@ module Appstats
         action.nil? ? action_name : action.name 
       end
       
+      def parse_groups(raw_input)
+        group_parser = @@groups_parser_template.dup
+        return if (raw_input.blank? || !group_parser.parse(raw_input))
+        group_parser.raw_results.each do |entry|
+          next if entry.kind_of?(String)
+          @groups<< entry[:filter]
+        end
+      end
+      
       def parse_query
         reset_query
         return nil_query if @query.nil?
@@ -114,6 +135,7 @@ module Appstats
         @date_range = DateRange.parse(parser.results[:date])
         @host = parser.results[:host]
         @contexts = parser.results[:contexts]
+        parse_groups(parser.results[:groups])
         
         if @operation == "#"
           @query_to_sql = "select count(*) from appstats_entries"
@@ -123,6 +145,12 @@ module Appstats
           @query_to_sql += " and #{Query.contexts_filter_to_sql(@contexts)}" unless @contexts.nil?
         end
 
+        unless @groups.empty?
+          query_to_sql_with_id = @query_to_sql.sub("count(*)","id")
+          group_as_sql = @groups.collect { |g| "'#{Query.sqlclean(g)}'" }.join(',')
+          @group_query_to_sql = "select context_filter, count(*) num from (select group_concat(appstats_contexts.context_value separator ', ') as context_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_filter;"
+        end
+
         @query_to_sql
       end    
       
@@ -138,6 +166,7 @@ module Appstats
       def nil_query
         @query_to_sql = @@nill_query
         @query_to_sql
+        @group_query_to_sql = nil
       end
       
       def reset_query
@@ -145,6 +174,7 @@ module Appstats
         @host = nil
         nil_query
         @date_range = DateRange.new
+        @groups = []
       end
     
   end

data/lib/appstats/result.rb

@@ -3,6 +3,7 @@ module Appstats
     set_table_name "appstats_results"
 
     attr_accessible :name, :result_type, :query, :query_as_sql, :count, :action, :host, :from_date, :to_date, :contexts
+    has_many :sub_results, :table_name => 'appstats_subresults', :foreign_key => 'appstats_result_id', :order => 'count DESC'
 
     def date_to_s
       return "" if from_date.nil? && to_date.nil?

data/lib/appstats/sub_result.rb

@@ -0,0 +1,26 @@
+module Appstats
+  class SubResult < ActiveRecord::Base
+    set_table_name "appstats_sub_results"
+
+    attr_accessible :context_filter, :count, :ratio_of_total
+    belongs_to :result, :foreign_key => "appstats_result_id"
+
+    def total_count
+      return 0 if result.nil?
+      result.count
+    end
+
+    def ==(o)
+       o.class == self.class && o.send(:state) == state
+    end
+    alias_method :eql?, :==
+
+    private
+
+      def state
+        [context_filter, count, ratio_of_total]
+      end
+
+    
+  end
+end

data/lib/appstats/version.rb

@@ -1,3 +1,3 @@
 module Appstats
-  VERSION = "0.13.4"
+  VERSION = "0.14.0"
 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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.create_from_logger_string("0.14.0 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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.14.0 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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        entry = Entry.create_from_logger_string("0.14.0 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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.14.0 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.13.4 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb')
+        entry = Entry.create_from_logger_string('0.14.0 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.13.4 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb"
+        entry.raw_entry.should == "0.14.0 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.13.4 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb')
+        entry = Entry.create_from_logger_string('0.14.0 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.13.4 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb"
+        entry.raw_entry.should == "0.14.0 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

@@ -115,12 +115,12 @@ module Appstats
       
       it "should accept numbers" do
         Appstats::Logger.entry(5, :blah => 6)   
-        Appstats::Logger.raw_read.should == ["0.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
+        Appstats::Logger.raw_read.should == ["0.14.0 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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=search : provider=one : provider=two"]
+        Appstats::Logger.raw_read.should == ["0.14.0 setup[:,=,-n] 2010-09-21 23:15:20 action=search : provider=one : provider=two"]
       end
 
 
@@ -130,7 +130,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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
+        Appstats::Logger.raw_read.should == ["0.14.0 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
       end
       
     end
@@ -147,47 +147,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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.14.0 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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.14.0 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.13.4 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.14.0 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.13.4 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.14.0 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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.14.0 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.13.4 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.14.0 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.13.4 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.14.0 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.13.4 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
+         actual = Appstats::Logger.entry_to_hash("0.14.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
          actual.should == expected
        end
        
@@ -196,66 +196,66 @@ module Appstats
     describe "#entry_to_s" do
       
       it "should handle a statistics entry" do
-        expected = "0.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.14.0 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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.14.0 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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.14.0 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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.14.0 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.13.4 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.14.0 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.13.4 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.14.0 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.13.4 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.14.0 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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.14.0 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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.14.0 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.13.4 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.14.0 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.13.4 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.14.0 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

@@ -32,7 +32,8 @@ module Appstats
         query.action.should == nil
         query.host.should == nil
         query.date_range.should == DateRange.new
-        
+        query.groups.should == []
+        query.group_query_to_sql.should == nil
       end
     
       it "should set the action and host" do
@@ -40,6 +41,8 @@ module Appstats
         query.action.should == "myblahs"
         query.host.should == "xyz.localnet"
         query.date_range.should == DateRange.parse("today")
+        query.groups.should == []
+        query.group_query_to_sql.should == nil
       end
     
       it "should understand the short hand 'on' instead of 'on server'" do
@@ -47,6 +50,8 @@ module Appstats
         query.action.should == "myblahs"
         query.host.should == "xyz.localnet"
         query.date_range.should == DateRange.new
+        query.groups.should == []
+        query.group_query_to_sql.should == nil
       end
     
       it "should understand the old 'on server' instead of new 'on'" do
@@ -54,7 +59,24 @@ module Appstats
         query.action.should == "myblahs"
         query.host.should == "xyz.localnet"
         query.date_range.should == DateRange.new
+        query.groups.should == []
+        query.group_query_to_sql.should == nil
+      end
+
+      describe "group by" do
+
+        it "should handle single entry" do
+          query = Appstats::Query.new(:query => "# myblahs group by aa")
+          query.groups.should == ["aa"]
+        end
+
+        it "should handle multi-entry" do
+          query = Appstats::Query.new(:query => "# myblahs group by aa,bbbb")
+          query.groups.should == ["aa","bbbb"]
+        end
+        
       end
+
     
     end
     
@@ -64,102 +86,130 @@ module Appstats
         Appstats::Entry.delete_all
       end
       
-      it "should return 0 if no results" do
-        query = Appstats::Query.new(:query => "# blahs")
-        result = query.run
-        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
+      describe "core search" do
+        it "should return 0 if no results" do
+          query = Appstats::Query.new(:query => "# blahs")
+          result = query.run
+          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 set name and result_type if provided" do
-        query = Appstats::Query.new(:name => "x", :result_type => "some_reason", :query => "# blahs")
-        result = query.run
-        result.new_record?.should == false
-        result.should == Appstats::Result.new(:name => "x", :result_type => "some_reason", :query => "# blahs", :query_as_sql => query.query_to_sql, :count => 0, :action => "blahs")
-      end
-    
-      it "should track contexts" do
-        query = Appstats::Query.new(:query => "# blahs where (a=b and c=4) or (aaa=5)")
-        result = query.run
-        result.new_record?.should == false
-        result.contexts.should == "(a=b and c=4) or (aaa=5)"
-      end
-    
-    
-      it "should track the count if available" do
-        Appstats::Entry.create(:action => "myblahs")
-        query = Appstats::Query.new(:query => "# myblahs")
-        query.run.count.should == 1
-        Appstats::Entry.create(:action => "myblahs")
-        query.run.count.should == 2
-      end
+        it "should set name and result_type if provided" do
+          query = Appstats::Query.new(:name => "x", :result_type => "some_reason", :query => "# blahs")
+          result = query.run
+          result.new_record?.should == false
+          result.should == Appstats::Result.new(:name => "x", :result_type => "some_reason", :query => "# blahs", :query_as_sql => query.query_to_sql, :count => 0, :action => "blahs")
+        end
 
-      it "should not double count an entry with multiple contexts" do
-        Appstats::Entry.create_from_logger("myblahs",:app_name => ["a","b"])
-        query = Appstats::Query.new(:query => "# myblahs where app_name='a' or app_name = 'b'")
-        query.run.count.should == 1
+        it "should track contexts" do
+          query = Appstats::Query.new(:query => "# blahs where (a=b and c=4) or (aaa=5)")
+          result = query.run
+          result.new_record?.should == false
+          result.contexts.should == "(a=b and c=4) or (aaa=5)"
+        end
 
-        Appstats::Entry.create_from_logger("myblahs",:app_name => ["a","c"])
-        Appstats::Entry.create_from_logger("myblahs",:app_name => ["b","d"])
-        Appstats::Entry.create_from_logger("myblahs",:app_name => ["c","d"])
-        query = Appstats::Query.new(:query => "# myblahs where app_name='a' or app_name = 'b'")
-        query.run.count.should == 3
 
-      end
+        it "should track the count if available" do
+          Appstats::Entry.create(:action => "myblahs")
+          query = Appstats::Query.new(:query => "# myblahs")
+          query.run.count.should == 1
+          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
-    
-      describe "fixed_points searches" do
+        it "should not double count an entry with multiple contexts" do
+          Appstats::Entry.create_from_logger("myblahs",:app_name => ["a","b"])
+          query = Appstats::Query.new(:query => "# myblahs where app_name='a' or app_name = 'b'")
+          query.run.count.should == 1
 
-        it "should handle year" do
-          query = Appstats::Query.new(:query => "# myblahs last year")
-          result = query.run
-          result.date_to_s.should == "2009-01-01 to 2009-12-31"
-        end
+          Appstats::Entry.create_from_logger("myblahs",:app_name => ["a","c"])
+          Appstats::Entry.create_from_logger("myblahs",:app_name => ["b","d"])
+          Appstats::Entry.create_from_logger("myblahs",:app_name => ["c","d"])
+          query = Appstats::Query.new(:query => "# myblahs where app_name='a' or app_name = 'b'")
+          query.run.count.should == 3
 
-        it "should handle quarter" do
-          query = Appstats::Query.new(:query => "# myblahs last quarter")
-          result = query.run
-          result.date_to_s.should == "2010-04-01 to 2010-06-30"
         end
 
-        it "should handle month" do
-          query = Appstats::Query.new(:query => "# myblahs last month")
+
+        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.date_to_s.should == "2010-08-01 to 2010-08-31"
+          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
 
-        it "should handle week" do
-          query = Appstats::Query.new(:query => "# myblahs last week")
+        describe "fixed_points searches" do
+
+          it "should handle year" do
+            query = Appstats::Query.new(:query => "# myblahs last year")
+            result = query.run
+            result.date_to_s.should == "2009-01-01 to 2009-12-31"
+          end
+
+          it "should handle quarter" do
+            query = Appstats::Query.new(:query => "# myblahs last quarter")
+            result = query.run
+            result.date_to_s.should == "2010-04-01 to 2010-06-30"
+          end
+
+          it "should handle month" do
+            query = Appstats::Query.new(:query => "# myblahs last month")
+            result = query.run
+            result.date_to_s.should == "2010-08-01 to 2010-08-31"
+          end
+
+          it "should handle week" do
+            query = Appstats::Query.new(:query => "# myblahs last week")
+            result = query.run
+            result.date_to_s.should == "2010-09-13 to 2010-09-19"
+          end
+
+          it "should handle day" do
+            query = Appstats::Query.new(:query => "# myblahs last day")
+            result = query.run
+            result.date_to_s.should == "2010-09-20"
+          end
+        end      
+      end
+      
+      describe "group sub results" do
+        
+        it "should not create sub results if no groups" do
+          query = Appstats::Query.new(:query => "# myblahs last day")
           result = query.run
-          result.date_to_s.should == "2010-09-13 to 2010-09-19"
+          result.sub_results.should == []
         end
 
-        it "should handle day" do
-          query = Appstats::Query.new(:query => "# myblahs last day")
+        it "should track sub results as required" do
+          Appstats::Entry.create_from_logger("myblahs",:service_provider => "a", :ignore => "1")
+          Appstats::Entry.create_from_logger("myblahs",:service_provider => "a", :ignore => "1")
+          Appstats::Entry.create_from_logger("myblahs",:service_provider => "a", :ignore => "2")
+          Appstats::Entry.create_from_logger("myblahs",:service_provider => "b", :ignore => "1")
+          
+          query = Appstats::Query.new(:query => "# myblahs group by service_provider")
           result = query.run
-          result.date_to_s.should == "2010-09-20"
+          result.count.should == 4
+          result.sub_results.size.should == 2
+          
+          result.sub_results[0].should == SubResult.new(:context_filter => "a", :count => 3, :ratio_of_total => 0.75)
+          result.sub_results[1].should == SubResult.new(:context_filter => "b", :count => 1, :ratio_of_total => 0.25)
+
+
         end
         
+        
       end
-    
 
     end
     
@@ -252,6 +302,45 @@ module Appstats
       
     end
     
+    describe "#group_query_to_sql" do
+            
+      before(:each) do
+        @template = "select id from appstats_entries where action = 'myblahs'"
+      end
+    
+      it "should support no filters" do
+        query = Appstats::Query.new(:query => "# myblahs")
+        query.group_query_to_sql.should == nil
+      end
+            
+      it "should support 1 filter" do
+        query = Appstats::Query.new(:query => "# myblahs group by aa")
+        expected = "select context_filter, count(*) num from (select group_concat(appstats_contexts.context_value separator ', ') as context_filter, appstats_entry_id from appstats_contexts where context_key in ('aa') and appstats_entry_id in ( #{@template} ) group by appstats_entry_id) results group by context_filter;"
+        query.group_query_to_sql.should == expected
+      end
+
+      it "should support surrounding quotes" do
+        query = Appstats::Query.new(:query => "# myblahs group by 'aa'")
+        expected = "select context_filter, count(*) num from (select group_concat(appstats_contexts.context_value separator ', ') as context_filter, appstats_entry_id from appstats_contexts where context_key in ('aa') and appstats_entry_id in ( #{@template} ) group by appstats_entry_id) results group by context_filter;"
+        query.group_query_to_sql.should == expected
+      end
+
+      it "should support inner quotes" do
+        query = Appstats::Query.new(:query => "# myblahs group by a's")
+        expected = "select context_filter, count(*) num from (select group_concat(appstats_contexts.context_value separator ', ') as context_filter, appstats_entry_id from appstats_contexts where context_key in ('a''s') and appstats_entry_id in ( #{@template} ) group by appstats_entry_id) results group by context_filter;"
+        query.group_query_to_sql.should == expected
+      end
+
+
+      it "should support many filters" do
+        query = Appstats::Query.new(:query => "# myblahs group by aa, bbb")
+        expected = "select context_filter, count(*) num from (select group_concat(appstats_contexts.context_value separator ', ') as context_filter, appstats_entry_id from appstats_contexts where context_key in ('aa','bbb') and appstats_entry_id in ( #{@template} ) group by appstats_entry_id) results group by context_filter;"
+        query.group_query_to_sql.should == expected
+      end
+      
+      
+    end
+    
     describe "#contexts_filter_to_sql" do
       
       before(:each) do

data/spec/result_spec.rb

@@ -126,6 +126,30 @@ module Appstats
       end
       
     end
+
+    describe "#sub_results" do
+      
+      it "should be empty be default" do
+        @result.sub_results.should == []
+      end
+      
+      it "should order by count" do
+        @result = Result.create
+        sub1 = SubResult.create(:count => 10)
+        sub2 = SubResult.create(:count => 20)
+        sub3 = SubResult.create(:count => 30)
+
+        @result.sub_results<< sub1
+        @result.sub_results<< sub3
+        @result.sub_results<< sub2
+
+        @result.save.should == true
+        @result.reload
+
+        @result.sub_results.should == [sub3,sub2,sub1]
+      end
+      
+    end
     
   end
 end

data/spec/sub_result_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+module Appstats
+  describe SubResult do
+
+    before(:each) do
+      @sub_result = Appstats::SubResult.new
+      Time.stub!(:now).and_return(Time.parse('2010-09-21 23:15:20'))
+    end
+
+    describe "#initialize" do
+    
+      it "should set attributes to nil" do
+        @sub_result.context_filter.should == nil
+        @sub_result.count.should == nil
+        @sub_result.ratio_of_total.should == nil
+      end
+    
+      it "should set on constructor" do
+        sub_result = Appstats::SubResult.new(:context_filter => 'a', :count => 1, :ratio_of_total => 0.2)
+        sub_result.context_filter.should == 'a'
+        sub_result.count.should == 1
+        sub_result.ratio_of_total.should == 0.2
+      end
+    
+    end
+    
+    describe "#result" do
+      
+      it "should be nil be default" do
+        @sub_result.result.should == nil
+      end
+      
+      it "should be settable" do
+        @result = Result.create
+        @sub_result.result = @result
+        @sub_result.save.should == true
+        
+        @sub_result.reload
+        @result.reload
+        
+        @sub_result.result.should == @result
+        @result.sub_results.should == [@sub_result]
+      end
+      
+    end
+    
+    describe "#==" do
+      
+      it "should be equal on all attributes" do
+        sub_result = Appstats::SubResult.new(:context_filter => 'a', :count => 1, :ratio_of_total => 0.2)
+        same_sub_result = Appstats::SubResult.new(:context_filter => 'a', :count => 1, :ratio_of_total => 0.2)
+        (sub_result == same_sub_result).should == true
+      end
+
+      it "should be not equal if diferent attributes" do
+        sub_result = Appstats::SubResult.new(:context_filter => 'a', :count => 1, :ratio_of_total => 0.2)
+        
+        [:context_filter,:count,:ratio_of_total].each do |attr|
+          different_sub_result = Appstats::SubResult.new(:context_filter => 'a', :count => 1, :ratio_of_total => 0.2)  
+          different_sub_result.context_filter = "XXX" if attr == :context_filter
+          different_sub_result.count = 11 if attr == :count
+          different_sub_result.ratio_of_total = 0.22 if attr == :ratio_of_total
+          
+          different_sub_result.should_not == sub_result
+        end
+      end
+
+    end
+    
+    describe "#total_count" do
+      
+      it "should be zero if no result" do
+        @sub_result.total_count.should == 0
+      end
+      
+      it "should be based on result.count" do
+        @sub_result.result = Result.create(:count => 10)
+        @sub_result.total_count.should == 10
+      end
+      
+    end
+    
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appstats
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 39
   prerelease: false
   segments: 
   - 0
-  - 13
-  - 4
-  version: 0.13.4
+  - 14
+  - 0
+  version: 0.14.0
 platform: ruby
 authors: 
 - Andrew Forward
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -05:00
+date: 2011-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -159,6 +159,8 @@ files:
 - db/migrations/20110222215437_create_appstats_jobs.rb
 - db/migrations/20110223212232_add_appstats_entries_week_and_quarter.rb
 - db/migrations/20110225192624_add_appstats_log_collector_local_filename.rb
+- db/migrations/20110301170733_add_appstats_results_group_query_to_sql.rb
+- db/migrations/20110301170947_create_appstats_sub_results.rb
 - db/schema.rb
 - lib/appstats.rb
 - lib/appstats/action.rb
@@ -177,6 +179,7 @@ files:
 - lib/appstats/query.rb
 - lib/appstats/result.rb
 - lib/appstats/result_job.rb
+- lib/appstats/sub_result.rb
 - lib/appstats/tasks.rb
 - lib/appstats/test_object.rb
 - lib/appstats/version.rb
@@ -217,6 +220,7 @@ files:
 - spec/result_job_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
+- spec/sub_result_spec.rb
 - spec/test_object_spec.rb
 has_rdoc: true
 homepage: http://github.com/aforward/appstats
@@ -270,4 +274,5 @@ test_files:
 - spec/result_job_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
+- spec/sub_result_spec.rb
 - spec/test_object_spec.rb