simplify conditional logic

blotto · Feb 24, 2014 · 08c6e52 · 08c6e52
1 parent c3279ba
commit 08c6e52
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/lib/thermometer/active_record.rb b/lib/thermometer/active_record.rb
@@ -5,18 +5,24 @@ module ActiveRecord
 
     module QueryMethods
 
-      def sample options
+      def data_sample options
+
         if options[:limit] && options[:order]
-          sample = limit(options[:limit]).order(options[:order]).pluck(options[:date])
-        elsif options[:limit] && options[:order].nil?
-          sample = limit(options[:limit]).pluck(options[:date])
-        elsif options[:limit].nil? && options[:order]
-          sample = order(options[:order]).pluck(options[:date])
-        else
-          sample = pluck(options[:date])
+          sample = limit(options[:limit]).order(options[:order])#.pluck(options[:date])
+        elsif options[:limit] #&& options[:order].nil?
+          sample = limit(options[:limit])#.pluck(options[:date])
+        else  #options[:order] #options[:limit].nil? &&
+          sample = order(options[:order])
         end
+
+        return sample.pluck(options[:date])
       end
 
+
+      #def conditions options
+      #  yield options[:limit],options[:order],options[:date]
+      #end
+
     end
 
     module RelationMethods
@@ -28,7 +34,7 @@ module RelationMethods
       def sample_records options
         options = Thermometer.configuration.process_scope_options(proxy_association.reflection.options[:thermometer].merge(options))
 
-        sample options
+        data_sample options
       end
 
 

diff --git a/lib/thermometer/temperature.rb b/lib/thermometer/temperature.rb
@@ -45,7 +45,7 @@ def measures_temperature_for *associations
       def sample_records options
         options = Thermometer.configuration.process_scope_options(options)
 
-        sample options
+        data_sample options
       end
 
     end