get_stats 0.2 → 0.3

data/app/models/stats.rb

@@ -12,129 +12,90 @@ class Stats < ActiveRecord::Base
       end   
   end
 
-  def self.show(field,time_range="week",report_start_date=nil,report_end_date=nil)
-    end_date = Date.today
-    case time_range 
-      when 'week'   
-       start_date = end_date - 1.week
-      when 'month'   
-       start_date = end_date - 1.month 
-      else
-       start_date = end_date - 1.month 
-    end
-    if !report_start_date.nil? && !report_end_date.nil?
-      start_date = report_start_date.to_date
-      end_date = report_end_date.to_date
-    end
-    @stats = Stats.find(:all,:conditions =>["stat_name=? and stat_date >=? and stat_date <=?",field,start_date,end_date])
+  def self.process_daily_stats(field, stats, start_date,end_date)
     @return_stat = []
-    now = start_date
-    while (now <= end_date) do 
-      today_stats = @stats.select{|c| c if c.stat_date == now }
+    while (start_date <= end_date) do 
+      today_stats = @stats.select{|c| c if c.stat_date == start_date }
       if today_stats.blank?
-        @return_stat << [field,now,0]
+        @return_stat << [field,start_date,0]
       else
-        @return_stat << [field,today_stats[0].stat_date,today_stats[0].count]  
+        @return_stat << [field,today_stats[0].stat_date,today_stats[0].count]
       end
-      now = now + 1.day
+      start_date = start_date + 1
     end
     return @return_stat
-  end 
+  end  
 
-  def self.daily_stats(field,time_range="last_week",report_start_date=nil,report_end_date=nil)
+  def self.find_date_range(time_range)
     end_date = Date.today
     case time_range 
       when 'week'   
        start_date = end_date - 1.week
-      when 'last_week'   
-       start_date = end_date - 1.week 
       when 'month'   
        start_date = end_date - 1.month 
-      when 'last_month'   
-       start_date = end_date - 1.month  
       else
-       start_date = end_date - 1.month 
+       start_date = end_date - 1.week 
     end
+    return start_date, end_date
+  end  
+
+ def self.show(field,time_range="week",report_start_date=nil,report_end_date=nil)
+    start_date,end_date = find_date_range(time_range)
     if !report_start_date.nil? && !report_end_date.nil?
       start_date = report_start_date.to_date
       end_date = report_end_date.to_date
     end
     @stats = Stats.find(:all,:conditions =>["stat_name=? and stat_date >=? and stat_date <=?",field,start_date,end_date])
-    @return_stat = []
-    now = start_date
-    while (now <= end_date) do 
-      today_stats = @stats.select{|c| c if c.stat_date == now }
-      if today_stats.blank?
-        @return_stat << [field,now,0]
-      else
-        @return_stat << [field,today_stats[0].stat_date,today_stats[0].count]  
-      end
-      now = now + 1.day
-    end
-    return @return_stat
+    process_daily_stats(field, @stats,start_date,end_date)
   end 
 
-  def self.weekly_stats(field,report_start_date=nil,report_end_date=nil)
-    if report_end_date.nil?
-      report_end_date = Date.today
-    end
-     
-    if report_start_date.nil? || report_start_date >= report_end_date
-      report_start_date = report_end_date - 1.month 
-    end  
-    report_start_date = report_start_date - report_start_date.wday + 1
-    @stats = Stats.find(:all,:conditions =>["stat_name=? and stat_date >=? and stat_date <=?",field,report_start_date,report_end_date])
-    now = report_start_date
-    @return_stat = []
-    week_collection = 0
-    while (now <= report_end_date) do
-      today_stats = @stats.select{|c| c if c.stat_date == now }
-      if !today_stats.blank?
-        week_collection = week_collection + today_stats[0].count
-      end 
-      if now.monday? && now != report_start_date
-        @return_stat << [field,now - 1.week ,week_collection]
-        week_collection = 0
-      end 
+  class << self 
+    alias :daily_stats :show
+  end
 
-      if now == report_end_date && !now.monday?
-         @return_stat << [field,now - now.wday + 1,week_collection]
-      end 
-      now = now + 1.day
-    end  
-    return @return_stat
+  ["monthly","weekly"].each do |name|
+  class_eval %{ def self.#{name}_stats(field,report_start_date=nil,report_end_date=nil)
+                  start_date,end_date = process_dates("#{name}",report_start_date,report_end_date)
+                  process_weekly_and_monthly_stats("#{name}",field,start_date,end_date)
+                end
+              }
   end
-   
-   def self.monthly_stats(field,report_start_date=nil,report_end_date=nil)
-    if report_end_date.nil?
-      report_end_date = Date.today
-    end
-     
-    if report_start_date.nil? || report_start_date >= report_end_date
-      report_start_date = report_end_date - 4.months
-    end  
-    report_start_date = report_start_date - report_start_date.mday + 1
-    @stats = Stats.find(:all,:conditions =>["stat_name=? and stat_date >=? and stat_date <=?",field,report_start_date,report_end_date])
-    now = report_start_date
+ 
+
+  def self.process_weekly_and_monthly_stats(method_type,field,start_date,end_date)
+    @stats = Stats.find(:all,:conditions =>["stat_name=? and stat_date >=? and stat_date <=?",field,start_date,end_date])
     @return_stat = []
-    month_collection = 0
-    while (now <= report_end_date) do
-      today_stats = @stats.select{|c| c if c.stat_date == now }
-      if !today_stats.blank?
-        month_collection = month_collection + today_stats[0].count
+    stat_collection = 0
+    original_start_date = start_date
+    while (start_date <= end_date) do 
+      today_stats = @stats.select{|c| c if c.stat_date == start_date }
+      stat_collection = stat_collection + today_stats[0].count if !today_stats.blank?
+      conitions_day = (method_type == "weekly" ? start_date.monday? : (start_date.mday == 1) )
+      if conitions_day && start_date != original_start_date
+        @return_stat << [field,(method_type == "weekly" ? start_date - 1.week : start_date - 1.month ),stat_collection]
+        stat_collection = 0
       end 
-      if now.mday == 1 && now != report_start_date
-        @return_stat << [field,now - 1.month ,month_collection]
-        month_collection = 0
-      end  
-      if now + 1.day == report_end_date && (now + 1.day).mday != 1
-         @return_stat << [field,now  ,month_collection]
+      if start_date + 1.day == end_date && !conitions_day
+           @return_stat << [field,start_date,stat_collection]
       end 
-      now = now + 1.day
+      start_date = start_date + 1.day
     end  
     return @return_stat
-  end
-   
+  end 
+
+  def self.process_dates(method_type,start_date,end_date)
+    end_date = Date.today if end_date.nil?
+    if start_date.nil? || start_date >= end_date
+      start_date = end_date - 4.months if method_type == "monthly"
+      start_date = end_date - 1.month if method_type == "weekly"
+    end  
+    if method_type == "weekly"
+      start_date = start_date - start_date.wday + 1
+    else
+      start_date = start_date - start_date.mday + 1
+    end  
+    return start_date, end_date
+  end 
 
   def self.show_all_stat_names
     @stats = Stats.find(:all,:group => 'stat_name')

data/lib/get_stats/version.rb

@@ -1,3 +1,3 @@
 module GetStats
-  VERSION = "0.2"
+  VERSION = "0.3"
 end

data/lib/rails/generators/get_stats/templates/schema.rb

@@ -1,9 +0,0 @@
-ActiveRecord::Schema.define(:version => 0) do
-    create_table :stats, :force => true do |t|
-      t.string :stat_name
-      t.date :stat_date
-      t.integer :count
-      t.timestamps
-    end
-    add_index :stats, [:stat_date, :stat_name], :unique => true 
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: get_stats
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies: []
 description: Dead simply statistics for Rails.
 email: