acts_as_list 0.9.19 → 1.0.4

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

@@ -64,7 +64,7 @@ module ActiveRecord::Acts::List::PositionColumnMethodDefiner #:nodoc:
       end
 
       define_method :"#{position_column}=" do |position|
-        write_attribute(position_column, position)
+        self[position_column] = position
         @position_changed = true
       end
 

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

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+require "active_support/inflector"
 
 module ActiveRecord::Acts::List::ScopeMethodDefiner #:nodoc:
   extend ActiveSupport::Inflector
 
   def self.call(caller_class, scope)
-    scope = idify(scope) if scope.is_a?(Symbol)
+    scope = idify(caller_class, scope) if scope.is_a?(Symbol)
 
     caller_class.class_eval do
       define_method :scope_name do
@@ -21,7 +22,6 @@ module ActiveRecord::Acts::List::ScopeMethodDefiner #:nodoc:
         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)
@@ -45,7 +45,6 @@ module ActiveRecord::Acts::List::ScopeMethodDefiner #:nodoc:
         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
@@ -66,9 +65,13 @@ module ActiveRecord::Acts::List::ScopeMethodDefiner #:nodoc:
     end
   end
 
-  def self.idify(name)
+  def self.idify(caller_class, name)
     return name if name.to_s =~ /_id$/
 
-    foreign_key(name).to_sym
+    if caller_class.reflections.key?(name.to_s)
+      caller_class.reflections[name.to_s].foreign_key.to_sym
+    else
+      foreign_key(name).to_sym
+    end
   end
 end

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

@@ -7,7 +7,7 @@ module ActiveRecord::Acts::List::SequentialUpdatesMethodDefiner #:nodoc:
         if !defined?(@sequential_updates)
           if sequential_updates_option.nil?
             table_exists =
-              if ActiveRecord::VERSION::MAJOR >= 5
+              if active_record_version_is?('>= 5')
                 caller_class.connection.data_source_exists?(caller_class.table_name)
               else
                 caller_class.connection.table_exists?(caller_class.table_name)

data/lib/acts_as_list/version.rb

@@ -3,7 +3,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.9.19'
+      VERSION = '1.0.4'
     end
   end
 end

data/test/helper.rb

@@ -13,7 +13,7 @@ rescue Bundler::BundlerError => e
 end
 require "active_record"
 require "minitest/autorun"
-require "mocha/mini_test"
+require "mocha/minitest"
 require "#{File.dirname(__FILE__)}/../init"
 
 if defined?(ActiveRecord::VERSION) &&
@@ -27,15 +27,6 @@ db_config = YAML.load_file(File.expand_path("../database.yml", __FILE__)).fetch(
 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
@@ -60,3 +51,19 @@ def assert_equal_or_nil(a, b)
     assert_equal a, b
   end
 end
+
+def assert_no_deprecation_warning_raised_by(failure_message = 'ActiveRecord deprecation warning raised when we didn\'t expect it', pass_message = 'No ActiveRecord deprecation raised')
+  original_behavior = ActiveSupport::Deprecation.behavior
+  ActiveSupport::Deprecation.behavior = :raise
+  begin
+    yield
+  rescue ActiveSupport::DeprecationException => e
+    flunk "#{failure_message}: #{e}"
+  rescue
+    raise
+  else
+    pass pass_message
+  end
+ensure
+  ActiveSupport::Deprecation.behavior = original_behavior
+end

data/test/shared_list.rb

@@ -10,6 +10,13 @@ module Shared
       end
     end
 
+    def test_current_position
+      first_item = ListMixin.where(parent_id: 5).first
+      assert_equal 1, first_item.current_position
+      first_item.remove_from_list
+      assert_nil first_item.current_position
+    end
+
     def test_reordering
       assert_equal [1, 2, 3, 4], ListMixin.where(parent_id: 5).order('pos').map(&:id)
 
@@ -230,12 +237,9 @@ module Shared
       # We need to trigger all the before_destroy callbacks without actually
       # destroying the record so we can see the affect the callbacks have on
       # the record.
-      # NOTE: Hotfix for rails3 ActiveRecord
       list = ListMixin.where(id: 2).first
       if list.respond_to?(:run_callbacks)
-        # Refactored to work according to Rails3 ActiveRSupport Callbacks <http://api.rubyonrails.org/classes/ActiveSupport/Callbacks.html>
-        list.run_callbacks(:destroy) if rails_3
-        list.run_callbacks(:before_destroy) if !rails_3
+        list.run_callbacks(:destroy)
       else
         list.send(:callback, :before_destroy)
       end
@@ -310,5 +314,11 @@ module Shared
         new.insert_at!(1)
       end
     end
+
+    def test_find_or_create_doesnt_raise_deprecation_warning
+      assert_no_deprecation_warning_raised_by('ActiveRecord deprecation warning raised when using `find_or_create_by` when we didn\'t expect it') do
+        ListMixin.where(parent_id: 5).find_or_create_by(pos: 5)
+      end
+    end
   end
 end

data/test/shared_list_sub.rb

@@ -47,7 +47,7 @@ module Shared
 
     def test_next_prev_not_regular_sequence
       ListMixin.all.each do |item|
-        item.update_attributes(pos: item.pos * 5)
+        item.update pos: item.pos * 5
       end
 
       assert_equal [1, 2, 3, 4], ListMixin.where(parent_id: 5000).order('pos').map(&:id)

data/test/test_list.rb

@@ -11,7 +11,7 @@ def setup_db(position_options = {})
 
   # AR caches columns options like defaults etc. Clear them!
   ActiveRecord::Base.connection.create_table :mixins do |t|
-    t.column :pos, :integer, position_options unless position_options[:positive] && sqlite
+    t.column :pos, :integer, **position_options unless position_options[:positive] && sqlite
     t.column :active, :boolean, default: true
     t.column :parent_id, :integer
     t.column :parent_type, :string
@@ -49,11 +49,9 @@ def setup_db(position_options = {})
   ActiveRecord::Base.connection.add_index 'altid-table', :pos, unique: true
 
   mixins = [ Mixin, ListMixin, ListMixinSub1, ListMixinSub2, ListWithStringScopeMixin,
-    ArrayScopeListMixin, ZeroBasedMixin, DefaultScopedMixin,
+    ArrayScopeListMixin, ZeroBasedMixin, DefaultScopedMixin, EnumArrayScopeListMixin,
     DefaultScopedWhereMixin, TopAdditionMixin, NoAdditionMixin, QuotedList, TouchDisabledMixin ]
 
-  mixins << EnumArrayScopeListMixin if rails_4
-
   ActiveRecord::Base.connection.schema_cache.clear!
   mixins.each do |klass|
     klass.reset_column_information
@@ -80,19 +78,11 @@ class ListMixinSub1 < ListMixin
 end
 
 class ListMixinSub2 < ListMixin
-  if rails_3
-    validates :pos, presence: true
-  else
-    validates_presence_of :pos
-  end
+  validates :pos, presence: true
 end
 
 class ListMixinError < ListMixin
-  if rails_3
-    validates :state, presence: true
-  else
-    validates_presence_of :state
-  end
+  validates :state, presence: true
 end
 
 class ListWithStringScopeMixin < Mixin
@@ -107,13 +97,11 @@ class ArrayScopeListWithHashMixin < Mixin
   acts_as_list column: "pos", scope: [:parent_id, state: nil]
 end
 
-if rails_4
-  class EnumArrayScopeListMixin < Mixin
-    STATE_VALUES = %w(active archived)
-    enum state: STATE_VALUES
+class EnumArrayScopeListMixin < Mixin
+  STATE_VALUES = %w(active archived)
+  enum state: STATE_VALUES
 
-    acts_as_list column: "pos", scope: [:parent_id, :state]
-  end
+  acts_as_list column: "pos", scope: [:parent_id, :state]
 end
 
 class ZeroBasedMixin < Mixin
@@ -130,13 +118,7 @@ class DefaultScopedWhereMixin < Mixin
   default_scope { order('pos ASC').where(active: true) }
 
   def self.for_active_false_tests
-    if ActiveRecord::VERSION::MAJOR < 4
-      unscoped do
-        order('pos ASC').where(active: false)
-      end
-    else
-      unscope(:where).where(active: false)
-    end
+    unscope(:where).where(active: false)
   end
 end
 
@@ -170,7 +152,7 @@ end
 ##
 # The way we track changes to
 # scope and position can get tripped up
-# by someone using update_attributes within
+# by someone using update within
 # a callback because it causes multiple passes
 # through the callback chain
 module CallbackMixin
@@ -185,7 +167,7 @@ module CallbackMixin
       # doesn't matter what column changes, just
       # need to change something
 
-      self.update_attributes(active: !self.active)
+      self.update active: !self.active
     end
   end
 end
@@ -437,6 +419,12 @@ class DefaultScopedTest < ActsAsListTestCase
     assert_equal_or_nil $default_position, new_noup.pos
   end
 
+  def test_find_or_create_doesnt_raise_deprecation_warning
+    assert_no_deprecation_warning_raised_by('ActiveRecord deprecation warning raised when using `find_or_create_by` when we didn\'t expect it') do
+      DefaultScopedMixin.find_or_create_by(pos: 5)
+    end
+  end
+
   def test_update_position
     assert_equal [1, 2, 3, 4], DefaultScopedMixin.all.map(&:id)
     DefaultScopedMixin.where(id: 2).first.set_list_position(4)
@@ -541,6 +529,12 @@ class DefaultScopedWhereTest < ActsAsListTestCase
     assert_equal_or_nil $default_position, new_noup.pos
   end
 
+  def test_find_or_create_doesnt_raise_deprecation_warning
+    assert_no_deprecation_warning_raised_by('ActiveRecord deprecation warning raised when using `find_or_create_by` when we didn\'t expect it') do
+      DefaultScopedWhereMixin.find_or_create_by(pos: 5)
+    end
+  end
+
   def test_update_position
     assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.for_active_false_tests.map(&:id)
     DefaultScopedWhereMixin.for_active_false_tests.where(id: 2).first.set_list_position(4)
@@ -649,7 +643,7 @@ class MultipleListsTest < ActsAsListTestCase
   def test_check_scope_order
     assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 1).order('pos').map(&:id)
     assert_equal [5, 6, 7, 8], ListMixin.where(:parent_id => 2).order('pos').map(&:id)
-    ListMixin.find(4).update_attributes(:parent_id => 2, :pos => 2)
+    ListMixin.find(4).update :parent_id => 2, :pos => 2
     assert_equal [1, 2, 3], ListMixin.where(:parent_id => 1).order('pos').map(&:id)
     assert_equal [5, 4, 6, 7, 8], ListMixin.where(:parent_id => 2).order('pos').map(&:id)
   end
@@ -657,34 +651,38 @@ class MultipleListsTest < ActsAsListTestCase
   def test_check_scope_position
     assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 1).map(&:pos)
     assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 2).map(&:pos)
-    ListMixin.find(4).update_attributes(:parent_id => 2, :pos => 2)
+    ListMixin.find(4).update :parent_id => 2, :pos => 2
     assert_equal [1, 2, 3], ListMixin.where(:parent_id => 1).order('pos').map(&:pos)
     assert_equal [1, 2, 3, 4, 5], ListMixin.where(:parent_id => 2).order('pos').map(&:pos)
   end
-end
 
-if rails_4
-  class EnumArrayScopeListMixinTest < ActsAsListTestCase
-    def setup
-      setup_db
-      EnumArrayScopeListMixin.create! :parent_id => 1, :state => EnumArrayScopeListMixin.states['active']
-      EnumArrayScopeListMixin.create! :parent_id => 1, :state => EnumArrayScopeListMixin.states['archived']
-      EnumArrayScopeListMixin.create! :parent_id => 2, :state => EnumArrayScopeListMixin.states["active"]
-      EnumArrayScopeListMixin.create! :parent_id => 2, :state => EnumArrayScopeListMixin.states["archived"]
+  def test_find_or_create_doesnt_raise_deprecation_warning
+    assert_no_deprecation_warning_raised_by('ActiveRecord deprecation warning raised when using `find_or_create_by` when we didn\'t expect it') do
+      ListMixin.where(:parent_id => 1).find_or_create_by(pos: 5)
     end
+  end
+end
 
-    def test_positions
-      assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 1, :state => EnumArrayScopeListMixin.states['active']).map(&:pos)
-      assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 1, :state => EnumArrayScopeListMixin.states['archived']).map(&:pos)
-      assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 2, :state => EnumArrayScopeListMixin.states['active']).map(&:pos)
-      assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 2, :state => EnumArrayScopeListMixin.states['archived']).map(&:pos)
-    end
+class EnumArrayScopeListMixinTest < ActsAsListTestCase
+  def setup
+    setup_db
+    EnumArrayScopeListMixin.create! :parent_id => 1, :state => EnumArrayScopeListMixin.states['active']
+    EnumArrayScopeListMixin.create! :parent_id => 1, :state => EnumArrayScopeListMixin.states['archived']
+    EnumArrayScopeListMixin.create! :parent_id => 2, :state => EnumArrayScopeListMixin.states["active"]
+    EnumArrayScopeListMixin.create! :parent_id => 2, :state => EnumArrayScopeListMixin.states["archived"]
+  end
 
-    def test_update_state
-      active_item = EnumArrayScopeListMixin.find_by(:parent_id => 2, :state => EnumArrayScopeListMixin.states['active'])
-      active_item.update(state: EnumArrayScopeListMixin.states['archived'])
-      assert_equal [1, 2], EnumArrayScopeListMixin.where(:parent_id => 2, :state => EnumArrayScopeListMixin.states['archived']).map(&:pos).sort
-    end
+  def test_positions
+    assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 1, :state => EnumArrayScopeListMixin.states['active']).map(&:pos)
+    assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 1, :state => EnumArrayScopeListMixin.states['archived']).map(&:pos)
+    assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 2, :state => EnumArrayScopeListMixin.states['active']).map(&:pos)
+    assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 2, :state => EnumArrayScopeListMixin.states['archived']).map(&:pos)
+  end
+
+  def test_update_state
+    active_item = EnumArrayScopeListMixin.find_by(:parent_id => 2, :state => EnumArrayScopeListMixin.states['active'])
+    active_item.update(state: EnumArrayScopeListMixin.states['archived'])
+    assert_equal [1, 2], EnumArrayScopeListMixin.where(:parent_id => 2, :state => EnumArrayScopeListMixin.states['archived']).map(&:pos).sort
   end
 end
 
@@ -699,7 +697,7 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   def test_order_after_all_scope_properties_are_changed
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:id)
     assert_equal [5, 6, 7, 8], ArrayScopeListMixin.where(:parent_id => 2, :parent_type => 'something').order('pos').map(&:id)
-    ArrayScopeListMixin.find(2).update_attributes(:parent_id => 2, :pos => 2,:parent_type => 'something')
+    ArrayScopeListMixin.find(2).update :parent_id => 2, :pos => 2,:parent_type => 'something'
     assert_equal [1, 3, 4], ArrayScopeListMixin.where(:parent_id => 1,:parent_type => 'anything').order('pos').map(&:id)
     assert_equal [5, 2, 6, 7, 8], ArrayScopeListMixin.where(:parent_id => 2,:parent_type => 'something').order('pos').map(&:id)
   end
@@ -707,7 +705,7 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   def test_position_after_all_scope_properties_are_changed
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').map(&:pos)
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 2, :parent_type => 'something').map(&:pos)
-    ArrayScopeListMixin.find(4).update_attributes(:parent_id => 2, :pos => 2, :parent_type => 'something')
+    ArrayScopeListMixin.find(4).update :parent_id => 2, :pos => 2, :parent_type => 'something'
     assert_equal [1, 2, 3], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:pos)
     assert_equal [1, 2, 3, 4, 5], ArrayScopeListMixin.where(:parent_id => 2, :parent_type => 'something').order('pos').map(&:pos)
   end
@@ -715,7 +713,7 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   def test_order_after_one_scope_property_is_changed
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:id)
     assert_equal [9, 10, 11, 12], ArrayScopeListMixin.where(:parent_id => 3, :parent_type => 'anything').order('pos').map(&:id)
-    ArrayScopeListMixin.find(2).update_attributes(:parent_id => 3, :pos => 2)
+    ArrayScopeListMixin.find(2).update :parent_id => 3, :pos => 2
     assert_equal [1, 3, 4], ArrayScopeListMixin.where(:parent_id => 1,:parent_type => 'anything').order('pos').map(&:id)
     assert_equal [9, 2, 10, 11, 12], ArrayScopeListMixin.where(:parent_id => 3,:parent_type => 'anything').order('pos').map(&:id)
   end
@@ -723,7 +721,7 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   def test_position_after_one_scope_property_is_changed
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').map(&:pos)
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 3, :parent_type => 'anything').map(&:pos)
-    ArrayScopeListMixin.find(4).update_attributes(:parent_id => 3, :pos => 2)
+    ArrayScopeListMixin.find(4).update :parent_id => 3, :pos => 2
     assert_equal [1, 2, 3], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:pos)
     assert_equal [1, 2, 3, 4, 5], ArrayScopeListMixin.where(:parent_id => 3, :parent_type => 'anything').order('pos').map(&:pos)
   end
@@ -731,7 +729,7 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   def test_order_after_moving_to_empty_list
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:id)
     assert_equal [], ArrayScopeListMixin.where(:parent_id => 4, :parent_type => 'anything').order('pos').map(&:id)
-    ArrayScopeListMixin.find(2).update_attributes(:parent_id => 4, :pos => 1)
+    ArrayScopeListMixin.find(2).update :parent_id => 4, :pos => 1
     assert_equal [1, 3, 4], ArrayScopeListMixin.where(:parent_id => 1,:parent_type => 'anything').order('pos').map(&:id)
     assert_equal [2], ArrayScopeListMixin.where(:parent_id => 4,:parent_type => 'anything').order('pos').map(&:id)
   end
@@ -739,7 +737,7 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   def test_position_after_moving_to_empty_list
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').map(&:pos)
     assert_equal [], ArrayScopeListMixin.where(:parent_id => 4, :parent_type => 'anything').map(&:pos)
-    ArrayScopeListMixin.find(2).update_attributes(:parent_id => 4, :pos => 1)
+    ArrayScopeListMixin.find(2).update :parent_id => 4, :pos => 1
     assert_equal [1, 2, 3], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:pos)
     assert_equal [1], ArrayScopeListMixin.where(:parent_id => 4, :parent_type => 'anything').order('pos').map(&:pos)
   end
@@ -1015,6 +1013,11 @@ class SequentialUpdatesMixinNotNullUniquePositiveConstraintsTest < ActsAsListTes
       assert_equal 3, new.pos
     end
 
+    def test_create_at_top
+      new = SequentialUpdatesAltId.create!(pos: 1)
+      assert_equal 1, new.pos
+    end
+
     def test_move_to_bottom
       item = SequentialUpdatesAltId.order(:pos).first
       item.move_to_bottom

data/test/test_no_update_for_extra_classes.rb

@@ -56,13 +56,13 @@ class NoUpdateForCollectionClassesTest < NoUpdateForCollectionClassesTestCase
   end
 
   def test_update
-    @item_1.update_attributes(position: 2)
+    @item_1.update 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) }
+    TodoItem.acts_as_list_no_update { @item_1.update position: 2 }
 
     assert_equal 2, @item_1.reload.position
     assert_equal 2, @item_2.reload.position
@@ -124,8 +124,8 @@ class NoUpdateForCollectionClassesTest < NoUpdateForCollectionClassesTestCase
   private
 
   def update_records!
-    @item_1.update_attributes(position: 2)
-    @attachment_1.update_attributes(position: 2)
-    @list_1.update_attributes(position: 2)
+    @item_1.update position: 2
+    @attachment_1.update position: 2
+    @list_1.update position: 2
   end
 end

data/test/test_no_update_for_scope_destruction.rb

@@ -53,13 +53,8 @@ class NoUpdateForScopeDestructionTestCase < Minitest::Test
     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
+      DestructionTodoItem.any_instance.expects(:decrement_positions_on_lower_items).never
+      DestructionTadaItem.any_instance.expects(:decrement_positions_on_lower_items).never
       assert @list.destroy
     end