acts_as_list 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b311fb3c5f9b0839f22ff361020142db9c63045
-  data.tar.gz: 7600388596e829712e8936f9a31b70008ee7d18b
+  metadata.gz: 8f0d9ba8f5cf3b633b34697998e60026fbe0e911
+  data.tar.gz: ade9d56a50252ff67e5254ac95af5709e3529e1c
 SHA512:
-  metadata.gz: dc169373691b7a79c44393a368f4f589b04462c341f8f423f7eeedf846f29346dd3c6821f618287244a24ceafe04ebe416b4c6b6704f0be8470e69a1cd098a76
-  data.tar.gz: 748929065353ef8d675953d0469a4bd26ec8aee6921edfe6710b97186b25f75abc4a57bd648a2b076923cf5283e6dafb225ba0e6596efd21b23734897adc2f66
+  metadata.gz: 4b3799c6c28e9484a89aafa9456d558376da4f9fd9a748ec58ece08398eb618641e44050e9c952221ed260fea7929016a07ffef68f8428e7d2d9e66bda70ab31
+  data.tar.gz: 64c1c416482deb55de8c40bbcb3f738eb16967c07df7e0e31729ae4c347268c421f30cf7279d562f910731318646f4dc4daa4e86d2a2a9d5fad8386c7b5e7f16

data/.travis.yml

@@ -1,17 +1,25 @@
 language: ruby
+cache: bundler
 # Explicit usage of containerized builds, should provide faster feedback
 # see https://docs.travis-ci.com/user/workers/container-based-infrastructure/
 # and https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
 sudo: false
 before_install:
-  - gem update bundler
+  - gem install bundler -v 1.13.7
+before_script:
+  - mysql -e 'create database acts_as_list;'
+  - psql -c 'create database acts_as_list;' -U postgres
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.2.2
+  - 2.1.9
+  - 2.2.6
+  - 2.3.3
   - jruby-19mode
-  - rbx-2
+env:
+  - DB=sqlite
+  - DB=mysql
+  - DB=postgresql
 gemfile:
   - gemfiles/rails_3_2.gemfile
   - gemfiles/rails_4_1.gemfile
@@ -23,10 +31,7 @@ matrix:
       gemfile: gemfiles/rails_5_0.gemfile
     - rvm: 2.0.0
       gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: 2.1.0
+    - rvm: 2.1.9
       gemfile: gemfiles/rails_5_0.gemfile
     - rvm: jruby-19mode
       gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: rbx-2
-      gemfile: gemfiles/rails_5_0.gemfile
-

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## [v0.8.2](https://github.com/swanandp/acts_as_list/tree/v0.8.2) (2016-09-23)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.8.1...v0.8.2)
+
+**Closed issues:**
+
+- We're a repo now, no longer a fork attached to rails/acts\_as\_list [\#232](https://github.com/swanandp/acts_as_list/issues/232)
+- Break away from rails/acts\_as\_list [\#224](https://github.com/swanandp/acts_as_list/issues/224)
+- Problem when inserting straight at top of list [\#109](https://github.com/swanandp/acts_as_list/issues/109)
+
+**Merged pull requests:**
+
+- Show items with same position in higher and lower items [\#231](https://github.com/swanandp/acts_as_list/pull/231) ([jpalumickas](https://github.com/jpalumickas))
+- fix setting position when previous position was nil [\#230](https://github.com/swanandp/acts_as_list/pull/230) ([StoneFrog](https://github.com/StoneFrog))
+
 ## [v0.8.1](https://github.com/swanandp/acts_as_list/tree/v0.8.1) (2016-09-06)
 [Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.8.0...v0.8.1)
 

data/Gemfile

@@ -1,8 +1,5 @@
 source "http://rubygems.org"
 
-gem "sqlite3", platforms: [:ruby]
-gem "activerecord-jdbcsqlite3-adapter", platforms: [:jruby]
-
 gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21, :jruby]
 
 gemspec
@@ -14,4 +11,20 @@ gem "github_changelog_generator", "1.9.0"
 group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"
+  gem "timecop"
+end
+
+group :sqlite do
+  gem "sqlite3", platforms: [:ruby]
+  gem "activerecord-jdbcsqlite3-adapter", platforms: [:jruby]
+end
+
+group :postgresql do
+  gem "pg", "~> 0.18.0", platforms: [:ruby]
+  gem "activerecord-jdbcpostgresql-adapter", platforms: [:jruby]
+end
+
+group :mysql do
+  gem "mysql2", "~> 0.3.10", platforms: [:ruby]
+  gem "activerecord-jdbcmysql-adapter", platforms: [:jruby]
 end

data/README.md

@@ -77,6 +77,30 @@ In `acts_as_list`, "higher" means further up the list (a lower `position`), and
 - `list_item.lower_item`
 - `list_item.lower_items` will return all the items below `list_item` in the list (ordered by the position, ascending)
 
+## Adding `acts_as_list` To An Existing Model
+As it stands `acts_as_list` requires position values to be set on the model before the instance methods above will work. Adding something like the below to your migration will set the default position. Change the parameters to order if you want a different initial ordering.
+
+```ruby
+class AddPositionToTodoItem < ActiveRecord::Migration
+  def change
+    add_column :todo_items, :position, :integer
+    TodoItem.order(:updated_at).each.with_index(1) do |todo_item, index|
+      todo_item.update_column :position, index
+    end
+  end
+end
+```
+
+If you are using the scope option things can get a bit more complicated. Let's say you have `acts_as_list scope: :todo_list`, you might instead need something like this:
+
+```ruby
+TodoList.all.each do |todo_list|
+  todo_list.todo_items.order(:updated_at).each.with_index(1) do |todo_item, index|
+    todo_item.update_column :position, index
+  end
+end
+```
+
 ## Notes
 All `position` queries (select, update, etc.) inside gem methods are executed without the default scope (i.e. `Model.unscoped`), this will prevent nasty issues when the default scope is different from `acts_as_list` scope.
 
@@ -99,7 +123,20 @@ default: `1`. Use this option to define the top of the list. Use 0 to make the c
 - `add_new_at`
 default: `:bottom`. Use this option to specify whether objects get added to the `:top` or `:bottom` of the list. `nil` will result in new items not being added to the list on create, i.e, position will be kept nil after create.
 
+## Disabling temporarily
+
+If you need to temporarily disable `acts_as_list` during specific operations such as mass-update or imports:
+```ruby
+TodoItem.acts_as_list_no_update do
+  perform_mass_update
+end
+```
+In an `acts_as_list_no_update` block, all callbacks are disabled, and positions are not updated. New records will be created with
+ the default value from the database. It is your responsibility to correctly manage `positions` values. 
+
 ## Versions
+Version `0.9.0` adds `acts_as_list_no_update` (https://github.com/swanandp/acts_as_list/pull/244) and compatibility with not-null and uniqueness constraints on the database (https://github.com/swanandp/acts_as_list/pull/246). These additions shouldn't break compatibility with existing implementations.
+
 As of version `0.7.5` Rails 5 is supported.
 
 All versions `0.1.5` onwards require Rails 3.0.x and higher.

data/gemfiles/rails_3_2.gemfile

@@ -2,8 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "sqlite3", :platforms => [:ruby]
-gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
 gem "rack", "~> 1", :platforms => [:ruby_19, :ruby_20, :ruby_21, :jruby]
 gem "rake"
 gem "appraisal"
@@ -13,7 +11,23 @@ gem "activerecord", "~> 3.2.22.2"
 group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"
+  gem "timecop"
   gem "after_commit_exception_notification"
 end
 
+group :sqlite do
+  gem "sqlite3", :platforms => [:ruby]
+  gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
+end
+
+group :postgresql do
+  gem "pg", "~> 0.18.0", :platforms => [:ruby]
+  gem "activerecord-jdbcpostgresql-adapter", :platforms => [:jruby]
+end
+
+group :mysql do
+  gem "mysql2", "~> 0.3.10", :platforms => [:ruby]
+  gem "activerecord-jdbcmysql-adapter", :platforms => [:jruby]
+end
+
 gemspec :path => "../"

data/gemfiles/rails_4_1.gemfile

@@ -2,8 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "sqlite3", :platforms => [:ruby]
-gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
 gem "rack", "~> 1", :platforms => [:ruby_19, :ruby_20, :ruby_21, :jruby]
 gem "rake"
 gem "appraisal"
@@ -13,7 +11,23 @@ gem "activerecord", "~> 4.1.16"
 group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"
+  gem "timecop"
   gem "after_commit_exception_notification"
 end
 
+group :sqlite do
+  gem "sqlite3", :platforms => [:ruby]
+  gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
+end
+
+group :postgresql do
+  gem "pg", "~> 0.18.0", :platforms => [:ruby]
+  gem "activerecord-jdbcpostgresql-adapter", :platforms => [:jruby]
+end
+
+group :mysql do
+  gem "mysql2", "~> 0.3.10", :platforms => [:ruby]
+  gem "activerecord-jdbcmysql-adapter", :platforms => [:jruby]
+end
+
 gemspec :path => "../"

data/gemfiles/rails_4_2.gemfile

@@ -2,8 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "sqlite3", :platforms => [:ruby]
-gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
 gem "rack", "~> 1", :platforms => [:ruby_19, :ruby_20, :ruby_21, :jruby]
 gem "rake"
 gem "appraisal"
@@ -13,6 +11,22 @@ gem "activerecord", "~> 4.2.7"
 group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"
+  gem "timecop"
+end
+
+group :sqlite do
+  gem "sqlite3", :platforms => [:ruby]
+  gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
+end
+
+group :postgresql do
+  gem "pg", "~> 0.18.0", :platforms => [:ruby]
+  gem "activerecord-jdbcpostgresql-adapter", :platforms => [:jruby]
+end
+
+group :mysql do
+  gem "mysql2", "~> 0.3.10", :platforms => [:ruby]
+  gem "activerecord-jdbcmysql-adapter", :platforms => [:jruby]
 end
 
 gemspec :path => "../"

data/gemfiles/rails_5_0.gemfile

@@ -2,8 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "sqlite3", :platforms => [:ruby]
-gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
 gem "rack", "~> 1", :platforms => [:ruby_19, :ruby_20, :ruby_21, :jruby]
 gem "rake"
 gem "appraisal"
@@ -13,6 +11,22 @@ gem "activerecord", "~> 5.0.0"
 group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"
+  gem "timecop"
+end
+
+group :sqlite do
+  gem "sqlite3", :platforms => [:ruby]
+  gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
+end
+
+group :postgresql do
+  gem "pg", "~> 0.18.0", :platforms => [:ruby]
+  gem "activerecord-jdbcpostgresql-adapter", :platforms => [:jruby]
+end
+
+group :mysql do
+  gem "mysql2", "~> 0.3.10", :platforms => [:ruby]
+  gem "activerecord-jdbcmysql-adapter", :platforms => [:jruby]
 end
 
 gemspec :path => "../"

data/lib/acts_as_list.rb

@@ -1,15 +1,9 @@
 require 'acts_as_list/active_record/acts/list'
-
-module ActsAsList
-  if defined?(Rails::Railtie)
-    class Railtie < Rails::Railtie
-      initializer 'acts_as_list.insert_into_active_record' do
-        ActiveSupport.on_load :active_record do
-          ActiveRecord::Base.send(:include, ActiveRecord::Acts::List)
-        end
-      end
-    end
-  else
-    ActiveRecord::Base.send(:include, ActiveRecord::Acts::List) if defined?(ActiveRecord)
-  end
-end
+require "acts_as_list/active_record/acts/column_method_definer"
+require "acts_as_list/active_record/acts/scope_method_definer"
+require "acts_as_list/active_record/acts/top_of_list_method_definer"
+require "acts_as_list/active_record/acts/add_new_at_method_definer"
+require "acts_as_list/active_record/acts/aux_method_definer"
+require "acts_as_list/active_record/acts/callback_definer"
+require 'acts_as_list/active_record/acts/no_update'
+require "acts_as_list/active_record/acts/sequential_updates_method_definer"

data/lib/acts_as_list/active_record/acts/add_new_at_method_definer.rb

@@ -0,0 +1,9 @@
+module ActiveRecord::Acts::List::AddNewAtMethodDefiner #:nodoc:
+  def self.call(caller_class, add_new_at)
+    caller_class.class_eval do
+      define_method :add_new_at do
+        add_new_at
+      end
+    end
+  end
+end

data/lib/acts_as_list/active_record/acts/aux_method_definer.rb

@@ -0,0 +1,9 @@
+module ActiveRecord::Acts::List::AuxMethodDefiner #:nodoc:
+  def self.call(caller_class)
+    caller_class.class_eval do
+      define_method :acts_as_list_class do
+        caller_class
+      end
+    end
+  end
+end

data/lib/acts_as_list/active_record/acts/callback_definer.rb

@@ -0,0 +1,19 @@
+module ActiveRecord::Acts::List::CallbackDefiner #:nodoc:
+  def self.call(caller_class, add_new_at)
+    caller_class.class_eval do
+      before_validation :check_top_position, unless: :act_as_list_no_update?
+
+      before_destroy :lock!
+      after_destroy :decrement_positions_on_lower_items, unless: :act_as_list_no_update?
+
+      before_update :check_scope, unless: :act_as_list_no_update?
+      after_update :update_positions, unless: :act_as_list_no_update?
+
+      after_commit :clear_scope_changed
+
+      if add_new_at.present?
+        before_create "add_to_list_#{add_new_at}".to_sym, unless: :act_as_list_no_update?
+      end
+    end
+  end
+end

data/lib/acts_as_list/active_record/acts/column_method_definer.rb

@@ -0,0 +1,50 @@
+module ActiveRecord::Acts::List::ColumnMethodDefiner #:nodoc:
+  def self.call(caller_class, column)
+    caller_class.class_eval do
+      attr_reader :position_changed
+
+      define_method :position_column do
+        column
+      end
+
+      define_method :"#{column}=" do |position|
+        write_attribute(column, position)
+        @position_changed = true
+      end
+
+      # only add to attr_accessible
+      # if the class has some mass_assignment_protection
+      if defined?(accessible_attributes) and !accessible_attributes.blank?
+        attr_accessible :"#{column}"
+      end
+
+      define_singleton_method :quoted_position_column do
+        @_quoted_position_column ||= connection.quote_column_name(column)
+      end
+
+      define_singleton_method :quoted_position_column_with_table_name do
+        @_quoted_position_column_with_table_name ||= "#{caller_class.quoted_table_name}.#{quoted_position_column}"
+      end
+
+      define_singleton_method :decrement_all do
+        update_all_with_touch "#{quoted_position_column} = (#{quoted_position_column_with_table_name} - 1)"
+      end
+
+      define_singleton_method :increment_all do
+        update_all_with_touch "#{quoted_position_column} = (#{quoted_position_column_with_table_name} + 1)"
+      end
+
+      define_singleton_method :update_all_with_touch do |updates|
+        record = new
+        attrs = record.send(:timestamp_attributes_for_update_in_model)
+        now = record.send(:current_time_from_proper_timezone)
+
+        attrs.each do |attr|
+          updates << ", #{connection.quote_column_name(attr)} = #{connection.quote(connection.quoted_date(now))}"
+        end
+
+        update_all(updates)
+      end
+    end
+  end
+end

data/lib/acts_as_list/active_record/acts/list.rb

@@ -1,10 +1,42 @@
+class << ActiveRecord::Base
+  # Configuration options are:
+  #
+  # * +column+ - specifies the column name to use for keeping the position integer (default: +position+)
+  # * +scope+ - restricts what is to be considered a list. Given a symbol, it'll attach <tt>_id</tt>
+  #   (if it hasn't already been added) and use that as the foreign key restriction. It's also possible
+  #   to give it an entire string that is interpolated if you need a tighter scope than just a foreign key.
+  #   Example: <tt>acts_as_list scope: 'todo_list_id = #{todo_list_id} AND completed = 0'</tt>
+  # * +top_of_list+ - defines the integer used for the top of the list. Defaults to 1. Use 0 to make the collection
+  #   act more like an array in its indexing.
+  # * +add_new_at+ - specifies whether objects get added to the :top or :bottom of the list. (default: +bottom+)
+  #                   `nil` will result in new items not being added to the list on create.
+  # * +sequential_updates+ - specifies whether insert_at should update objects positions during shuffling
+  #   one by one to respect position column unique not null constraint. 
+  #   Defaults to true if position column has unique index, otherwise false.
+  #   If constraint is <tt>deferrable initially deferred<tt>, overriding it with false will speed up insert_at.
+  def acts_as_list(options = {})
+    configuration = { column: "position", scope: "1 = 1", top_of_list: 1, add_new_at: :bottom }
+    configuration.update(options) if options.is_a?(Hash)
+
+    caller_class = self
+
+    ActiveRecord::Acts::List::ColumnMethodDefiner.call(caller_class, configuration[:column])
+    ActiveRecord::Acts::List::ScopeMethodDefiner.call(caller_class, configuration[:scope])
+    ActiveRecord::Acts::List::TopOfListMethodDefiner.call(caller_class, configuration[:top_of_list])
+    ActiveRecord::Acts::List::AddNewAtMethodDefiner.call(caller_class, configuration[:add_new_at])
+
+    ActiveRecord::Acts::List::AuxMethodDefiner.call(caller_class)
+    ActiveRecord::Acts::List::CallbackDefiner.call(caller_class, configuration[:add_new_at])
+    ActiveRecord::Acts::List::SequentialUpdatesMethodDefiner.call(caller_class, configuration[:column], configuration[:sequential_updates])
+
+    include ActiveRecord::Acts::List::InstanceMethods
+    include ActiveRecord::Acts::List::NoUpdate
+  end
+end
+
 module ActiveRecord
   module Acts #:nodoc:
     module List #:nodoc:
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
       # This +acts_as+ extension provides the capabilities 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.
@@ -22,142 +54,6 @@ module ActiveRecord
       #
       #   todo_list.first.move_to_bottom
       #   todo_list.last.move_higher
-      module ClassMethods
-        # Configuration options are:
-        #
-        # * +column+ - specifies the column name to use for keeping the position integer (default: +position+)
-        # * +scope+ - restricts what is to be considered a list. Given a symbol, it'll attach <tt>_id</tt>
-        #   (if it hasn't already been added) and use that as the foreign key restriction. It's also possible
-        #   to give it an entire string that is interpolated if you need a tighter scope than just a foreign key.
-        #   Example: <tt>acts_as_list scope: 'todo_list_id = #{todo_list_id} AND completed = 0'</tt>
-        # * +top_of_list+ - defines the integer used for the top of the list. Defaults to 1. Use 0 to make the collection
-        #   act more like an array in its indexing.
-        # * +add_new_at+ - specifies whether objects get added to the :top or :bottom of the list. (default: +bottom+)
-        #                   `nil` will result in new items not being added to the list on create
-        def acts_as_list(options = {})
-          configuration = { column: "position", scope: "1 = 1", top_of_list: 1, add_new_at: :bottom}
-          configuration.update(options) if options.is_a?(Hash)
-
-          if configuration[:scope].is_a?(Symbol) && configuration[:scope].to_s !~ /_id$/
-            configuration[:scope] = :"#{configuration[:scope]}_id"
-          end
-
-          caller_class = self
-
-          class_eval do
-            define_singleton_method :acts_as_list_top do
-              configuration[:top_of_list].to_i
-            end
-
-            define_method :acts_as_list_top do
-              configuration[:top_of_list].to_i
-            end
-
-            define_method :acts_as_list_class do
-              caller_class
-            end
-
-            define_method :position_column do
-              configuration[:column]
-            end
-
-            define_method :scope_name do
-              configuration[:scope]
-            end
-
-            define_method :add_new_at do
-              configuration[:add_new_at]
-            end
-
-            define_method :"#{configuration[:column]}=" do |position|
-              write_attribute(configuration[:column], position)
-              @position_changed = true
-            end
-
-            if configuration[:scope].is_a?(Symbol)
-              define_method :scope_condition do
-                { configuration[:scope] => send(:"#{configuration[:scope]}") }
-              end
-
-              define_method :scope_changed? do
-                changed.include?(scope_name.to_s)
-              end
-            elsif configuration[:scope].is_a?(Array)
-              define_method :scope_condition do
-                configuration[:scope].inject({}) do |hash, column|
-                  hash.merge!({ column.to_sym => read_attribute(column.to_sym) })
-                end
-              end
-
-              define_method :scope_changed? do
-                (scope_condition.keys & changed.map(&:to_sym)).any?
-              end
-            else
-              define_method :scope_condition do
-                eval "%{#{configuration[:scope]}}"
-              end
-
-              define_method :scope_changed? do
-                false
-              end
-            end
-
-            # only add to attr_accessible
-            # if the class has some mass_assignment_protection
-            if defined?(accessible_attributes) and !accessible_attributes.blank?
-              attr_accessible :"#{configuration[:column]}"
-            end
-
-            define_singleton_method :quoted_position_column do
-              @_quoted_position_column ||= connection.quote_column_name(configuration[:column])
-            end
-
-            define_singleton_method :quoted_position_column_with_table_name do
-              @_quoted_position_column_with_table_name ||= "#{caller_class.quoted_table_name}.#{quoted_position_column}"
-            end
-
-            scope :in_list, lambda { where("#{quoted_position_column_with_table_name} IS NOT NULL") }
-
-            define_singleton_method :decrement_all do
-              update_all_with_touch "#{quoted_position_column} = (#{quoted_position_column_with_table_name} - 1)"
-            end
-
-            define_singleton_method :increment_all do
-              update_all_with_touch "#{quoted_position_column} = (#{quoted_position_column_with_table_name} + 1)"
-            end
-
-            define_singleton_method :update_all_with_touch do |updates|
-              record = new
-              attrs = record.send(:timestamp_attributes_for_update_in_model)
-              now = record.send(:current_time_from_proper_timezone)
-
-              query = attrs.map { |attr| "#{connection.quote_column_name(attr)} = :now" }
-              query.push updates
-              query = query.join(", ")
-
-              update_all([query, now: now])
-            end
-          end
-
-          attr_reader :position_changed
-
-          before_validation :check_top_position
-
-          before_destroy :lock!
-          after_destroy :decrement_positions_on_lower_items
-
-          before_update :check_scope
-          after_update :update_positions
-
-          after_commit :clear_scope_changed
-
-          if configuration[:add_new_at].present?
-            before_create "add_to_list_#{configuration[:add_new_at]}".to_sym
-          end
-
-          include ::ActiveRecord::Acts::List::InstanceMethods
-        end
-      end
 
       # All the methods available to a record that has had <tt>acts_as_list</tt> specified. Each method works
       # by assuming the object to be the item in the list, so <tt>chapter.move_lower</tt> would move that chapter
@@ -315,214 +211,240 @@ module ActiveRecord
 
         private
 
-          def swap_positions(item1, item2)
-            item1.set_list_position(item2.send(position_column))
-            item2.set_list_position(item1.send("#{position_column}_was"))
-          end
+        def swap_positions(item1, item2)
+          item1_position = item1.send(position_column)
 
-          def acts_as_list_list
-            acts_as_list_class.unscoped do
-              acts_as_list_class.where(scope_condition)
-            end
+          item1.set_list_position(item2.send(position_column))
+          item2.set_list_position(item1_position)
+        end
+
+        def acts_as_list_list
+          acts_as_list_class.unscoped do
+            acts_as_list_class.where(scope_condition)
           end
+        end
 
-          # Poorly named methods. They will insert the item at the desired position if the position
-          # has been set manually using position=, not necessarily the top or bottom of the list:
+        # Poorly named methods. They will insert the item at the desired position if the position
+        # has been set manually using position=, not necessarily the top or bottom of the list:
 
-          def add_to_list_top
-            if not_in_list? || internal_scope_changed? && !position_changed || default_position?
-              increment_positions_on_all_items
-              self[position_column] = acts_as_list_top
-            else
-              increment_positions_on_lower_items(self[position_column], id)
-            end
+        def add_to_list_top
+          if not_in_list? || internal_scope_changed? && !position_changed || default_position?
+            increment_positions_on_all_items
+            self[position_column] = acts_as_list_top
+          else
+            increment_positions_on_lower_items(self[position_column], id)
+          end
 
-            # Make sure we know that we've processed this scope change already
-            @scope_changed = false
+          # Make sure we know that we've processed this scope change already
+          @scope_changed = false
 
-            # Don't halt the callback chain
-            true
+          # Don't halt the callback chain
+          true
+        end
+
+        def add_to_list_bottom
+          if not_in_list? || internal_scope_changed? && !position_changed || default_position?
+            self[position_column] = bottom_position_in_list.to_i + 1
+          else
+            increment_positions_on_lower_items(self[position_column], id)
           end
 
-          def add_to_list_bottom
-            if not_in_list? || internal_scope_changed? && !position_changed || default_position?
-              self[position_column] = bottom_position_in_list.to_i + 1
-            else
-              increment_positions_on_lower_items(self[position_column], id)
-            end
+          # Make sure we know that we've processed this scope change already
+          @scope_changed = false
 
-            # Make sure we know that we've processed this scope change already
-            @scope_changed = false
+          # Don't halt the callback chain
+          true
+        end
 
-            # Don't halt the callback chain
-            true
-          end
+        # Overwrite this method to define the scope of the list changes
+        def scope_condition() {} end
 
-          # Overwrite this method to define the scope of the list changes
-          def scope_condition() {} end
+        # Returns the bottom position number in the list.
+        #   bottom_position_in_list    # => 2
+        def bottom_position_in_list(except = nil)
+          item = bottom_item(except)
+          item ? item.send(position_column) : acts_as_list_top - 1
+        end
 
-          # Returns the bottom position number in the list.
-          #   bottom_position_in_list    # => 2
-          def bottom_position_in_list(except = nil)
-            item = bottom_item(except)
-            item ? item.send(position_column) : acts_as_list_top - 1
-          end
+        # Returns the bottom item
+        def bottom_item(except = nil)
+          conditions = except ? "#{quoted_table_name}.#{self.class.primary_key} != #{self.class.connection.quote(except.id)}" : {}
+          acts_as_list_list.in_list.where(
+            conditions
+          ).order(
+            "#{quoted_position_column_with_table_name} DESC"
+          ).first
+        end
 
-          # Returns the bottom item
-          def bottom_item(except = nil)
-            conditions = except ? "#{quoted_table_name}.#{self.class.primary_key} != #{self.class.connection.quote(except.id)}" : {}
-            acts_as_list_list.in_list.where(
-              conditions
-            ).order(
-              "#{quoted_position_column_with_table_name} DESC"
-            ).first
-          end
+        # Forces item to assume the bottom position in the list.
+        def assume_bottom_position
+          set_list_position(bottom_position_in_list(self).to_i + 1)
+        end
 
-          # Forces item to assume the bottom position in the list.
-          def assume_bottom_position
-            set_list_position(bottom_position_in_list(self).to_i + 1)
-          end
+        # Forces item to assume the top position in the list.
+        def assume_top_position
+          set_list_position(acts_as_list_top)
+        end
 
-          # Forces item to assume the top position in the list.
-          def assume_top_position
-            set_list_position(acts_as_list_top)
-          end
+        # This has the effect of moving all the higher items down one.
+        def increment_positions_on_higher_items
+          return unless in_list?
+          acts_as_list_list.where("#{quoted_position_column_with_table_name} < ?", send(position_column).to_i).increment_all
+        end
 
-          # This has the effect of moving all the higher items up one.
-          def decrement_positions_on_higher_items(position)
-            acts_as_list_list.where("#{quoted_position_column_with_table_name} <= ?", position).decrement_all
-          end
+        # This has the effect of moving all the lower items down one.
+        def increment_positions_on_lower_items(position, avoid_id = nil)
+          scope = acts_as_list_list
 
-          # This has the effect of moving all the lower items up one.
-          def decrement_positions_on_lower_items(position=nil)
-            return unless in_list?
-            position ||= send(position_column).to_i
-            acts_as_list_list.where("#{quoted_position_column_with_table_name} > ?", position).decrement_all
+          if avoid_id
+            scope = scope.where("#{quoted_table_name}.#{self.class.primary_key} != ?", self.class.connection.quote(avoid_id))
           end
 
-          # This has the effect of moving all the higher items down one.
-          def increment_positions_on_higher_items
-            return unless in_list?
-            acts_as_list_list.where("#{quoted_position_column_with_table_name} < #{send(position_column).to_i}").increment_all
-          end
+          scope.where("#{quoted_position_column_with_table_name} >= ?", position).increment_all
+        end
 
-          # This has the effect of moving all the lower items down one.
-          def increment_positions_on_lower_items(position, avoid_id = nil)
-            avoid_id_condition = avoid_id ? " AND #{quoted_table_name}.#{self.class.primary_key} != #{self.class.connection.quote(avoid_id)}" : ''
+        # This has the effect of moving all the higher items up one.
+        def decrement_positions_on_higher_items(position)
+          acts_as_list_list.where("#{quoted_position_column_with_table_name} <= ?", position).decrement_all
+        end
 
-            acts_as_list_list.where("#{quoted_position_column_with_table_name} >= #{position}#{avoid_id_condition}").increment_all
-          end
+        # This has the effect of moving all the lower items up one.
+        def decrement_positions_on_lower_items(position=nil)
+          return unless in_list?
+          position ||= send(position_column).to_i
+          acts_as_list_list.where("#{quoted_position_column_with_table_name} > ?", position).decrement_all
+        end
 
-          # Increments position (<tt>position_column</tt>) of all items in the list.
-          def increment_positions_on_all_items
-            acts_as_list_list.increment_all
-          end
+        # Increments position (<tt>position_column</tt>) of all items in the list.
+        def increment_positions_on_all_items
+          acts_as_list_list.increment_all
+        end
 
-          # Reorders intermediate items to support moving an item from old_position to new_position.
-          def shuffle_positions_on_intermediate_items(old_position, new_position, avoid_id = nil)
-            return if old_position == new_position
-            avoid_id_condition = avoid_id ? " AND #{quoted_table_name}.#{self.class.primary_key} != #{self.class.connection.quote(avoid_id)}" : ''
-
-            if old_position < new_position
-              # Decrement position of intermediate items
-              #
-              # e.g., if moving an item from 2 to 5,
-              # move [3, 4, 5] to [2, 3, 4]
-              acts_as_list_list.where(
-                "#{quoted_position_column_with_table_name} > ?", old_position
-              ).where(
-                "#{quoted_position_column_with_table_name} <= #{new_position}#{avoid_id_condition}"
-              ).decrement_all
+        # Reorders intermediate items to support moving an item from old_position to new_position.
+        # unique constraint prevents regular increment_all and forces to do increments one by one
+        # http://stackoverflow.com/questions/7703196/sqlite-increment-unique-integer-field
+        # both SQLite and PostgreSQL (and most probably MySQL too) has same issue
+        # that's why *sequential_updates?* check alters implementation behavior
+        def shuffle_positions_on_intermediate_items(old_position, new_position, avoid_id = nil)
+          return if old_position == new_position
+          scope = acts_as_list_list
+
+          if avoid_id
+            scope = scope.where("#{quoted_table_name}.#{self.class.primary_key} != ?", self.class.connection.quote(avoid_id))
+          end
+
+          if old_position < new_position
+            # Decrement position of intermediate items
+            #
+            # e.g., if moving an item from 2 to 5,
+            # move [3, 4, 5] to [2, 3, 4]
+            items = scope.where(
+              "#{quoted_position_column_with_table_name} > ?", old_position
+            ).where(
+              "#{quoted_position_column_with_table_name} <= ?", new_position
+            )
+
+            if sequential_updates?
+              items.order("#{quoted_position_column_with_table_name} ASC").each do |item|
+                item.decrement!(position_column)
+              end
             else
-              # Increment position of intermediate items
-              #
-              # e.g., if moving an item from 5 to 2,
-              # move [2, 3, 4] to [3, 4, 5]
-              acts_as_list_list.where(
-                "#{quoted_position_column_with_table_name} >= ?", new_position
-              ).where(
-                "#{quoted_position_column_with_table_name} < #{old_position}#{avoid_id_condition}"
-              ).increment_all
+              items.decrement_all
             end
-          end
-
-          def insert_at_position(position)
-            return set_list_position(position) if new_record?
-            with_lock do
-              if in_list?
-                old_position = send(position_column).to_i
-                return if position == old_position
-                shuffle_positions_on_intermediate_items(old_position, position)
-              else
-                increment_positions_on_lower_items(position)
+          else
+            # Increment position of intermediate items
+            #
+            # e.g., if moving an item from 5 to 2,
+            # move [2, 3, 4] to [3, 4, 5]
+            items = scope.where(
+              "#{quoted_position_column_with_table_name} >= ?", new_position
+            ).where(
+              "#{quoted_position_column_with_table_name} < ?", old_position
+            )
+
+            if sequential_updates?
+              items.order("#{quoted_position_column_with_table_name} DESC").each do |item|
+                item.increment!(position_column)
               end
-              set_list_position(position)
+            else
+              items.increment_all
             end
           end
-
-          # used by insert_at_position instead of remove_from_list, as postgresql raises error if position_column has non-null constraint
-          def store_at_0
+        end
+        
+        def insert_at_position(position)
+          return set_list_position(position) if new_record?
+          with_lock do
             if in_list?
               old_position = send(position_column).to_i
-              set_list_position(0)
-              decrement_positions_on_lower_items(old_position)
+              return if position == old_position
+              # temporary move after bottom with gap, avoiding duplicate values
+              # gap is required to leave room for position increments
+              # positive number will be valid with unique not null check (>= 0) db constraint
+              temporary_position = acts_as_list_class.maximum(position_column).to_i + 2
+              set_list_position(temporary_position)
+              shuffle_positions_on_intermediate_items(old_position, position, id)
+            else
+              increment_positions_on_lower_items(position)
             end
+            set_list_position(position)
           end
+        end
 
-          def update_positions
-            old_position = send("#{position_column}_was") || bottom_position_in_list + 1
-            new_position = send(position_column).to_i
+        def update_positions
+          old_position = send("#{position_column}_was") || bottom_position_in_list + 1
+          new_position = send(position_column).to_i
 
-            return unless acts_as_list_list.where(
-              "#{quoted_position_column_with_table_name} = #{new_position}"
-            ).count > 1
-            shuffle_positions_on_intermediate_items old_position, new_position, id
-          end
+          return unless acts_as_list_list.where(
+            "#{quoted_position_column_with_table_name} = #{new_position}"
+          ).count > 1
+          shuffle_positions_on_intermediate_items old_position, new_position, id
+        end
 
-          def internal_scope_changed?
-            return @scope_changed if defined?(@scope_changed)
+        def internal_scope_changed?
+          return @scope_changed if defined?(@scope_changed)
 
-            @scope_changed = scope_changed?
-          end
+          @scope_changed = scope_changed?
+        end
 
-          def clear_scope_changed
-            remove_instance_variable(:@scope_changed) if defined?(@scope_changed)
-          end
+        def clear_scope_changed
+          remove_instance_variable(:@scope_changed) if defined?(@scope_changed)
+        end
 
-          def check_scope
-            if internal_scope_changed?
-              cached_changes = changes
+        def check_scope
+          if internal_scope_changed?
+            cached_changes = changes
 
-              cached_changes.each { |attribute, values| self[attribute] = values[0] }
-              send('decrement_positions_on_lower_items') if lower_item
-              cached_changes.each { |attribute, values| self[attribute] = values[1] }
+            cached_changes.each { |attribute, values| self[attribute] = values[0] }
+            send('decrement_positions_on_lower_items') if lower_item
+            cached_changes.each { |attribute, values| self[attribute] = values[1] }
 
-              send("add_to_list_#{add_new_at}") if add_new_at.present?
-            end
+            send("add_to_list_#{add_new_at}") if add_new_at.present?
           end
+        end
 
-          # This check is skipped if the position is currently the default position from the table
-          # as modifying the default position on creation is handled elsewhere
-          def check_top_position
-            if send(position_column) && !default_position? && send(position_column) < acts_as_list_top
-              self[position_column] = acts_as_list_top
-            end
+        # This check is skipped if the position is currently the default position from the table
+        # as modifying the default position on creation is handled elsewhere
+        def check_top_position
+          if send(position_column) && !default_position? && send(position_column) < acts_as_list_top
+            self[position_column] = acts_as_list_top
           end
+        end
 
-          # When using raw column name it must be quoted otherwise it can raise syntax errors with SQL keywords (e.g. order)
-          def quoted_position_column
-            @_quoted_position_column ||= self.class.connection.quote_column_name(position_column)
-          end
+        # When using raw column name it must be quoted otherwise it can raise syntax errors with SQL keywords (e.g. order)
+        def quoted_position_column
+          @_quoted_position_column ||= self.class.connection.quote_column_name(position_column)
+        end
 
-          # Used in order clauses
-          def quoted_table_name
-            @_quoted_table_name ||= acts_as_list_class.quoted_table_name
-          end
+        # Used in order clauses
+        def quoted_table_name
+          @_quoted_table_name ||= acts_as_list_class.quoted_table_name
+        end
 
-          def quoted_position_column_with_table_name
-            @_quoted_position_column_with_table_name ||= "#{quoted_table_name}.#{quoted_position_column}"
-          end
+        def quoted_position_column_with_table_name
+          @_quoted_position_column_with_table_name ||= "#{quoted_table_name}.#{quoted_position_column}"
+        end
       end
     end
   end
-end
+end