acts_as_list 0.9.17 → 0.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fab8be3ea9754103e60311aaa592f0ab4b7c84e3
-  data.tar.gz: 166a2aff0b3f6cbb6cfc67709de71fda2f4b3960
+  metadata.gz: c7f90b8a37019ae091449a79440aca7cb8862960
+  data.tar.gz: db75dccae8c652a84e9dfaaffb2f195ca238b442
 SHA512:
-  metadata.gz: 5afeff2ad86a92fb1261062596b2646508dee23473242686bf20ccf809623834705e467c3ad701963eba9a46c839f29fc2f3aba4adbce62dbe49d91e810f628d
-  data.tar.gz: 037aa8e4d42c306040f7e2da8c9f9615e1c1a1c123df08edb7d1cb511fadb63a388f65567a45e20ea58a3444905f024f38da10fa54b0e55cdd3c610587539af4
+  metadata.gz: 65c7f4c2b1ee583aeb3f2ddc8a9c9c07b5428ad6b0d4b3f5d45e0ad9f1e2a55b7ac98c1f0f1ea7a4ee79969bf2bd343b748f1b9463c65a6635120a3235ad02c1
+  data.tar.gz: 8bd08749b808b25f33e9f8f398731973625ff0ee42dc76080944a94ab88ca6e817412609af0897d69db7e2c7a8843a36a5a90177fffee17d2cadbfa483a87df8

data/Appraisals

@@ -3,6 +3,7 @@ appraise "rails-3-2" do
     gem "mysql2", "~> 0.3.21", platforms: [:ruby]
   end
   gem "activerecord", "~> 3.2.22.2"
+  gem "rake", "~> 12.2.0", platforms: [:ruby_19]
   group :test do
     gem "after_commit_exception_notification"
   end
@@ -13,6 +14,7 @@ appraise "rails-4-1" do
     gem "mysql2", "~> 0.3.21", platforms: [:ruby]
   end
   gem "activerecord", "~> 4.1.16"
+  gem "rake", "~> 12.2.0", platforms: [:ruby_19]
   group :test do
     gem "after_commit_exception_notification"
   end
@@ -23,6 +25,7 @@ appraise "rails-4-2" do
     gem "mysql2", "~> 0.4.10", platforms: [:ruby]
   end
   gem "activerecord", "~> 4.2.10"
+  gem "rake", "~> 12.2.0", platforms: [:ruby_19]
 end
 
 appraise "rails-5-0" do

data/CHANGELOG.md

@@ -1,4 +1,35 @@
-# Change Log
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.9.18] - 2019-03-08
+### Added
+- Added additional gemspec metadata [@boone](https://github.com/boone)
+- Add gem version badge to README [@joshuapinter](https://github.com/joshuapinter)
+- Add touch on update configuration [@mgbatchelor](https://github.com/mgbatchelor)
+
+### Changed
+- Let's start a new direction with the CHANGELOG file [@mainameiz](https://github.com/mainameiz)
+
+### Fixed
+- Fix sqlite3 gem pinning breaking tests
+
+## [v0.9.17](https://github.com/swanandp/acts_as_list/tree/v0.9.17) (2018-10-29)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.9.16...v0.9.17)
+
+**Closed issues:**
+
+- Inconsistent behavior [\#330](https://github.com/swanandp/acts_as_list/issues/330)
+- Using `top\_of\_list` set to 1 and setting a record to index 0 triggers a `PG::UniqueViolation` [\#322](https://github.com/swanandp/acts_as_list/issues/322)
+
+**Merged pull requests:**
+
+- Feature/add exception to wrong position [\#323](https://github.com/swanandp/acts_as_list/pull/323) ([TheNeikos](https://github.com/TheNeikos))
+- Methods move\_to\_bottom and move\_to\_top should not fail when there are unique constraints [\#320](https://github.com/swanandp/acts_as_list/pull/320) ([faucct](https://github.com/faucct))
 
 ## [v0.9.16](https://github.com/swanandp/acts_as_list/tree/v0.9.16) (2018-08-30)
 [Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.9.15...v0.9.16)
@@ -572,7 +603,3 @@
 - Fixed test issue for test\_injection: expected SQL was reversed. [\#3](https://github.com/swanandp/acts_as_list/pull/3) ([afriqs](https://github.com/afriqs))
 - Added an option to set the top of the position [\#2](https://github.com/swanandp/acts_as_list/pull/2) ([danielcooper](https://github.com/danielcooper))
 - minor change to acts\_as\_list's callbacks [\#1](https://github.com/swanandp/acts_as_list/pull/1) ([tiegz](https://github.com/tiegz))
-
-
-
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -19,7 +19,7 @@ group :test do
 end
 
 group :sqlite do
-  gem "sqlite3", platforms: [:ruby]
+  gem "sqlite3", "~> 1.3.13", platforms: [:ruby]
 end
 
 group :postgresql do

data/README.md

@@ -2,6 +2,7 @@
 
 ## Build Status
 [![Build Status](https://secure.travis-ci.org/swanandp/acts_as_list.png)](https://secure.travis-ci.org/swanandp/acts_as_list)
+[![Gem Version](https://badge.fury.io/rb/acts_as_list.svg)](https://badge.fury.io/rb/acts_as_list)
 
 ## Description
 

data/acts_as_list.gemspec

@@ -16,6 +16,12 @@ Gem::Specification.new do |s|
   s.rubyforge_project     = "acts_as_list"
   s.required_ruby_version = ">= 1.9.2"
 
+  if s.respond_to?(:metadata)
+    s.metadata['changelog_uri'] = 'https://github.com/swanandp/acts_as_list/blob/master/CHANGELOG.md'
+    s.metadata['source_code_uri'] = 'https://github.com/swanandp/acts_as_list'
+    s.metadata['bug_tracker_uri'] = 'https://github.com/swanandp/acts_as_list/issues'
+  end
+
   # Load Paths...
   s.files                 = `git ls-files`.split("\n")
   s.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")

data/gemfiles/rails_3_2.gemfile

@@ -3,7 +3,7 @@
 source "http://rubygems.org"
 
 gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
-gem "rake"
+gem "rake", "~> 12.2.0", platforms: [:ruby_19]
 gem "appraisal"
 gem "activerecord", "~> 3.2.22.2"
 
@@ -20,7 +20,7 @@ group :test do
 end
 
 group :sqlite do
-  gem "sqlite3", platforms: [:ruby]
+  gem "sqlite3", "~> 1.3.13", platforms: [:ruby]
 end
 
 group :postgresql do

data/gemfiles/rails_4_1.gemfile

@@ -3,7 +3,7 @@
 source "http://rubygems.org"
 
 gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
-gem "rake"
+gem "rake", "~> 12.2.0", platforms: [:ruby_19]
 gem "appraisal"
 gem "activerecord", "~> 4.1.16"
 
@@ -20,7 +20,7 @@ group :test do
 end
 
 group :sqlite do
-  gem "sqlite3", platforms: [:ruby]
+  gem "sqlite3", "~> 1.3.13", platforms: [:ruby]
 end
 
 group :postgresql do

data/gemfiles/rails_4_2.gemfile

@@ -3,7 +3,7 @@
 source "http://rubygems.org"
 
 gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
-gem "rake"
+gem "rake", "~> 12.2.0", platforms: [:ruby_19]
 gem "appraisal"
 gem "activerecord", "~> 4.2.10"
 
@@ -19,7 +19,7 @@ group :test do
 end
 
 group :sqlite do
-  gem "sqlite3", platforms: [:ruby]
+  gem "sqlite3", "~> 1.3.13", platforms: [:ruby]
 end
 
 group :postgresql do

data/gemfiles/rails_5_0.gemfile

@@ -19,7 +19,7 @@ group :test do
 end
 
 group :sqlite do
-  gem "sqlite3", platforms: [:ruby]
+  gem "sqlite3", "~> 1.3.13", platforms: [:ruby]
 end
 
 group :postgresql do

data/gemfiles/rails_5_1.gemfile

@@ -19,7 +19,7 @@ group :test do
 end
 
 group :sqlite do
-  gem "sqlite3", platforms: [:ruby]
+  gem "sqlite3", "~> 1.3.13", platforms: [:ruby]
 end
 
 group :postgresql do

data/gemfiles/rails_5_2.gemfile

@@ -5,7 +5,7 @@ source "http://rubygems.org"
 gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
 gem "rake"
 gem "appraisal"
-gem "activerecord", "~> 5.2.0.rc1"
+gem "activerecord", "~> 5.2.1"
 
 group :development do
   gem "github_changelog_generator", "1.9.0"
@@ -19,7 +19,7 @@ group :test do
 end
 
 group :sqlite do
-  gem "sqlite3", platforms: [:ruby]
+  gem "sqlite3", "~> 1.3.13", platforms: [:ruby]
 end
 
 group :postgresql do

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

@@ -20,13 +20,14 @@ module ActiveRecord
         #   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.
+        # * +touch_on_update+ - configuration to disable the update of the model timestamps when the positions are updated.
         def acts_as_list(options = {})
-          configuration = { column: "position", scope: "1 = 1", top_of_list: 1, add_new_at: :bottom }
+          configuration = { column: "position", scope: "1 = 1", top_of_list: 1, add_new_at: :bottom, touch_on_update: true }
           configuration.update(options) if options.is_a?(Hash)
 
           caller_class = self
 
-          ActiveRecord::Acts::List::PositionColumnMethodDefiner.call(caller_class, configuration[:column])
+          ActiveRecord::Acts::List::PositionColumnMethodDefiner.call(caller_class, configuration[:column], configuration[:touch_on_update])
           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])
@@ -327,9 +328,7 @@ module ActiveRecord
           position ||= send(position_column).to_i
 
           if sequential_updates?
-            acts_as_list_list.where("#{quoted_position_column_with_table_name} > ?", position).reorder(acts_as_list_order_argument(:asc)).each do |item|
-              item.decrement!(position_column)
-            end
+            acts_as_list_list.where("#{quoted_position_column_with_table_name} > ?", position).reorder(acts_as_list_order_argument(:asc)).decrement_sequentially
           else
             acts_as_list_list.where("#{quoted_position_column_with_table_name} > ?", position).decrement_all
           end
@@ -365,9 +364,7 @@ module ActiveRecord
             )
 
             if sequential_updates?
-              items.reorder(acts_as_list_order_argument(:asc)).each do |item|
-                item.decrement!(position_column)
-              end
+              items.reorder(acts_as_list_order_argument(:asc)).decrement_sequentially
             else
               items.decrement_all
             end
@@ -383,9 +380,7 @@ module ActiveRecord
             )
 
             if sequential_updates?
-              items.reorder(acts_as_list_order_argument(:desc)).each do |item|
-                item.increment!(position_column)
-              end
+              items.reorder(acts_as_list_order_argument(:desc)).increment_sequentially
             else
               items.increment_all
             end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module ActiveRecord::Acts::List::PositionColumnMethodDefiner #:nodoc:
-  def self.call(caller_class, position_column)
-    define_class_methods(caller_class, position_column)
+  def self.call(caller_class, position_column, touch_on_update)
+    define_class_methods(caller_class, position_column, touch_on_update)
     define_instance_methods(caller_class, position_column)
 
     if mass_assignment_protection_was_used_by_user?(caller_class)
@@ -12,7 +12,7 @@ module ActiveRecord::Acts::List::PositionColumnMethodDefiner #:nodoc:
 
   private
 
-  def self.define_class_methods(caller_class, position_column)
+  def self.define_class_methods(caller_class, position_column, touch_on_update)
     caller_class.class_eval do
       define_singleton_method :quoted_position_column do
         @_quoted_position_column ||= connection.quote_column_name(position_column)
@@ -22,6 +22,18 @@ module ActiveRecord::Acts::List::PositionColumnMethodDefiner #:nodoc:
         @_quoted_position_column_with_table_name ||= "#{caller_class.quoted_table_name}.#{quoted_position_column}"
       end
 
+      define_singleton_method :decrement_sequentially do
+        pluck(primary_key).each do |id|
+          where(primary_key => id).decrement_all
+        end
+      end
+
+      define_singleton_method :increment_sequentially do
+        pluck(primary_key).each do |id|
+          where(primary_key => id).increment_all
+        end
+      end
+
       define_singleton_method :decrement_all do
         update_all_with_touch "#{quoted_position_column} = (#{quoted_position_column_with_table_name} - 1)"
       end
@@ -31,7 +43,8 @@ module ActiveRecord::Acts::List::PositionColumnMethodDefiner #:nodoc:
       end
 
       define_singleton_method :update_all_with_touch do |updates|
-        update_all(updates + touch_record_sql)
+        updates += touch_record_sql if touch_on_update
+        update_all(updates)
       end
 
       private

data/lib/acts_as_list/version.rb

@@ -3,7 +3,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.9.17'
+      VERSION = '0.9.18'
     end
   end
 end

data/test/test_list.rb

@@ -39,9 +39,18 @@ def setup_db(position_options = {})
     t.column :order, :integer
   end
 
+  # This table is used to test table names with different primary_key columns
+  ActiveRecord::Base.connection.create_table 'altid-table', primary_key: 'altid' do |t|
+    t.column :pos, :integer
+    t.column :created_at, :datetime
+    t.column :updated_at, :datetime
+  end
+
+  ActiveRecord::Base.connection.add_index 'altid-table', :pos, unique: true
+
   mixins = [ Mixin, ListMixin, ListMixinSub1, ListMixinSub2, ListWithStringScopeMixin,
     ArrayScopeListMixin, ZeroBasedMixin, DefaultScopedMixin,
-    DefaultScopedWhereMixin, TopAdditionMixin, NoAdditionMixin, QuotedList ]
+    DefaultScopedWhereMixin, TopAdditionMixin, NoAdditionMixin, QuotedList, TouchDisabledMixin ]
 
   mixins << EnumArrayScopeListMixin if rails_4
 
@@ -63,6 +72,10 @@ class ListMixin < Mixin
   acts_as_list column: "pos", scope: :parent
 end
 
+class TouchDisabledMixin < Mixin
+  acts_as_list column: "pos", touch_on_update: false
+end
+
 class ListMixinSub1 < ListMixin
 end
 
@@ -131,6 +144,17 @@ class SequentialUpdatesDefault < Mixin
   acts_as_list column: "pos"
 end
 
+class SequentialUpdatesAltId < ActiveRecord::Base
+  self.table_name = "altid-table"
+  self.primary_key = "altid"
+
+  acts_as_list column: "pos"
+end
+
+class SequentialUpdatesAltIdTouchDisabled < SequentialUpdatesAltId
+  acts_as_list column: "pos", touch_on_update: false
+end
+
 class SequentialUpdatesFalseMixin < Mixin
   acts_as_list column: "pos", sequential_updates: false
 end
@@ -812,6 +836,41 @@ class TouchTest < ActsAsListTestCase
   end
 end
 
+class TouchDisabledTest < ActsAsListTestCase
+  def setup
+    setup_db
+    Timecop.freeze(yesterday) do
+      4.times { TouchDisabledMixin.create! }
+    end
+  end
+
+  def now
+    @now ||= Time.current.change(usec: 0)
+  end
+
+  def yesterday
+    @yesterday ||= 1.day.ago
+  end
+
+  def updated_ats
+    TouchDisabledMixin.order(:id).pluck(:updated_at)
+  end
+
+  def positions
+    ListMixin.order(:id).pluck(:pos)
+  end
+
+  def test_deleting_item_does_not_touch_higher_items
+    Timecop.freeze(now) do
+      TouchDisabledMixin.first.destroy
+      updated_ats.each do |updated_at|
+        assert_equal updated_at.to_i, yesterday.to_i
+      end
+      assert_equal positions, [1, 2, 3]
+    end
+  end
+end
+
 class ActsAsListTopTest < ActsAsListTestCase
   def setup
     setup_db
@@ -930,4 +989,95 @@ class SequentialUpdatesMixinNotNullUniquePositiveConstraintsTest < ActsAsListTes
       new_item.insert_at(0)
     end
   end
+
+
+  class SequentialUpdatesMixinNotNullUniquePositiveConstraintsTest < ActsAsListTestCase
+    def setup
+      setup_db null: false, unique: true, positive: true
+      (1..4).each { |counter| SequentialUpdatesAltId.create!({pos: counter}) }
+    end
+
+    def test_sequential_updates_default_to_true_with_unique_index
+      assert_equal true, SequentialUpdatesAltId.new.send(:sequential_updates?)
+    end
+
+    def test_insert_at
+      new = SequentialUpdatesAltId.create
+      assert_equal 5, new.pos
+
+      new.insert_at(1)
+      assert_equal 1, new.pos
+
+      new.insert_at(5)
+      assert_equal 5, new.pos
+
+      new.insert_at(3)
+      assert_equal 3, new.pos
+    end
+
+    def test_move_to_bottom
+      item = SequentialUpdatesAltId.order(:pos).first
+      item.move_to_bottom
+      assert_equal 4, item.pos
+    end
+
+    def test_move_to_top
+      new_item = SequentialUpdatesAltId.create!
+      assert_equal 5, new_item.pos
+
+      new_item.move_to_top
+      assert_equal 1, new_item.pos
+    end
+
+    def test_destroy
+      new_item = SequentialUpdatesAltId.create
+      assert_equal 5, new_item.pos
+
+      new_item.insert_at(2)
+      assert_equal 2, new_item.pos
+
+      new_item.destroy
+      assert_equal [1,2,3,4], SequentialUpdatesAltId.all.map(&:pos).sort
+
+    end
+  end
+
+  class SequentialUpdatesAltIdTouchDisabledTest < ActsAsListTestCase
+    def setup
+      setup_db
+      Timecop.freeze(yesterday) do
+        4.times { SequentialUpdatesAltIdTouchDisabled.create! }
+      end
+    end
+
+    def now
+      @now ||= Time.current.change(usec: 0)
+    end
+
+    def yesterday
+      @yesterday ||= 1.day.ago
+    end
+
+    def updated_ats
+      SequentialUpdatesAltIdTouchDisabled.order(:altid).pluck(:updated_at)
+    end
+
+    def positions
+      SequentialUpdatesAltIdTouchDisabled.order(:altid).pluck(:pos)
+    end
+
+    def test_sequential_updates_default_to_true_with_unique_index
+      assert_equal true, SequentialUpdatesAltIdTouchDisabled.new.send(:sequential_updates?)
+    end
+
+    def test_deleting_item_does_not_touch_higher_items
+      Timecop.freeze(now) do
+        SequentialUpdatesAltIdTouchDisabled.first.destroy
+        updated_ats.each do |updated_at|
+          assert_equal updated_at.to_i, yesterday.to_i
+        end
+        assert_equal positions, [1, 2, 3]
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.9.17
+  version: 0.9.18
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -97,7 +97,10 @@ files:
 homepage: http://github.com/swanandp/acts_as_list
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/swanandp/acts_as_list/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/swanandp/acts_as_list
+  bug_tracker_uri: https://github.com/swanandp/acts_as_list/issues
 post_install_message: 
 rdoc_options: []
 require_paths: