reduce some code duplication

.gitignore

@@ -6,3 +6,4 @@ test/dummy/db/*.sqlite3-journal
 test/dummy/log/*.log
 test/dummy/tmp/
 test/dummy/.sass-cache
+ *.gem

lib/thermometer/active_record.rb

@@ -2,14 +2,10 @@
 
 module Thermometer
   module ActiveRecord
-    module RelationMethods
-      include Evaluate::Temperatures
 
-      private
-
-      def sample_records options
-        options = Thermometer.configuration.process_scope_options(proxy_association.reflection.options[:thermometer].merge(options))
+    module QueryMethods
 
+      def sample options
         if options[:limit] && options[:order]
           sample = limit(options[:limit]).order(options[:order]).pluck(options[:date])
         elsif options[:limit] && options[:order].nil?
@@ -21,25 +17,22 @@ def sample_records options
         end
       end
 
-
     end
-=begin
-    module Temperature
-
-      def
-      rel = if ::ActiveRecord::Relation === self
-              self
-            elsif !defined?(::ActiveRecord::Scoping) or ::ActiveRecord::Scoping::ClassMethods.method_defined? :with_scope
-              # Active Record 3
-              scoped
-            else
-              # Active Record 4
-              all
-            end
-
-      rel = rel.extending(RelationMethods)
+
+    module RelationMethods
+      include Evaluate::Temperatures
+      include ActiveRecord::QueryMethods
+
+      private
+
+      def sample_records options
+        options = Thermometer.configuration.process_scope_options(proxy_association.reflection.options[:thermometer].merge(options))
+
+        sample options
+      end
+
+
     end
-=end
   end
 
   #::ActiveRecord::Base.extend RelationMethods

lib/thermometer/temperature.rb

@@ -10,6 +10,7 @@ def self.included(base)
 
     module ClassMethods
       include Evaluate::Temperatures
+      include ActiveRecord::QueryMethods
 
       def acts_as_thermometer
         include Thermometer::Temperature::InstanceMethods
@@ -44,15 +45,7 @@ def measures_temperature_for *associations
       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
+        sample options
       end
 
     end