sortifiable 0.2.4 → 0.2.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+*0.2.5 (September 11th, 2011)
+
+* Don't rely on the current position attribute as it may be stale
+
+
 *0.2.4 (June 18th, 2011)
 
 * Typecast the list of primary keys return by lock_list! correctly as

data/Rakefile

@@ -1,9 +1,6 @@
-require 'rake'
-require 'rake/rdoctask'
 require 'rake/testtask'
-require 'bundler'
-
-Bundler::GemHelper.install_tasks
+require 'rdoc/task'
+require "bundler/gem_tasks"
 
 desc 'Default: run sortifiable unit tests.'
 task :default => :test
@@ -16,7 +13,7 @@ Rake::TestTask.new(:test) do |t|
 end
 
 desc 'Generate documentation for the sortifiable gem.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Sortifiable'
   rdoc.options << '--line-numbers' << '--inline-source'

data/lib/sortifiable.rb

@@ -378,12 +378,17 @@ module Sortifiable
       end
 
       def decrement_position_on_lower_items #:nodoc:
-        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
+        list_class.transaction do
+          ids = lock_list!
+          current_position, last_position = ids.index(id) + 1, ids.size
+
+          if current_position == last_position
+            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
       end
 

data/lib/sortifiable/version.rb

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

data/sortifiable.gemspec

@@ -37,9 +37,9 @@ EOF
 
   s.add_dependency "activesupport", ">= 3.0"
   s.add_dependency "activerecord", ">= 3.0"
-  s.add_development_dependency "bundler", ">= 1.0.10"
+  s.add_development_dependency "bundler", ">= 1.0.18"
   s.add_development_dependency "mysql", "~> 2.8.1"
-  s.add_development_dependency "mysql2", "~> 0.2.7"
-  s.add_development_dependency "pg", "~> 0.9.0"
-  s.add_development_dependency "sqlite3", "~> 1.3.3"
+  s.add_development_dependency "mysql2", ">= 0.2.7"
+  s.add_development_dependency "pg", ">= 0.9.0"
+  s.add_development_dependency "sqlite3", ">= 1.3.3"
 end

data/test/sortifiable_test.rb

@@ -155,6 +155,12 @@ class ListTest < ActiveSupport::TestCase
     assert_equal 2, ListMixin.find(4).pos
   end
 
+  def test_destroy_all
+    assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 5).map(&:id)
+    ListMixin.destroy_all
+    assert_equal [], ListMixin.where(:parent_id => 5).map(&:id)
+  end
+
   def test_nil_scope
     new1, new2, new3 = ListMixin.create, ListMixin.create, ListMixin.create
     new2.move_higher
@@ -291,6 +297,18 @@ class ListTest < ActiveSupport::TestCase
     assert_equal true, item.send(:decrement_position_on_lower_items_in_old_list)
   end
 
+  def test_decrement_callbacks_maintain_list_order
+    assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 5).map(&:pos)
+
+    third = ListMixin.where(:parent_id => 5, :pos => 3).first
+    first = ListMixin.where(:parent_id => 5, :pos => 1).first
+
+    first.destroy
+    third.destroy
+
+    assert_equal [1, 2], ListMixin.where(:parent_id => 5).map(&:pos)
+  end
+
 end
 
 class ListWithStringScopeTest < ActiveSupport::TestCase
@@ -475,6 +493,12 @@ class ListSubTest < ActiveSupport::TestCase
     assert_equal 2, ListMixin.find(4).pos
   end
 
+  def test_destroy_all
+    assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 5000).map(&:id)
+    ListMixin.destroy_all
+    assert_equal [], ListMixin.where(:parent_id => 5000).map(&:id)
+  end
+
   def test_higher_items
     ListMixin.find(2).remove_from_list
     assert_equal [1], ListMixin.find(3).higher_items.map(&:id)
@@ -640,6 +664,12 @@ class ArrayScopeListTest < ActiveSupport::TestCase
     assert_equal 2, ArrayScopeListMixin.find(4).pos
   end
 
+  def test_destroy_all
+    assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(conditions).map(&:id)
+    ArrayScopeListMixin.destroy_all
+    assert_equal [], ArrayScopeListMixin.where(conditions).map(&:id)
+  end
+
   def test_remove_from_list_by_updating_scope_part_1_should_shift_lower_items
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(conditions).map(&:id)
 

metadata

@@ -1,151 +1,114 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sortifiable
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.2.5
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
 platform: ruby
-authors: 
+authors:
 - Andrew White
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-18 00:00:00 +01:00
+date: 2011-09-11 00:00:00.000000000 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2161594080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2161594080
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2161593620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2161593620
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2161593160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
-        version: 1.0.10
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.18
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mysql
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2161593160
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: &2161592700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 2
-        - 8
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.8.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mysql2
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2161592700
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: &2161592240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 2
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.7
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: pg
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2161592240
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: &2161591780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2161591780
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2161591320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :development
-  version_requirements: *id007
-description: |
-  This gem provides an acts_as_list compatible capability for sorting
+  prerelease: false
+  version_requirements: *2161591320
+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
+
   specified needs to have a +position+ column defined as an integer on
+
   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
 
-email: 
+'
+email:
 - andyw@pixeltrix.co.uk
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - CHANGELOG
 - LICENSE
@@ -158,36 +121,27 @@ files:
 has_rdoc: true
 homepage: http://github.com/pixeltrix/sortifiable/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Sort your models
-test_files: 
+test_files:
 - test/sortifiable_test.rb