rankle 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 074be4978d90fa4f0456dc867138970a59d0aaf4
-  data.tar.gz: 9c6742f8b6f14098c5c62ee2748d5f46c8241f34
+  metadata.gz: 0bd53864ab5c3ebe82169b4c56529ab2b8f4537b
+  data.tar.gz: d36b947d0862c318cb2ca4a8eab43e981766eb55
 SHA512:
-  metadata.gz: 431ea786772022a565750d33713834bdb8c4f4828f8dc99f05cc70fb92fd291e5b08b90a0700368d2ff6443e2e62e97236581fc9e39e9bc5a8887b3faadb2427
-  data.tar.gz: 6797af0d99cc9aa1a85be6de905606ca84b864f9546d7cf667225f295a92db5c8adcf97528418aad01f802aa6ed2c5e09d566eff5e3fab646523fc1a39f6c089
+  metadata.gz: 0a89a97093b96fb436c66204ebcda541a1448718881562799bb05749435cf97a988540f801fd893f64c231f382d999fc196a8450853ef57b57a4fb39709f6559
+  data.tar.gz: 777f55941e126d0d5a0112341d3d2fbc115cdf802067e380eb473fefd2c1e301671c49cd953b734898bd213c398bd016438c117e013c35e58547a0e833c477d3

data/lib/generators/rankle/templates/migration.rb

@@ -1,4 +1,4 @@
-class CreateRankleIndices < ActiveRecord::Migration
+class CreateRankleIndices < ActiveRecord::Migration[5.0]
   def change
     create_table :rankle_indices do |t|
       t.string  :indexable_name
@@ -14,4 +14,4 @@ class CreateRankleIndices < ActiveRecord::Migration
     add_index :rankle_indices, :indexable_type
     add_index :rankle_indices, :indexable_position
   end
-end
+end

data/lib/rankle/version.rb

@@ -1,3 +1,3 @@
 module Rankle
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/rankle_index.rb

@@ -17,6 +17,7 @@ class RankleIndex < ActiveRecord::Base
     if @rankers[instance.class] && @rankers[instance.class].strategy
       position = instance.class.ranked.each_with_index { |record, index| break index if @rankers[instance.class].strategy.call(instance, record) } unless @rankers[instance.class].strategy.is_a?(Symbol)
     end
+    position = position.count if position.is_a?(ActiveRecord::Relation)
     position = instance.class.count - 1 if position.nil? || position.is_a?(Array)
     instance.rank position
     if @rankers[instance.class] && @rankers[instance.class].strategy.is_a?(Symbol)
@@ -26,20 +27,20 @@ class RankleIndex < ActiveRecord::Base
 
   def self.rank instance, name, position
     existing_indices = if name == :default
-                            RankleIndex.where indexable_name: name.to_s, indexable_type: instance.class
+                            RankleIndex.where indexable_name: name.to_s, indexable_type: instance.class.to_s
                           else
                             RankleIndex.where indexable_name: name.to_s
                           end
-    position = existing_indices.length - 1 if position > existing_indices.length
+    position = existing_indices.count - 1 if position > existing_indices.count
     position = 0 if position < 0
-    index = RankleIndex.where(indexable_name: name.to_s, indexable_id: instance.id, indexable_type: instance.class).first_or_create!
+    index = RankleIndex.where(indexable_name: name.to_s, indexable_id: instance.id, indexable_type: instance.class.to_s).first_or_create!
     index.update_attribute(:row_order_position, position)
   end
 
   def self.position instance, name
-    indexable_position = where(indexable_name: name.to_s, indexable_id: instance.id, indexable_type: instance.class).first_or_create!.indexable_position
+    indexable_position = where(indexable_name: name.to_s, indexable_id: instance.id, indexable_type: instance.class.to_s).first_or_create!.indexable_position
     indexable_scope = where(indexable_name: name.to_s)
-    indexable_scope = indexable_scope.where(indexable_type: instance.class) if name == :default
+    indexable_scope = indexable_scope.where(indexable_type: instance.class.to_s) if name == :default
     indexable_scope = indexable_scope.where('indexable_position < ?', indexable_position)
     indexable_scope.count
   end

data/test/performance/set_position_test.rb

@@ -2,7 +2,7 @@ require_relative '../support/test_helper'
 
 class TestSetPosition < Minitest::Test
   def test_initializing_position_makes_six_queries
-    assert_queries(8) do
+    assert_queries(10) do
       apple  = Fruit.create! name: 'apple'
     end
   end
@@ -10,7 +10,7 @@ class TestSetPosition < Minitest::Test
   def test_update_position_makes_three_queries
     apple  = Fruit.create! name: 'apple'
 
-    assert_queries(4) do
+    assert_queries(6) do
       apple.update_attribute :position, 1
     end
   end
@@ -18,7 +18,7 @@ class TestSetPosition < Minitest::Test
   def test_update_rank_makes_three_queries
     apple  = Fruit.create! name: 'apple'
 
-    assert_queries(4) do
+    assert_queries(6) do
       apple.rank 1
     end
   end
@@ -26,7 +26,7 @@ class TestSetPosition < Minitest::Test
   def test_initializing_position_with_a_proc_makes_eight_queries
     Fruit.send :ranks, ->(a, b) { a.name < b.name }
 
-    assert_queries(10) do
+    assert_queries(13) do
       Fruit.create! name: 'apple'
     end
   end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: rankle
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Wil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   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: ranked-model
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: rspec-expectations
   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: database_cleaner
   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_rails
   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: yard
   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: Rankle provides multi-resource ranking.
@@ -143,7 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - LICENSE.txt
@@ -178,17 +178,17 @@ 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.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Rankle provides multi-resource ranking.
@@ -205,4 +205,3 @@ test_files:
 - test/support/models.rb
 - test/support/schema.rb
 - test/support/test_helper.rb
-has_rdoc: