randumb 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fde8e702f664f00c3ea3972f32eec66ce71637d6
-  data.tar.gz: 1938439b5466df1dfe6e29ae1711110ddc2ffb5c
+SHA256:
+  metadata.gz: 9fd0e54ae7de8a15766df8a33d65edd4a5d1eab2cb3ba36b27c6f9541ab39a72
+  data.tar.gz: ed1afd68fa829e7e236d92d44fda28439492b004eda2c8d45b11b1b85f8feee3
 SHA512:
-  metadata.gz: 10ef96fbd1bd664ff50dcc467f6377071781f2f82a1a5f85350942c6e72a6ad7e8db1df4d2da993e2ec7b5e528d74f0b15e8f1f21293f546f51c3bd216ee5e03
-  data.tar.gz: baef13e37ec9801a19d26db584fce314e55e1208d0fc03342e772945e9095960c98828faf945d8184b63116f9cb953d20488aaee5cfb46d49bb0d6cff1b1df3e
+  metadata.gz: 7031236bbde306b4c508d019956514ebe0a9b93b037f0d2cc2a539ea694b55c33c05b6728cfaae952f663b2727f919b974a863ddc905b15c77e70ca99c149c91
+  data.tar.gz: 7431df3f579c21e3076507b85564375646db6e78135ac0420d399c62e50474bafe3a1d827bc1f174edb57f22c8a68dbbaf7eb6b8e656e845e23476dfbb4bc310

data/lib/randumb/relation.rb

@@ -91,15 +91,10 @@ module Randumb
           Randumb::Syntax.random_order_clause(opts)
         end
 
-        if ::ActiveRecord::VERSION::MAJOR == 3 && ::ActiveRecord::VERSION::MINOR < 2
-          # AR 3.0.0 support
-          order(order_clause)
-        else
-          # keep prior orders and append random
-          all_orders = (orders + [order_clause])
-          # override all previous orders
-          reorder(all_orders)
-        end
+        # keep prior orders and append random
+        all_orders = (arel.orders + [order_clause])
+        # override all previous orders
+        reorder(all_orders)
       end
 
       # postgres won't let you do an order_by when also doing a distinct

data/lib/randumb/version.rb

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

data/test/models/factories.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :artist do
     name { Faker::Lorem.words(3).join(' ') }
     views  { Random.rand(50) }

data/test/randumb_test.rb

@@ -39,7 +39,7 @@ class RandumbTest < Minitest::Test
 
   context "1 record in the table" do
     setup do
-      @high_on_fire = FactoryGirl.create(:artist, :name => "High On Fire", :views => 1)
+      @high_on_fire = FactoryBot.create(:artist, :name => "High On Fire", :views => 1)
     end
 
     should "select only 1 record even when you request more" do
@@ -67,8 +67,8 @@ class RandumbTest < Minitest::Test
 
     context "3 records in table" do
       setup do
-        @fiona_apple = FactoryGirl.create(:artist, :name => "Fiona Apple", :views => 3)
-        @magnetic_fields = FactoryGirl.create(:artist, :name => "The Magnetic Fields", :views => 2)
+        @fiona_apple = FactoryBot.create(:artist, :name => "Fiona Apple", :views => 3)
+        @magnetic_fields = FactoryBot.create(:artist, :name => "The Magnetic Fields", :views => 2)
       end
 
       should "apply randomness after other orders when using sql method" do
@@ -124,10 +124,10 @@ class RandumbTest < Minitest::Test
 
       context "with some albums" do
         setup do
-          @tidal = FactoryGirl.create(:album, :name => "Tidal", :artist => @fiona_apple)
-          @extraordinary_machine = FactoryGirl.create(:album, :name => "Extraordinary Machine", :artist => @fiona_apple)
-          @sixty_nine_love_songs = FactoryGirl.create(:album, :name => "69 Love Songs", :artist => @magnetic_fields)
-          @snakes_for_the_divine = FactoryGirl.create(:album, :name => "Snakes For the Divine", :artist => @high_on_fire)
+          @tidal = FactoryBot.create(:album, :name => "Tidal", :artist => @fiona_apple)
+          @extraordinary_machine = FactoryBot.create(:album, :name => "Extraordinary Machine", :artist => @fiona_apple)
+          @sixty_nine_love_songs = FactoryBot.create(:album, :name => "69 Love Songs", :artist => @magnetic_fields)
+          @snakes_for_the_divine = FactoryBot.create(:album, :name => "Snakes For the Divine", :artist => @high_on_fire)
         end
 
 
@@ -135,7 +135,7 @@ class RandumbTest < Minitest::Test
           artists = Artist.includes(:albums).random(10)
           fiona_apple = artists.find { |a| a.name == "Fiona Apple" }
           # if I add a new album now, it shouldn't be in the albums assocation yet b/c it was already loaded
-          FactoryGirl.create(:album, :name => "When The Pawn", :artist => @fiona_apple)
+          FactoryBot.create(:album, :name => "When The Pawn", :artist => @fiona_apple)
 
           assert_equal 2, fiona_apple.albums.length
           assert_equal 3, @fiona_apple.reload.albums.length
@@ -145,7 +145,7 @@ class RandumbTest < Minitest::Test
           artists = Artist.includes(:albums).random_by_id_shuffle(10)
           fiona_apple = artists.find { |a| a.name == "Fiona Apple" }
           # if I add a new album now, it shouldn't be in the albums assocation yet b/c it was already loaded
-          FactoryGirl.create(:album, :name => "When The Pawn", :artist => @fiona_apple)
+          FactoryBot.create(:album, :name => "When The Pawn", :artist => @fiona_apple)
 
           assert_equal 2, fiona_apple.albums.length
           assert_equal 3, @fiona_apple.reload.albums.length
@@ -189,8 +189,8 @@ class RandumbTest < Minitest::Test
 
   context "2 records in table" do
     setup do
-      @hum = FactoryGirl.create(:artist, :name => "Hum", :views => 3)
-      @minutemen = FactoryGirl.create(:artist, :name => "Minutemen", :views => 2)
+      @hum = FactoryBot.create(:artist, :name => "Hum", :views => 3)
+      @minutemen = FactoryBot.create(:artist, :name => "Minutemen", :views => 2)
     end
 
     should "eventually render the 2 possible orders using default method" do

data/test/test_helper.rb

@@ -2,7 +2,7 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'rubygems'
 require "minitest/autorun"
 require 'shoulda'
-require 'factory_girl'
+require 'factory_bot'
 require 'faker'
 require 'active_record'
 require 'active_support/dependencies'
@@ -22,6 +22,8 @@ commands = {
 }
 %x{#{commands[driver] || true}}
 
+
+
 ActiveRecord::Base.establish_connection config[driver]
 puts "Using #{RUBY_VERSION} AR #{version} with #{driver}"
 

data/test/weighted_test.rb

@@ -41,7 +41,7 @@ class WeightedTest < Minitest::Test
   end
 
   should "not interfere with active record dynamic methods that use method_missing" do
-    @artist = FactoryGirl.create(:artist, :name => 'Spiritualized')
+    @artist = FactoryBot.create(:artist, :name => 'Spiritualized')
     assert_equal @artist, Artist.find_by_name('Spiritualized')
   end
 
@@ -59,7 +59,7 @@ 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| FactoryBot.create(:artist, views: views) }
     end
 
     should "respect default scope" do

metadata

@@ -1,139 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: randumb
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Zachary Kloepping
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.20
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.20
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.10
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.10
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.19.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.19.0
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: minitest
   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'
 - !ruby/object:Gem::Dependency
   name: shoulda
   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'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   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'
 - !ruby/object:Gem::Dependency
   name: faker
   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'
 - !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: 
@@ -142,10 +184,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/randumb.rb
 - lib/randumb/relation.rb
 - lib/randumb/syntax.rb
 - lib/randumb/version.rb
-- lib/randumb.rb
 - test/models/album.rb
 - test/models/artist.rb
 - test/models/factories.rb
@@ -162,17 +204,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Adds the ability to pull random records from ActiveRecord