lib/thermometer/temperature.rb in thermometer-0.0.2 vs lib/thermometer/temperature.rb in thermometer-0.0.3

@@ -8,11 +8,14 @@
       base.extend ClassMethods
     end
 
     module ClassMethods
       include Evaluate::Temperatures
+      include ActiveRecord::QueryMethods
 
+
+
       def acts_as_thermometer
         include Thermometer::Temperature::InstanceMethods
       end
 
 
@@ -42,19 +45,11 @@
       private
 
       def sample_records options
         options = Thermometer.configuration.process_scope_options(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])
-        end
+        data_sample options
       end
 
     end
 
     module InstanceMethods
@@ -63,15 +58,15 @@
 
 
       ##
       # Rollup all associations and self into a hash
       #
-      def has_temperatures
+      def has_temperatures options={}
         results = {}
         reflections.select {|r,v| v.options.has_key? :thermometer}.each do |r,v|
-          results[r] = send(r).has_temperature
+          results[r] = send(r).has_temperature options
         end
-        results[:self] = has_temperature
+        results[:self] = has_temperature options
 
         return results
       end
 
       private