punch.rb in punching_bag-0.3.4

- old
+ new

@@ -1,11 +1,9 @@
 class Punch < ActiveRecord::Base
 
   belongs_to :punchable, :polymorphic => true
 
-  attr_accessible # none
-
   before_validation :set_defaults
   validates :punchable_id, :punchable_type, :starts_at, :ends_at, :average_time, :hits, :presence => true
 
   default_scope order('punches.average_time DESC')
   scope :combos, where('punches.hits > 1')
@@ -46,47 +44,47 @@
   end
 
   def day_combo?
     timeframe == :day
   end
-  
+
   def month_combo?
     timeframe == :month
   end
-  
+
   def year_combo?
     timeframe == :year
   end
-  
+
   def find_combo_for(timeframe)
     punches = punchable.punches.by_timeframe(timeframe, average_time)
     punches.combos.first || punches.first
   end
-  
+
   def combine_with(combo)
     if combo != self
       combo.starts_at = starts_at if starts_at < combo.starts_at
       combo.ends_at = ends_at if ends_at > combo.ends_at
       combo.average_time = PunchingBag.average_time(combo, self)
       combo.hits += hits
       self.destroy if combo.save
     end
     combo
   end
-  
+
   def combine_by_day
     unless day_combo? || month_combo? || year_combo?
       combine_with find_combo_for(:day)
     end
   end
-  
+
   def combine_by_month
     unless month_combo? || year_combo?
       combine_with find_combo_for(:month)
     end
   end
-  
+
   def combine_by_year
     unless year_combo?
       combine_with find_combo_for(:year)
     end
   end
@@ -98,14 +96,14 @@
 
     sums = Punch.where(:punchable_type => punchables.first.class.to_s, :punchable_id => punchables.map(&:id)).group(:punchable_id).sum(:hits)
 
     return 0 if sums.empty? # catch divide by zero
 
-    sums.values.inject(:+).to_f / sums.length    
+    sums.values.inject(:+).to_f / sums.length
   end
 
   private
-  
+
   def set_defaults
     if date = (self.starts_at ||= DateTime.now)
       self.ends_at ||= date
       self.average_time ||= date
       self.hits ||= 1