appstats 0.1.0 → 0.3.1

data/Gemfile.lock

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

data/db/migrations/20110207213514_create_appstats_actions.rb

@@ -0,0 +1,14 @@
+class CreateAppstatsActions < ActiveRecord::Migration
+  def self.up
+    create_table :appstats_actions do |t|
+      t.string :name
+      t.string :plural_name
+      t.string :status
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :appstats_actions
+  end
+end

data/db/migrations/20110208210921_align_entry_time_names.rb

@@ -0,0 +1,15 @@
+class AlignEntryTimeNames < ActiveRecord::Migration
+  def self.up
+    remove_index :appstats_entries, :name => "index_entries_by_minute"
+    rename_column :appstats_entries, :minute, :min
+    rename_column :appstats_entries, :second, :sec
+    add_index :appstats_entries, [:year,:month,:day,:hour,:min], :name => "index_entries_by_minute"
+  end
+
+  def self.down
+    remove_index :appstats_entries, :name => "index_entries_by_minute"
+    rename_column :appstats_entries, :min, :minute
+    rename_column :appstats_entries, :sec, :second
+    add_index :appstats_entries, [:year,:month,:day,:hour,:minute], :name => "index_entries_by_minute"
+  end
+end

data/db/schema.rb

@@ -10,7 +10,15 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110207200431) do
+ActiveRecord::Schema.define(:version => 20110208210921) do
+
+  create_table "appstats_actions", :force => true do |t|
+    t.string   "name"
+    t.string   "plural_name"
+    t.string   "status"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
 
   create_table "appstats_contexts", :force => true do |t|
     t.string   "context_key"
@@ -37,12 +45,12 @@ ActiveRecord::Schema.define(:version => 20110207200431) do
     t.integer  "month"
     t.integer  "day"
     t.integer  "hour"
-    t.integer  "minute"
-    t.integer  "second"
+    t.integer  "min"
+    t.integer  "sec"
   end
 
   add_index "appstats_entries", ["action"], :name => "index_appstats_entries_on_action"
-  add_index "appstats_entries", ["year", "month", "day", "hour", "minute"], :name => "index_entries_by_minute"
+  add_index "appstats_entries", ["year", "month", "day", "hour", "min"], :name => "index_entries_by_minute"
   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"

data/lib/appstats.rb

@@ -2,10 +2,14 @@ require 'rubygems'
 require 'active_record'
 require "#{File.dirname(__FILE__)}/appstats/code_injections"
 require "#{File.dirname(__FILE__)}/appstats/entry"
+require "#{File.dirname(__FILE__)}/appstats/entry_date"
+require "#{File.dirname(__FILE__)}/appstats/date_range"
+require "#{File.dirname(__FILE__)}/appstats/action"
 require "#{File.dirname(__FILE__)}/appstats/context"
 require "#{File.dirname(__FILE__)}/appstats/tasks"
 require "#{File.dirname(__FILE__)}/appstats/logger"
 require "#{File.dirname(__FILE__)}/appstats/log_collector"
+require "#{File.dirname(__FILE__)}/appstats/query"
 
 # required in the appstats.gemspec
 # require "#{File.dirname(__FILE__)}/appstats/version"

data/lib/appstats/action.rb

@@ -0,0 +1,19 @@
+
+module Appstats
+  class Action < ActiveRecord::Base
+    set_table_name "appstats_actions"
+    
+    attr_accessible :name, :plural_name, :status
+
+    def self.update_actions
+      sql = "select distinct(action) from appstats_entries where action not in (select name from appstats_actions)"
+      count = 0
+      ActiveRecord::Base.connection.execute(sql).each do |row| 
+        Appstats::Action.create(:name => row[0], :plural_name => row[0].pluralize, :status => 'derived')
+        count += 1
+      end
+      count
+    end
+  
+  end
+end

data/lib/appstats/date_range.rb

@@ -0,0 +1,159 @@
+
+module Appstats
+  class DateRange
+
+    attr_accessor :from, :to, :format
+    
+    def initialize(data = {})
+      @from = data[:from]
+      @to = data[:to]
+      @format = data[:format] || :inclusive
+    end
+    
+    def from_to_s
+      return nil if @from.nil?
+      mode = @format == :inclusive ? :start : :end
+      @from.to_time(mode).strftime('%Y-%m-%d %H:%M:%S')
+    end
+
+    def to_to_s
+      return nil if @to.nil?
+      mode = @format == :exclusive ? :start : :end
+      @to.to_time(mode).strftime('%Y-%m-%d %H:%M:%S')
+    end
+    
+    def to_sql
+      return "1=1" if @from.nil? && @to.nil?
+      
+      if !@from.nil? && @to.nil?
+        return case @format
+          when :inclusive then 
+            "occurred_at >= '#{from_to_s}'"
+          when :exclusive then 
+            "occurred_at > '#{from_to_s}'"
+          when :fixed_point then 
+            answer = "("
+            [:year,:month,:day,:hour,:min,:sec].each do |t|
+              next if from.send(t).nil?
+              answer += " and " unless answer.size == 1
+              answer += "#{t}=#{from.send(t)}"
+            end
+            answer += ")"
+            answer 
+        end
+      elsif @from.nil? && !@to.nil?
+        return case @format
+          when :inclusive then "occurred_at <= '#{to_to_s}'"
+          when :exclusive then "occurred_at < '#{to_to_s}'"
+          else "1=1"
+        end
+      else
+        return case @format
+          when :inclusive then "(occurred_at >= '#{from_to_s}' and occurred_at <= '#{to_to_s}')"
+          when :exclusive then "(occurred_at > '#{from_to_s}' and occurred_at < '#{to_to_s}')"
+          else "1=1"
+        end
+      end
+      
+      
+    end 
+
+    def self.parse(raw_input)
+      range = DateRange.new
+      return range if raw_input.nil? || raw_input == ''
+      input = raw_input.strip
+      
+      m = input.match(/^today|yesterday|YTD|ytd$/)
+      unless m.nil?
+        range.from = EntryDate.parse(input)
+        range.format = :fixed_point
+      end
+      
+      m = input.match(/^between\s*(.*)\s*and\s*(.*)$/)
+      unless m.nil?
+        range.from = EntryDate.parse(m[1])
+        range.to = EntryDate.parse(m[2])
+        return range
+      end
+      
+      m = input.match(/^(in|on)\s*(.*)$/)
+      unless m.nil?
+        range.from = EntryDate.parse(m[2])
+        range.format = :fixed_point
+        return range
+      end
+
+      m = input.match(/^before\s*(.*)$/)
+      unless m.nil?
+        range.to = EntryDate.parse(m[1])
+        range.format = :exclusive
+        return range
+      end
+
+      m = input.match(/^after\s*(.*)$/)
+      unless m.nil?
+        range.from = EntryDate.parse(m[1])
+        range.format = :exclusive
+        return range
+      end
+
+      m = input.match(/^since\s*(.*)$/)
+      unless m.nil?
+        range.from = EntryDate.parse(m[1])
+        range.format = :inclusive
+        return range
+      end
+
+
+      m = input.match(/^this\s*(year|month|week|day)$/)
+      unless m.nil?
+        range.from = EntryDate.parse(input)
+        range.format = m[1] == "week" ? :inclusive : :fixed_point
+        return range
+      end
+
+      m = input.match(/^(last|previous)\s*(year|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
+        else
+          range.format = :fixed_point  
+        end
+        return range
+      end
+
+      m = input.match(/^last\s*(.+)\s*(year|years|month|months|week|weeks|day|days)$/)
+      unless m.nil?
+        range.from = EntryDate.parse(input)
+        range.format = :inclusive
+        return range
+      end
+
+      m = input.match(/^previous\s*(.+)\s*(year|month|week|day)s?$/)
+      unless m.nil?
+        range.from = EntryDate.parse(input)
+        to = EntryDate.parse("last #{m[2]}")
+        to = to.end_of_week if m[2] == "week"
+        range.to = to
+        range.format = :inclusive
+        return range
+      end
+      
+      range
+    end
+
+    def ==(o)
+       o.class == self.class && o.send(:state) == state
+    end
+    alias_method :eql?, :==
+
+    private
+
+      def state
+        [@from, @to, @format]
+      end
+  
+  end
+end

data/lib/appstats/entry.rb

@@ -17,15 +17,15 @@ module Appstats
         self[:month] = nil
         self[:day] = nil
         self[:hour] = nil
-        self[:minute] = nil
-        self[:second] = nil
+        self[:min] = nil
+        self[:sec] = nil
       else
         self[:year] = value.year
         self[:month] = value.month
         self[:day] = value.day
         self[:hour] = value.hour
-        self[:minute] = value.min
-        self[:second] = value.sec
+        self[:min] = value.min
+        self[:sec] = value.sec
       end
     end
   

data/lib/appstats/entry_date.rb

@@ -0,0 +1,156 @@
+
+module Appstats
+  class EntryDate
+
+    attr_accessor :year, :month, :day, :hour, :min, :sec
+    
+    def initialize(data = {})
+      @year = data[:year]
+      @month = data[:month]
+      @day = data[:day]
+      @hour = data[:hour]
+      @min = data[:min]
+      @sec = data[:sec]
+    end
+    
+    def end_of_week
+      week = self.dup
+      t = to_time.end_of_week
+      week.year = t.year
+      week.month = t.month
+      week.day = t.day
+      week  
+    end
+
+    def to_time(mode = :start)
+      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?
+      end
+      t
+    end
+
+    def to_s
+      s = ""
+      return s if @year.nil?
+      s += "#{@year}"
+
+      return s if @month.nil?
+      s += "-#{@month.to_s.rjust(2,'0')}"
+
+      return s if @day.nil?
+      s += "-#{@day.to_s.rjust(2,'0')}"
+
+      return s if @hour.nil?
+      s += " #{@hour.to_s.rjust(2,'0')}"
+
+      return s if @min.nil?
+      s += ":#{@min.to_s.rjust(2,'0')}"
+
+      return s if @sec.nil?
+      s += ":#{@sec.to_s.rjust(2,'0')}"
+      
+      s
+    end
+    
+    def self.parse(raw_input)
+      date = EntryDate.new
+      return date if raw_input.nil? || raw_input == ''
+      input = raw_input.strip
+
+      if input.match(/^\d*$/) # year
+        date.year = input.to_i
+        return date
+      end
+      
+      t = Time.now
+      t_parts = nil
+      
+      if input.match(/^YTD|ytd$/)
+        t_parts = [:year]
+      elsif input.match(/^today$/)
+        t_parts = [:year,:month,:day]
+      elsif input.match(/^yesterday$/)
+        t -= 1.day
+        t_parts = [:year,:month,:day]
+      elsif input.match(/^this year$/)
+        t_parts = [:year]
+      elsif input.match(/^this month$/)
+        t_parts = [:year,:month]
+      elsif input.match(/^this week$/)
+        t = t.beginning_of_week
+        t_parts = [:year,:month,:day]
+      elsif input.match(/^this day$/)
+        t_parts = [:year,:month,:day]
+      elsif input.match(/^(.*),[^\d]*(\d*)$/) # month, year
+        t = Time.parse(input)
+        t_parts = [:year,:month]
+      elsif input.match(/^(\d*)-(\d*)-(\d*)$/) # YYYY-mm-dd
+        t = Time.parse(input)
+        t_parts = [:year,:month,:day]
+      end
+
+      m = input.match(/^(last|previous)\s*(\d*)\s*years?$/)
+      if m
+        t -= last_date_offset(m).year
+        t_parts = [:year]
+      end
+      
+      m = input.match(/^(last|previous)\s*(\d*)\s*months?$/)
+      if m
+        t -= last_date_offset(m).month
+        t_parts = [:year,:month]
+      end
+
+      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]
+      end
+
+      m = input.match(/^(last|previous)\s*(\d*)\s*days?$/)
+      if m
+        t -= last_date_offset(m).day
+        t_parts = [:year,:month,:day]
+      end
+
+      unless t_parts.nil?
+        t_parts.each do |label|
+          date.send("#{label}=",t.send(label))
+        end
+        return date
+      end
+      
+
+      begin
+        t = Time.parse(input)
+        return EntryDate.new(:year => t.year, :month => t.month, :day => t.day, :hour => t.hour, :min => t.min, :sec => t.sec)
+      rescue
+        return EntryDate.new
+      end
+    end
+
+    def ==(o)
+       o.class == self.class && o.send(:state) == state
+    end
+    alias_method :eql?, :==
+
+    private
+
+      def state
+        [@year, @month, @day, @hour, @min, @sec]
+      end
+      
+      # (last|previous) (\d*)
+      def self.last_date_offset(match)
+        offset = match[1] == "last" ? -1 : 0
+        amount = match[2] == "" ? 1 : match[2].to_i + offset
+        amount
+      end
+  
+  end
+end