resort 0.2.1 → 0.2.2

data/lib/resort/version.rb

@@ -1,4 +1,4 @@
 module Resort
   # Resort's version number
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/resort.rb

@@ -93,7 +93,7 @@ module Resort
         elements = {}
 
         scoped.each do |element|
-          if element.first?
+          if ordered_elements.empty? && element.first?
             ordered_elements << element
           else
             elements[element.id] = element
@@ -149,17 +149,17 @@ module Resort
 
       # Puts the object in the first position of the list.
       def prepend
-        return if first?
-
-        if _siblings.count > 0
-          self.class.transaction do
-            self.lock!
+        self.class.transaction do
+          self.lock!
+          return if first?
+          if _siblings.count > 0
             delete_from_list
-            _siblings.where(:first => true).first.append_to(self)
+            old_first = self.class.first_in_order
+            self.update_attribute(:next_id, old_first.id)
+            old_first.update_attribute(:first, false)
           end
+          self.update_attribute(:first, true)
         end
-
-        self.update_attribute(:first, true)
       end
 
       # Puts the object in the last position of the list.
@@ -172,10 +172,9 @@ module Resort
 
       # Puts the object right after another object in the list.
       def append_to(another)
-        return if another.next_id == id
-
         self.class.transaction do
           self.lock!
+          return if another.next_id == id
           another.lock!
           delete_from_list
           self.update_attribute(:next_id, another.next_id) if self.next_id or (another && another.next_id)
@@ -207,7 +206,10 @@ module Resort
       end
 
       def last!
-        _siblings.last_in_order.update_attribute(:next_id, self.id)
+        self.class.transaction do
+          self.lock!
+          _siblings.last_in_order.update_attribute(:next_id, self.id)
+        end
       end
 
       def _siblings

data/spec/resort_spec.rb

@@ -168,6 +168,25 @@ module Resort
 
             first.next_id.should eq(last.id)
           end
+
+          it 'prepends the last element' do
+            one_list = List.create(:name => 'My list')
+            ListItem.create(:name => "First", :list => one_list)
+            ListItem.create(:name => "Second", :list => one_list)
+            third = ListItem.create(:name => "Third", :list => one_list)
+
+            third.prepend
+            first = ListItem.where(:name => "First", :list_id => one_list).first
+            second = ListItem.where(:name => "Second", :list_id => one_list).first
+            third = ListItem.where(:name => "Third", :list_id => one_list).first
+
+            first.should_not be_first
+            second.should_not be_first
+            third.should be_first
+            third.next.name.should == 'First'
+            first.next.name.should == 'Second'
+            second.next.should be_nil
+          end
         end
         after do
           List.destroy_all
@@ -269,6 +288,17 @@ module Resort
           article3.previous.should be_nil
           article3.next.name.should == '1'
         end
+
+        it "prepends the last element" do
+          @article4.prepend
+
+          article4 = Article.find_by_name('4')
+
+          article4.should be_first
+          article4.previous.should be_nil
+          article4.next.name.should == '1'
+        end
+
         context 'when the article is already first' do
           it 'does nothing' do
             @article1.prepend

metadata

@@ -2,7 +2,7 @@
 name: resort
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Oriol Gual
@@ -12,8 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 +02:00
-default_executable: 
+date: 2011-04-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -106,7 +105,6 @@ files:
 - spec/generators/migration_spec.rb
 - spec/resort_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://codegram.github.com/resort
 licenses: []
 
@@ -130,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: resort
-rubygems_version: 1.5.2
+rubygems_version: 1.7.1
 signing_key: 
 specification_version: 3
 summary: Positionless model sorting for Rails 3.