appstats 0.11.7 → 0.12.1

data/Gemfile.lock

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

data/db/migrations/20110223212232_add_appstats_entries_week_and_quarter.rb

@@ -0,0 +1,15 @@
+class AddAppstatsEntriesWeekAndQuarter < ActiveRecord::Migration
+  def self.up
+    add_column :appstats_entries, :week, :integer
+    add_column :appstats_entries, :quarter, :integer
+    add_index :appstats_entries, [:year,:week], :name => "index_entries_by_week"
+    add_index :appstats_entries, [:year,:quarter], :name => "index_entries_by_quarter"
+  end
+
+  def self.down
+    remove_column :appstats_entries, :week
+    remove_column :appstats_entries, :quarter
+    remove_index :appstats_entries, :name => "index_entries_by_week"
+    remove_index :appstats_entries, :name => "index_entries_by_quarter"
+  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 => 20110222215437) do
+ActiveRecord::Schema.define(:version => 20110223212232) do
 
   create_table "appstats_actions", :force => true do |t|
     t.string   "name"
@@ -63,6 +63,8 @@ ActiveRecord::Schema.define(:version => 20110222215437) do
     t.integer  "hour"
     t.integer  "min"
     t.integer  "sec"
+    t.integer  "week"
+    t.integer  "quarter"
   end
 
   add_index "appstats_entries", ["action"], :name => "index_appstats_entries_on_action"
@@ -70,6 +72,8 @@ ActiveRecord::Schema.define(:version => 20110222215437) do
   add_index "appstats_entries", ["year", "month", "day", "hour"], :name => "index_entries_by_hour"
   add_index "appstats_entries", ["year", "month", "day"], :name => "index_entries_by_day"
   add_index "appstats_entries", ["year", "month"], :name => "index_entries_by_month"
+  add_index "appstats_entries", ["year", "quarter"], :name => "index_entries_by_quarter"
+  add_index "appstats_entries", ["year", "week"], :name => "index_entries_by_week"
   add_index "appstats_entries", ["year"], :name => "index_entries_by_year"
 
   create_table "appstats_hosts", :force => true do |t|

data/lib/appstats/date_range.rb

@@ -12,13 +12,16 @@ module Appstats
     
     def from_date
       return nil if @from.nil?
-      mode = @format == :inclusive ? :start : :end
+      mode = @format == :exclusive ? :end : :beginning
       @from.to_time(mode)
     end
     
     def to_date
+      if @format == :fixed_point && !@from.nil?
+        return @from.to_time(:end)
+      end
       return nil if @to.nil?
-      mode = @format == :exclusive ? :start : :end
+      mode = @format == :exclusive ? :beginning : :end
       @to.to_time(mode)
     end
     
@@ -118,22 +121,14 @@ module Appstats
       m = input.match(/^this\s*(year|quarter|month|week|day)$/)
       unless m.nil?
         range.from = EntryDate.parse(input)
-        range.format = ["week","quarter"].include?(m[1]) ? :inclusive : :fixed_point
+        range.format = :fixed_point
         return range
       end
 
       m = input.match(/^(last|previous)\s*(year|quarter|month|week|day)$/)
       unless m.nil?
         range.from = EntryDate.parse(input)
-        if m[2] == "week"
-          range.to = range.from.end_of_week
-          range.format = :inclusive
-        elsif m[2] == "quarter"
-          range.to = range.from.end_of_quarter
-          range.format = :inclusive
-        else
-          range.format = :fixed_point  
-        end
+        range.format = :fixed_point
         return range
       end
 

data/lib/appstats/entry.rb

@@ -19,6 +19,8 @@ module Appstats
         self[:hour] = nil
         self[:min] = nil
         self[:sec] = nil
+        self[:week] = nil
+        self[:quarter] = nil
       else
         self[:year] = value.year
         self[:month] = value.month
@@ -26,6 +28,8 @@ module Appstats
         self[:hour] = value.hour
         self[:min] = value.min
         self[:sec] = value.sec
+        self[:week] = EntryDate.calculate_week_of(value)
+        self[:quarter] = EntryDate.calculate_quarter_of(value)
       end
     end
   

data/lib/appstats/entry_date.rb

@@ -2,7 +2,7 @@
 module Appstats
   class EntryDate
 
-    attr_accessor :year, :month, :day, :hour, :min, :sec
+    attr_accessor :year, :month, :day, :hour, :min, :sec, :week, :quarter
     
     def initialize(data = {})
       @year = data[:year]
@@ -11,6 +11,8 @@ module Appstats
       @hour = data[:hour]
       @min = data[:min]
       @sec = data[:sec]
+      @week = data[:week]
+      @quarter = data[:quarter]
     end
     
     def end_of_week
@@ -19,24 +21,32 @@ module Appstats
       week.year = t.year
       week.month = t.month
       week.day = t.day
+      week.week = EntryDate.calculate_week_of(t)
       week  
     end
 
     def end_of_quarter
       t = to_time.end_of_quarter
-      EntryDate.new(:year => t.year, :month => t.month)
+      EntryDate.new(:year => t.year, :month => t.month, :quarter => EntryDate.calculate_quarter_of(t))
     end
 
-    def to_time(mode = :start)
+    def to_time(mode = :beginning)
       return Time.now if @year.nil?
       t = Time.parse("#{@year}-#{@month||'01'}-#{@day||'01'} #{@hour||'00'}:#{@min||'00'}:#{@sec||'00'}")
       
-      if mode == :end
-        t = t.end_of_year if @month.nil?
-        t = t.end_of_month if @day.nil?
-        t = t.end_of_day if @hour.nil?
+      if @month.nil?
+        method = "_of_year"
+      elsif !@quarter.nil?
+        method = "_of_quarter"
+      elsif !@week.nil?
+        method = "_of_week"
+      elsif @day.nil?
+        method = "_of_month"
+      elsif @hour.nil?
+        method = "_of_day"
       end
-      t
+      return t if method.nil?
+      t.send("#{mode}#{method}")
     end
 
     def to_s
@@ -62,6 +72,17 @@ module Appstats
       s
     end
     
+    def self.calculate_quarter_of(time)
+      return nil if time.nil?
+      (time.month - 1) / 3 + 1
+    end
+    
+    def self.calculate_week_of(time)
+      return nil if time.nil?
+      return -1 if time.beginning_of_week.year != time.year
+      time.strftime("%W").to_i
+    end
+    
     def self.parse(raw_input)
       date = EntryDate.new
       return date if raw_input.nil? || raw_input == ''
@@ -86,12 +107,12 @@ module Appstats
         t_parts = [:year]
       elsif input.match(/^this quarter$/)
         t = t.beginning_of_quarter
-        t_parts = [:year,:month]
+        t_parts = [:year,:month, :quarter]
       elsif input.match(/^this month$/)
         t_parts = [:year,:month]
       elsif input.match(/^this week$/)
         t = t.beginning_of_week
-        t_parts = [:year,:month,:day]
+        t_parts = [:year,:month,:day, :week]
       elsif input.match(/^this day$/)
         t_parts = [:year,:month,:day]
       elsif input.match(/^(.*),[^\d]*(\d*)$/) # month, year
@@ -112,7 +133,7 @@ module Appstats
       if m
         t = t.beginning_of_quarter
         last_date_offset(m).times { t = (t - 1.day).beginning_of_quarter }
-        t_parts = [:year,:month]
+        t_parts = [:year,:month,:quarter]
       end
       
       m = input.match(/^(last|previous)\s*(\d*)\s*months?$/)
@@ -124,7 +145,7 @@ module Appstats
       m = input.match(/^(last|previous)\s*(\d*)\s*weeks?$/)
       if m
         t = (t - last_date_offset(m).week).beginning_of_week
-        t_parts = [:year,:month,:day]
+        t_parts = [:year,:month,:day,:week]
       end
 
       m = input.match(/^(last|previous)\s*(\d*)\s*days?$/)
@@ -135,7 +156,11 @@ module Appstats
 
       unless t_parts.nil?
         t_parts.each do |label|
-          date.send("#{label}=",t.send(label))
+          if [:quarter,:week].include?(label)
+            date.send("#{label}=",EntryDate.send("calculate_#{label}_of",t))
+          else
+            date.send("#{label}=",t.send(label))
+          end
         end
         return date
       end
@@ -157,7 +182,7 @@ module Appstats
     private
 
       def state
-        [@year, @month, @day, @hour, @min, @sec]
+        [@year, @month, @day, @hour, @min, @sec, @week, @quarter]
       end
       
       # (last|previous) (\d*)

data/lib/appstats/result.rb

@@ -6,10 +6,26 @@ module Appstats
 
     def date_to_s
       return "" if from_date.nil? && to_date.nil?
-      return "#{from_date_to_s} to present" if !from_date.nil? && to_date.nil? && created_at.nil?
-      return "#{from_date_to_s} to #{created_at.strftime('%Y-%m-%d')}" if !from_date.nil? && to_date.nil? && !created_at.nil?
-      return "up to #{to_date_to_s}" if from_date.nil? && !to_date.nil?
-      "#{from_date_to_s} to #{to_date_to_s}"
+      
+      from_s = nil
+      to_s = nil
+      
+      if !from_date.nil? && to_date.nil? && created_at.nil?
+        from_s = from_date_to_s
+        to_s = "present"
+      elsif !from_date.nil? && to_date.nil? && !created_at.nil?
+        from_s = from_date_to_s
+        to_s = created_at.strftime('%Y-%m-%d')
+      elsif from_date.nil? && !to_date.nil?
+        from_s = "up"
+        to_s = to_date_to_s
+      else
+        from_s = from_date_to_s
+        to_s = to_date_to_s
+      end
+      
+      return from_s if from_s == to_s
+      "#{from_s} to #{to_s}"
     end
 
     def from_date_to_s

data/lib/appstats/version.rb

@@ -1,3 +1,3 @@
 module Appstats
-  VERSION = "0.11.7"
+  VERSION = "0.12.1"
 end

data/spec/date_range_spec.rb

@@ -32,6 +32,7 @@ module Appstats
         date_range.should == same_date_range
         date_range.should_not == another_date_range
       end
+      
     end
     
     describe "#parse" do
@@ -89,7 +90,7 @@ module Appstats
         end
 
         it "should understand this quarter" do
-          DateRange.parse("  this quarter  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1), :to => nil, :format => :inclusive )
+          DateRange.parse("  this quarter  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :quarter => 1), :to => nil, :format => :fixed_point )
         end
 
         it "should understand this month" do
@@ -97,7 +98,7 @@ module Appstats
         end
 
         it "should understand this week" do
-          DateRange.parse("  this week  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 11), :to => nil, :format => :inclusive )
+          DateRange.parse("  this week  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 11, :week => 2), :to => nil, :format => :fixed_point )
         end
 
         it "should understand this day" do
@@ -113,7 +114,7 @@ module Appstats
         end
 
         it "should understand last quarter" do
-          DateRange.parse("  last quarter  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10), :to => EntryDate.new(:year => 2009, :month => 12), :format => :inclusive )
+          DateRange.parse("  last quarter  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10, :quarter => 4), :to => nil, :format => :fixed_point )
         end
 
         it "should understand last month" do
@@ -121,7 +122,7 @@ module Appstats
         end
 
         it "should understand last week" do
-          DateRange.parse("  last week  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 4), :to => EntryDate.new(:year => 2010, :month => 1, :day => 10), :format => :inclusive )
+          DateRange.parse("  last week  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 4, :week => 1), :to => nil, :format => :fixed_point )
         end
 
         it "should understand last day" do
@@ -137,7 +138,7 @@ module Appstats
         end
 
         it "should understand previous week" do
-          DateRange.parse("  previous week  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 4), :to => EntryDate.new(:year => 2010, :month => 1, :day => 10), :format => :inclusive )
+          DateRange.parse("  previous week  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 4, :week => 1), :to => nil, :format => :fixed_point )
         end
 
         it "should understand previous day" do
@@ -155,9 +156,9 @@ module Appstats
         end
 
         it "should understand last X quarters" do
-          DateRange.parse("  last 1 quarter  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1), :to => nil, :format => :inclusive )
-          DateRange.parse("  last 2 quarters  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10), :to => nil, :format => :inclusive )
-          DateRange.parse("  last 3 quarters  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 7), :to => nil, :format => :inclusive )
+          DateRange.parse("  last 1 quarter  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :quarter => 1), :to => nil, :format => :inclusive )
+          DateRange.parse("  last 2 quarters  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10, :quarter => 4), :to => nil, :format => :inclusive )
+          DateRange.parse("  last 3 quarters  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 7, :quarter => 3), :to => nil, :format => :inclusive )
         end
 
         it "should understand last X months" do
@@ -167,9 +168,9 @@ module Appstats
         end
 
         it "should understand last X weeks" do
-          DateRange.parse("  last 1 week  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 11), :to => nil, :format => :inclusive )
-          DateRange.parse("  last 2 weeks  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 4), :to => nil, :format => :inclusive )
-          DateRange.parse("  last 3 weeks  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 12, :day => 28), :to => nil, :format => :inclusive )
+          DateRange.parse("  last 1 week  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 11, :week => 2), :to => nil, :format => :inclusive )
+          DateRange.parse("  last 2 weeks  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 4, :week => 1), :to => nil, :format => :inclusive )
+          DateRange.parse("  last 3 weeks  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 12, :day => 28, :week => 52), :to => nil, :format => :inclusive )
         end
 
         it "should understand last X days" do
@@ -189,9 +190,9 @@ module Appstats
         end
 
         it "should understand previous Y quarters" do
-          DateRange.parse("  previous 1 quarter  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10), :to => EntryDate.new(:year => 2009, :month => 12), :format => :inclusive )
-          DateRange.parse("  previous 2 quarters  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 7), :to => EntryDate.new(:year => 2009, :month => 12), :format => :inclusive )
-          DateRange.parse("  previous 3 quarters  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 4), :to => EntryDate.new(:year => 2009, :month => 12), :format => :inclusive )
+          DateRange.parse("  previous 1 quarter  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10, :quarter => 4), :to => EntryDate.new(:year => 2009, :month => 12, :quarter => 4), :format => :inclusive )
+          DateRange.parse("  previous 2 quarters  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 7, :quarter => 3), :to => EntryDate.new(:year => 2009, :month => 12, :quarter => 4), :format => :inclusive )
+          DateRange.parse("  previous 3 quarters  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 4, :quarter => 2), :to => EntryDate.new(:year => 2009, :month => 12, :quarter => 4), :format => :inclusive )
         end
 
         it "should understand previous Y months" do
@@ -201,9 +202,9 @@ module Appstats
         end
 
         it "should understand previous 2 weeks" do
-          DateRange.parse("  previous 1 week  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 4), :to => EntryDate.new(:year => 2010, :month => 1, :day => 10), :format => :inclusive )
-          DateRange.parse("  previous 2 weeks  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 12, :day => 28), :to => EntryDate.new(:year => 2010, :month => 1, :day => 10), :format => :inclusive )
-          DateRange.parse("  previous 3 weeks  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 12, :day => 21), :to => EntryDate.new(:year => 2010, :month => 1, :day => 10), :format => :inclusive )
+          DateRange.parse("  previous 1 week  ").should == DateRange.new(:from => EntryDate.new(:year => 2010, :month => 1, :day => 4, :week => 1), :to => EntryDate.new(:year => 2010, :month => 1, :day => 10, :week => 1), :format => :inclusive )
+          DateRange.parse("  previous 2 weeks  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 12, :day => 28, :week => 52), :to => EntryDate.new(:year => 2010, :month => 1, :day => 10, :week => 1), :format => :inclusive )
+          DateRange.parse("  previous 3 weeks  ").should == DateRange.new(:from => EntryDate.new(:year => 2009, :month => 12, :day => 21, :week => 51), :to => EntryDate.new(:year => 2010, :month => 1, :day => 10, :week => 1), :format => :inclusive )
         end
 
         it "should understand previous 2 days" do
@@ -266,6 +267,15 @@ module Appstats
         DateRange.new(:from => EntryDate.new(:year => 2009, :month => 2), :format => :exclusive).from_date.to_s.should == Time.parse("2009-02-28 23:59:59").to_s
         DateRange.new(:from => EntryDate.new(:year => 2009, :month => 2, :day => 15), :format => :exclusive).from_date.to_s.should == Time.parse("2009-02-15 23:59:59").to_s
       end
+
+      it "should handle fixed points" do
+        DateRange.new(:from => EntryDate.new(:year => 2009), :to => nil, :format => :fixed_point ).from_date.to_s.should == Time.parse("2009-01-01 00:00:00").to_s
+        DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10, :quarter => 4), :to => nil, :format => :fixed_point ).from_date.to_s.should == Time.parse("2009-10-01 00:00:00").to_s
+        DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10, :day => 2, :week => 39), :to => nil, :format => :fixed_point ).from_date.to_s.should == Time.parse("2009-09-28 00:00:00").to_s
+        DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10), :to => nil, :format => :fixed_point ).from_date.to_s.should == Time.parse("2009-10-01 00:00:00").to_s
+        DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10, :day => 3), :to => nil, :format => :fixed_point ).from_date.to_s.should == Time.parse("2009-10-03 00:00:00").to_s
+        DateRange.new(:from => nil, :to => nil, :format => :fixed_point ).from_date.should == nil
+      end
       
     end
 
@@ -284,6 +294,15 @@ module Appstats
         DateRange.new(:to => EntryDate.new(:year => 2009, :month => 2, :day => 15), :format => :inclusive).to_date.to_s.should == Time.parse("2009-02-15 23:59:59").to_s
       end
 
+      it "should handle fixed points" do
+        DateRange.new(:from => EntryDate.new(:year => 2009), :to => nil, :format => :fixed_point ).to_date.to_s.should == Time.parse("2009-12-31 23:59:59").to_s
+        DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10), :to => nil, :format => :fixed_point ).to_date.to_s.should == Time.parse("2009-10-31 23:59:59").to_s
+        DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10, :quarter => 4), :to => nil, :format => :fixed_point ).to_date.to_s.should == Time.parse("2009-12-31 23:59:59").to_s
+        DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10, :day => 2, :week => 39), :to => nil, :format => :fixed_point ).to_date.to_s.should == Time.parse("2009-10-04 23:59:59").to_s
+        DateRange.new(:from => EntryDate.new(:year => 2009, :month => 10, :day => 3), :to => nil, :format => :fixed_point ).to_date.to_s.should == Time.parse("2009-10-03 23:59:59").to_s
+
+        DateRange.new(:from => nil, :to => nil, :format => :fixed_point ).to_date.should == nil
+      end
 
     end    
     

data/spec/entry_date_spec.rb

@@ -11,26 +11,38 @@ module Appstats
     describe "#initialize" do
       
       it "should understand year, month, day, hour, min, sec" do
-        date = EntryDate.new(:year => 2010, :month => 1, :day => 2, :hour => 3, :min => 4, :sec => 5)
+        date = EntryDate.new(:year => 2010, :month => 1, :day => 2, :hour => 3, :min => 4, :sec => 5, :week => 6, :quarter => 7)
         date.year.should == 2010
         date.month.should == 1
         date.day.should == 2
         date.hour.should == 3
         date.min.should == 4
         date.sec.should == 5
+        date.week.should == 6
+        date.quarter.should == 7
       end
+  
+    end
+    
+    describe "#==" do
       
-      it "should understand equality" do
-        date = EntryDate.new(:year => 2010, :month => 1, :day => 2, :hour => 3, :min => 4, :sec => 5)
-        same_date = EntryDate.new(:year => 2010, :month => 1, :day => 2, :hour => 3, :min => 4, :sec => 5)
-        another_date = EntryDate.new(:year => 2011, :month => 1, :day => 2, :hour => 3, :min => 4, :sec => 5)
-        
+      it "should be equal on all attributes" do
+        date = EntryDate.new(:year => 2010, :month => 1, :day => 2, :hour => 3, :min => 4, :sec => 5, :week => 6, :quarter => 7)
+        same_date = EntryDate.new(:year => 2010, :month => 1, :day => 2, :hour => 3, :min => 4, :sec => 5, :week => 6, :quarter => 7)
         date.should == date
         date.should == same_date
-        date.should_not == another_date
       end
       
-      
+      it "should be not equal if diferent attributes" do
+        date = EntryDate.new(:year => 2010, :month => 1, :day => 2, :hour => 3, :min => 4, :sec => 5, :week => 6, :quarter => 7)
+        
+        [:year,:month,:day,:hour,:min,:sec,:week,:quarter].each do |attr|
+          different_date = EntryDate.new(:year => 2010, :month => 1, :day => 2, :hour => 3, :min => 4, :sec => 5, :week => 6, :quarter => 7)
+          different_date.send("#{attr}=",99)
+          different_date.should_not == date
+        end
+      end
+              
     end
     
     describe "#to_time" do
@@ -43,6 +55,18 @@ module Appstats
         EntryDate.new(:year => 2010, :month => 2).to_time.should == Time.parse("2010-02-01 00:00:00")
       end
 
+      it "should handle quarter" do
+        EntryDate.new(:year => 2010, :month => 2, :quarter => 1).to_time(:beginning).should == Time.parse("2010-01-01 00:00:00")
+        EntryDate.new(:year => 2010, :month => 2, :quarter => 1).to_time(:end).to_s.should == Time.parse("2010-03-31 23:59:59").to_s
+        EntryDate.new(:year => 2010, :month => 2, :quarter => 1).to_time.should == Time.parse("2010-01-01 00:00:00")
+      end
+
+      it "should handle week" do
+        EntryDate.new(:year => 2010, :month => 2, :day => 16, :week => 7).to_time(:beginning).should == Time.parse("2010-02-15 00:00:00")
+        EntryDate.new(:year => 2010, :month => 2, :day => 16, :week => 7).to_time(:end).to_s.should == Time.parse("2010-02-21 23:59:59").to_s
+        EntryDate.new(:year => 2010, :month => 2, :day => 16, :week => 7).to_time.should == Time.parse("2010-02-15 00:00:00")
+      end
+
       it "should handle now" do
         EntryDate.new.to_time.should == Time.now
       end
@@ -70,7 +94,7 @@ module Appstats
     describe "#end_of_week" do
       it "should return the same 'level' data points" do
         now = EntryDate.new(:year => 2010, :month => 1, :day => 5, :hour => 10) # tuesday
-        expected = EntryDate.new(:year => 2010, :month => 1, :day => 10, :hour => 10)
+        expected = EntryDate.new(:year => 2010, :month => 1, :day => 10, :hour => 10, :week => 1)
         now.end_of_week.should == expected
       end
     end
@@ -78,11 +102,112 @@ module Appstats
     describe "#end_of_quarter" do
       it "should return the same 'level' data points" do
         now = EntryDate.new(:year => 2010, :month => 1, :day => 5, :hour => 10)
-        expected = EntryDate.new(:year => 2010, :month => 3)
+        expected = EntryDate.new(:year => 2010, :month => 3, :quarter => 1)
         now.end_of_quarter.should == expected
       end
+
+      it "should return quarter" do
+        now = EntryDate.new(:year => 2010, :month => 1, :quarter => 1)
+        expected = EntryDate.new(:year => 2010, :month => 3, :quarter => 1)
+        now.end_of_quarter.should == expected
+      end
+
+    end
+
+    describe "#calculate_quarter_of" do
+      
+      it "should handle nil" do
+        EntryDate.calculate_quarter_of(nil).should == nil
+      end
+      
+      it "should be 1 for jan/feb/mar" do
+        EntryDate.calculate_quarter_of(Time.parse("2011-01-01")).should == 1
+        EntryDate.calculate_quarter_of(Time.parse("2011-02-15")).should == 1
+        EntryDate.calculate_quarter_of(Time.parse("2011-03-31")).should == 1
+      end
+
+      it "should be 2 for apr/may/jun" do
+        EntryDate.calculate_quarter_of(Time.parse("2011-04-01")).should == 2
+        EntryDate.calculate_quarter_of(Time.parse("2011-05-15")).should == 2
+        EntryDate.calculate_quarter_of(Time.parse("2011-06-30")).should == 2
+      end
+
+      it "should be 3 for jul/aug/sep" do
+        EntryDate.calculate_quarter_of(Time.parse("2011-07-01")).should == 3
+        EntryDate.calculate_quarter_of(Time.parse("2011-08-15")).should == 3
+        EntryDate.calculate_quarter_of(Time.parse("2011-09-30")).should == 3
+      end
+
+      it "should be 4 for oct/nov/dec" do
+        EntryDate.calculate_quarter_of(Time.parse("2011-10-01")).should == 4
+        EntryDate.calculate_quarter_of(Time.parse("2011-11-15")).should == 4
+        EntryDate.calculate_quarter_of(Time.parse("2011-12-31")).should == 4
+      end
+      
+      
+    end
+
+    describe "#calculate_quarter_of" do
+      
+      it "should handle nil" do
+        EntryDate.calculate_quarter_of(nil).should == nil
+      end
+      
+      it "should be 1 for jan/feb/mar" do
+        EntryDate.calculate_quarter_of(Time.parse("2011-01-01")).should == 1
+        EntryDate.calculate_quarter_of(Time.parse("2011-02-15")).should == 1
+        EntryDate.calculate_quarter_of(Time.parse("2011-03-31")).should == 1
+      end
+
+      it "should be 2 for apr/may/jun" do
+        EntryDate.calculate_quarter_of(Time.parse("2011-04-01")).should == 2
+        EntryDate.calculate_quarter_of(Time.parse("2011-05-15")).should == 2
+        EntryDate.calculate_quarter_of(Time.parse("2011-06-30")).should == 2
+      end
+
+      it "should be 3 for jul/aug/sep" do
+        EntryDate.calculate_quarter_of(Time.parse("2011-07-01")).should == 3
+        EntryDate.calculate_quarter_of(Time.parse("2011-08-15")).should == 3
+        EntryDate.calculate_quarter_of(Time.parse("2011-09-30")).should == 3
+      end
+
+      it "should be 4 for oct/nov/dec" do
+        EntryDate.calculate_quarter_of(Time.parse("2011-10-01")).should == 4
+        EntryDate.calculate_quarter_of(Time.parse("2011-11-15")).should == 4
+        EntryDate.calculate_quarter_of(Time.parse("2011-12-31")).should == 4
+      end
+      
+      
     end
 
+    describe "#calculate_week_of" do
+      
+      it "should handle nil" do
+        EntryDate.calculate_week_of(nil).should == nil
+      end
+      
+      it "should be -1 if jan 1 is not start of week" do
+        EntryDate.calculate_week_of(Time.parse("2011-01-01")).should == -1
+        EntryDate.calculate_week_of(Time.parse("2011-01-02")).should == -1
+      end
+      
+      it "should be 1 for the first monday of the year" do
+        EntryDate.calculate_week_of(Time.parse("2011-01-03")).should == 1
+      end
+
+      it "should be 1 if the first day is on a monday" do
+        EntryDate.calculate_week_of(Time.parse("2018-01-01")).should == 1
+      end
+
+      it "should be X for the Xth monday of the year" do
+        time = Time.parse("2011-01-03")
+        1.upto(52).each do |offset|
+          EntryDate.calculate_week_of(time).should == offset
+          time = time.next_week
+        end
+      end
+      
+    end
 
     describe "#parse" do
 
@@ -128,7 +253,7 @@ module Appstats
       end
 
       it "should understand last quarter" do
-        EntryDate.parse("last quarter").should == EntryDate.new(:year => 2009, :month => 10)
+        EntryDate.parse("last quarter").should == EntryDate.new(:year => 2009, :month => 10, :quarter => 4)
       end
 
       it "should understand last month" do
@@ -136,7 +261,7 @@ module Appstats
       end
 
       it "should understand last week" do
-        EntryDate.parse("last week").should == EntryDate.new(:year => 2010, :month => 1, :day => 4)
+        EntryDate.parse("last week").should == EntryDate.new(:year => 2010, :month => 1, :day => 4, :week => 1)
       end
 
       it "should understand last day" do
@@ -148,7 +273,7 @@ module Appstats
       end
 
       it "should understand previous quarter" do
-        EntryDate.parse("previous quarter").should == EntryDate.new(:year => 2009, :month => 10)
+        EntryDate.parse("previous quarter").should == EntryDate.new(:year => 2009, :month => 10, :quarter => 4)
       end
 
       it "should understand previous month" do
@@ -156,7 +281,7 @@ module Appstats
       end
 
       it "should understand previous week" do
-        EntryDate.parse("previous week").should == EntryDate.new(:year => 2010, :month => 1, :day => 4)
+        EntryDate.parse("previous week").should == EntryDate.new(:year => 2010, :month => 1, :day => 4, :week => 1)
       end
 
       it "should understand previous day" do
@@ -168,7 +293,7 @@ module Appstats
       end
 
       it "should understand this quarter" do
-        EntryDate.parse("this quarter").should == EntryDate.new(:year => 2010, :month => 1)
+        EntryDate.parse("this quarter").should == EntryDate.new(:year => 2010, :month => 1, :quarter => 1)
       end
 
       it "should understand this month" do
@@ -176,7 +301,7 @@ module Appstats
       end
 
       it "should understand this week" do
-        EntryDate.parse("this week").should == EntryDate.new(:year => 2010, :month => 1, :day => 11)
+        EntryDate.parse("this week").should == EntryDate.new(:year => 2010, :month => 1, :day => 11, :week => 2)
       end
 
       it "should understand this day" do
@@ -190,9 +315,9 @@ module Appstats
       end
 
       it "should understand last X quarters" do
-        EntryDate.parse("last 1 quarter").should == EntryDate.new(:year => 2010, :month => 1)
-        EntryDate.parse("last 2 quarters").should == EntryDate.new(:year => 2009, :month => 10)
-        EntryDate.parse("last 3 quarters").should == EntryDate.new(:year => 2009, :month => 7)
+        EntryDate.parse("last 1 quarter").should == EntryDate.new(:year => 2010, :month => 1, :quarter => 1 )
+        EntryDate.parse("last 2 quarters").should == EntryDate.new(:year => 2009, :month => 10, :quarter => 4)
+        EntryDate.parse("last 3 quarters").should == EntryDate.new(:year => 2009, :month => 7, :quarter => 3)
       end
 
 
@@ -203,9 +328,9 @@ module Appstats
       end
 
       it "should understand last X weeks" do
-        EntryDate.parse("last 1 week").should == EntryDate.new(:year => 2010, :month => 1, :day => 11)
-        EntryDate.parse("last 2 weeks").should == EntryDate.new(:year => 2010, :month => 1, :day => 4)
-        EntryDate.parse("last 3 weeks").should == EntryDate.new(:year => 2009, :month => 12, :day => 28)
+        EntryDate.parse("last 1 week").should == EntryDate.new(:year => 2010, :month => 1, :day => 11, :week => 2)
+        EntryDate.parse("last 2 weeks").should == EntryDate.new(:year => 2010, :month => 1, :day => 4, :week => 1)
+        EntryDate.parse("last 3 weeks").should == EntryDate.new(:year => 2009, :month => 12, :day => 28, :week => 52)
       end
 
       it "should understand last X days" do
@@ -221,9 +346,9 @@ module Appstats
       end
 
       it "should understand previous X quarters" do
-        EntryDate.parse("previous 1 quarter").should == EntryDate.new(:year => 2009, :month => 10)
-        EntryDate.parse("previous 2 quarters").should == EntryDate.new(:year => 2009, :month => 7)
-        EntryDate.parse("previous 3 quarters").should == EntryDate.new(:year => 2009, :month => 4)
+        EntryDate.parse("previous 1 quarter").should == EntryDate.new(:year => 2009, :month => 10, :quarter => 4)
+        EntryDate.parse("previous 2 quarters").should == EntryDate.new(:year => 2009, :month => 7, :quarter => 3)
+        EntryDate.parse("previous 3 quarters").should == EntryDate.new(:year => 2009, :month => 4, :quarter => 2)
       end
 
       it "should understand previous X months" do
@@ -233,9 +358,9 @@ module Appstats
       end
 
       it "should understand previous X weeks" do
-        EntryDate.parse("previous 1 week").should == EntryDate.new(:year => 2010, :month => 1, :day => 4)
-        EntryDate.parse("previous 2 weeks").should == EntryDate.new(:year => 2009, :month => 12, :day => 28)
-        EntryDate.parse("previous 3 weeks").should == EntryDate.new(:year => 2009, :month => 12, :day => 21)
+        EntryDate.parse("previous 1 week").should == EntryDate.new(:year => 2010, :month => 1, :day => 4, :week => 1)
+        EntryDate.parse("previous 2 weeks").should == EntryDate.new(:year => 2009, :month => 12, :day => 28, :week => 52)
+        EntryDate.parse("previous 3 weeks").should == EntryDate.new(:year => 2009, :month => 12, :day => 21, :week => 51)
       end
 
       it "should understand previous X days" do

data/spec/entry_spec.rb

@@ -72,6 +72,8 @@ module Appstats
         entry.hour.should == 10
         entry.min.should == 11
         entry.sec.should == 12
+        entry.week.should == 2
+        entry.quarter.should == 1 
         
         entry.occurred_at = Time.parse("2011-02-16 17:18:19")
         entry.year.should == 2011
@@ -80,6 +82,8 @@ module Appstats
         entry.hour.should == 17
         entry.min.should == 18
         entry.sec.should == 19
+        entry.week.should == 7
+        entry.quarter.should == 1 
         
         entry.occurred_at = nil
         entry.year.should == nil
@@ -88,7 +92,8 @@ module Appstats
         entry.hour.should == nil
         entry.min.should == nil
         entry.sec.should == nil
-        
+        entry.week.should == nil
+        entry.quarter.should == nil 
       end
       
     end
@@ -188,18 +193,18 @@ module Appstats
       end
       
       it "should understand an entry without contexts" do
-        entry = Entry.create_from_logger_string("0.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.create_from_logger_string("0.12.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.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.12.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.create_from_logger_string("0.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        entry = Entry.create_from_logger_string("0.12.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.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.12.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"

data/spec/logger_spec.rb

@@ -115,7 +115,7 @@ module Appstats
       
       it "should accept numbers" do
         Appstats::Logger.entry(5, :blah => 6)   
-        Appstats::Logger.raw_read.should == ["0.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
+        Appstats::Logger.raw_read.should == ["0.12.1 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
       end
 
     end
@@ -124,7 +124,7 @@ module Appstats
 
       it "should look similar to regular entry" do
         Appstats::Logger.exception_entry(RuntimeError.new("blah"),:on => "login")   
-        Appstats::Logger.raw_read.should == ["0.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
+        Appstats::Logger.raw_read.should == ["0.12.1 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
       end
       
     end
@@ -141,29 +141,29 @@ module Appstats
     
        it "should handle a statistics entry" do
          expected = { :action => "address_search", :timestamp => "2010-09-21 23:15:20" }
-         actual = Appstats::Logger.entry_to_hash("0.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.12.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.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.12.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.11.7 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.12.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.11.7 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.12.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.11.7 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
+         actual = Appstats::Logger.entry_to_hash("0.12.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
          actual.should == expected
        end
        
@@ -172,66 +172,66 @@ module Appstats
     describe "#entry_to_s" do
       
       it "should handle a statistics entry" do
-        expected = "0.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.12.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.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.12.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.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.12.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.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.12.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.11.7 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.12.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.11.7 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.12.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.11.7 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.12.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.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.12.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.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.12.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.11.7 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.12.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.11.7 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.12.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

@@ -3,6 +3,10 @@ require 'spec_helper'
 module Appstats
   describe Query do
 
+    before(:each) do
+      Time.stub!(:now).and_return(Time.parse('2010-09-21 23:15:20'))
+    end
+
     describe "#initialize" do
       
       before(:each) do
@@ -108,6 +112,41 @@ module Appstats
         query.run.count.should == 2
       end
     
+      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
     
     

data/spec/result_spec.rb

@@ -75,6 +75,11 @@ module Appstats
         @result.date_to_s.should == "2010-01-02 to present"
       end
 
+      it "should return one date if 'today'" do
+        @result.from_date = Time.parse("2010-01-02 03:04:05")
+        @result.to_date = Time.parse("2010-01-02 04:05:06")
+        @result.date_to_s.should == "2010-01-02"
+      end
       
       it "should handle a from date only" do
         @result.from_date = Time.parse("2010-01-02 03:04:05")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appstats
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 45
   prerelease: false
   segments: 
   - 0
-  - 11
-  - 7
-  version: 0.11.7
+  - 12
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - Andrew Forward
@@ -157,6 +157,7 @@ files:
 - db/migrations/20110217220357_add_additional_contexts_indexes.rb
 - db/migrations/20110217234136_add_appstats_results_contexts.rb
 - db/migrations/20110222215437_create_appstats_jobs.rb
+- db/migrations/20110223212232_add_appstats_entries_week_and_quarter.rb
 - db/schema.rb
 - lib/appstats.rb
 - lib/appstats/action.rb