sortifiable 0.2.5 → 0.2.6

data/CHANGELOG

@@ -1,3 +1,8 @@
+*0.2.6 (March 5th, 2012)
+
+* Ensure that the default scope is ignored when performing list updates
+
+
 *0.2.5 (September 11th, 2011)
 
 * Don't rely on the current position attribute as it may be stale

data/lib/sortifiable.rb

@@ -476,7 +476,7 @@ module Sortifiable
       end
 
       def update_position(new_position) #:nodoc:
-        list_class.update_all({ position_column => new_position }, { list_class.primary_key => id })
+        base_scope.update_all({ position_column => new_position }, { list_class.primary_key => id })
         set_position new_position
       end
   end

data/lib/sortifiable/version.rb

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

data/test/sortifiable_test.rb

@@ -827,3 +827,54 @@ class AssociationScopeListTest < ActiveSupport::TestCase
   end
 
 end
+
+class DefaultScopeListTest < ActiveSupport::TestCase
+
+  def setup
+    [5, 6].each do |parent_id|
+      (1..4).each do |i|
+        ParanoidMixin.create! :pos => i, :parent_id => parent_id
+      end
+    end
+  end
+
+  def relation
+    ParanoidMixin.where(:parent_id => 5).where('pos IS NOT NULL')
+  end
+
+  def test_default_scope_is_ignored_when_updating_position
+
+    assert_equal [1, 2, 3, 4], relation.map(&:id)
+
+    ParanoidMixin.find(3).destroy
+    assert_equal [1, 2, 4], relation.map(&:id)
+
+    ParanoidMixin.find(4).move_to_top
+    assert_equal [4, 1, 2], relation.map(&:id)
+
+    ParanoidMixin.find(2).move_to_bottom
+    assert_equal [4, 1, 2], relation.map(&:id)
+
+    ParanoidMixin.find(1).remove_from_list
+    assert_equal false, ParanoidMixin.find(1).in_list?
+    assert_equal [4, 2], relation.map(&:id)
+
+    ParanoidMixin.find(1).add_to_list
+    assert_equal true, ParanoidMixin.find(1).in_list?
+    assert_equal [4, 2, 1], relation.map(&:id)
+
+    ParanoidMixin.deleted.find(3).remove_from_list
+    assert_equal false, ParanoidMixin.deleted.find(3).in_list?
+    assert_equal [4, 2, 1], relation.map(&:id)
+
+    ParanoidMixin.deleted.find(3).add_to_list
+    assert_equal true, ParanoidMixin.deleted.find(3).in_list?
+    assert_equal [4, 2, 1], relation.map(&:id)
+
+    ParanoidMixin.deleted.find(3).restore
+    assert_equal [4, 2, 1, 3], relation.map(&:id)
+    assert_equal [1, 2, 3, 4], relation.map(&:pos)
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sortifiable
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-11 00:00:00.000000000 +01:00
-default_executable: 
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161594080 !ruby/object:Gem::Requirement
+  requirement: &2151822120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161594080
+  version_requirements: *2151822120
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2161593620 !ruby/object:Gem::Requirement
+  requirement: &2151821600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161593620
+  version_requirements: *2151821600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2161593160 !ruby/object:Gem::Requirement
+  requirement: &2151820980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *2161593160
+  version_requirements: *2151820980
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2161592700 !ruby/object:Gem::Requirement
+  requirement: &2151820440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +54,10 @@ dependencies:
         version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: *2161592700
+  version_requirements: *2151820440
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &2161592240 !ruby/object:Gem::Requirement
+  requirement: &2151819900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: 0.2.7
   type: :development
   prerelease: false
-  version_requirements: *2161592240
+  version_requirements: *2151819900
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &2161591780 !ruby/object:Gem::Requirement
+  requirement: &2151819240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *2161591780
+  version_requirements: *2151819240
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2161591320 !ruby/object:Gem::Requirement
+  requirement: &2151818640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +87,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2161591320
+  version_requirements: *2151818640
 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
@@ -118,7 +117,6 @@ files:
 - lib/sortifiable/version.rb
 - sortifiable.gemspec
 - test/sortifiable_test.rb
-has_rdoc: true
 homepage: http://github.com/pixeltrix/sortifiable/
 licenses: []
 post_install_message: 
@@ -139,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Sort your models