From 61ec878e18510808065dbbd3b6b5d4d783b63521 Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Tue, 23 Jul 2019 11:53:10 -0500 Subject: [PATCH 1/4] Have less activerecord::base envy --- lib/ranked-model.rb | 6 +++++- lib/ranked-model/ranker.rb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/ranked-model.rb b/lib/ranked-model.rb index a302061..95f7723 100644 --- a/lib/ranked-model.rb +++ b/lib/ranked-model.rb @@ -42,6 +42,10 @@ def ranker name end end + def ranker_connection_class + ActiveRecord::Base + end + private def ranks *args @@ -69,7 +73,7 @@ def ranks *args end def column_default ranker - column_defaults[ranker.name.to_s] if ActiveRecord::Base.connected? + column_defaults[ranker.name.to_s] if ranker_connection_class.connected? end end diff --git a/lib/ranked-model/ranker.rb b/lib/ranked-model/ranker.rb index 5804d67..70ec9b1 100644 --- a/lib/ranked-model/ranker.rb +++ b/lib/ranked-model/ranker.rb @@ -183,7 +183,7 @@ def assure_unique_position def rearrange_ranks _scope = finder - escaped_column = ActiveRecord::Base.connection.quote_column_name ranker.column + escaped_column = instance_class.ranker_connection_class.connection.quote_column_name ranker.column # If there is room at the bottom of the list and we're added to the very top of the list... if current_first.rank && current_first.rank > RankedModel::MIN_RANK_VALUE && rank == RankedModel::MAX_RANK_VALUE # ...then move everyone else down 1 to make room for us at the end From edeaac6514c32def113224cd2b52bd7f19aba910 Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Tue, 23 Jul 2019 15:30:44 -0500 Subject: [PATCH 2/4] Always call super from included --- lib/ranked-model.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/ranked-model.rb b/lib/ranked-model.rb index 95f7723..8d9b718 100644 --- a/lib/ranked-model.rb +++ b/lib/ranked-model.rb @@ -11,6 +11,7 @@ class NonNilColumnDefault < StandardError; end MIN_RANK_VALUE = -2147483648 def self.included base + super base.class_eval do class_attribute :rankers From fb06561ec9c3ac258c88ac2633d38a024d83fa11 Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Tue, 23 Jul 2019 15:30:59 -0500 Subject: [PATCH 3/4] Make --only-failures possible --- .gitignore | 2 ++ spec/spec_helper.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 9c81b0d..222013e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ pkg/* Gemfile.lock *.gemfile.lock + +spec/examples.txt diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0f74f31..53a7bbf 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -31,6 +31,8 @@ config.order = :random Kernel.srand config.seed + + config.example_status_persistence_file_path = "spec/examples.txt" end RSpec::Matchers.define :define_constant do |expected| From a6c31af715d9ab778c5c5ebebf660cf5b970a227 Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Wed, 24 Jul 2019 09:43:45 -0500 Subject: [PATCH 4/4] Remove trailing whitespace --- lib/ranked-model/railtie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ranked-model/railtie.rb b/lib/ranked-model/railtie.rb index 38e7b6b..aa0db93 100644 --- a/lib/ranked-model/railtie.rb +++ b/lib/ranked-model/railtie.rb @@ -4,7 +4,7 @@ module RankedModel class Railtie < Rails::Railtie - + initializer "ranked-model.initialize" do |app| end