acts_as_list 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9d85921cd5b149fa3581d5868734c62fb42e449e4058db26cffb0e62a146b9c
-  data.tar.gz: 94b6b6a6599ec0fa381f737bd5b2132258b7620905016bb467e1663f9552021a
+  metadata.gz: af90a91e87476f41d5712ba02b1e409558b4b96e1a8ad4c448a18c21f6a39d88
+  data.tar.gz: 8441f44a8ad1e71639a29dc6e11477b728a0d8dbbe78d6d1e93d465ef7384697
 SHA512:
-  metadata.gz: f991880d1399bdbe56e4ef2511368115fc382dfebe2549188e0b8123f5cd8a93b33f067a602aadd8dbfa70893662b6fe5072d9deea7aba26d8827b83b9e1ac41
-  data.tar.gz: df1570e602643b91b602ed3044c9fbe8457ce95e42cf8fdca5858d8bd1460f4105f8839bf87c5338cb0fb4cbac11c46b15c6206dc039cc39cc3c1b561129fcee
+  metadata.gz: 15add9a3324c4a2aa8e03de8bae61be55e05362a65eac09fbd9f3d0924d8e79f7ebdbbb2bcff98cdec58830c041831385c2b5795c4f5857e1c220fc4aec49c1b
+  data.tar.gz: c57ac0454483abbe36e2c37dfb63525c40254f4f419a11367356a505df611d49cc55b422143a30bdbe624788e785d24f1effd6b9b4478d5c8293373e61292056

data/CHANGELOG.md

@@ -6,6 +6,16 @@ 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
+- Updated .gemspec to exclude unnecessary files from the gem package. [\#437](https://github.com/brendon/acts_as_list/pull/437) ([f440])
+
 ## v1.2.1 - 2024-06-06
 
 ### 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.1'
+      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.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Swanand Pagnis
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -134,16 +134,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gemtest"
-- ".github/FUNDING.yml"
-- ".github/dependabot.yml"
-- ".github/workflows/continuous_integration.yml"
-- ".gitignore"
 - CHANGELOG.md
-- Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
-- acts_as_list.gemspec
 - init.rb
 - lib/acts_as_list.rb
 - lib/acts_as_list/active_record/acts/active_record.rb
@@ -156,25 +150,8 @@ 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
-- test/helper.rb
-- test/shared.rb
-- test/shared_array_scope_list.rb
-- test/shared_list.rb
-- test/shared_list_sub.rb
-- test/shared_no_addition.rb
-- test/shared_quoting.rb
-- test/shared_top_addition.rb
-- test/shared_zero_based.rb
-- test/support/ci_database.yml
-- test/support/database.yml
-- test/test_default_scope_with_select.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
-- test/test_no_update_for_subclasses.rb
-- test/test_scope_with_user_defined_foreign_key.rb
 homepage: https://github.com/brendon/acts_as_list
 licenses:
 - MIT
@@ -203,22 +180,4 @@ signing_key:
 specification_version: 4
 summary: A gem adding sorting, reordering capabilities to an active_record model,
   allowing it to act as a list
-test_files:
-- test/helper.rb
-- test/shared.rb
-- test/shared_array_scope_list.rb
-- test/shared_list.rb
-- test/shared_list_sub.rb
-- test/shared_no_addition.rb
-- test/shared_quoting.rb
-- test/shared_top_addition.rb
-- test/shared_zero_based.rb
-- test/support/ci_database.yml
-- test/support/database.yml
-- test/test_default_scope_with_select.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
-- test/test_no_update_for_subclasses.rb
-- test/test_scope_with_user_defined_foreign_key.rb
+test_files: []

data/.github/FUNDING.yml

@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-github: [brendon]

data/.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

data/.github/workflows/continuous_integration.yml

@@ -1,62 +0,0 @@
-name: Continuous Integration
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    name: Ruby ${{ matrix.ruby }}, DB ${{ matrix.db }}, Rails ${{ matrix.rails }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby:
-          - '3.0'
-          - '3.1'
-          - '3.2'
-          - '3.3'
-        rails:
-          - '6.1'
-          - '7.0'
-          - '7.1'
-        db:
-          - mysql
-          - postgresql
-          - sqlite
-        exclude:
-          - rails: '7.0'
-            ruby: '3.1'
-          - rails: '7.0'
-            ruby: '3.2'
-          - rails: '7.0'
-            ruby: '3.3'
-    env:
-      DB: ${{ matrix.db }}
-      RAILS_VERSION: ${{ matrix.rails }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - name: Enable MySQL
-        if: ${{ matrix.db == 'mysql' }}
-        run: sudo systemctl start mysql.service
-      - name: Create MySQL Database
-        if: ${{ matrix.db == 'mysql' }}
-        run: mysql -u root -proot -e 'CREATE DATABASE runner;'
-      - name: Enable PostgreSQL
-        if: ${{ matrix.db == 'postgresql' }}
-        run: sudo systemctl start postgresql.service
-      - name: Create PostgreSQL User
-        if: ${{ matrix.db == 'postgresql' }}
-        run: sudo -u postgres -i createuser runner -s
-      - name: Create PostgreSQL Database
-        if: ${{ matrix.db == 'postgresql' }}
-        run: createdb runner
-      - name: Run the default task
-        run: bundle exec rake

data/.gitignore

@@ -1,13 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-.rvmrc
-*.tmproj
-.rbenv-version
-.ruby-gemset
-.ruby-version
-.DS_Store
-/tmp/
-/db/
-file::memory*

data/Gemfile

@@ -1,13 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in positioning.gemspec
-gemspec
-
-gem "rake", "~> 13.0"
-
-gem "minitest", "~> 5.0"
-
-if ENV["RAILS_VERSION"]
-  gem "activerecord", ENV["RAILS_VERSION"]
-  gem "activesupport", ENV["RAILS_VERSION"]
-end

data/acts_as_list.gemspec

@@ -1,40 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "acts_as_list/version"
-
-Gem::Specification.new do |s|
-  # Description Meta...
-  s.name                  = "acts_as_list"
-  s.version               = ActiveRecord::Acts::List::VERSION
-  s.platform              = Gem::Platform::RUBY
-  s.authors               = ["Swanand Pagnis", "Brendon Muir"]
-  s.email                 = %w(swanand.pagnis@gmail.com brendon@spikeatschool.co.nz)
-  s.homepage              = "https://github.com/brendon/acts_as_list"
-  s.summary               = "A gem adding sorting, reordering capabilities to an active_record model, allowing it to act as a list"
-  s.description           = '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.'
-  s.license               = "MIT"
-  s.required_ruby_version = ">= 2.5"
-
-  if s.respond_to?(:metadata)
-    s.metadata['changelog_uri']   = 'https://github.com/brendon/acts_as_list/blob/master/CHANGELOG.md'
-    s.metadata['source_code_uri'] = 'https://github.com/brendon/acts_as_list'
-    s.metadata['bug_tracker_uri'] = 'https://github.com/brendon/acts_as_list/issues'
-    s.metadata['rubygems_mfa_required'] = 'true'
-  end
-
-  # Load Paths...
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map {|f| File.basename(f)}
-  s.require_paths = ["lib"]
-
-  # Dependencies (installed via "bundle install")
-  s.add_dependency "activerecord", ">= 6.1"
-  s.add_dependency "activesupport", ">= 6.1"
-  s.add_development_dependency "minitest-hooks", "~> 1.5.1"
-  s.add_development_dependency "mocha", "~> 2.1.0"
-  s.add_development_dependency "timecop", "~> 0.9.8"
-  s.add_development_dependency "mysql2", "~> 0.5.6"
-  s.add_development_dependency "pg", "~> 1.5.5"
-  s.add_development_dependency "sqlite3", "~> 1.7.2"
-end

data/test/helper.rb

@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-# $DEBUG = true
-
-require "rubygems"
-require "bundler/setup"
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require "active_record"
-require "minitest/autorun"
-require "mocha/minitest"
-require "#{File.dirname(__FILE__)}/../init"
-
-ENV["DB"] = "mysql" unless ENV["DB"]
-
-if defined?(ActiveRecord::VERSION) &&
-  ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 2
-
-  # Was removed in Rails 5 and is effectively true.
-  ActiveRecord::Base.raise_in_transactional_callbacks = true
-end
-
-database_configuration = ENV["CI"] ? "test/support/ci_database.yml" : "test/support/database.yml"
-
-ActiveRecord::Base.configurations = YAML.safe_load(IO.read(database_configuration))
-ActiveRecord::Base.establish_connection(ENV["DB"].to_sym)
-ActiveRecord::Schema.verbose = false
-
-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"
-
-# require 'logger'
-# ActiveRecord::Base.logger = Logger.new(STDOUT)
-
-def assert_equal_or_nil(a, b)
-  if a.nil?
-    assert_nil b
-  else
-    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 = active_record_deprecator.behavior
-  active_record_deprecator.behavior = :raise
-  begin
-    yield
-  rescue ActiveSupport::DeprecationException => e
-    flunk "#{failure_message}: #{e}"
-  rescue
-    raise
-  else
-    pass pass_message
-  end
-ensure
-  active_record_deprecator.behavior = original_behavior
-end
-
-def active_record_deprecator
-  if ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1 || ActiveRecord::VERSION::MAJOR > 7
-    ActiveRecord.deprecator
-  else
-    ActiveSupport::Deprecation
-  end
-end

data/test/shared.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-# Common shared behaviour.
-module Shared
-  autoload :List,           'shared_list'
-  autoload :ListSub,        'shared_list_sub'
-  autoload :ZeroBased,      'shared_zero_based'
-  autoload :ArrayScopeList, 'shared_array_scope_list'
-  autoload :TopAddition,    'shared_top_addition'
-  autoload :NoAddition,     'shared_no_addition'
-  autoload :Quoting,        'shared_quoting'
-end