has-activity 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/has-activity.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "has-activity"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cary Dunn"]
-  s.date = "2012-05-02"
+  s.date = "2012-05-08"
   s.description = "A simple way to grab recent activity on a given model grouped by hour, day, week or month (time series). Supports \"padding\" for intervals without activity."
   s.email = "cary.dunn@gmail.com"
   s.extra_rdoc_files = [

data/lib/has_activity/activitize_calculations.rb

@@ -34,6 +34,9 @@ module HasActivity
       #       default is "*". optionally put a custom aggregator ex "table.field".
       #   * :count_distinct
       #       default is false. optionally set to true for distinct counts on :count_on ex. "COUNT(DISTINCT table.field)".
+      #   * :sum_on
+      #       default is to :count_on. optionally put a custom aggregator ex "table.field" which will "SUM(table.field)"
+      #       instead of COUNT.
       # 
       def calculate_activity(between_start, between_end, options={})
         options[:padding] ||= true
@@ -41,6 +44,7 @@ module HasActivity
         options[:by] ||= :hour
         options[:on] ||= has_activity_options[:on]
         options[:count_on] ||= "*"
+        #options[:sum_on] ||= ""
         options[:count_distinct] = false unless options[:count_distinct]
 
         # TODO: check for index on :on column
@@ -50,8 +54,12 @@ module HasActivity
         raise "You cannot use custom #group filters with #activity_since" if self.group_values.present?
 
         activity_column = parse_activity_column(options[:on])
-        count_column = parse_activity_column(options[:count_on])
-        count_column = "DISTINCT(#{count_column})" if options[:count_distinct]
+        if options[:sum_on]
+          aggregate_column = "SUM(#{parse_activity_column(options[:sum_on])})"
+        else
+          aggregate_column = "COUNT(#{parse_activity_column(options[:count_on])})"
+          aggregate_column = "DISTINCT(#{aggregate_column})" if options[:count_distinct]
+        end
 
         activity_end_time = "'#{between_end.to_s(:db)}'"
 
@@ -59,7 +67,7 @@ module HasActivity
         when "hour"
           relation = self.select("
             #{activity_column} AS has_activity_timestamp,
-            COUNT(#{count_column}) AS has_activity_count,
+            #{aggregate_column} AS has_activity_count,
             ((((YEAR(#{activity_end_time}) - YEAR(#{activity_column}))*365)+(DAYOFYEAR(#{activity_end_time})-DAYOFYEAR(#{activity_column})))*24)+(HOUR(#{activity_end_time})-HOUR(#{activity_column})) AS has_activity_hours_ago,
             CONCAT(YEAR(#{activity_column}), CONCAT(DAYOFYEAR(#{activity_column}), HOUR(#{activity_column}))) AS has_activity_uniqueness
           ")
@@ -68,7 +76,7 @@ module HasActivity
         when "day"
           relation = self.select("
             #{activity_column} AS has_activity_timestamp,
-            COUNT(#{count_column}) AS has_activity_count,
+            #{aggregate_column} AS has_activity_count,
             DATEDIFF(#{activity_end_time}, #{activity_column}) AS has_activity_days_ago,
             CONCAT(YEAR(#{activity_column}), CONCAT(DAYOFYEAR(#{activity_column}))) AS has_activity_uniqueness
           ")
@@ -77,7 +85,7 @@ module HasActivity
         when "week"
           relation = self.select("
             #{activity_column} AS has_activity_timestamp,
-            COUNT(#{count_column}) AS has_activity_count,
+            #{aggregate_column} AS has_activity_count,
             ((YEAR(#{activity_end_time}) - YEAR(#{activity_column}))*52)+(WEEK(#{activity_end_time})-WEEK(#{activity_column})) AS has_activity_weeks_ago,
             YEARWEEK(#{activity_column}) AS has_activity_uniqueness
           ")
@@ -86,7 +94,7 @@ module HasActivity
         when "month"
           relation = self.select("
             #{activity_column} AS has_activity_timestamp,
-            COUNT(#{count_column}) AS has_activity_count,
+            #{aggregate_column} AS has_activity_count,
             ((YEAR(#{activity_end_time}) - YEAR(#{activity_column}))*12)+(MONTH(#{activity_end_time})-MONTH(#{activity_column})) AS has_activity_months_ago,
             CONCAT(YEAR(#{activity_column}), CONCAT(MONTH(#{activity_column}))) AS has_activity_uniqueness
           ")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has-activity
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70254072540360 !ruby/object:Gem::Requirement
+  requirement: &70095520508740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254072540360
+  version_requirements: *70095520508740
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70254072539680 !ruby/object:Gem::Requirement
+  requirement: &70095520508060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70254072539680
+  version_requirements: *70095520508060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70254072539000 !ruby/object:Gem::Requirement
+  requirement: &70095520507380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70254072539000
+  version_requirements: *70095520507380
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70254069044600 !ruby/object:Gem::Requirement
+  requirement: &70095520506660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70254069044600
+  version_requirements: *70095520506660
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70254069043860 !ruby/object:Gem::Requirement
+  requirement: &70095520528660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254069043860
+  version_requirements: *70095520528660
 description: A simple way to grab recent activity on a given model grouped by hour,
   day, week or month (time series). Supports "padding" for intervals without activity.
 email: cary.dunn@gmail.com
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4197150481822050296
+      hash: 3293291275645446971
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: