ranked-model 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cfad22b2acf05bc3deda080d1bb11b96ade3c9d
-  data.tar.gz: cd2d02de24cf6465ee4211818beb6696ec41e616
+  metadata.gz: 8b5933c81c7b8db9b1a26b327b7805d0aa0f6334
+  data.tar.gz: eaf6954358557ed51528cf76d9848f6d3961a7a1
 SHA512:
-  metadata.gz: fd1dbb2069c730aeda634d15cc4cd5a5fa0be8def4cca8db3b6bb320e40ef97f29f88bac16f2ba12720a1287cbb06ae3188e7862f5586599757fc2c56f6d3e6e
-  data.tar.gz: b5f0896c2a4979b3f8d157bc20f3ee1bc7846ea6ef2ffb3432b50d5696e0852f803026bea3d0177c8db22b949c3d8c89022582b4c79da84c8ff8fc4a2611d3a6
+  metadata.gz: 1b905fc8d5ffb24b27eacbe3de7a7de5be4ff16c23ed2ca6256a1a73f6424076660bbbd74f1b99e472421f50fcd637c2732edf574a22f217ad8963af0f418901
+  data.tar.gz: f917f55c584657fe4d744592e04f131ec7cf58e9cf3abba73b532075a2776ec21d759d488d028e413deaedc946bf9b91b2b5a4c72980a2f535c46cfbc6e59cf9

data/.travis.yml

@@ -45,3 +45,5 @@ matrix:
       gemfile: gemfiles/rails_4_1.gemfile
     - rvm: 2.5.1
       gemfile: gemfiles/rails_4_1.gemfile
+    - rvm: rbx-3.107
+      gemfile: gemfiles/rails_5_2.gemfile

data/lib/ranked-model.rb

@@ -3,6 +3,8 @@ require File.dirname(__FILE__)+'/ranked-model/railtie' if defined?(Rails::Railti
 
 module RankedModel
 
+  class NonNilColumnDefault < StandardError; end
+
   # Signed INT in MySQL
   #
   MAX_RANK_VALUE = 2147483647
@@ -18,7 +20,7 @@ module RankedModel
       before_save :handle_ranking
 
       scope :rank, lambda { |name|
-        order ranker(name.to_sym).column
+        reorder ranker(name.to_sym).column
       }
     end
 
@@ -45,6 +47,11 @@ module RankedModel
     def ranks *args
       self.rankers ||= []
       ranker = RankedModel::Ranker.new(*args)
+
+      if column_defaults[ranker.name.to_s]
+        raise NonNilColumnDefault, %Q{Your ranked model column "#{ranker.name}" must not have a default value in the database.}
+      end
+
       self.rankers << ranker
       attr_reader "#{ranker.name}_position"
       define_method "#{ranker.name}_position=" do |position|

data/lib/ranked-model/ranker.rb

@@ -205,7 +205,7 @@ module RankedModel
       end
 
       def rebalance_ranks
-        if rank
+        if rank && instance.persisted?
           origin = current_order.index { |item| item.instance.id == instance.id }
           destination = current_order.index { |item| rank <= item.rank }
           destination -= 1 if origin < destination
@@ -256,7 +256,7 @@ module RankedModel
             _finder = _finder.where.not instance_class.primary_key.to_sym => instance.id
           end
 
-          _finder.order(ranker.column.to_sym => order).select(columns)
+          _finder.reorder(ranker.column.to_sym => order).select(columns)
         end
       end
 

data/lib/ranked-model/version.rb

@@ -1,3 +1,3 @@
 module RankedModel
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/duck-model/column_default_ducks_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe 'ColumnDefaultDuck' do
+
+	it "should raise an error if we try to initialise ranked_model on a column with a default value" do
+		expect {
+			class ColumnDefaultDuck < ActiveRecord::Base
+			  include RankedModel
+			  ranks :size, :with_same => :pond
+			end
+		}.to raise_error(RankedModel::NonNilColumnDefault, 'Your ranked model column "size" must not have a default value in the database.')
+	end
+
+end

data/spec/spec_helper.rb

@@ -29,6 +29,8 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
+  config.order = :random
+  Kernel.srand config.seed
 end
 
 RSpec::Matchers.define :define_constant do |expected|

data/spec/support/active_record.rb

@@ -33,6 +33,12 @@ ActiveRecord::Schema.define :version => 0 do
     t.string :pond
   end
 
+  create_table :column_default_ducks, :force => true do |t|
+    t.string :name
+    t.integer :size, default: 0
+    t.string :pond
+  end
+
   create_table :elements, :force => true do |t|
     t.string :symbol
     t.string :type

data/spec/support/database.yml

@@ -17,6 +17,6 @@ postgresql:
   database: ranked_model_test
   pool: 5
   timeout: 5000
-  username: postgres
+  username: brendon
   password:
   min_messages: ERROR

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ranked-model
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Matthew Beale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-09 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -150,6 +150,7 @@ files:
 - lib/ranked-model/version.rb
 - rails/init.rb
 - ranked-model.gemspec
+- spec/duck-model/column_default_ducks_spec.rb
 - spec/duck-model/duck_spec.rb
 - spec/duck-model/lots_of_ducks_spec.rb
 - spec/duck-model/wrong_ducks_spec.rb
@@ -189,6 +190,7 @@ signing_key:
 specification_version: 4
 summary: An acts_as_sortable replacement built for Rails 3 & 4
 test_files:
+- spec/duck-model/column_default_ducks_spec.rb
 - spec/duck-model/duck_spec.rb
 - spec/duck-model/lots_of_ducks_spec.rb
 - spec/duck-model/wrong_ducks_spec.rb