acts_as_list 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5389d6284e204b5d24d21e0059706dfca2f6ffb4
-  data.tar.gz: 8c70ec4d0148e815bd1261a2ab29db12dc7c1446
+  metadata.gz: 4602fbf2208d5b39ba3a0fe78b4ab3ad0947e69a
+  data.tar.gz: f3ef72c6695c6441366c657f41a3d8b273e7c588
 SHA512:
-  metadata.gz: 9612ad3b4bf5ba60f8ff652acac46905c384349b2c63521b36a90ef11e24e1342db72bcded83fc6b1eb9944b37c5297a799460068f2c445a3adaf256930b70dd
-  data.tar.gz: a0efb9b5b14c53871437c4562a2ff073d7ad7088c896aaccb2a43c2ab7cacf86d4447c871f9af7dcdab2fa21f6f2e994fa61871aa262a4d1544e878e7e3eace6
+  metadata.gz: 499b30c7a96fb04f2ab8c66414c7165686652b4969692a1e82a3af482b6f54e49d2270ed902466721874d0fcbe144cbc541fad09b55f22c385a0f181ffca8b3d
+  data.tar.gz: 38ae417b51053320bf227a3be9b44c8de46f754990bd4d74e427c47da6502e282e20c02ce4a47dc0466ee488c73fec14f8b44af660645379a412c9632ed2e29b

data/.travis.yml

@@ -15,6 +15,7 @@ rvm:
   - 2.1.9
   - 2.2.6
   - 2.3.3
+  - 2.4.0
   - jruby-19mode
 env:
   - DB=sqlite
@@ -25,13 +26,26 @@ gemfile:
   - gemfiles/rails_4_1.gemfile
   - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_5_0.gemfile
+  - gemfiles/rails_5_1.gemfile
 matrix:
   exclude:
     - rvm: 1.9.3
       gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_5_1.gemfile
     - rvm: 2.0.0
       gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_5_1.gemfile
     - rvm: 2.1.9
       gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.1.9
+      gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_3_2.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4_1.gemfile
     - rvm: jruby-19mode
       gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rails_5_1.gemfile

data/Appraisals

@@ -19,3 +19,7 @@ end
 appraise "rails-5-0" do
   gem "activerecord", "~> 5.0.0"
 end
+
+appraise "rails-5-1" do
+  gem "activerecord", "~> 5.1.0.beta1"
+end

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v0.9.2](https://github.com/swanandp/acts_as_list/tree/v0.9.2) (2017-02-07)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.9.1...v0.9.2)
+
+**Closed issues:**
+
+- Getting invalid input syntax for uuid [\#253](https://github.com/swanandp/acts_as_list/issues/253)
+
 ## [v0.9.1](https://github.com/swanandp/acts_as_list/tree/v0.9.1) (2017-01-26)
 [Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.9.0...v0.9.1)
 

data/Gemfile

@@ -12,6 +12,7 @@ group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"
   gem "timecop"
+  gem "mocha"
 end
 
 group :sqlite do

data/README.md

@@ -27,27 +27,27 @@ At first, you need to add a `position` column to desired table:
 
     rails g migration AddPositionToTodoItem position:integer
     rake db:migrate
-    
-After that you can use `acts_as_list` method in the model: 
+
+After that you can use `acts_as_list` method in the model:
 
 ```ruby
 class TodoList < ActiveRecord::Base
   has_many :todo_items, -> { order(position: :asc) }
 end
-    
+
 class TodoItem < ActiveRecord::Base
   belongs_to :todo_list
   acts_as_list scope: :todo_list
 end
 
-todo_list = TodoList.find(...)    
+todo_list = TodoList.find(...)
 todo_list.todo_items.first.move_to_bottom
 todo_list.todo_items.last.move_higher
 ```
 
 ## Instance Methods Added To ActiveRecord Models
 
-You'll have a number of methods added to each instance of the ActiveRecord model that to which `acts_as_list` is added. 
+You'll have a number of methods added to each instance of the ActiveRecord model that to which `acts_as_list` is added.
 
 In `acts_as_list`, "higher" means further up the list (a lower `position`), and "lower" means further down the list (a higher `position`). That can be confusing, so it might make sense to add tests that validate that you're using the right method given your context.
 
@@ -132,7 +132,34 @@ TodoItem.acts_as_list_no_update do
 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. 
+ the default value from the database. It is your responsibility to correctly manage `positions` values.
+
+You can also pass an array of classes as an argument to disable database updates on just those classes. It can be any ActiveRecord class that has acts_as_list enabled.
+```ruby
+class TodoList < ActiveRecord::Base
+  has_many :todo_items, -> { order(position: :asc) }
+  acts_as_list
+end
+
+class TodoItem < ActiveRecord::Base
+  belongs_to :todo_list
+  has_many :todo_attachments, -> { order(position: :asc) }
+
+  acts_as_list scope: :todo_list
+end
+
+class TodoAttachment < ActiveRecord::Base
+  belongs_to :todo_list
+  acts_as_list scope: :todo_item
+end
+
+TodoItem.acts_as_list_no_update([TodoAttachment]) do
+  TodoItem.find(10).update(position: 2)
+  TodoAttachment.find(10).update(position: 1)
+  TodoAttachment.find(11).update(position: 2)
+  TodoList.find(2).update(position: 3) # For this instance the callbacks will be called because we haven't passed the class as an argument
+end
+```
 
 ## 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.
@@ -152,7 +179,7 @@ All versions `0.1.5` onwards require Rails 3.0.x and higher.
 1. Sort based feature
 
 ## Contributing to `acts_as_list`
- 
+
 - Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 - Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 - Fork the project

data/gemfiles/rails_3_2.gemfile

@@ -12,6 +12,7 @@ group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"
   gem "timecop"
+  gem "mocha"
   gem "after_commit_exception_notification"
 end
 

data/gemfiles/rails_4_1.gemfile

@@ -12,6 +12,7 @@ group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"
   gem "timecop"
+  gem "mocha"
   gem "after_commit_exception_notification"
 end
 

data/gemfiles/rails_4_2.gemfile

@@ -12,6 +12,7 @@ group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"
   gem "timecop"
+  gem "mocha"
 end
 
 group :sqlite do

data/gemfiles/rails_5_0.gemfile

@@ -12,6 +12,7 @@ group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"
   gem "timecop"
+  gem "mocha"
 end
 
 group :sqlite do

data/gemfiles/rails_5_1.gemfile

@@ -0,0 +1,33 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+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.1.0.beta1"
+
+group :test do
+  gem "minitest", "~> 5.0"
+  gem "test_after_commit", "~> 0.4.2"
+  gem "timecop"
+  gem "mocha"
+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,5 +1,5 @@
 require 'acts_as_list/active_record/acts/list'
-require "acts_as_list/active_record/acts/column_method_definer"
+require "acts_as_list/active_record/acts/position_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"

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

@@ -3,8 +3,8 @@ module ActiveRecord::Acts::List::CallbackDefiner #:nodoc:
     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_destroy :lock!, unless: "destroyed_via_scope? || act_as_list_no_update?"
+      after_destroy :decrement_positions_on_lower_items, unless: "destroyed_via_scope? || 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?

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

@@ -20,7 +20,7 @@ class << ActiveRecord::Base
 
     caller_class = self
 
-    ActiveRecord::Acts::List::ColumnMethodDefiner.call(caller_class, configuration[:column])
+    ActiveRecord::Acts::List::PositionColumnMethodDefiner.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])
@@ -393,7 +393,7 @@ module ActiveRecord
         end
 
         def update_positions
-          old_position = send("#{position_column}_was") || bottom_position_in_list + 1
+          old_position = position_before_save || bottom_position_in_list + 1
           new_position = send(position_column).to_i
 
           return unless acts_as_list_list.where(
@@ -402,6 +402,14 @@ module ActiveRecord
           shuffle_positions_on_intermediate_items old_position, new_position, id
         end
 
+        def position_before_save
+          if ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+            send("#{position_column}_before_last_save")
+          else
+            send("#{position_column}_was")
+          end
+        end
+
         def internal_scope_changed?
           return @scope_changed if defined?(@scope_changed)
 

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

@@ -4,39 +4,99 @@ module ActiveRecord
       module NoUpdate
         extend ActiveSupport::Concern
 
+        class ArrayTypeError < SyntaxError
+          def initialize
+            super("The first argument must be an array")
+          end
+        end
+
+        class DisparityClassesError < NotImplementedError
+          def initialize
+            super("The first argument should contain ActiveRecord or ApplicationRecord classes")
+          end
+        end
+
         module ClassMethods
           # Lets you selectively disable all act_as_list database updates
           # for the duration of a block.
           #
           # ==== Examples
-          #   ActiveRecord::Acts::List.acts_as_list_no_update do
-          #     TodoList....
-          #   end
           #
-          #   TodoList.acts_as_list_no_update do
-          #     TodoList....
-          #   end
+          # class TodoList < ActiveRecord::Base
+          #   has_many :todo_items, -> { order(position: :asc) }
+          # end
+          #
+          # class TodoItem < ActiveRecord::Base
+          #   belongs_to :todo_list
+          #
+          #   acts_as_list scope: :todo_list
+          # end
+          #
+          # TodoItem.acts_as_list_no_update do
+          #   TodoList.first.update(position: 2)
+          # end
+          #
+          # You can also pass an array of classes as an argument to disable database updates on just those classes.
+          # It can be any ActiveRecord class that has acts_as_list enabled.
+          #
+          # ==== Examples
+          #
+          # class TodoList < ActiveRecord::Base
+          #   has_many :todo_items, -> { order(position: :asc) }
+          #   acts_as_list
+          # end
+          #
+          # class TodoItem < ActiveRecord::Base
+          #   belongs_to :todo_list
+          #   has_many :todo_attachments, -> { order(position: :asc) }
+          #
+          #   acts_as_list scope: :todo_list
+          # end
           #
-          def acts_as_list_no_update(&block)
-            NoUpdate.apply_to(self, &block)
+          # class TodoAttachment < ActiveRecord::Base
+          #   belongs_to :todo_list
+          #   acts_as_list scope: :todo_item
+          # end
+          #
+          # TodoItem.acts_as_list_no_update([TodoAttachment]) do
+          #   TodoItem.find(10).update(position: 2)
+          #   TodoAttachment.find(10).update(position: 1)
+          #   TodoAttachment.find(11).update(position: 2)
+          #   TodoList.find(2).update(position: 3) # For this instance the callbacks will be called because we haven't passed the class as an argument
+          # end
+
+          def acts_as_list_no_update(extra_classes = [], &block)
+            return raise ArrayTypeError unless extra_classes.is_a?(Array)
+
+            extra_classes << self
+
+            return raise DisparityClassesError unless active_record_objects?(extra_classes)
+
+            NoUpdate.apply_to(extra_classes, &block)
+          end
+
+          private
+
+          def active_record_objects?(extra_classes)
+            extra_classes.all? { |klass| klass.ancestors.include? ActiveRecord::Base }
           end
         end
 
         class << self
-          def apply_to(klass)
-            klasses.push(klass)
+          def apply_to(klasses)
+            extracted_klasses.push(*klasses)
             yield
           ensure
-            klasses.pop
+            extracted_klasses.clear
           end
 
           def applied_to?(klass)
-            klasses.any? { |k| k >= klass }
+            extracted_klasses.any? { |k| k == klass }
           end
 
           private
 
-            def klasses
+            def extracted_klasses
               Thread.current[:act_as_list_no_update] ||= []
             end
         end

data/lib/acts_as_list/active_record/acts/{column_method_definer.rb → position_column_method_definer.rb}

@@ -1,25 +1,19 @@
-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
+module ActiveRecord::Acts::List::PositionColumnMethodDefiner #:nodoc:
+  def self.call(caller_class, position_column)
+    define_class_methods(caller_class, position_column)
+    define_instance_methods(caller_class, position_column)
 
-      define_method :"#{column}=" do |position|
-        write_attribute(column, position)
-        @position_changed = true
-      end
+    if mass_assignment_protection_was_used_by_user?(caller_class)
+      protect_attributes_from_mass_assignment(caller_class, position_column)
+    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 :"#{column}"
-      end
+  private
 
+  def self.define_class_methods(caller_class, position_column)
+    caller_class.class_eval do
       define_singleton_method :quoted_position_column do
-        @_quoted_position_column ||= connection.quote_column_name(column)
+        @_quoted_position_column ||= connection.quote_column_name(position_column)
       end
 
       define_singleton_method :quoted_position_column_with_table_name do
@@ -47,4 +41,31 @@ module ActiveRecord::Acts::List::ColumnMethodDefiner #:nodoc:
       end
     end
   end
+
+  def self.define_instance_methods(caller_class, position_column)
+    caller_class.class_eval do
+      attr_reader :position_changed
+
+      define_method :position_column do
+        position_column
+      end
+
+      define_method :"#{position_column}=" do |position|
+        write_attribute(position_column, position)
+        @position_changed = true
+      end
+    end
+  end
+
+  def self.mass_assignment_protection_was_used_by_user?(caller_class)
+    caller_class.class_eval do
+      respond_to?(:accessible_attributes) and accessible_attributes.present?
+    end
+  end
+
+  def self.protect_attributes_from_mass_assignment(caller_class, position_column)
+    caller_class.class_eval do
+      attr_accessible position_column.to_sym
+    end
+  end
 end

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

@@ -17,6 +17,11 @@ module ActiveRecord::Acts::List::ScopeMethodDefiner #:nodoc:
         define_method :scope_changed? do
           changed.include?(scope_name.to_s)
         end
+
+        define_method :destroyed_via_scope? do
+          return false if ActiveRecord::VERSION::MAJOR < 4
+          scope == (destroyed_by_association && destroyed_by_association.foreign_key.to_sym)
+        end
       elsif scope.is_a?(Array)
         define_method :scope_condition do
           scope.inject({}) do |hash, column|
@@ -27,6 +32,11 @@ module ActiveRecord::Acts::List::ScopeMethodDefiner #:nodoc:
         define_method :scope_changed? do
           (scope_condition.keys & changed.map(&:to_sym)).any?
         end
+
+        define_method :destroyed_via_scope? do
+          return false if ActiveRecord::VERSION::MAJOR < 4
+          scope_condition.keys.include? (destroyed_by_association && destroyed_by_association.foreign_key.to_sym)
+        end
       else
         define_method :scope_condition do
           eval "%{#{scope}}"
@@ -35,6 +45,10 @@ module ActiveRecord::Acts::List::ScopeMethodDefiner #:nodoc:
         define_method :scope_changed? do
           false
         end
+
+        define_method :destroyed_via_scope? do
+          false
+        end
       end
 
       self.scope :in_list, lambda { where("#{quoted_position_column_with_table_name} IS NOT NULL") }

data/lib/acts_as_list/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.9.2'
+      VERSION = '0.9.3'
     end
   end
 end

data/test/helper.rb

@@ -11,6 +11,7 @@ rescue Bundler::BundlerError => e
 end
 require "active_record"
 require "minitest/autorun"
+require "mocha/mini_test"
 require "#{File.dirname(__FILE__)}/../init"
 
 if defined?(ActiveRecord::VERSION) &&
@@ -20,6 +21,31 @@ if defined?(ActiveRecord::VERSION) &&
   ActiveRecord::Base.raise_in_transactional_callbacks = true
 end
 
+db_config = YAML.load_file(File.expand_path("../database.yml", __FILE__)).fetch(ENV["DB"] || "sqlite")
+ActiveRecord::Base.establish_connection(db_config)
+ActiveRecord::Schema.verbose = false
+
+# Returns true if ActiveRecord is rails 3, 4 version
+def rails_3
+  defined?(ActiveRecord::VERSION) && ActiveRecord::VERSION::MAJOR >= 3
+end
+
+def rails_4
+  defined?(ActiveRecord::VERSION) && ActiveRecord::VERSION::MAJOR >= 4
+end
+
+def teardown_db
+  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
+
 require "shared"
 
 # ActiveRecord::Base.logger = Logger.new(STDOUT)
@@ -30,4 +56,4 @@ def assert_equal_or_nil(a, b)
   else
     assert_equal a, b
   end
-end
+end

data/test/test_joined_list.rb

@@ -1,9 +1,5 @@
 require 'helper'
 
-db_config = YAML.load_file(File.expand_path("../database.yml", __FILE__)).fetch(ENV["DB"] || "sqlite")
-ActiveRecord::Base.establish_connection(db_config)
-ActiveRecord::Schema.verbose = false
-
 class Section < ActiveRecord::Base
   has_many :items
   acts_as_list
@@ -37,14 +33,7 @@ class JoinedTestCase < Minitest::Test
   end
 
   def teardown
-    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
+    teardown_db
     super
   end
 end

data/test/test_list.rb

@@ -1,13 +1,9 @@
 # NOTE: following now done in helper.rb (better Readability)
 require 'helper'
 
-db_config = YAML.load_file(File.expand_path("../database.yml", __FILE__)).fetch(ENV["DB"] || "sqlite")
-ActiveRecord::Base.establish_connection(db_config)
-ActiveRecord::Schema.verbose = false
-
 def setup_db(position_options = {})
   $default_position = position_options[:default]
-  
+
   # sqlite cannot drop/rename/alter columns and add constraints after table creation
   sqlite = ENV.fetch("DB", "sqlite") == "sqlite"
 
@@ -25,7 +21,7 @@ def setup_db(position_options = {})
   if position_options[:unique] && !(sqlite && position_options[:positive])
     ActiveRecord::Base.connection.add_index :mixins, :pos, unique: true
   end
-  
+
   if position_options[:positive]
     if sqlite
       # SQLite cannot add constraint after table creation, also cannot add unique inside ADD COLUMN
@@ -57,27 +53,6 @@ def setup_db_with_default
   setup_db default: 0
 end
 
-# Returns true if ActiveRecord is rails3,4 version
-def rails_3
-  defined?(ActiveRecord::VERSION) && ActiveRecord::VERSION::MAJOR >= 3
-end
-
-def rails_4
-  defined?(ActiveRecord::VERSION) && ActiveRecord::VERSION::MAJOR >= 4
-end
-
-def teardown_db
-  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
-
 class Mixin < ActiveRecord::Base
   self.table_name = 'mixins'
 end

data/test/test_no_update_for_extra_classes.rb

@@ -0,0 +1,104 @@
+require 'helper'
+
+class TodoList < ActiveRecord::Base
+  has_many :todo_items
+  acts_as_list
+end
+
+class TodoItem < ActiveRecord::Base
+  belongs_to :todo_list
+  has_many :todo_item_attachments
+  acts_as_list scope: :todo_list
+end
+
+class TodoItemAttachment < ActiveRecord::Base
+  belongs_to :todo_item
+  acts_as_list scope: :todo_item
+end
+
+class NoUpdateForCollectionClassesTestCase < Minitest::Test
+  def setup
+    ActiveRecord::Base.connection.create_table :todo_lists do |t|
+      t.column :position, :integer
+    end
+
+    ActiveRecord::Base.connection.create_table :todo_items do |t|
+      t.column :position, :integer
+      t.column :todo_list_id, :integer
+    end
+
+    ActiveRecord::Base.connection.create_table :todo_item_attachments do |t|
+      t.column :position, :integer
+      t.column :todo_item_id, :integer
+    end
+
+    ActiveRecord::Base.connection.schema_cache.clear!
+    [TodoList, TodoItem, TodoItemAttachment].each(&:reset_column_information)
+    super
+  end
+
+  def teardown
+    teardown_db
+    super
+  end
+end
+
+class NoUpdateForCollectionClassesTest < NoUpdateForCollectionClassesTestCase
+  def setup
+    super
+    @list_1, @list_2 = (1..2).map { |counter| TodoList.create!(position: counter) }
+
+    @item_1, @item_2 = (1..2).map { |counter| TodoItem.create!(position: counter, todo_list_id: @list_1.id) }
+    @attachment_1, @attachment_2 = (1..2).map { |counter| TodoItemAttachment.create!(position: counter, todo_item_id: @item_1.id) }
+  end
+
+  def test_update
+    @item_1.update_attributes(position: 2)
+    assert_equal 2, @item_1.reload.position
+    assert_equal 1, @item_2.reload.position
+  end
+
+  def test_no_update_for_single_class_instances
+    TodoItem.acts_as_list_no_update { @item_1.update_attributes(position: 2) }
+
+    assert_equal 2, @item_1.reload.position
+    assert_equal 2, @item_2.reload.position
+  end
+
+  def test_no_update_for_different_class_instances
+    TodoItem.acts_as_list_no_update([TodoItemAttachment]) { update_records! }
+
+    assert_equal 2, @item_1.reload.position
+    assert_equal 2, @item_2.reload.position
+
+    assert_equal 2, @attachment_1.reload.position
+    assert_equal 2, @attachment_2.reload.position
+
+    assert_equal 2, @list_1.reload.position
+    assert_equal 1, @list_2.reload.position
+  end
+
+  def test_raising_array_type_error
+    exception = assert_raises ActiveRecord::Acts::List::NoUpdate::ArrayTypeError do
+      TodoList.acts_as_list_no_update(nil)
+    end
+
+    assert_equal("The first argument must be an array", exception.message )
+  end
+
+  def test_non_disparity_classes_error
+    exception = assert_raises ActiveRecord::Acts::List::NoUpdate::DisparityClassesError do
+      TodoList.acts_as_list_no_update([Class])
+    end
+
+    assert_equal("The first argument should contain ActiveRecord or ApplicationRecord classes", exception.message )
+  end
+
+  private
+
+  def update_records!
+    @item_1.update_attributes(position: 2)
+    @attachment_1.update_attributes(position: 2)
+    @list_1.update_attributes(position: 2)
+  end
+end

data/test/test_no_update_for_scope_destruction.rb

@@ -0,0 +1,72 @@
+require 'helper'
+
+class DestructionTodoList < ActiveRecord::Base
+  has_many :destruction_todo_items, dependent: :destroy
+  has_many :destruction_tada_items, dependent: :destroy
+end
+
+class DestructionTodoItem < ActiveRecord::Base
+  belongs_to :destruction_todo_list
+  acts_as_list scope: :destruction_todo_list
+end
+
+class DestructionTadaItem < ActiveRecord::Base
+  belongs_to :destruction_todo_list
+  acts_as_list scope: [:destruction_todo_list_id, :enabled]
+end
+
+class NoUpdateForScopeDestructionTestCase < Minitest::Test
+  def setup
+    ActiveRecord::Base.connection.create_table :destruction_todo_lists do |t|
+    end
+
+    ActiveRecord::Base.connection.create_table :destruction_todo_items do |t|
+      t.column :position, :integer
+      t.column :destruction_todo_list_id, :integer
+    end
+
+    ActiveRecord::Base.connection.create_table :destruction_tada_items do |t|
+      t.column :position, :integer
+      t.column :destruction_todo_list_id, :integer
+      t.column :enabled, :boolean
+    end
+
+    ActiveRecord::Base.connection.schema_cache.clear!
+    [DestructionTodoList, DestructionTodoItem, DestructionTadaItem].each(&:reset_column_information)
+    super
+  end
+
+  def teardown
+    teardown_db
+    super
+  end
+
+  class NoUpdateForScopeDestructionTest < NoUpdateForScopeDestructionTestCase
+    def setup
+      super
+      @list = DestructionTodoList.create!
+
+      @todo_item_1 = DestructionTodoItem.create! position: 1, destruction_todo_list_id: @list.id
+      @tada_item_1 = DestructionTadaItem.create! position: 1, destruction_todo_list_id: @list.id, enabled: true
+    end
+
+    def test_no_update_children_when_parent_destroyed
+      if ActiveRecord::VERSION::MAJOR < 4
+        DestructionTodoItem.any_instance.expects(:decrement_positions_on_lower_items).once
+        DestructionTadaItem.any_instance.expects(:decrement_positions_on_lower_items).once
+      else
+        DestructionTodoItem.any_instance.expects(:decrement_positions_on_lower_items).never
+        DestructionTadaItem.any_instance.expects(:decrement_positions_on_lower_items).never
+      end
+      assert @list.destroy
+    end
+
+    def test_update_children_when_sibling_destroyed
+      @todo_item_1.expects(:decrement_positions_on_lower_items).once
+      @tada_item_1.expects(:decrement_positions_on_lower_items).once
+      assert @todo_item_1.destroy
+      assert @tada_item_1.destroy
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -63,14 +63,15 @@ files:
 - gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
+- gemfiles/rails_5_1.gemfile
 - init.rb
 - lib/acts_as_list.rb
 - lib/acts_as_list/active_record/acts/add_new_at_method_definer.rb
 - lib/acts_as_list/active_record/acts/aux_method_definer.rb
 - lib/acts_as_list/active_record/acts/callback_definer.rb
-- lib/acts_as_list/active_record/acts/column_method_definer.rb
 - lib/acts_as_list/active_record/acts/list.rb
 - lib/acts_as_list/active_record/acts/no_update.rb
+- lib/acts_as_list/active_record/acts/position_column_method_definer.rb
 - lib/acts_as_list/active_record/acts/scope_method_definer.rb
 - lib/acts_as_list/active_record/acts/sequential_updates_method_definer.rb
 - lib/acts_as_list/active_record/acts/top_of_list_method_definer.rb
@@ -87,6 +88,8 @@ files:
 - test/shared_zero_based.rb
 - test/test_joined_list.rb
 - test/test_list.rb
+- test/test_no_update_for_extra_classes.rb
+- test/test_no_update_for_scope_destruction.rb
 homepage: http://github.com/swanandp/acts_as_list
 licenses:
 - MIT
@@ -125,3 +128,5 @@ test_files:
 - test/shared_zero_based.rb
 - test/test_joined_list.rb
 - test/test_list.rb
+- test/test_no_update_for_extra_classes.rb
+- test/test_no_update_for_scope_destruction.rb