randumb 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dfd32d6c13a988c2fb72afea69f8e7d2824b2cf
-  data.tar.gz: 77ad6781fc9a3618757d916ed815e3356d1b14a0
+  metadata.gz: fde8e702f664f00c3ea3972f32eec66ce71637d6
+  data.tar.gz: 1938439b5466df1dfe6e29ae1711110ddc2ffb5c
 SHA512:
-  metadata.gz: a0a9f3960ff23cf85fd19283ebed1027382841b19f1c4a55292ce15fccce324c0f95b1400f3e17af952bebb7da89894ca8026f117a018e88f4836d3bc4175088
-  data.tar.gz: d01853119a813ed7f26933ce15db02a1b52ca2be5c74e9fef131facef27a9c4ab417819ebe4cc2b4acdbdd1a144ad98385e53ef8a5944d0936de4d5abe85c599
+  metadata.gz: 10ef96fbd1bd664ff50dcc467f6377071781f2f82a1a5f85350942c6e72a6ad7e8db1df4d2da993e2ec7b5e528d74f0b15e8f1f21293f546f51c3bd216ee5e03
+  data.tar.gz: baef13e37ec9801a19d26db584fce314e55e1208d0fc03342e772945e9095960c98828faf945d8184b63116f9cb953d20488aaee5cfb46d49bb0d6cff1b1df3e

data/lib/randumb/relation.rb

@@ -162,25 +162,27 @@ module Randumb
 
 
     # Class methods
+    # where(nil) is because:
+    # http://stackoverflow.com/questions/18198963/with-rails-4-model-scoped-is-deprecated-but-model-all-cant-replace-it
     module Base
       def random(max_items = nil, opts = {})
-        relation.random(max_items, opts)
+        where(nil).random(max_items, opts)
       end
 
       def random_weighted(ranking_column, max_items = nil, opts = {})
-        relation.random_weighted(ranking_column, max_items, opts)
+        where(nil).random_weighted(ranking_column, max_items, opts)
       end
 
       def random_by_id_shuffle(max_items = nil, opts = {})
-        relation.random_by_id_shuffle(max_items, opts)
+        where(nil).random_by_id_shuffle(max_items, opts)
       end
 
-      def order_by_rand(opts={})
-        relation.order_by_rand(opts)
+      def order_by_rand(opts = {})
+        where(nil).order_by_rand(opts)
       end
 
       def order_by_rand_weighted(ranking_column, opts={})
-        relation.order_by_rand_weighted(ranking_column, opts)
+        where(nil).order_by_rand_weighted(ranking_column, opts)
       end
     end
 

data/lib/randumb/version.rb

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

data/test/models/artist.rb

@@ -1,5 +1,11 @@
 class Artist < ActiveRecord::Base
   has_many :albums
-  
+
+  if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("3.2")
+    default_scope { where("artists.deleted_at IS NULL") }
+  else
+    default_scope where("artists.deleted_at IS NULL")
+  end
+
   scope :at_least_three_views, -> { where("views >= 3") }
-end
+end

data/test/randumb_test.rb

@@ -57,6 +57,14 @@ class RandumbTest < Minitest::Test
       assert_equal_for_both_methods nil, Artist.where(:name => "The Little Gentlemen")
     end
 
+    should "respect default scope" do
+      @high_on_fire.deleted_at = Time.now.utc
+      @high_on_fire.save!
+      assert_equal 0, Artist.count
+      assert_nil Artist.order_by_rand.first
+      assert_equal @high_on_fire, Artist.unscoped.order_by_rand.first
+    end
+
     context "3 records in table" do
       setup do
         @fiona_apple = FactoryGirl.create(:artist, :name => "Fiona Apple", :views => 3)

data/test/test_helper.rb

@@ -32,6 +32,7 @@ ActiveRecord::Base.connection.create_table(:artists, :force => true) do |t|
   t.float    "rating"
   t.datetime "created_at"
   t.datetime "updated_at"
+  t.datetime "deleted_at"
 end
 
 ActiveRecord::Base.connection.create_table(:albums, :force => true) do |t|
@@ -40,6 +41,7 @@ ActiveRecord::Base.connection.create_table(:albums, :force => true) do |t|
   t.integer "artist_id"
   t.datetime "created_at"
   t.datetime "updated_at"
+  t.datetime "deleted_at"
 end
 
 # setup models for lazy load

data/test/weighted_test.rb

@@ -59,7 +59,17 @@ class WeightedTest < Minitest::Test
   context "order by ranking_column" do
     setup do
       @view_counts = [1, 2, 3, 4, 5]
-      @view_counts.each { |views| FactoryGirl.create(:artist, :views => views) }
+      @view_counts.each { |views| FactoryGirl.create(:artist, views: views) }
+    end
+
+    should "respect default scope" do
+      artist = Artist.last
+      artist.deleted_at = Time.now.utc
+      artist.save!
+      50.times do
+        assert Artist.random_weighted("views").id != artist.id, "should never pick deleted artist"
+      end
+      assert_equal 4, Artist.order_by_rand_weighted("views").all.length
     end
 
     should "order by ranking column with explicit method call" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: randumb
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Zachary Kloepping
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake