lib/perus/server/models/metric.rb in perus-0.1.9 vs lib/perus/server/models/metric.rb in perus-0.1.10

@@ -31,11 +31,17 @@
         def values_dataset
             system.values_dataset.where(metric: name)
         end
 
         def values_over_period(period)
-            raise 'invalid period' unless period.keys.include?(:hours)
-            min_timeout = Time.now.to_i - (period[:hours] * 60 * 60)
+            if period.keys.include?(:hours)
+                min_timeout = Time.now.to_i - (period[:hours] * 60 * 60)
+            elsif period.keys.include?(:mins)
+                min_timeout = Time.now.to_i - (period[:mins] * 60)
+            else
+                raise 'invalid period - must be :hours or :mins'
+            end
+            
             values_dataset.where("timestamp >= #{min_timeout}")
         end
 
         def num_values_over_period(period)
             values = values_over_period(period)