punching_bag 0.3.2 → 0.3.3

data/lib/punching_bag/version.rb

@@ -1,3 +1,3 @@
 module PunchingBag
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/lib/tasks/punching_bag.rake

@@ -1,29 +1,31 @@
 namespace :punching_bag do
-
   desc 'Combine old hit records together to improve performance'
   task :combine, [:by_day_after, :by_month_after, :by_year_after] => [:environment] do |t, args|
-    args.with_defaults :by_day_after => 7, :by_month_after => 1, :by_year_after => 1 
-    
-    punchables = Punch.all.map(&:punchable).uniq
-    punchables.each do |punchable|
-      
-      # by_year
-      punchable.punches.before(args[:by_year_after].years.ago).each do |punch|
-        punch.combine_by_year
-      end
-      
-      # by_month
-      punchable.punches.before(args[:by_month_after].months.ago).each do |punch|
-        punch.combine_by_month
-      end
-      
-      # by_day
-      punchable.punches.before(args[:by_day_after].days.ago).each do |punch|
-        punch.combine_by_day
+    args.with_defaults :by_day_after => 7, :by_month_after => 1, :by_year_after => 1
+
+    punchable_types = Punch.uniq.pluck(:punchable_type)
+
+    punchable_types.each do |punchable_type|
+      punchable_ids = Punch.uniq.where(punchable_type: punchable_type).pluck(:punchable_id)
+
+      punchable_ids.each do |punchable_id|
+        punchable = punchable_type.constantize.find(punchable_id)
+
+        # by_year
+        punchable.punches.before(args[:by_year_after].years.ago).each do |punch|
+          punch.combine_by_year
+        end
+
+        # by_month
+        punchable.punches.before(args[:by_month_after].months.ago).each do |punch|
+          punch.combine_by_month
+        end
+
+        # by_day
+        punchable.punches.before(args[:by_day_after].days.ago).each do |punch|
+          punch.combine_by_day
+        end
       end
-      
     end
-    
   end
-
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: punching_bag
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Adam Crownoble
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-05 00:00:00 Z
+date: 2013-06-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: voight_kampff