acts_as_list 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc38c9c0378653bb5f8eb7194bd9cc22d906df7cf2b7a158e9fe763a0d6f5a94
-  data.tar.gz: c67158a399378bab4f1258ba6819f9cb7715eedc0b63e1f995869d0032075b75
+  metadata.gz: af90a91e87476f41d5712ba02b1e409558b4b96e1a8ad4c448a18c21f6a39d88
+  data.tar.gz: 8441f44a8ad1e71639a29dc6e11477b728a0d8dbbe78d6d1e93d465ef7384697
 SHA512:
-  metadata.gz: 8b4b29d19abf1dbc2b0c75b4f0a0e4123ec4580084a170af83ca3431ca0bc7d46fa108ba3d6573620585bb00332c0b2b10b68779d2a4fd899fcfc888601e83ab
-  data.tar.gz: 2c999ec1287f4fafacd7406317075c5a0410f84a8c7e0b96ec787fffee0209033ca78aa4947948aee830fe41a6de173ad031fe5895daf33b12679140507aa278
+  metadata.gz: 15add9a3324c4a2aa8e03de8bae61be55e05362a65eac09fbd9f3d0924d8e79f7ebdbbb2bcff98cdec58830c041831385c2b5795c4f5857e1c220fc4aec49c1b
+  data.tar.gz: c57ac0454483abbe36e2c37dfb63525c40254f4f419a11367356a505df611d49cc55b422143a30bdbe624788e785d24f1effd6b9b4478d5c8293373e61292056

data/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## v1.2.3 - 2024-10-14
+
+### Changed
+- Use `.with_connection do |connection|` where possible instead of `.connection` [\#441](https://github.com/brendon/acts_as_list/pull/441) ([flood4life])
+
 ## v1.2.2 - 2024-07-16
 
 ### Fixed

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative './with_connection'
+
 module ActiveRecord
   module Acts #:nodoc:
     module List #:nodoc:
@@ -459,7 +461,9 @@ module ActiveRecord
 
         # 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)
+          @_quoted_position_column ||= ActiveRecord::Acts::List::WithConnection.new(self.class).call do |connection|
+            connection.quote_column_name(position_column)
+          end
         end
 
         # Used in order clauses
@@ -481,9 +485,8 @@ module ActiveRecord
           requirement.satisfied_by?(version)
         end
 
-        def primary_key_condition(id = nil)
-          primary_keys = Array.wrap(self.class.primary_key)
-          id ? primary_keys.zip(Array.wrap(id)).to_h : slice(*primary_keys)
+        def primary_key_condition(id = self.id)
+          { self.class.primary_key => [id] }
         end
       end
 

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative './with_connection'
+
 module ActiveRecord::Acts::List::PositionColumnMethodDefiner #:nodoc:
   def self.call(caller_class, position_column, touch_on_update)
     define_class_methods(caller_class, position_column, touch_on_update)
@@ -15,7 +17,9 @@ module ActiveRecord::Acts::List::PositionColumnMethodDefiner #:nodoc:
   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)
+        @_quoted_position_column ||= ActiveRecord::Acts::List::WithConnection.new(self).call do |connection|
+          connection.quote_column_name(position_column)
+        end
       end
 
       define_singleton_method :quoted_position_column_with_table_name do
@@ -72,18 +76,22 @@ module ActiveRecord::Acts::List::PositionColumnMethodDefiner #:nodoc:
         cached_quoted_now = quoted_current_time_from_proper_timezone
 
         timestamp_attributes_for_update_in_model.map do |attr|
-          ", #{self.class.connection.quote_column_name(attr)} = #{cached_quoted_now}"
+          ActiveRecord::Acts::List::WithConnection.new(self.class).call do |connection|
+            ", #{connection.quote_column_name(attr)} = #{cached_quoted_now}"
+          end
         end.join
       end
 
       private
 
       def quoted_current_time_from_proper_timezone
-        self.class.connection.quote(
-          self.class.connection.quoted_date(
-            current_time_from_proper_timezone
+        ActiveRecord::Acts::List::WithConnection.new(self.class).call do |connection|
+          connection.quote(
+            connection.quoted_date(
+              current_time_from_proper_timezone
+            )
           )
-        )
+        end
       end
     end
   end

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

@@ -1,24 +1,24 @@
 # frozen_string_literal: true
 
+require_relative './with_connection'
+
 module ActiveRecord::Acts::List::SequentialUpdatesMethodDefiner #:nodoc:
   def self.call(caller_class, column, sequential_updates_option)
     caller_class.class_eval do
       define_method :sequential_updates? do
-        if !defined?(@sequential_updates)
-          if sequential_updates_option.nil?
-            table_exists =
-              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)
-              end
-            index_exists = caller_class.connection.index_exists?(caller_class.table_name, column, unique: true)
-            @sequential_updates = table_exists && index_exists
-          else
-            @sequential_updates = sequential_updates_option
-          end
-        else
-          @sequential_updates
+        return @sequential_updates if defined?(@sequential_updates)
+
+        return @sequential_updates = sequential_updates_option unless sequential_updates_option.nil?
+
+        ActiveRecord::Acts::List::WithConnection.new(caller_class).call do |connection|
+          table_exists =
+            if active_record_version_is?('>= 5')
+              connection.data_source_exists?(caller_class.table_name)
+            else
+              connection.table_exists?(caller_class.table_name)
+            end
+          index_exists = connection.index_exists?(caller_class.table_name, column, unique: true)
+          @sequential_updates = table_exists && index_exists
         end
       end
 

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module Acts
+    module List
+      class WithConnection
+        def initialize(recipient)
+          @recipient = recipient
+        end
+
+        attr_reader :recipient
+
+        def call
+          if recipient.respond_to?(:with_connection)
+            recipient.with_connection do |connection|
+              yield connection
+            end
+          else
+            yield recipient.connection
+          end
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_list/version.rb

@@ -3,7 +3,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '1.2.2'
+      VERSION = '1.2.3'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Swanand Pagnis
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -150,6 +150,7 @@ files:
 - 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
+- lib/acts_as_list/active_record/acts/with_connection.rb
 - lib/acts_as_list/version.rb
 homepage: https://github.com/brendon/acts_as_list
 licenses: