has-activity 0.3.0 → 0.3.1

data/README.rdoc

@@ -8,7 +8,7 @@ A simple way to grab recent activity on a given model grouped by hour, day, week
 
 Add gem to Gemfile...
   
-  gem 'has-activity', '~>0.1.0'
+  gem 'has-activity'
 
 Add the activity functionality to a model...
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/has-activity.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "has-activity"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cary Dunn"]
-  s.date = "2012-05-08"
+  s.date = "2012-05-17"
   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

@@ -57,8 +57,9 @@ module HasActivity
         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 = parse_activity_column(options[:count_on])
           aggregate_column = "DISTINCT(#{aggregate_column})" if options[:count_distinct]
+          aggregate_column = "COUNT(#{aggregate_column})"
         end
 
         activity_end_time = "'#{between_end.to_s(:db)}'"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has-activity
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70095520508740 !ruby/object:Gem::Requirement
+  requirement: &70102127719900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095520508740
+  version_requirements: *70102127719900
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70095520508060 !ruby/object:Gem::Requirement
+  requirement: &70102127719240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70095520508060
+  version_requirements: *70102127719240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70095520507380 !ruby/object:Gem::Requirement
+  requirement: &70102127718560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70095520507380
+  version_requirements: *70102127718560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70095520506660 !ruby/object:Gem::Requirement
+  requirement: &70102127717880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70095520506660
+  version_requirements: *70102127717880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70095520528660 !ruby/object:Gem::Requirement
+  requirement: &70102127717040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095520528660
+  version_requirements: *70102127717040
 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: 3293291275645446971
+      hash: 1430934337659065681
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: