ryanb-acts-as-list 0.1.1 → 0.1.2

data/acts-as-list.gemspec

@@ -1,14 +1,14 @@
 
-# Gem::Specification for Acts-as-list-0.1.1
+# Gem::Specification for Acts-as-list-0.1.2
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{acts-as-list}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Bates, Rails Core"]
-  s.date = %q{2008-07-01}
+  s.date = %q{2008-07-21}
   s.description = %q{Gem version of acts_as_list Rails plugin.}
   s.email = %q{ryan (at) railscasts (dot) com}
   s.extra_rdoc_files = ["lib/acts_as_list.rb", "README", "tasks/deployment.rake"]
@@ -42,7 +42,7 @@ end
 # begin
 #   require 'echoe'
 # 
-#   Echoe.new('acts-as-list', '0.1.1') do |p|
+#   Echoe.new('acts-as-list', '0.1.2') do |p|
 #     p.summary        = "Gem version of acts_as_list Rails plugin."
 #     p.description    = "Gem version of acts_as_list Rails plugin."
 #     p.url            = "http://github.com/ryanb/acts-as-list"

data/lib/acts_as_list.rb

@@ -79,21 +79,21 @@ module ActsAsList
 
     # Swap positions with the next lower item, if one exists.
     def move_lower
-      return unless lower_item
-
+      lower = lower_item
+      return unless lower
       acts_as_list_class.transaction do
-        lower_item.decrement_position
-        increment_position
+        self.update_attribute(position_column, lower.send(position_column))
+        lower.decrement_position
       end
     end
 
     # Swap positions with the next higher item, if one exists.
     def move_higher
-      return unless higher_item
-
+      higher = higher_item
+      return unless higher
       acts_as_list_class.transaction do
-        higher_item.increment_position
-        decrement_position
+        self.update_attribute(position_column, higher.send(position_column))
+        higher.increment_position
       end
     end
 
@@ -153,7 +153,7 @@ module ActsAsList
     def higher_item
       return nil unless in_list?
       acts_as_list_class.find(:first, :conditions =>
-        "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i - 1).to_s}"
+        "#{scope_condition} AND #{position_column} < #{send(position_column).to_s}", :order => "#{position_column} DESC"
       )
     end
 
@@ -161,7 +161,7 @@ module ActsAsList
     def lower_item
       return nil unless in_list?
       acts_as_list_class.find(:first, :conditions =>
-        "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i + 1).to_s}"
+        "#{scope_condition} AND #{position_column} > #{send(position_column).to_s}", :order => "#{position_column} ASC"
       )
     end
 

data/test/list_test.rb

@@ -221,6 +221,43 @@ class ListTest < Test::Unit::TestCase
     assert_equal 3, ListMixin.find(4).pos
   end 
   
+  # special thanks to openhood on github
+  def test_delete_middle_with_holes
+    # first we check everything is at expected place
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    # then we create a hole in the list, say you're working with existing data in which you already have holes
+    # or your scope is very complex
+    ListMixin.delete(2)
+
+    # we ensure the hole is really here
+    assert_equal [1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+    assert_equal 1, ListMixin.find(1).pos
+    assert_equal 3, ListMixin.find(3).pos
+    assert_equal 4, ListMixin.find(4).pos
+
+    # can we retrieve lower item despite the hole?
+    assert_equal 3, ListMixin.find(1).lower_item.id
+
+    # can we move an item lower jumping more than one position?
+    ListMixin.find(1).move_lower
+    assert_equal [3, 1, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+    assert_equal 2, ListMixin.find(3).pos
+    assert_equal 3, ListMixin.find(1).pos
+    assert_equal 4, ListMixin.find(4).pos
+
+    # create another hole
+    ListMixin.delete(1)
+
+    # can we retrieve higher item despite the hole?
+    assert_equal 3, ListMixin.find(4).higher_item.id
+
+    # can we move an item higher jumping more than one position?
+    ListMixin.find(4).move_higher
+    assert_equal [4, 3], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+    assert_equal 2, ListMixin.find(4).pos
+    assert_equal 3, ListMixin.find(3).pos
+  end
 end
 
 class ListSubTest < Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ryanb-acts-as-list
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ryan Bates, Rails Core
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-01 00:00:00 -07:00
+date: 2008-07-21 00:00:00 -07:00
 default_executable: 
 dependencies: []