sortifiable 0.2.6 → 0.2.7

data/CHANGELOG

@@ -1,3 +1,8 @@
+*0.2.7 (February 23rd, 2013)
+
+* Fix a bug when using insert_at to move an existing item down the list [Arthur Holstvoogd]
+
+
 *0.2.6 (March 5th, 2012)
 
 * Ensure that the default scope is ignored when performing list updates

data/README.md

@@ -1,6 +1,8 @@
 Sortifiable
 ===========
 
+[![Build Status][build]][travis] [![Dependency Status][depends]][gemnasium]
+
 This gem provides an acts_as_list compatible capability for sorting
 and reordering a number of objects in a list. The class that has this
 specified needs to have a +position+ column defined as an integer on
@@ -41,3 +43,8 @@ Thanks to the following people for their contributions:
 * Reinier de Lange
 
 Copyright (c) 2011 Andrew White, released under the MIT license
+
+[build]: https://secure.travis-ci.org/pixeltrix/sortifiable.png
+[travis]: http://travis-ci.org/pixeltrix/sortifiable
+[depends]: https://gemnasium.com/pixeltrix/sortifiable.png?travis
+[gemnasium]: https://gemnasium.com/pixeltrix/sortifiable

data/Rakefile

@@ -3,7 +3,7 @@ require 'rdoc/task'
 require "bundler/gem_tasks"
 
 desc 'Default: run sortifiable unit tests.'
-task :default => :test
+task :default => "test:all"
 
 desc 'Test the sortifiable gem.'
 Rake::TestTask.new(:test) do |t|

data/lib/sortifiable.rb

@@ -178,7 +178,7 @@ module Sortifiable
             #{quoted_position_column} = CASE
             WHEN #{quoted_position_column} = #{current_position} THEN #{position}
             WHEN #{quoted_position_column} > #{current_position}
-            AND #{quoted_position_column} < #{position} THEN #{quoted_position_column} - 1
+            AND #{quoted_position_column} <= #{position} THEN #{quoted_position_column} - 1
             WHEN #{quoted_position_column} < #{current_position}
             AND #{quoted_position_column} >= #{position} THEN #{quoted_position_column} + 1
             ELSE #{quoted_position_column}
@@ -242,7 +242,7 @@ module Sortifiable
       if in_list?
         list_class.transaction do
           ids = lock_list!
-          current_position, last_position = ids.index(id) + 1, ids.size
+          current_position = ids.index(id) + 1
 
           if current_position > 1
             sql = <<-SQL
@@ -327,7 +327,7 @@ module Sortifiable
       if in_list?
         list_class.transaction do
           ids = lock_list!
-          current_position, last_position = ids.index(id) + 1, ids.size
+          current_position = ids.index(id) + 1
 
           if current_position > 1
             sql = <<-SQL
@@ -354,7 +354,7 @@ module Sortifiable
       if in_list?
         list_class.transaction do
           ids = lock_list!
-          current_position, last_position = ids.index(id) + 1, ids.size
+          current_position = ids.index(id) + 1
 
           sql = <<-SQL
             #{quoted_position_column} = CASE

data/lib/sortifiable/version.rb

@@ -1,3 +1,3 @@
 module Sortifiable
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/sortifiable.gemspec

@@ -37,8 +37,7 @@ EOF
 
   s.add_dependency "activesupport", ">= 3.0"
   s.add_dependency "activerecord", ">= 3.0"
-  s.add_development_dependency "bundler", ">= 1.0.18"
-  s.add_development_dependency "mysql", "~> 2.8.1"
+  s.add_development_dependency "mysql", ">= 2.8.1"
   s.add_development_dependency "mysql2", ">= 0.2.7"
   s.add_development_dependency "pg", ">= 0.9.0"
   s.add_development_dependency "sqlite3", ">= 1.3.3"

data/test/sortifiable_test.rb

@@ -104,36 +104,55 @@ class ListTest < ActiveSupport::TestCase
   def test_insert_at
     new = ListMixin.create(:parent_id => 20)
     assert_equal 1, new.pos
+    assert_equal [1], ListMixin.where(:parent_id => 20).map(&:pos)
 
     new = ListMixin.create(:parent_id => 20)
     assert_equal 2, new.pos
+    assert_equal [1, 2], ListMixin.where(:parent_id => 20).map(&:pos)
 
     new = ListMixin.create(:parent_id => 20)
     assert_equal 3, new.pos
+    assert_equal [1, 2, 3], ListMixin.where(:parent_id => 20).map(&:pos)
 
     new4 = ListMixin.create(:parent_id => 20)
     assert_equal 4, new4.pos
+    assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 20).map(&:pos)
 
     new4.insert_at(3)
     assert_equal 3, new4.pos
+    assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 20).map(&:pos)
 
     new.reload
     assert_equal 4, new.pos
+    assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 20).map(&:pos)
 
     new.insert_at(2)
     assert_equal 2, new.pos
+    assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 20).map(&:pos)
 
     new4.reload
     assert_equal 4, new4.pos
+    assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 20).map(&:pos)
 
     new5 = ListMixin.create(:parent_id => 20)
     assert_equal 5, new5.pos
+    assert_equal [1, 2, 3, 4, 5], ListMixin.where(:parent_id => 20).map(&:pos)
 
     new5.insert_at(1)
     assert_equal 1, new5.pos
+    assert_equal [1, 2, 3, 4, 5], ListMixin.where(:parent_id => 20).map(&:pos)
 
     new4.reload
     assert_equal 5, new4.pos
+    assert_equal [1, 2, 3, 4, 5], ListMixin.where(:parent_id => 20).map(&:pos)
+
+    new.reload
+    assert_equal 3, new.pos
+    assert_equal [1, 2, 3, 4, 5], ListMixin.where(:parent_id => 20).map(&:pos)
+
+    new.insert_at(5)
+    assert_equal 5, new.pos
+    assert_equal [1, 2, 3, 4, 5], ListMixin.where(:parent_id => 20).map(&:pos)
   end
 
   def test_delete_middle

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sortifiable
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2151822120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151822120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2151821600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,32 +37,31 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151821600
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2151820980 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.18
-  type: :development
-  prerelease: false
-  version_requirements: *2151820980
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2151820440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: *2151820440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &2151819900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +69,15 @@ dependencies:
         version: 0.2.7
   type: :development
   prerelease: false
-  version_requirements: *2151819900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &2151819240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +85,15 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *2151819240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2151818640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +101,12 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2151818640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 description: ! 'This gem provides an acts_as_list compatible capability for sorting
 
   and reordering a number of objects in a list. The class that has this
@@ -129,15 +148,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1709003177613176418
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1709003177613176418
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Sort your models