acts_as_list 0.7.4 → 0.7.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODI0OTU2NzgzMmY0MmI3YjMyMDk2ZDg5YWJjNjkxZDE4ZjViODliYQ==
-  data.tar.gz: !binary |-
-    OThlMWNiYjU3MGRmMGQzNjA5NzQ1MDk1MzdiYTg1MGFjODJlNDJmYQ==
+SHA1:
+  metadata.gz: d62dacdeb7972152a2ee04cee3cccb8ef26898d7
+  data.tar.gz: fe6b02bfa1c5ed33407d1852c7b988a1848c7cd4
 SHA512:
-  metadata.gz: !binary |-
-    ZDMzOWRkNzQ2ZjNmZGRlM2QxYzJkN2VjYzM2MGY1Yzk4MjE1MmZiOWQyZjY1
-    NmY4Y2FjY2U4YjczNjliZjFmYzYwYmMzYTNlNTA2MjU4NmVlODFmMzg1NGY0
-    OWNkN2Y4MGU2ZTM4YjM2YjY0MTZkNjcwMjk0NmQ1YzBkMmNjYjE=
-  data.tar.gz: !binary |-
-    Mzg4NGQwNmY2NjdjN2MxZWIzYWE4MWNiOTlkMTc5NGM5NTRiMzRmY2MwNDVh
-    ODI2YTVhZmUwMzE1OTAwNzA1OWZjMjc3ZGNhZmI1Y2ZmNmU4NmYzNGQ3ZTc1
-    OGUyZDE0NjZkZTVjNmQxZTJhOWUyNjdhOWIwMjJiMTg2YzA2NWI=
+  metadata.gz: 6b376b14646463802f4aee7080663eefdb3d7b1a43088df7126f57c84ecfb0a8730470efe4b57758f2b2079d6bd52b19f2a80293b211095318425d5892194897
+  data.tar.gz: fa104b99749d08767074e96f5fea1e97590ee841673660c39d03bb3d2cd50a3d2db2de4d1d195d5503d1bfadec7cbe84e046714f0ab98d0d509bc4c4797949e2

data/.travis.yml

@@ -9,9 +9,24 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.2
   - jruby-19mode
   - rbx-2
 gemfile:
   - gemfiles/rails_3_2.gemfile
   - gemfiles/rails_4_1.gemfile
   - gemfiles/rails_4_2.gemfile
+  - gemfiles/rails_5_0.gemfile
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.1.0
+      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/Appraisals

@@ -1,11 +1,21 @@
 appraise "rails-3-2" do
-  gem "activerecord", "~> 3.2.21"
+  gem "activerecord", "~> 3.2.22.2"
+  group :test do
+    gem "after_commit_exception_notification"
+  end
 end
 
 appraise "rails-4-1" do
-  gem "activerecord", "~> 4.1.10"
+  gem "activerecord", "~> 4.1.16"
+  group :test do
+    gem "after_commit_exception_notification"
+  end
 end
 
 appraise "rails-4-2" do
-  gem "activerecord", "~> 4.2.1"
+  gem "activerecord", "~> 4.2.7"
+end
+
+appraise "rails-5-0" do
+  gem "activerecord", "~> 5.0.0"
 end

data/CHANGELOG.md

@@ -1,7 +1,82 @@
 # Change Log
 
+## [v0.7.6](https://github.com/swanandp/acts_as_list/tree/v0.7.6) (2016-07-15)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.7.5...v0.7.6)
+
+**Closed issues:**
+
+- add\_new\_at nil with scope causes NoMethodError [\#211](https://github.com/swanandp/acts_as_list/issues/211)
+
+**Merged pull requests:**
+
+- Add class method acts\_as\_list\_top as reader for configured top\_of\_list [\#213](https://github.com/swanandp/acts_as_list/pull/213) ([krzysiek1507](https://github.com/krzysiek1507))
+- Bugfix/add new at nil on scope change [\#212](https://github.com/swanandp/acts_as_list/pull/212) ([greatghoul](https://github.com/greatghoul))
+
+## [v0.7.5](https://github.com/swanandp/acts_as_list/tree/v0.7.5) (2016-06-30)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.7.4...v0.7.5)
+
+**Implemented enhancements:**
+
+- Touch when reordering [\#173](https://github.com/swanandp/acts_as_list/pull/173) ([botandrose](https://github.com/botandrose))
+
+**Closed issues:**
+
+- Exception raised when calling destroy "NameError - instance variable @scope\_changed not defined:" [\#206](https://github.com/swanandp/acts_as_list/issues/206)
+- Undefined instance variable @scope\_changed since 0.7.3 [\#199](https://github.com/swanandp/acts_as_list/issues/199)
+- Reordering large lists is slow [\#198](https://github.com/swanandp/acts_as_list/issues/198)
+- Reparenting child leaves gap in source list in rails 5 [\#194](https://github.com/swanandp/acts_as_list/issues/194)
+- Support rails 5 ? [\#186](https://github.com/swanandp/acts_as_list/issues/186)
+- I get a NoMethodError: undefined method `acts\_as\_list' when trying to include acts\_as\_list [\#176](https://github.com/swanandp/acts_as_list/issues/176)
+- Phenomenon of mysterious value of the position is skipped by one [\#166](https://github.com/swanandp/acts_as_list/issues/166)
+- Model.find being called twice with acts\_as\_list on destroy [\#161](https://github.com/swanandp/acts_as_list/issues/161)
+- `scope\_changed?` problem with acts\_as\_paranoid [\#158](https://github.com/swanandp/acts_as_list/issues/158)
+- Inconsistent behaviour between Symbol and Array scopes [\#155](https://github.com/swanandp/acts_as_list/issues/155)
+- insert\_at doesn't seem to be working in ActiveRecord callback \(Rails 4.2\) [\#150](https://github.com/swanandp/acts_as_list/issues/150)
+- Project Documentation link redirects to expired domain [\#149](https://github.com/swanandp/acts_as_list/issues/149)
+- Problem when updating an position of array of AR objects. [\#137](https://github.com/swanandp/acts_as_list/issues/137)
+- Unexpected behaviour when inserting consecutive items with default positions [\#124](https://github.com/swanandp/acts_as_list/issues/124)
+- self.reload prone to error [\#122](https://github.com/swanandp/acts_as_list/issues/122)
+- Rails 3.0.x in\_list causes the return of default\_scope [\#120](https://github.com/swanandp/acts_as_list/issues/120)
+- Relationships with dependency:destroy cause ActiveRecord::RecordNotFound [\#118](https://github.com/swanandp/acts_as_list/issues/118)
+- Using insert\_at with values with type String [\#117](https://github.com/swanandp/acts_as_list/issues/117)
+- Batch setting of position [\#112](https://github.com/swanandp/acts_as_list/issues/112)
+- position: 0 now makes model pushed to top? [\#110](https://github.com/swanandp/acts_as_list/issues/110)
+- Create element in default position [\#103](https://github.com/swanandp/acts_as_list/issues/103)
+- Enhancement: Expose scope object [\#97](https://github.com/swanandp/acts_as_list/issues/97)
+- Shuffle list [\#96](https://github.com/swanandp/acts_as_list/issues/96)
+- Creating an item with a nil scope should not add it to the list [\#92](https://github.com/swanandp/acts_as_list/issues/92)
+- Performance Improvements  [\#88](https://github.com/swanandp/acts_as_list/issues/88)
+- has\_many :through or has\_many\_and\_belongs\_to\_many support [\#86](https://github.com/swanandp/acts_as_list/issues/86)
+- ActiveRecord dependency causes rake assets:compile to fail without access to a database [\#84](https://github.com/swanandp/acts_as_list/issues/84)
+- move\_higher/move\_lower vs move\_to\_top/move\_to\_bottom act differently when item is already at top or bottom [\#77](https://github.com/swanandp/acts_as_list/issues/77)
+- Limiting the list size [\#61](https://github.com/swanandp/acts_as_list/issues/61)
+- Adding multiple creates strange ordering [\#55](https://github.com/swanandp/acts_as_list/issues/55)
+- Feature: sort [\#26](https://github.com/swanandp/acts_as_list/issues/26)
+
+**Merged pull requests:**
+
+- Removed duplicated assignment [\#207](https://github.com/swanandp/acts_as_list/pull/207) ([shunwen](https://github.com/shunwen))
+- Quote all identifiers [\#205](https://github.com/swanandp/acts_as_list/pull/205) ([fabn](https://github.com/fabn))
+- Start testing Rails 5 [\#203](https://github.com/swanandp/acts_as_list/pull/203) ([brendon](https://github.com/brendon))
+- Lock! the record before destroying [\#201](https://github.com/swanandp/acts_as_list/pull/201) ([brendon](https://github.com/brendon))
+- Fix ambiguous column error when joining some relations [\#180](https://github.com/swanandp/acts_as_list/pull/180) ([natw](https://github.com/natw))
+
+## [v0.7.4](https://github.com/swanandp/acts_as_list/tree/v0.7.4) (2016-04-15)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.7.3...v0.7.4)
+
+**Closed issues:**
+
+- Releasing a new gem version [\#196](https://github.com/swanandp/acts_as_list/issues/196)
+
+**Merged pull requests:**
+
+- Fix scope changed [\#200](https://github.com/swanandp/acts_as_list/pull/200) ([brendon](https://github.com/brendon))
+
 ## [v0.7.3](https://github.com/swanandp/acts_as_list/tree/v0.7.3) (2016-04-14)
-[Full Changelog](https://github.com/swanandp/acts_as_list/compare/0.7.1...v0.7.3)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.7.2...v0.7.3)
+
+## [v0.7.2](https://github.com/swanandp/acts_as_list/tree/v0.7.2) (2016-04-01)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/0.7.2...v0.7.2)
 
 **Closed issues:**
 
@@ -238,4 +313,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -9,12 +9,12 @@ platforms :rbx do
   gem "rubysl-test-unit"
 end
 
-# Specify your gem"s dependencies in acts_as_list-rails3.gemspec
+gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21, :jruby]
+
 gemspec
 
 gem "rake"
 gem "appraisal"
-# Used to automatically generate changelog file
 gem "github_changelog_generator", "1.9.0"
 
 group :test do

data/README.md

@@ -95,6 +95,8 @@ default: '1'. Use this option to define the top of the list. Use 0 to make the c
 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.
 
 ## Versions
+As of version `0.7.5` Rails 5 is supported.
+
 All versions `0.1.5` onwards require Rails 3.0.x and higher.
 
 ## Build Status
@@ -106,7 +108,6 @@ All versions `0.1.5` onwards require Rails 3.0.x and higher.
 ## Roadmap
 
 1. Sort based feature
-2. Rails 4 compatibility and bye bye Rails 2! Older versions would of course continue to work with Rails 2, but there won't be any support on those.
 
 ## Contributing to `acts_as_list`
  

data/gemfiles/rails_3_2.gemfile

@@ -4,10 +4,11 @@ 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"
 gem "github_changelog_generator", "1.9.0"
-gem "activerecord", "~> 3.2.21"
+gem "activerecord", "~> 3.2.22.2"
 
 group :test do
   gem "minitest", "~> 5.0"

data/gemfiles/rails_4_1.gemfile

@@ -4,10 +4,11 @@ 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"
 gem "github_changelog_generator", "1.9.0"
-gem "activerecord", "~> 4.1.10"
+gem "activerecord", "~> 4.1.16"
 
 group :test do
   gem "minitest", "~> 5.0"

data/gemfiles/rails_4_2.gemfile

@@ -4,10 +4,11 @@ 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"
 gem "github_changelog_generator", "1.9.0"
-gem "activerecord", "~> 4.2.1"
+gem "activerecord", "~> 4.2.7"
 
 group :test do
   gem "minitest", "~> 5.0"

data/gemfiles/rails_5_0.gemfile

@@ -0,0 +1,24 @@
+# This file was generated by Appraisal
+
+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"
+gem "github_changelog_generator", "1.9.0"
+gem "activerecord", "~> 5.0.0"
+
+group :test do
+  gem "minitest", "~> 5.0"
+  gem "test_after_commit", "~> 0.4.2"
+end
+
+platforms :rbx do
+  gem "rubysl", "~> 2.0"
+  gem "rubinius-developer_tools"
+  gem "rubysl-test-unit"
+end
+
+gemspec :path => "../"

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

@@ -74,8 +74,13 @@ module ActiveRecord
             )
           end
 
+          quoted_position_column = connection.quote_column_name(configuration[:column])
+          quoted_position_column_with_table_name = "#{quoted_table_name}.#{quoted_position_column}"
+
           class_eval <<-EOV, __FILE__, __LINE__ + 1
-            include ::ActiveRecord::Acts::List::InstanceMethods
+            def self.acts_as_list_top
+              #{configuration[:top_of_list]}.to_i
+            end
 
             def acts_as_list_top
               #{configuration[:top_of_list]}.to_i
@@ -111,23 +116,46 @@ module ActiveRecord
               attr_accessible :#{configuration[:column]}
             end
 
-            before_validation :check_top_position
-            
-            before_destroy :reload_position
-            after_destroy :decrement_positions_on_lower_items
-            
-            before_update :check_scope
-            after_update :update_positions
+            scope :in_list, lambda { where(%q{#{quoted_position_column_with_table_name} IS NOT NULL}) }
 
-            after_commit 'remove_instance_variable(:@scope_changed) if defined?(@scope_changed)'
+            def self.decrement_all
+              update_all_with_touch %q(#{quoted_position_column} = (#{quoted_position_column_with_table_name} - 1))
+            end
 
-            scope :in_list, lambda { where("#{table_name}.#{configuration[:column]} IS NOT NULL") }
+            def self.increment_all
+              update_all_with_touch %q(#{quoted_position_column} = (#{quoted_position_column_with_table_name} + 1))
+            end
+
+            def self.update_all_with_touch(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
           EOV
 
+          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?
-            self.send :before_create, :"add_to_list_#{configuration[:add_new_at]}"
+            before_create "add_to_list_#{configuration[:add_new_at]}".to_sym
           end
 
+          include ::ActiveRecord::Acts::List::InstanceMethods
         end
       end
 
@@ -232,10 +260,10 @@ module ActiveRecord
           limit ||= acts_as_list_list.count
           position_value = send(position_column)
           acts_as_list_list.
-            where("#{position_column} < ?", position_value).
-            where("#{position_column} >= ?", position_value - limit).
+            where("#{quoted_position_column_with_table_name} < ?", position_value).
+            where("#{quoted_position_column_with_table_name} >= ?", position_value - limit).
             limit(limit).
-            order("#{acts_as_list_class.table_name}.#{position_column} ASC")
+            order("#{quoted_position_column_with_table_name} ASC")
         end
 
         # Return the next lower item in the list.
@@ -250,10 +278,10 @@ module ActiveRecord
           limit ||= acts_as_list_list.count
           position_value = send(position_column)
           acts_as_list_list.
-            where("#{position_column} > ?", position_value).
-            where("#{position_column} <= ?", position_value + limit).
+            where("#{quoted_position_column_with_table_name} > ?", position_value).
+            where("#{quoted_position_column_with_table_name} <= ?", position_value + limit).
             limit(limit).
-            order("#{acts_as_list_class.table_name}.#{position_column} ASC")
+            order("#{quoted_position_column_with_table_name} ASC")
         end
 
         # Test if this record is in a list
@@ -298,7 +326,7 @@ module ActiveRecord
           # A poorly named method. It will insert the item at the desired position if the position
           # has been set manually using position=, not necessarily the bottom of the list
           def add_to_list_bottom
-            if not_in_list? || internal_scope_changed? && !@position_changed || default_position?
+            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)
@@ -323,12 +351,11 @@ module ActiveRecord
 
           # Returns the bottom item
           def bottom_item(except = nil)
-            conditions = scope_condition
-            conditions = except ? "#{self.class.primary_key} != #{self.class.connection.quote(except.id)}" : {}
+            conditions = except ? "#{quoted_table_name}.#{self.class.primary_key} != #{self.class.connection.quote(except.id)}" : {}
             acts_as_list_list.in_list.where(
               conditions
             ).order(
-              "#{acts_as_list_class.table_name}.#{position_column} DESC"
+              "#{quoted_position_column_with_table_name} DESC"
             ).first
           end
 
@@ -344,56 +371,38 @@ module ActiveRecord
 
           # This has the effect of moving all the higher items up one.
           def decrement_positions_on_higher_items(position)
-            acts_as_list_list.where(
-              "#{position_column} <= #{position}"
-            ).update_all(
-              "#{position_column} = (#{position_column} - 1)"
-            )
+            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 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(
-              "#{position_column} > #{position}"
-            ).update_all(
-              "#{position_column} = (#{position_column} - 1)"
-            )
+            acts_as_list_list.where("#{quoted_position_column_with_table_name} > ?", position).decrement_all
           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(
-              "#{position_column} < #{send(position_column).to_i}"
-            ).update_all(
-              "#{position_column} = (#{position_column} + 1)"
-            )
+            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 lower items down one.
           def increment_positions_on_lower_items(position, avoid_id = nil)
-            avoid_id_condition = avoid_id ? " AND #{self.class.primary_key} != #{self.class.connection.quote(avoid_id)}" : ''
+            avoid_id_condition = avoid_id ? " AND #{quoted_table_name}.#{self.class.primary_key} != #{self.class.connection.quote(avoid_id)}" : ''
 
-            acts_as_list_list.where(
-              "#{position_column} >= #{position}#{avoid_id_condition}"
-            ).update_all(
-              "#{position_column} = (#{position_column} + 1)"
-            )
+            acts_as_list_list.where("#{quoted_position_column_with_table_name} >= #{position}#{avoid_id_condition}").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.update_all(
-              "#{position_column} = (#{position_column} + 1)"
-            )
+            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 #{self.class.primary_key} != #{self.class.connection.quote(avoid_id)}" : ''
+            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
@@ -401,37 +410,35 @@ module ActiveRecord
               # e.g., if moving an item from 2 to 5,
               # move [3, 4, 5] to [2, 3, 4]
               acts_as_list_list.where(
-                "#{position_column} > #{old_position}"
+                "#{quoted_position_column_with_table_name} > ?", old_position
               ).where(
-                "#{position_column} <= #{new_position}#{avoid_id_condition}"
-              ).update_all(
-                "#{position_column} = (#{position_column} - 1)"
-              )
+                "#{quoted_position_column_with_table_name} <= #{new_position}#{avoid_id_condition}"
+              ).decrement_all
             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(
-                "#{position_column} >= #{new_position}"
+                "#{quoted_position_column_with_table_name} >= ?", new_position
               ).where(
-                "#{position_column} < #{old_position}#{avoid_id_condition}"
-              ).update_all(
-                "#{position_column} = (#{position_column} + 1)"
-              )
+                "#{quoted_position_column_with_table_name} < #{old_position}#{avoid_id_condition}"
+              ).increment_all
             end
           end
 
           def insert_at_position(position)
             return set_list_position(position) if new_record?
-            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)
+            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)
+              end
+              set_list_position(position)
             end
-            set_list_position(position)
           end
 
           # used by insert_at_position instead of remove_from_list, as postgresql raises error if position_column has non-null constraint
@@ -448,37 +455,31 @@ module ActiveRecord
             new_position = send(position_column).to_i
 
             return unless acts_as_list_list.where(
-              "#{position_column} = #{new_position}"
+              "#{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)
-            
+
             @scope_changed = scope_changed?
           end
 
-          # Temporarily swap changes attributes with current attributes
-          def swap_changed_attributes
-            @changed_attributes.each do |k, _|
-              if self.class.column_names.include? k
-                @changed_attributes[k], self[k] = self[k], @changed_attributes[k]
-              end
-            end
+          def clear_scope_changed
+            remove_instance_variable(:@scope_changed) if defined?(@scope_changed)
           end
 
           def check_scope
             if internal_scope_changed?
-              swap_changed_attributes
+              cached_changes = changes
+
+              cached_changes.each { |attribute, values| self[attribute] = values[0] }
               send('decrement_positions_on_lower_items') if lower_item
-              swap_changed_attributes
-              send("add_to_list_#{add_new_at}")
-            end
-          end
+              cached_changes.each { |attribute, values| self[attribute] = values[1] }
 
-          def reload_position
-            self.reload
+              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
@@ -488,6 +489,20 @@ module ActiveRecord
               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
+
+          # 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
       end
     end
   end

data/lib/acts_as_list/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.7.4'
+      VERSION = '0.7.7'
     end
   end
 end

data/test/helper.rb

@@ -12,9 +12,9 @@ require "minitest/autorun"
 require "#{File.dirname(__FILE__)}/../init"
 
 if defined?(ActiveRecord::VERSION) &&
-  ActiveRecord::VERSION::MAJOR > 4 ||
-  (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 2)
+  ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 2
 
+  # Was removed in Rails 5 and is effectively true.
   ActiveRecord::Base.raise_in_transactional_callbacks = true
 end
 

data/test/shared.rb

@@ -6,4 +6,5 @@ module Shared
   autoload :ArrayScopeList, 'shared_array_scope_list'
   autoload :TopAddition,    'shared_top_addition'
   autoload :NoAddition,     'shared_no_addition'
+  autoload :Quoting,        'shared_quoting'
 end

data/test/shared_list.rb

@@ -104,6 +104,12 @@ module Shared
 
       new4.reload
       assert_equal 5, new4.pos
+
+      last1 = ListMixin.order('pos').last
+      last2 = ListMixin.order('pos').last
+      last1.insert_at(1)
+      last2.insert_at(1)
+      assert_equal [1, 2, 3, 4, 5], ListMixin.where(parent_id: 20).order('pos').map(&:pos)
     end
 
     def test_delete_middle
@@ -142,7 +148,7 @@ module Shared
 
     def test_update_position_when_scope_changes
       assert_equal [1, 2, 3, 4], ListMixin.where(parent_id: 5).order('pos').map(&:id)
-      parent = ListMixin.create(parent_id: 6)
+      ListMixin.create(parent_id: 6)
 
       ListMixin.where(id: 2).first.move_within_scope(6)
 
@@ -246,5 +252,11 @@ module Shared
 
       assert_equal [5, 1, 6, 2, 3, 4], ListMixin.where(parent_id: 5).order('pos').map(&:id)
     end
+
+    def test_non_persisted_records_dont_get_lock_called
+      new = ListMixin.new(parent_id: 5)
+
+      new.destroy
+    end
   end
 end

data/test/shared_no_addition.rb

@@ -21,5 +21,16 @@ module Shared
       assert !new.in_list?
     end
 
+    def test_update_scope_does_not_add_to_list
+      new = NoAdditionMixin.create
+
+      new.update_attribute(:parent_id, 20)
+      new.reload
+      assert !new.in_list?
+
+      new.update_attribute(:parent_id, 5)
+      new.reload
+      assert !new.in_list?
+    end
   end
 end

data/test/shared_quoting.rb

@@ -0,0 +1,21 @@
+module Shared
+  module Quoting
+
+    def setup
+      3.times { |counter| QuotedList.create! order: counter }
+    end
+
+    def test_create
+      assert_equal QuotedList.in_list.size, 3
+    end
+
+    # This test execute raw queries involving table name
+    def test_moving
+      item = QuotedList.first
+      item.higher_items
+      item.lower_items
+      item.send :bottom_item # Part of private api
+    end
+
+  end
+end

data/test/test_joined_list.rb

@@ -0,0 +1,64 @@
+require 'helper'
+
+ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
+ActiveRecord::Schema.verbose = false
+
+class Section < ActiveRecord::Base
+  has_many :items
+  acts_as_list
+
+  scope :visible, -> { where(visible: true) }
+end
+
+class Item < ActiveRecord::Base
+  belongs_to :section
+  acts_as_list scope: :section
+
+  scope :visible, -> { where(visible: true).joins(:section).merge(Section.visible) }
+end
+
+class JoinedTestCase < Minitest::Test
+  def setup
+    ActiveRecord::Base.connection.create_table :sections do |t|
+      t.column :position, :integer
+      t.column :visible, :boolean, default: true
+    end
+
+    ActiveRecord::Base.connection.create_table :items do |t|
+      t.column :position, :integer
+      t.column :section_id, :integer
+      t.column :visible, :boolean, default: true
+    end
+
+    ActiveRecord::Base.connection.schema_cache.clear!
+    [Section, Item].each(&:reset_column_information)
+    super
+  end
+
+  def teardown
+    ActiveRecord::Base.connection.tables.each do |table|
+      ActiveRecord::Base.connection.drop_table(table)
+    end
+    super
+  end
+end
+
+# joining the relation returned by `#higher_items` or `#lower_items` to another table
+# previously could result in ambiguous column names in the query
+class TestHigherLowerItems < JoinedTestCase
+  def test_higher_items
+    section = Section.create
+    item1 = Item.create section: section
+    item2 = Item.create section: section
+    item3 = Item.create section: section
+    assert_equal item3.higher_items.visible, [item1, item2]
+  end
+
+  def test_lower_items
+    section = Section.create
+    item1 = Item.create section: section
+    item2 = Item.create section: section
+    item3 = Item.create section: section
+    assert_equal item1.lower_items.visible, [item2, item3]
+  end
+end

data/test/test_list.rb

@@ -1,7 +1,10 @@
 # NOTE: following now done in helper.rb (better Readability)
 require 'helper'
 
-ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
+ActiveRecord::Base.establish_connection(
+  adapter: "sqlite3",
+  database: 'file:memdb1?mode=memory&cache=shared'
+)
 ActiveRecord::Schema.verbose = false
 
 def setup_db(position_options = {})
@@ -16,9 +19,14 @@ def setup_db(position_options = {})
     t.column :state, :integer
   end
 
+  # This table is used to test table names and column names quoting
+  ActiveRecord::Base.connection.create_table 'table-name' do |t|
+    t.column :order, :integer
+  end
+
   mixins = [ Mixin, ListMixin, ListMixinSub1, ListMixinSub2, ListWithStringScopeMixin,
     ArrayScopeListMixin, ZeroBasedMixin, DefaultScopedMixin,
-    DefaultScopedWhereMixin, TopAdditionMixin, NoAdditionMixin ]
+    DefaultScopedWhereMixin, TopAdditionMixin, NoAdditionMixin, QuotedList ]
 
   mixins << EnumArrayScopeListMixin if rails_4
 
@@ -42,7 +50,13 @@ def rails_4
 end
 
 def teardown_db
-  ActiveRecord::Base.connection.tables.each do |table|
+  if ActiveRecord::VERSION::MAJOR >= 5
+    tables = ActiveRecord::Base.connection.data_sources
+  else
+    tables = ActiveRecord::Base.connection.tables
+  end
+
+  tables.each do |table|
     ActiveRecord::Base.connection.drop_table(table)
   end
 end
@@ -149,6 +163,18 @@ end
 class TheBaseSubclass < TheBaseClass
 end
 
+class DBConfigTest < Minitest::Test
+  def test_db_config
+    # make sure sqlite3 accepts multi threaded access
+    assert_equal "file:memdb1?mode=memory&cache=shared", ActiveRecord::Base.connection.pool.spec.config[:database]
+  end
+end
+
+class QuotedList < ActiveRecord::Base
+  self.table_name = 'table-name'
+  acts_as_list column: :order
+end
+
 class ActsAsListTestCase < Minitest::Test
   # No default test required as this class is abstract.
   # Need for test/unit.
@@ -184,6 +210,37 @@ class ListTest < ActsAsListTestCase
     setup_db
     super
   end
+
+  def test_insert_race_condition
+    # the bigger n is the more likely we will have a race condition
+    n = 1000
+    (1..n).each do |counter|
+      node = ListMixin.new parent_id: 1
+      node.pos = counter
+      node.save!
+    end
+
+    wait_for_it  = true
+    threads = []
+    4.times do |i|
+      threads << Thread.new do
+        true while wait_for_it
+        ActiveRecord::Base.connection_pool.with_connection do |c|
+          n.times do
+            begin
+              ListMixin.where(parent_id: 1).order(:pos).last.insert_at(1)
+            rescue Exception
+              # ignore SQLite3::SQLException due to table locking
+            end
+          end
+        end
+      end
+    end
+    wait_for_it = false
+    threads.each(&:join)
+
+    assert_equal (1..n).to_a, ListMixin.where(parent_id: 1).order('pos').map(&:pos)
+  end
 end
 
 class ListWithCallbackTest < ActsAsListTestCase
@@ -243,6 +300,15 @@ class ArrayScopeListTestWithDefault < ActsAsListTestCase
   end
 end
 
+class QuotingTestList < ActsAsListTestCase
+  include Shared::Quoting
+
+  def setup
+    setup_db_with_default
+    super
+  end
+end
+
 class DefaultScopedTest < ActsAsListTestCase
   def setup
     setup_db
@@ -603,3 +669,82 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
     assert_equal [1], ArrayScopeListMixin.where(:parent_id => 4, :parent_type => 'anything').order(:pos).map(&:pos)
   end
 end
+
+class TouchTest < ActsAsListTestCase
+  def setup
+    setup_db
+    4.times { ListMixin.create! updated_at: yesterday }
+  end
+
+  def now
+    Time.now.utc
+  end
+
+  def yesterday
+    1.day.ago
+  end
+
+  def updated_ats
+    ListMixin.pluck(:updated_at)
+  end
+
+  def test_moving_item_lower_touches_self_and_lower_item
+    ListMixin.first.move_lower
+    updated_ats[0..1].each do |updated_at|
+      assert_in_delta updated_at, now, 1.second
+    end
+    updated_ats[2..3].each do |updated_at|
+      assert_in_delta updated_at, yesterday, 1.second
+    end
+  end
+
+  def test_moving_item_higher_touches_self_and_higher_item
+    ListMixin.all.second.move_higher
+    updated_ats[0..1].each do |updated_at|
+      assert_in_delta updated_at, now, 1.second
+    end
+    updated_ats[2..3].each do |updated_at|
+      assert_in_delta updated_at, yesterday, 1.second
+    end
+  end
+
+  def test_moving_item_to_bottom_touches_all_other_items
+    ListMixin.first.move_to_bottom
+    updated_ats.each do |updated_at|
+      assert_in_delta updated_at, now, 1.second
+    end
+  end
+
+  def test_moving_item_to_top_touches_all_other_items
+    ListMixin.last.move_to_top
+    updated_ats.each do |updated_at|
+      assert_in_delta updated_at, now, 1.second
+    end
+  end
+
+  def test_removing_item_touches_all_lower_items
+    ListMixin.all.third.remove_from_list
+    updated_ats[0..1].each do |updated_at|
+      assert_in_delta updated_at, yesterday, 1.second
+    end
+    updated_ats[2..2].each do |updated_at|
+      assert_in_delta updated_at, now, 1.second
+    end
+  end
+end
+
+class ActsAsListTopTest < ActsAsListTestCase
+  def setup
+    setup_db
+  end
+
+  def test_acts_as_list_top
+    assert_equal 1, TheBaseSubclass.new.acts_as_list_top
+    assert_equal 0, ZeroBasedMixin.new.acts_as_list_top
+  end
+
+  def test_class_acts_as_list_top
+    assert_equal 1, TheBaseSubclass.acts_as_list_top
+    assert_equal 0, ZeroBasedMixin.acts_as_list_top
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.7
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,34 +10,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: This "acts_as" extension provides the capabilities for sorting and reordering
@@ -49,9 +49,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
-- .gitignore
-- .travis.yml
+- ".gemtest"
+- ".gitignore"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -62,6 +62,7 @@ files:
 - gemfiles/rails_3_2.gemfile
 - gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_0.gemfile
 - init.rb
 - lib/acts_as_list.rb
 - lib/acts_as_list/active_record/acts/list.rb
@@ -72,8 +73,10 @@ files:
 - test/shared_list.rb
 - test/shared_list_sub.rb
 - test/shared_no_addition.rb
+- test/shared_quoting.rb
 - test/shared_top_addition.rb
 - test/shared_zero_based.rb
+- test/test_joined_list.rb
 - test/test_list.rb
 homepage: http://github.com/swanandp/acts_as_list
 licenses:
@@ -85,12 +88,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -107,6 +110,8 @@ test_files:
 - test/shared_list.rb
 - test/shared_list_sub.rb
 - test/shared_no_addition.rb
+- test/shared_quoting.rb
 - test/shared_top_addition.rb
 - test/shared_zero_based.rb
+- test/test_joined_list.rb
 - test/test_list.rb