randumb 0.1.4 → 0.2.0

data/lib/randumb.rb

@@ -2,69 +2,48 @@ require 'active_support/core_ext/module/delegation'
 require 'active_record/relation'
 
 module Randumb
-  
-    #  https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/query_methods.rb
+  # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/query_methods.rb
   module ActiveRecord
     
     module Relation
       
       def random(max_items = nil)
-        # return only the first record if method was called without parameters
-        return_first_record = max_items.nil?
+        return_first_record = max_items.nil? # see return switch at end
         max_items ||= 1
-
-        # take out limit from relation to use later
-    
         relation = clone
       
-        # store these for including at the end
-        original_includes = relation.includes_values
-        original_selects = relation.select_values
-        
-        # clear these for our id only query
-        relation.select_values = []
-        relation.includes_values = []
-      
-        # does their original query but only for id fields
-        id_only_relation = relation.select("#{table_name}.id")
-        id_results = connection.select_all(id_only_relation.to_sql)
-      
-        ids = {}
-      
-        while( ids.length < max_items && ids.length < id_results.length )
-          rand_index = rand( id_results.length )
-          ids[rand_index] = id_results[rand_index]["id"] unless ids.has_key?(rand_index)
+        if connection.adapter_name =~ /sqlite/i || connection.adapter_name =~ /postgres/i
+          rand_syntax = "RANDOM()"
+        elsif connection.adapter_name =~ /mysql/i
+          rand_syntax = "RAND()"
+        else
+          raise Exception, "ActiveRecord adapter: '#{connection.adapter_name}' not supported by randumb.  Send a pull request or open a ticket: https://github.com/spilliton/randumb"
         end
-  
-        the_scope = klass.includes(original_includes)
-        # specifying empty selects caused bug in rails 3.0.0/3.0.1
-        the_scope = the_scope.select(original_selects) unless original_selects.empty? 
-        records = the_scope.find_all_by_id(ids.values)
+
+        the_scope = relation.order(rand_syntax)
+        the_scope = the_scope.limit(max_items) unless relation.limit_value && relation.limit_value < max_items
                 
+        # return first record if method was called without parameters
         if return_first_record
-          records.first
+          the_scope.first
         else
-          records
+          the_scope.all
         end
       end
 
     end # Relation
     
     module Base
-      
       # Class method
       def random(max_items = nil)
         relation.random(max_items)
       end
-      
-    end # Base
+    end 
     
     
   end # ActiveRecord
-  
 end # Randumb
 
-
 # Mix it in
 class ActiveRecord::Relation
   include Randumb::ActiveRecord::Relation

metadata

@@ -2,7 +2,7 @@
 name: randumb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors: 
 - Zachary Kloepping
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-13 00:00:00 Z
+date: 2012-05-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Adds the ability to pull random records from ActiveRecord