randumb 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7a8de94fe998a9315531dc1785ccec096ed4a7e
-  data.tar.gz: b7e3d1440cc41ecd3231f8f9cde03361414cc329
+  metadata.gz: 7dfd32d6c13a988c2fb72afea69f8e7d2824b2cf
+  data.tar.gz: 77ad6781fc9a3618757d916ed815e3356d1b14a0
 SHA512:
-  metadata.gz: b215658a671a55d23fa68db3807ba2f2b6b204263ecb200f1a664f2f25bb58c0137132b1a67d4bbacaebf73ab7025f5a1348c7d2c722dc9f58837fa92faf024c
-  data.tar.gz: 7ea4b738b0cca2b7544bda4a55eb0e74c0e662cab6d85a46322086ddae7fa32def04afad55e82b5cb3fec8542a86116ca0ae00551803fdcc002695e665d0316b
+  metadata.gz: a0a9f3960ff23cf85fd19283ebed1027382841b19f1c4a55292ce15fccce324c0f95b1400f3e17af952bebb7da89894ca8026f117a018e88f4836d3bc4175088
+  data.tar.gz: d01853119a813ed7f26933ce15db02a1b52ca2be5c74e9fef131facef27a9c4ab417819ebe4cc2b4acdbdd1a144ad98385e53ef8a5944d0936de4d5abe85c599

data/lib/randumb/relation.rb

@@ -57,14 +57,21 @@ module Randumb
         # get the records and shuffle since the order of the ids
         # passed to where() isn't retained in the result set
         rng = random_number_generator(opts)
-        records = the_scope.where(:id => ids).shuffle!(:random => rng)
+        records = the_scope.where(:id => ids).to_a.shuffle!(:random => rng)
 
         # return first record if method was called without parameters
         return_first_record ? records.first : records
       end
 
-      def order_by_rand(opts={})
-        build_order_scope(opts)
+      def order_by_rand(opts = {})
+        if opts.is_a?(Hash)
+          build_order_scope(opts)
+        else
+          raise ArgumentError.new(
+            "order_by_rand() expects a hash of options.  If you need to limit "\
+            "results simply add a limit to your scope ex: Artist.order_by_rand.limit(1)"
+          )
+        end
       end
 
       def order_by_rand_weighted(ranking_column, opts={})
@@ -89,7 +96,7 @@ module Randumb
           order(order_clause)
         else
           # keep prior orders and append random
-          all_orders = (orders + [order_clause]).join(", ")
+          all_orders = (orders + [order_clause])
           # override all previous orders
           reorder(all_orders)
         end
@@ -118,7 +125,7 @@ module Randumb
 
       # Returns all matching ids from the db, shuffles them,
       # then returns an array containing at most max_ids
-      def fetch_random_ids(relation, max_ids, opts={})
+      def fetch_random_ids(relation, max_ids, opts = {})
         # clear these for our id only query
         relation.select_values = []
         relation.includes_values = []
@@ -131,11 +138,11 @@ module Randumb
         rng = random_number_generator(opts)
         if max_ids == 1 && id_results.count > 0
           rand_index = rng.rand(id_results.count)
-          [ id_results[ rand_index ]['id'] ]
+          [id_results[rand_index]["id"]]
         else
-          # ActiveRecord 4 requires .to_ary
-          arr = id_results.respond_to?(:to_ary) ? id_results.to_ary : id_results
-          arr.shuffle!(:random => rng)[0,max_ids].collect!{ |h| h['id'] }
+          # ActiveRecord 4 requires .to_a
+          arr = id_results.respond_to?(:to_a) ? id_results.to_a : id_results
+          arr.shuffle!(random: rng)[0, max_ids].collect! { |h| h["id"] }
         end
       end
 

data/lib/randumb/version.rb

@@ -1,3 +1,3 @@
 module Randumb
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/test/randumb_test.rb

@@ -1,10 +1,15 @@
 $:.unshift '.'; require File.dirname(__FILE__) + '/test_helper'
 
-class RandumbTest < Test::Unit::TestCase
+class RandumbTest < Minitest::Test
 
   def assert_equal_for_both_methods(expected, obj, *params)
-    assert_equal expected, obj.send(:random, *params), "when calling random"
-    assert_equal expected, obj.send(:random_by_id_shuffle, *params), "when calling random_by_id_shuffle"
+    if expected.nil?
+      assert_nil obj.send(:random, *params), "when calling random"
+      assert_nil obj.send(:random_by_id_shuffle, *params), "when calling random_by_id_shuffle"
+    else
+      assert_equal expected, obj.send(:random, *params), "when calling random"
+      assert_equal expected, obj.send(:random_by_id_shuffle, *params), "when calling random_by_id_shuffle"
+    end
   end
 
   should "should return empty when no record in table" do
@@ -25,6 +30,13 @@ class RandumbTest < Test::Unit::TestCase
     assert_equal_for_both_methods nil, Artist.limit(50)
   end
 
+  should "raise helpful error if non-hash passed" do
+    error = assert_raises ArgumentError do
+      Artist.order_by_rand(10)
+    end
+    assert error.message.include?("order_by_rand")
+  end
+
   context "1 record in the table" do
     setup do
       @high_on_fire = FactoryGirl.create(:artist, :name => "High On Fire", :views => 1)
@@ -65,19 +77,22 @@ class RandumbTest < Test::Unit::TestCase
       end
 
       should "respect selecting certain columns" do
+        # this version doesn't throw for some reason...
+        skip_throw_missing = ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
+
         assert_equal 3, Artist.find(@fiona_apple.id).views
 
         artists = Artist.select(:name).random(3)
         assert_equal false, artists.first.name.nil?
-        assert_raise (ActiveModel::MissingAttributeError) {artists.first.views}
+        assert_raises (ActiveModel::MissingAttributeError) { artists.first.views } unless skip_throw_missing
 
         artists = Artist.select(:name).order_by_rand.limit(3)
         assert_equal false, artists.first.name.nil?
-        assert_raise (ActiveModel::MissingAttributeError) {artists.first.views}
+        assert_raises (ActiveModel::MissingAttributeError) { artists.first.views } unless skip_throw_missing
 
         artists = Artist.select(:name).random_by_id_shuffle(3)
         assert_equal false, artists.first.name.nil?
-        assert_raise (ActiveModel::MissingAttributeError) {artists.first.views}
+        assert_raises (ActiveModel::MissingAttributeError) { artists.first.views } unless skip_throw_missing
       end
 
       should "respect scopes" do
@@ -153,8 +168,8 @@ class RandumbTest < Test::Unit::TestCase
           should "work with uniq" do
             assert_equal 2, Artist.uniq.random(2).length
             assert_equal 2, Artist.uniq.random_by_id_shuffle(2).length
-            assert_not_nil Artist.uniq.random
-            assert_not_nil Artist.uniq.random_by_id_shuffle
+            assert !Artist.uniq.random.nil?
+            assert !Artist.uniq.random_by_id_shuffle.nil?
           end
         end
 
@@ -211,7 +226,7 @@ class RandumbTest < Test::Unit::TestCase
           assert_equal seeded_order, Artist.random(2, seed: @seed)
         end
 
-        10.times do 
+        10.times do
           assert_equal seeded_order, Artist.order_by_rand(seed: @seed).limit(2)
         end
       end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'rubygems'
-require 'test/unit'
+require "minitest/autorun"
 require 'shoulda'
 require 'factory_girl'
 require 'faker'
@@ -14,14 +14,14 @@ config = YAML::load(File.open(File.expand_path("../databases.yml", __FILE__)))
 version = ActiveRecord::VERSION::STRING
 driver = (ENV["DB"] or "sqlite3").downcase
 in_memory = config[driver]["database"] == ":memory:"
-    
+
 # http://about.travis-ci.org/docs/user/database-setup/
 commands = {
   "mysql"    => "mysql -e 'create database randumb_test;'",
   "postgres" => "psql -c 'create database randumb_test;' -U postgres"
 }
 %x{#{commands[driver] || true}}
-    
+
 ActiveRecord::Base.establish_connection config[driver]
 puts "Using #{RUBY_VERSION} AR #{version} with #{driver}"
 
@@ -33,7 +33,7 @@ ActiveRecord::Base.connection.create_table(:artists, :force => true) do |t|
   t.datetime "created_at"
   t.datetime "updated_at"
 end
-  
+
 ActiveRecord::Base.connection.create_table(:albums, :force => true) do |t|
   t.string  "name"
   t.integer "views"
@@ -41,7 +41,7 @@ ActiveRecord::Base.connection.create_table(:albums, :force => true) do |t|
   t.datetime "created_at"
   t.datetime "updated_at"
 end
-  
+
 # setup models for lazy load
 dep = defined?(ActiveSupport::Dependencies) ? ActiveSupport::Dependencies : ::Dependencies
 dep.autoload_paths.unshift MODELS_PATH
@@ -50,7 +50,7 @@ dep.autoload_paths.unshift MODELS_PATH
 require 'test/models/factories'
 
 # clear db for every test
-class Test::Unit::TestCase
+class Minitest::Test
 
   def setup
     Artist.delete_all

data/test/weighted_test.rb

@@ -1,6 +1,6 @@
 $:.unshift '.'; require File.dirname(__FILE__) + '/test_helper'
 
-class WeightedTest < Test::Unit::TestCase
+class WeightedTest < Minitest::Test
 
   should "raise exception when called with a non-existent column" do
     assert_raises(ArgumentError) do
@@ -66,7 +66,7 @@ class WeightedTest < Test::Unit::TestCase
       assert_hits_per_views do
         Artist.random_weighted("views").views
       end
-      assert_hits_per_views do 
+      assert_hits_per_views do
         Artist.order_by_rand_weighted("views").first.views
       end
     end
@@ -84,7 +84,7 @@ class WeightedTest < Test::Unit::TestCase
         result.first.views
       end
 
-      assert_hits_per_views do 
+      assert_hits_per_views do
         result = Artist.order_by_rand_weighted("views").limit(5).all
         assert(result.size == 5)
         result.first.views
@@ -120,13 +120,13 @@ class WeightedTest < Test::Unit::TestCase
     should "order by ranking column with method_missing using 1 max_items" do
       assert_hits_per_views do
         result = Artist.random_weighted_by_views(1)
-        assert(result.size == 1)
+        assert_equal 1, result.length
         result.first.views
       end
 
       assert_hits_per_views do
         result = Artist.order_by_rand_weighted(:views).limit(1)
-        assert(result.size == 1)
+        assert_equal 1, result.length
         result.first.views
       end
     end
@@ -135,7 +135,7 @@ class WeightedTest < Test::Unit::TestCase
   def assert_hits_per_views
     hits_per_views = Hash.new
     @view_counts.each { |views| hits_per_views[views] = 0 }
-    
+
     1000.times do
       hits_per_views[yield] += 1
     end
@@ -148,4 +148,4 @@ class WeightedTest < Test::Unit::TestCase
   end
 
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: randumb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Zachary Kloepping
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,42 +30,56 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.20
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.20
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +98,16 @@ dependencies:
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: 
 executables: []
@@ -144,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Adds the ability to pull random records from ActiveRecord