acts_as_list 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66daa5cd56691f7a638ae9dd8f1a9c3feec0577c
-  data.tar.gz: 7574120085bc23b698489eeb890112df78dd7689
+  metadata.gz: 5be2da067217f4dab82cf86a51c149578b3839ff
+  data.tar.gz: ead2d7fc41857aa193f37d0f8cbd5bffbe052462
 SHA512:
-  metadata.gz: acad50db58bda1347963b54c71929bf9d79fce33e47b3efc0c3d7f2ffe17a370ff984c3ff83796e3a31350ec10fce07d2448d95adf796cf1661166070f06ada6
-  data.tar.gz: 7d3bdb848e5a1bc50ed1b5e620eaaaa940cb956a23f1fc12649ca1fab410a2dd3d9df8e0190fd6229ec69048c0066fad59d86d5f48ef07b8e2602d3b1bcf4ee8
+  metadata.gz: fa9338e297f70fc50afd3d1ad6bf4d933883f0626f6f85a2ef79543255a4191df222a90e9b683edc95d3f613f27135538de0dc795086144e7d6bcbc4404c87a9
+  data.tar.gz: 02f13a0c906e75a3fe32341bcaa6237c3ba4ba258bbf80809a7cc332dffb0e1d90e3ab1047335ad46f6f315a3daf2b46dadc44959d791009617588d849f99988

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## [v0.9.5](https://github.com/swanandp/acts_as_list/tree/v0.9.5) (2017-04-04)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.9.4...v0.9.5)
+
+**Closed issues:**
+
+- acts\_as\_list\_class.maximum\(position\_column\) is causing the entire table to lock [\#264](https://github.com/swanandp/acts_as_list/issues/264)
+- Be more precise with unscope-ing [\#263](https://github.com/swanandp/acts_as_list/issues/263)
+
+**Merged pull requests:**
+
+- Use bottom\_position\_in\_list instead of the highest value in the table [\#266](https://github.com/swanandp/acts_as_list/pull/266) ([brendon](https://github.com/brendon))
+- Be more surgical about unscoping [\#265](https://github.com/swanandp/acts_as_list/pull/265) ([brendon](https://github.com/brendon))
+
 ## [v0.9.4](https://github.com/swanandp/acts_as_list/tree/v0.9.4) (2017-03-16)
 [Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.9.3...v0.9.4)
 

data/acts_as_list.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
 
 
   # Dependencies (installed via "bundle install")
-  s.add_dependency("activerecord", [">= 3.0"])
-  s.add_development_dependency("bundler", [">= 1.0.0"])
+  s.add_dependency "activerecord", ">= 3.0"
+  s.add_development_dependency "bundler", ">= 1.0.0"
 end

data/lib/acts_as_list.rb

@@ -1,9 +1,10 @@
-require 'acts_as_list/active_record/acts/list'
+require "acts_as_list/active_record/acts/list"
 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"
 require "acts_as_list/active_record/acts/aux_method_definer"
 require "acts_as_list/active_record/acts/callback_definer"
-require 'acts_as_list/active_record/acts/no_update'
+require "acts_as_list/active_record/acts/no_update"
 require "acts_as_list/active_record/acts/sequential_updates_method_definer"
+require "acts_as_list/active_record/acts/active_record"

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

@@ -0,0 +1,3 @@
+ActiveSupport.on_load :active_record do
+  extend ActiveRecord::Acts::List::ClassMethods
+end

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

@@ -1,64 +1,66 @@
-class << ActiveRecord::Base
-  # Configuration options are:
-  #
-  # * +column+ - specifies the column name to use for keeping the position integer (default: +position+)
-  # * +scope+ - restricts what is to be considered a list. Given a symbol, it'll attach <tt>_id</tt>
-  #   (if it hasn't already been added) and use that as the foreign key restriction. It's also possible
-  #   to give it an entire string that is interpolated if you need a tighter scope than just a foreign key.
-  #   Example: <tt>acts_as_list scope: 'todo_list_id = #{todo_list_id} AND completed = 0'</tt>
-  # * +top_of_list+ - defines the integer used for the top of the list. Defaults to 1. Use 0 to make the collection
-  #   act more like an array in its indexing.
-  # * +add_new_at+ - specifies whether objects get added to the :top or :bottom of the list. (default: +bottom+)
-  #                   `nil` will result in new items not being added to the list on create.
-  # * +sequential_updates+ - specifies whether insert_at should update objects positions during shuffling
-  #   one by one to respect position column unique not null constraint. 
-  #   Defaults to true if position column has unique index, otherwise false.
-  #   If constraint is <tt>deferrable initially deferred<tt>, overriding it with false will speed up insert_at.
-  def acts_as_list(options = {})
-    configuration = { column: "position", scope: "1 = 1", top_of_list: 1, add_new_at: :bottom }
-    configuration.update(options) if options.is_a?(Hash)
-
-    caller_class = self
-
-    ActiveRecord::Acts::List::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])
-
-    ActiveRecord::Acts::List::AuxMethodDefiner.call(caller_class)
-    ActiveRecord::Acts::List::CallbackDefiner.call(caller_class, configuration[:add_new_at])
-    ActiveRecord::Acts::List::SequentialUpdatesMethodDefiner.call(caller_class, configuration[:column], configuration[:sequential_updates])
-
-    include ActiveRecord::Acts::List::InstanceMethods
-    include ActiveRecord::Acts::List::NoUpdate
-  end
-end
-
 module ActiveRecord
   module Acts #:nodoc:
     module List #:nodoc:
-      # This +acts_as+ extension provides the capabilities for sorting and reordering a number of objects in a list.
-      # The class that has this specified needs to have a +position+ column defined as an integer on
-      # the mapped database table.
-      #
-      # Todo list example:
-      #
-      #   class TodoList < ActiveRecord::Base
-      #     has_many :todo_items, order: "position"
-      #   end
-      #
-      #   class TodoItem < ActiveRecord::Base
-      #     belongs_to :todo_list
-      #     acts_as_list scope: :todo_list
-      #   end
-      #
-      #   todo_list.first.move_to_bottom
-      #   todo_list.last.move_higher
-
-      # All the methods available to a record that has had <tt>acts_as_list</tt> specified. Each method works
-      # by assuming the object to be the item in the list, so <tt>chapter.move_lower</tt> would move that chapter
-      # lower in the list of all chapters. Likewise, <tt>chapter.first?</tt> would return +true+ if that chapter is
-      # the first in the list of all chapters.
+
+      module ClassMethods
+        # Configuration options are:
+        #
+        # * +column+ - specifies the column name to use for keeping the position integer (default: +position+)
+        # * +scope+ - restricts what is to be considered a list. Given a symbol, it'll attach <tt>_id</tt>
+        #   (if it hasn't already been added) and use that as the foreign key restriction. It's also possible
+        #   to give it an entire string that is interpolated if you need a tighter scope than just a foreign key.
+        #   Example: <tt>acts_as_list scope: 'todo_list_id = #{todo_list_id} AND completed = 0'</tt>
+        # * +top_of_list+ - defines the integer used for the top of the list. Defaults to 1. Use 0 to make the collection
+        #   act more like an array in its indexing.
+        # * +add_new_at+ - specifies whether objects get added to the :top or :bottom of the list. (default: +bottom+)
+        #                   `nil` will result in new items not being added to the list on create.
+        # * +sequential_updates+ - specifies whether insert_at should update objects positions during shuffling
+        #   one by one to respect position column unique not null constraint.
+        #   Defaults to true if position column has unique index, otherwise false.
+        #   If constraint is <tt>deferrable initially deferred<tt>, overriding it with false will speed up insert_at.
+        def acts_as_list(options = {})
+          configuration = { column: "position", scope: "1 = 1", top_of_list: 1, add_new_at: :bottom }
+          configuration.update(options) if options.is_a?(Hash)
+
+          caller_class = self
+
+          ActiveRecord::Acts::List::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])
+
+          ActiveRecord::Acts::List::AuxMethodDefiner.call(caller_class)
+          ActiveRecord::Acts::List::CallbackDefiner.call(caller_class, configuration[:add_new_at])
+          ActiveRecord::Acts::List::SequentialUpdatesMethodDefiner.call(caller_class, configuration[:column], configuration[:sequential_updates])
+
+          include ActiveRecord::Acts::List::InstanceMethods
+          include ActiveRecord::Acts::List::NoUpdate
+        end
+
+        # This +acts_as+ extension provides the capabilities for sorting and reordering a number of objects in a list.
+        # The class that has this specified needs to have a +position+ column defined as an integer on
+        # the mapped database table.
+        #
+        # Todo list example:
+        #
+        #   class TodoList < ActiveRecord::Base
+        #     has_many :todo_items, order: "position"
+        #   end
+        #
+        #   class TodoItem < ActiveRecord::Base
+        #     belongs_to :todo_list
+        #     acts_as_list scope: :todo_list
+        #   end
+        #
+        #   todo_list.first.move_to_bottom
+        #   todo_list.last.move_higher
+
+        # All the methods available to a record that has had <tt>acts_as_list</tt> specified. Each method works
+        # by assuming the object to be the item in the list, so <tt>chapter.move_lower</tt> would move that chapter
+        # lower in the list of all chapters. Likewise, <tt>chapter.first?</tt> would return +true+ if that chapter is
+        # the first in the list of all chapters.
+      end
+
       module InstanceMethods
         # Insert the item at the given position (defaults to the top position of 1).
         def insert_at(position = acts_as_list_top)
@@ -376,7 +378,7 @@ module ActiveRecord
             end
           end
         end
-        
+
         def insert_at_position(position)
           return set_list_position(position) if new_record?
           with_lock do
@@ -408,7 +410,7 @@ module ActiveRecord
 
         def position_before_save
           if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR >= 1 ||
-            ActiveRecord::VERSION::MAJOR > 5
+              ActiveRecord::VERSION::MAJOR > 5
 
             send("#{position_column}_before_last_save")
           else
@@ -430,9 +432,9 @@ module ActiveRecord
           if internal_scope_changed?
             cached_changes = changes
 
-            cached_changes.each { |attribute, values| self[attribute] = values[0] }
+            cached_changes.each { |attribute, values| send("#{attribute}=", values[0]) }
             send('decrement_positions_on_lower_items') if lower_item
-            cached_changes.each { |attribute, values| self[attribute] = values[1] }
+            cached_changes.each { |attribute, values| send("#{attribute}=", values[1]) }
 
             send("add_to_list_#{add_new_at}") if add_new_at.present?
           end
@@ -460,6 +462,7 @@ module ActiveRecord
           @_quoted_position_column_with_table_name ||= "#{quoted_table_name}.#{quoted_position_column}"
         end
       end
+
     end
   end
 end

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

@@ -2,7 +2,10 @@ module ActiveRecord
   module Acts
     module List
       module NoUpdate
-        extend ActiveSupport::Concern
+
+        def self.included(base)
+          base.extend ClassMethods
+        end
 
         class ArrayTypeError < SyntaxError
           def initialize
@@ -96,9 +99,9 @@ module ActiveRecord
 
           private
 
-            def extracted_klasses
-              Thread.current[:act_as_list_no_update] ||= []
-            end
+          def extracted_klasses
+            Thread.current[:act_as_list_no_update] ||= []
+          end
         end
 
         def act_as_list_no_update?

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

@@ -29,15 +29,13 @@ module ActiveRecord::Acts::List::PositionColumnMethodDefiner #:nodoc:
       end
 
       define_singleton_method :update_all_with_touch do |updates|
-        record = new
-        attrs = record.send(:timestamp_attributes_for_update_in_model)
-        now = record.send(:current_time_from_proper_timezone)
+        update_all(updates << touch_record_sql)
+      end
 
-        attrs.each do |attr|
-          updates << ", #{connection.quote_column_name(attr)} = #{connection.quote(connection.quoted_date(now))}"
-        end
+      private
 
-        update_all(updates)
+      define_singleton_method :touch_record_sql do
+        new.touch_record_sql
       end
     end
   end
@@ -54,6 +52,23 @@ module ActiveRecord::Acts::List::PositionColumnMethodDefiner #:nodoc:
         write_attribute(position_column, position)
         @position_changed = true
       end
+
+      define_method :touch_record_sql do
+        cached_quoted_now = quoted_current_time_from_proper_timezone
+
+        timestamp_attributes_for_update_in_model.map do |attr|
+          ", #{connection.quote_column_name(attr)} = #{cached_quoted_now}"
+        end.join
+      end
+
+      private
+
+      delegate :connection, to: self
+
+      def quoted_current_time_from_proper_timezone
+        connection.quote(connection.quoted_date(
+          current_time_from_proper_timezone))
+      end
     end
   end
 

data/lib/acts_as_list/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.9.5'
+      VERSION = '0.9.6'
     end
   end
 end

data/test/shared_array_scope_list.rb

@@ -62,7 +62,7 @@ module Shared
 
       new = ArrayScopeListMixin.acts_as_list_no_update { ArrayScopeListMixin.create(parent_id: 20, parent_type: 'ParentClass') }
       assert_equal_or_nil $default_position,new.pos
-      assert_equal $default_position.is_a?(Fixnum), new.first?
+      assert_equal $default_position.is_a?(Integer), new.first?
       assert !new.last?
 
       new = ArrayScopeListMixin.create(parent_id: 20, parent_type: 'ParentClass')

data/test/shared_list.rb

@@ -62,7 +62,7 @@ module Shared
 
       new = ListMixin.acts_as_list_no_update { ListMixin.create(parent_id: 20) }
       assert_equal_or_nil $default_position, new.pos
-      assert_equal $default_position.is_a?(Fixnum), new.first?
+      assert_equal $default_position.is_a?(Integer), new.first?
       assert !new.last?
 
       new = ListMixin.create(parent_id: 20)

data/test/shared_top_addition.rb

@@ -48,7 +48,7 @@ module Shared
 
       new = TopAdditionMixin.acts_as_list_no_update { TopAdditionMixin.create(parent_id: 20) }
       assert_equal_or_nil $default_position, new.pos
-      assert_equal $default_position.is_a?(Fixnum), new.first?
+      assert_equal $default_position.is_a?(Integer), new.first?
       assert !new.last?
 
       new = TopAdditionMixin.create(parent_id: 20)

data/test/test_list.rb

@@ -327,7 +327,7 @@ class DefaultScopedTest < ActsAsListTestCase
 
     new = DefaultScopedMixin.acts_as_list_no_update { DefaultScopedMixin.create }
     assert_equal_or_nil $default_position, new.pos
-    assert_equal $default_position.is_a?(Fixnum), new.first?
+    assert_equal $default_position.is_a?(Integer), new.first?
     assert !new.last?
 
     new = DefaultScopedMixin.create
@@ -431,7 +431,7 @@ class DefaultScopedWhereTest < ActsAsListTestCase
 
     new = DefaultScopedWhereMixin.acts_as_list_no_update { DefaultScopedWhereMixin.create }
     assert_equal_or_nil $default_position, new.pos
-    assert_equal $default_position.is_a?(Fixnum), new.first?
+    assert_equal $default_position.is_a?(Integer), new.first?
     assert !new.last?
 
     new = DefaultScopedWhereMixin.create
@@ -641,6 +641,12 @@ if rails_4
       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
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,6 +66,7 @@ files:
 - gemfiles/rails_5_1.gemfile
 - init.rb
 - lib/acts_as_list.rb
+- lib/acts_as_list/active_record/acts/active_record.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