ranked-model 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b5933c81c7b8db9b1a26b327b7805d0aa0f6334
-  data.tar.gz: eaf6954358557ed51528cf76d9848f6d3961a7a1
+  metadata.gz: e92bbed2da4ae8cd7a3705fed451fb73a27b6eee
+  data.tar.gz: da248775ef6a763b5a6342587fd5343c06db9adb
 SHA512:
-  metadata.gz: 1b905fc8d5ffb24b27eacbe3de7a7de5be4ff16c23ed2ca6256a1a73f6424076660bbbd74f1b99e472421f50fcd637c2732edf574a22f217ad8963af0f418901
-  data.tar.gz: f917f55c584657fe4d744592e04f131ec7cf58e9cf3abba73b532075a2776ec21d759d488d028e413deaedc946bf9b91b2b5a4c72980a2f535c46cfbc6e59cf9
+  metadata.gz: 638948178a3dd3c45bdc811e43ea8b5ca2cd8401ae7a74124c97e2cf09d5a68381bcce5e810db1d42b311281a07633cfb69946c0994e8f1a1675fb564501e70b
+  data.tar.gz: 3d37e0b29d0aac037f6ca3edf7258ffac9b17aefa55f46f472d0789999eddf37e5258ea30969a94d7f1543a95e63bf964d40b0d4c517354f6e64b057f1054cc0

data/Appraisals

@@ -1,6 +1,6 @@
 appraise "rails-4-1" do
   group :sqlite do
-    gem "sqlite3", platform: :ruby
+    gem "sqlite3", "~> 1.3.13", platform: :ruby
     gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
   end
   group :mysql do
@@ -17,7 +17,7 @@ end
 
 appraise "rails-4-2" do
   group :sqlite do
-    gem "sqlite3", platform: :ruby
+    gem "sqlite3", "~> 1.3.13", platform: :ruby
     gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
   end
   group :mysql do
@@ -34,7 +34,7 @@ end
 
 appraise "rails-5-0" do
   group :sqlite do
-    gem "sqlite3", platform: :ruby
+    gem "sqlite3", "~> 1.3.13", platform: :ruby
     gem "activerecord-jdbcsqlite3-adapter", "~> 50.1", platform: :jruby
   end
   group :mysql do
@@ -51,7 +51,7 @@ end
 
 appraise "rails-5-1" do
   group :sqlite do
-    gem "sqlite3", platform: :ruby
+    gem "sqlite3", "~> 1.3.13", platform: :ruby
     gem "activerecord-jdbcsqlite3-adapter", "~> 51.1", platform: :jruby
   end
   group :mysql do
@@ -68,7 +68,7 @@ end
 
 appraise "rails-5-2" do
   group :sqlite do
-    gem "sqlite3", platform: :ruby
+    gem "sqlite3", "~> 1.3.13", platform: :ruby
   end
   group :mysql do
     gem "mysql2", "~> 0.4.10", platform: :ruby

data/Readme.mkd

@@ -72,6 +72,15 @@ $.ajax({
 });
 ```
 
+If you need to find the rank of an item with respect to other ranked items, you can use the `{column_name}_rank` method on the model instance. `{column_name}` is your resource ranking column.
+
+Following on from our examples above, the `row_order_rank` method will return the position of the duck object in the list with respect to the order defined by the row_order column.
+
+``` ruby
+Duck.rank(:row_order).first.row_order_rank # => 0
+Duck.rank(:row_order).third.row_order_rank # => 2
+```
+
 Complex Use
 -----------
 

data/gemfiles/rails_4_1.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "activerecord", "~> 4.1.16"
 
 group :sqlite do
-  gem "sqlite3", platform: :ruby
+  gem "sqlite3", "~> 1.3.13", platform: :ruby
   gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
 end
 

data/gemfiles/rails_4_2.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "activerecord", "~> 4.2.10"
 
 group :sqlite do
-  gem "sqlite3", platform: :ruby
+  gem "sqlite3", "~> 1.3.13", platform: :ruby
   gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
 end
 

data/gemfiles/rails_5_0.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "activerecord", "~> 5.0.7"
 
 group :sqlite do
-  gem "sqlite3", platform: :ruby
+  gem "sqlite3", "~> 1.3.13", platform: :ruby
   gem "activerecord-jdbcsqlite3-adapter", "~> 50.1", platform: :jruby
 end
 

data/gemfiles/rails_5_1.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "activerecord", "~> 5.1.6"
 
 group :sqlite do
-  gem "sqlite3", platform: :ruby
+  gem "sqlite3", "~> 1.3.13", platform: :ruby
   gem "activerecord-jdbcsqlite3-adapter", "~> 51.1", platform: :jruby
 end
 

data/gemfiles/rails_5_2.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "activerecord", "~> 5.2.0"
 
 group :sqlite do
-  gem "sqlite3", platform: :ruby
+  gem "sqlite3", "~> 1.3.13", platform: :ruby
 end
 
 group :mysql do

data/lib/ranked-model.rb

@@ -48,7 +48,7 @@ module RankedModel
       self.rankers ||= []
       ranker = RankedModel::Ranker.new(*args)
 
-      if column_defaults[ranker.name.to_s]
+      if column_default(ranker)
         raise NonNilColumnDefault, %Q{Your ranked model column "#{ranker.name}" must not have a default value in the database.}
       end
 
@@ -61,9 +61,17 @@ module RankedModel
         end
       end
 
+      define_method "#{ranker.name}_rank" do
+        ranker.with(self).relative_rank
+      end
+
       public "#{ranker.name}_position", "#{ranker.name}_position="
     end
 
+    def column_default ranker
+      column_defaults[ranker.name.to_s] if ActiveRecord::Base.connected?
+    end
+
   end
 
 end

data/lib/ranked-model/ranker.rb

@@ -73,6 +73,10 @@ module RankedModel
         instance.send "#{ranker.name}_position"
       end
 
+      def relative_rank
+        finder.where("#{ranker.column} < #{rank}").count(:all)
+      end
+
       def rank
         instance.send "#{ranker.column}"
       end

data/lib/ranked-model/version.rb

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

data/spec/duck-model/column_default_ducks_spec.rb

@@ -11,4 +11,19 @@ describe 'ColumnDefaultDuck' do
 		}.to raise_error(RankedModel::NonNilColumnDefault, 'Your ranked model column "size" must not have a default value in the database.')
 	end
 
+	it "should not raise an error if we don't have a database connection when checking for default value" do
+		begin
+			ActiveRecord::Base.remove_connection
+
+			expect {
+				class ColumnDefaultDuck < ActiveRecord::Base
+				  include RankedModel
+				  ranks :size, :with_same => :pond
+				end
+			}.not_to raise_error
+		ensure
+			ActiveRecord::Base.establish_connection(DB_CONFIG.to_sym)
+		end
+	end
+
 end

data/spec/duck-model/duck_spec.rb

@@ -10,12 +10,16 @@ describe Duck do
 
   it { expect(subject).to respond_to(:row_position) }
   it { expect(subject).to respond_to(:row_position=) }
+  it { expect(subject).to respond_to(:row_rank) }
   it { expect(subject).to respond_to(:size_position) }
   it { expect(subject).to respond_to(:size_position=) }
+  it { expect(subject).to respond_to(:size_rank) }
   it { expect(subject).to respond_to(:age_position) }
   it { expect(subject).to respond_to(:age_position=) }
+  it { expect(subject).to respond_to(:age_rank) }
   it { expect(subject).to respond_to(:landing_order_position) }
   it { expect(subject).to respond_to(:landing_order_position=) }
+  it { expect(subject).to respond_to(:landing_order_rank) }
 
 end
 
@@ -748,6 +752,33 @@ describe Duck do
 
   end
 
+  describe "fetching rank for an instance" do
+    before {
+      [:quacky, :feathers, :wingy, :webby, :waddly, :beaky].each_with_index do |name, i|
+         Duck.where(id: @ducks[name].id).update_all(row: RankedModel::MAX_RANK_VALUE - i)
+         @ducks[name].reload
+      end
+    }
+
+    context {
+      subject { Duck.find_by(id: @ducks[:beaky]).row_rank }
+
+      it { should == 0 }
+    }
+
+    context {
+      subject { Duck.find_by(id: @ducks[:wingy]).row_rank }
+
+      it { should == 3 }
+    }
+
+    context {
+      subject { Duck.find_by(id: @ducks[:quacky]).row_rank }
+
+      it { should == 5 }
+    }
+  end
+
 end
 
 describe Duck do

data/spec/support/database.yml

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ranked-model
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Matthew Beale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -138,7 +138,6 @@ files:
 - LICENSE
 - Rakefile
 - Readme.mkd
-- gemfiles/rails_3_2.gemfile
 - gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile

data/gemfiles/rails_3_2.gemfile

@@ -1,22 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 3.2.22.5"
-
-group :sqlite do
-  gem "sqlite3", platform: :ruby
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
-end
-
-group :mysql do
-  gem "mysql2", "~> 0.3.21", platform: :ruby
-  gem "activerecord-jdbcmysql-adapter", "~> 1.3.24", platform: :jruby
-end
-
-group :postgresql do
-  gem "pg", "~> 0.18.0", platform: :ruby
-  gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.24", platform: :jruby
-end
-
-gemspec path: "../"