sortifiable 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,12 @@
+*0.2.2 (May 3rd, 2011)
+
+* Ensure that callbacks return true when no updates take place
+
+* Moving first and last items should return true even when no update takes place
+
+* Loosen gem dependencies so that it will work with Rails edge
+
+
 *0.2.1 (April 20th, 2011)
 
 * Add checking for scope changes so items are moved between lists correctly [Manuel Meurer]

data/{README → README.md}

@@ -1,4 +1,5 @@
-== Sortifiable
+Sortifiable
+===========
 
 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
@@ -8,23 +9,25 @@ the mapped database table.
 This gem requires ActiveRecord 3.0 as it has been refactored to use
 the scope methods and query interface introduced with Ruby on Rails 3.0
 
+Example
+-------
 
-=== Example
+``` ruby
+class TodoList < ActiveRecord::Base
+  has_many :todo_items, :order => "position"
+end
 
-  class TodoList < ActiveRecord::Base
-    has_many :todo_items, :order => "position"
-  end
+class TodoItem < ActiveRecord::Base
+  belongs_to :todo_list
+  acts_as_list :scope => :todo_list
+end
 
-  class TodoItem < ActiveRecord::Base
-    belongs_to :todo_list
-    acts_as_list :scope => :todo_list
-  end
+todo_list.first.move_to_bottom
+todo_list.last.move_higher
+```
 
-  todo_list.first.move_to_bottom
-  todo_list.last.move_higher
-
-
-=== Contributions
+Contributions
+-------------
 
 Bug fixes and new feature patches are welcome. Please provide tests and
 documentation wherever possible - without them it is unlikely your patch
@@ -36,5 +39,4 @@ Thanks to the following people for their contributions:
 
 * Manuel Meurer
 
-
 Copyright (c) 2011 Andrew White, released under the MIT license

data/Rakefile

@@ -20,6 +20,5 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Sortifiable'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/lib/sortifiable.rb

@@ -243,6 +243,8 @@ module Sortifiable
 
             set_position current_position - 1
             list_scope.update_all(sql) > 0
+          else
+            true
           end
         end
       else
@@ -269,6 +271,8 @@ module Sortifiable
 
             set_position current_position + 1
             list_scope.update_all(sql) > 0
+          else
+            true
           end
         end
       else
@@ -296,6 +300,8 @@ module Sortifiable
 
             set_position last_position
             list_scope.update_all(sql) > 0
+          else
+            true
           end
         end
       else
@@ -322,6 +328,8 @@ module Sortifiable
 
             set_position 1
             list_scope.update_all(sql) > 0
+          else
+            true
           end
         end
       else
@@ -358,9 +366,13 @@ module Sortifiable
       end
 
       def decrement_position_on_lower_items #:nodoc:
-        update = "#{quoted_position_column} = #{quoted_position_column} - 1"
-        conditions = "#{quoted_position_column} > #{current_position}"
-        list_scope.update_all(update, conditions) > 0
+        if last?
+          true
+        else
+          update = "#{quoted_position_column} = #{quoted_position_column} - 1"
+          conditions = "#{quoted_position_column} > #{current_position}"
+          list_scope.update_all(update, conditions) > 0
+        end
       end
 
       def decrement_position_on_lower_items_in_old_list #:nodoc:
@@ -376,10 +388,12 @@ module Sortifiable
         # Set old scope
         scope_parts.each { |scope_part| send "#{scope_part}=", send("#{scope_part}_was") }
 
-        yield
+        retval = yield
 
         # Set new scope
         scope_parts.each_with_index { |scope_part, i| send "#{scope_part}=", new_scope[i] }
+
+        retval
       end
 
       def scope_parts_from_string(string) #:nodoc:
@@ -401,6 +415,7 @@ module Sortifiable
 
       def set_position(position) #:nodoc:
         send "#{position_column}=", position
+        true
       end
 
       def list_class #:nodoc:

data/lib/sortifiable/version.rb

@@ -1,3 +1,3 @@
 module Sortifiable
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/sortifiable.gemspec

@@ -24,7 +24,7 @@ EOF
     ".gemtest",
     "CHANGELOG",
     "LICENSE",
-    "README",
+    "README.md",
     "Rakefile",
     "lib/sortifiable.rb",
     "lib/sortifiable/version.rb",
@@ -35,8 +35,8 @@ EOF
   s.test_files    = ["test/sortifiable_test.rb"]
   s.require_paths = ["lib"]
 
-  s.add_dependency "activesupport", "~> 3.0.3"
-  s.add_dependency "activerecord", "~> 3.0.3"
-  s.add_development_dependency "bundler", "~> 1.0.10"
-  s.add_development_dependency "sqlite3", "~> 1.3.3"
+  s.add_dependency "activesupport", ">= 3.0"
+  s.add_dependency "activerecord", ">= 3.0"
+  s.add_development_dependency "bundler", ">= 1.0.10"
+  s.add_development_dependency "sqlite3", ">= 1.3.3"
 end

data/test/sortifiable_test.rb

@@ -336,6 +336,46 @@ class ListTest < Test::Unit::TestCase
     assert_equal     [], ListMixin.find(4).lower_items.map(&:id)
   end
 
+  def test_moving_first_and_last_items_return_true
+    assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 5).map(&:id)
+    assert_equal true, ListMixin.find(1).move_to_top
+    assert_equal true, ListMixin.find(1).move_higher
+    assert_equal true, ListMixin.find(4).move_to_bottom
+    assert_equal true, ListMixin.find(4).move_lower
+  end
+
+  def test_add_to_list_should_return_true
+    assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 5).map(&:id)
+
+    item = ListMixin.new(:parent_id => 5)
+    assert_equal true, item.new_record?
+    assert_equal false, item.in_list?
+    assert_equal true, item.add_to_list
+
+    item = ListMixin.create(:parent_id => 5)
+    item.remove_from_list
+    assert_equal false, item.new_record?
+    assert_equal false, item.in_list?
+    assert_equal true, item.add_to_list
+  end
+
+  def test_decrement_callbacks_should_return_true
+    assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 5).map(&:id)
+
+    item = ListMixin.find(4)
+    assert_equal 4, item.pos
+    assert_equal true, item.send(:decrement_position_on_lower_items)
+
+    assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 5).map(&:id)
+
+    item = ListMixin.find(4)
+    item.parent_id = 6
+
+    assert_equal 4, item.pos
+    assert_equal true, item.will_leave_list?
+    assert_equal true, item.send(:decrement_position_on_lower_items_in_old_list)
+  end
+
 end
 
 class ListWithStringScopeTest < Test::Unit::TestCase

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sortifiable
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Andrew White
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +01:00
+date: 2011-05-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
+        version: "3.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,14 +39,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
+        version: "3.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,7 +54,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
@@ -72,7 +70,7 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 29
         segments: 
@@ -103,7 +101,7 @@ files:
 - .gemtest
 - CHANGELOG
 - LICENSE
-- README
+- README.md
 - Rakefile
 - lib/sortifiable.rb
 - lib/sortifiable/version.rb