resort 0.0.1 → 0.0.2

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Codegram
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Readme.md

@@ -17,9 +17,9 @@ the _weight_ of a given element within a tree. This field has no semantic sense,
 since "84" by itself gives you absolutely no information about an element's
 position or its relations with other elements of the tree.
 
-Resort is implemented quite like a [binary tree](http://en.wikipedia.org/wiki/Binary_tree),
+Resort is implemented like a [linked list](http://en.wikipedia.org/wiki/Linked_list),
 rather than relying on absolute position values. This way, every model
-references a `next` and a `previous`, which seems a bit more sensible :)
+references a `next` element, which seems a bit more sensible :)
 
 ##Usage
 
@@ -29,6 +29,8 @@ You must add two fields (`next_id` and `first`) to your model's table:
       def self.up
         add_column :products, :next_id, :integer
         add_column :products, :first,   :boolean
+        add_index :products, :next_id
+        add_index :products, :first
       end
 
       def self.down

data/lib/resort/version.rb

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

data/lib/resort.rb

@@ -128,7 +128,7 @@ module Resort
       # in the first position. Otherwise, it appends it to the end of the
       # empty list.
       def include_in_list!
-        _siblings.count > 0 ? push\
+        _siblings.count > 0 ? last!\
                             : prepend
       end
 
@@ -146,22 +146,20 @@ module Resort
 
       # Puts the object in the last position of the list.
       def push
-        return if last?
-        last_element = _siblings.where(:next_id => nil).first
-        self.append_to(last_element)
+        self.append_to(last) unless last?
       end
 
       # Puts the object right after another object in the list.
       def append_to(another)
         if self.next
           delete_from_list
-        elsif last?
-          self.previous.update_attribute(:next_id, nil)
+        elsif last? && self.previous
+          # self.previous.update_attribute(:next_id, nil)
           self.previous = nil
         end
 
-        self.update_attribute(:next_id, another.next_id)
-        another.update_attribute(:next_id, self.id)
+        self.update_attribute(:next_id, another.next_id) if self.next_id or (another && another.next_id)
+        another.update_attribute(:next_id, self.id) if another
       end
 
       private
@@ -180,7 +178,15 @@ module Resort
       end
 
       def last?
-        self.previous && !self.next
+        self.first != true && self.next_id == nil
+      end
+
+      def last
+        _siblings.where(:next_id => nil).first
+      end
+
+      def last!
+        last.update_attribute(:next_id, self.id)
       end
 
       def _siblings

data/spec/resort_spec.rb

@@ -267,6 +267,24 @@ module Resort
             article4.next.name.should == '3'
           end
         end
+        context 'appending 3 after 1' do
+          it "appends the element after another element" do
+            @article3.append_to(@article1)
+
+            article1 = Article.find_by_name('1')
+            article1.next.name.should == '3'
+            
+            article2 = Article.find_by_name('2')
+            article2.previous.name.should == '3'
+            article2.next.name.should == '4'
+
+            article3 = Article.find_by_name('3')
+            article3.previous.name.should == '1'
+            article3.next.name.should == '2'
+
+            @article4.previous.name.should == '2'
+          end
+        end
 
         context 'when the article is already after the other element' do
           it 'does nothing' do

metadata

@@ -2,7 +2,7 @@
 name: resort
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Oriol Gual
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 +01:00
+date: 2011-03-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,7 @@ files:
 - .rspec
 - .rvmrc
 - Gemfile
+- LICENSE
 - Rakefile
 - Readme.md
 - lib/resort.rb
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: resort
-rubygems_version: 1.5.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Positionless model sorting for Rails 3.