acts_as_list 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12c682a75d4197c1e22f97b8423db27fbb75efaf8bcdc049a30548946c0dd5f0
-  data.tar.gz: 0eb3aaba4c6c977dcd7ead96491092774838e1330c91bf1d19a527c1cf3b8c98
+  metadata.gz: a36b9ed8db57946d5ac96c829c68ce4f4107068628827840140e9dadb3c682fa
+  data.tar.gz: 60b6890922d26b913aed5a212eae7d228629c1ce3721dd0818ec2e5069697d25
 SHA512:
-  metadata.gz: 642f0590fc1c162ef9abac2ef4e1153fbe15e8f7b0db0b39f5771fbe7f76bbb1b4cdd45121d7ab03968ea3391449966a785e6d0a898db6a02b1b57c9bcd0ef8e
-  data.tar.gz: f878ad669e23e211a543997215f7680b8ed51e66fff568b93cdd3f472a8745ab9fe496c5865e80b516d52989db7110d8809e1a749323d93160afe22152e7c7f8
+  metadata.gz: 1bfced5d2dd4e50194eb8bdb92b244d40dd0a19df0ee663649510a965077a0d332715dc0100c1e9d006222e96e57745638c77812767b88ec7b9274dd350af4c1
+  data.tar.gz: 485f6be53763f1f112095075b1c69d6e620f89018c2e3435f3500decf986e110c832f78ce5db6462d6233d13816516a2c1d59df1e3c172455439a11704b1c8b5

data/.travis.yml

@@ -7,9 +7,11 @@ before_script:
   - mysql -e 'create database acts_as_list;'
   - psql -c 'create database acts_as_list;' -U postgres
 rvm:
-  - 2.4.7
-  - 2.5.6
-  - 2.6.4
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
 services:
   - mysql
   - postgresql
@@ -23,7 +25,31 @@ gemfile:
   - gemfiles/rails_5_1.gemfile
   - gemfiles/rails_5_2.gemfile
   - gemfiles/rails_6_0.gemfile
+  - gemfiles/rails_6_1.gemfile
 matrix:
   exclude:
-    - rvm: 2.4.7
+    - rvm: 2.4
       gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/rails_6_1.gemfile
+    # Ruby 2.7 uses a `bigdecimal` version that doesn't support BigDecimal.new
+    # that Rails 4.2 uses. See also:
+    # https://github.com/ruby/bigdecimal#which-version-should-you-select
+    - rvm: 2.7
+      gemfile: gemfiles/rails_4_2.gemfile
+    # Ruby 2.7 warning `sqlite3-1.3.13/lib/sqlite3/statement.rb:108: warning: rb_tainted_str_new is deprecated`
+    # and job wil exceed the maximum log length
+    # see also: https://github.com/sparklemotion/sqlite3-ruby/issues/276
+    - rvm: 2.7
+      gemfile: gemfiles/rails_5_0.gemfile
+      env: DB=sqlite
+    # Rails <6 does not support Ruby 3, see:
+    # https://github.com/rails/rails/issues/40938#issuecomment-751898275
+    - rvm: 3.0
+      gemfile: gemfiles/rails_4_2.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/rails_5_2.gemfile

data/Appraisals

@@ -8,10 +8,18 @@ appraise "rails-4-2" do
   group :test do
     gem "test_after_commit", "~> 0.4.2"
   end
+  group :sqlite do
+    gem "sqlite3", "~> 1.3.13"
+  end
+
   gem "activerecord", "~> 4.2.0"
 end
 
 appraise "rails-5-0" do
+  group :sqlite do
+    gem "sqlite3", "~> 1.3.13"
+  end
+
   gem "activerecord", "~> 5.0.0"
 end
 
@@ -24,8 +32,9 @@ appraise "rails-5-2" do
 end
 
 appraise "rails-6-0" do
-  group :sqlite do
-    gem "sqlite3", "~> 1.4"
-  end
   gem "activerecord", "~> 6.0.0"
 end
+
+appraise "rails-6-1" do
+  gem "activerecord", "6.1.0.rc1"
+end

data/CHANGELOG.md

@@ -4,6 +4,30 @@ 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
+
+## v1.0.4 - 2021-04-20
+
+### Fixed
+- Add Tests ruby 2.7 and 3.0 [\#393](https://github.com/brendon/acts_as_list/pull/393) ([QWYNG])
+
+## v1.0.3 - 2020-12-24
+
+### Fixed
+- Silence deprecation warnings in Rails 6 [\#384](https://github.com/brendon/acts_as_list/pull/384) ([h-lame])
+- Add explicit requirement of ActiveSupport::Inflector [\#387](https://github.com/brendon/acts_as_list/pull/387) ([rdvdijk])
+
+## v1.0.2 - 2020-09-14
+
+### Fixed
+- Get foreign key from reflections when possible [\#383](https://github.com/brendon/acts_as_list/pull/383) ([jefftsang])
+
+### Removed
+- gemspec: Drop defunct `rubyforge_project` directive [\#373](https://github.com/brendon/acts_as_list/pull/373) ([olleolleolle])
+
+[olleolleolle]: https://github.com/olleolleolle
+[jefftsang]: https://github.com/jefftsang
+
 ## v1.0.1 - 2020-02-27
 
 ### Fixed

data/Gemfile

@@ -16,11 +16,11 @@ group :test do
 end
 
 group :sqlite do
-  gem "sqlite3", "~> 1.3.13"
+  gem "sqlite3", "~> 1.4"
 end
 
 group :postgresql do
-  gem "pg", "~> 1.1.4"
+  gem "pg", "~> 1.2.0"
 end
 
 group :mysql do

data/README.md

@@ -108,7 +108,7 @@ end
 When using PostgreSQL, it is also possible to leave this migration up to the database layer. Inside of the `change` block you could write:
 
 ```ruby
- execute <<~SQL.squeeze
+ execute <<~SQL.squish
    UPDATE todo_items
    SET position = mapping.new_position
    FROM (
@@ -282,7 +282,7 @@ All versions `0.1.5` onwards require Rails 3.0.x and higher.
 
 We often hear complaints that `position` values are repeated, incorrect etc. For example, #254. To ensure data integrity, you should rely on your database. There are two things you can do:
 
-1. Use constraints.  If you model `Item` that `belongs_to` an `Order`, and it has a `position` column, then add a unique constraint on `items` with `[:order_id, :position_id]`.  Think of it as a list invariant. What are the properties of your list that don't change no matter how many items you have in it?  One such propery is that each item has a distinct position. Another _could be_ that position is always greater than 0. It is strongly recommended that you rely on your database to enforce these invariants or constraints. Here are the docs for [PostgreSQL](https://www.postgresql.org/docs/9.5/static/ddl-constraints.html) and [MySQL](https://dev.mysql.com/doc/refman/8.0/en/alter-table.html).
+1. Use constraints.  If you model `Item` that `belongs_to` an `Order`, and it has a `position` column, then add a unique constraint on `items` with `[:order_id, :position]`.  Think of it as a list invariant. What are the properties of your list that don't change no matter how many items you have in it?  One such propery is that each item has a distinct position. Another _could be_ that position is always greater than 0. It is strongly recommended that you rely on your database to enforce these invariants or constraints. Here are the docs for [PostgreSQL](https://www.postgresql.org/docs/9.5/static/ddl-constraints.html) and [MySQL](https://dev.mysql.com/doc/refman/8.0/en/alter-table.html).
 2. Use mutexes or row level locks. At its heart the duplicate problem is that of handling concurrency. Adding a contention resolution mechanism like locks will solve it to some extent.  But it is not a solution or replacement for constraints.  Locks are also prone to deadlocks.
 
 As a library, `acts_as_list` may not always have all the context needed to apply these tools. They are much better suited at the application level.

data/acts_as_list.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   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.rubyforge_project     = "acts_as_list"
   s.required_ruby_version = ">= 2.4.7"
 
   if s.respond_to?(:metadata)

data/gemfiles/rails_5_0.gemfile

@@ -21,7 +21,7 @@ group :sqlite do
 end
 
 group :postgresql do
-  gem "pg", "~> 1.1.4"
+  gem "pg", "~> 1.2.0"
 end
 
 group :mysql do

data/gemfiles/rails_5_1.gemfile

@@ -17,11 +17,11 @@ group :test do
 end
 
 group :sqlite do
-  gem "sqlite3", "~> 1.3.13"
+  gem "sqlite3", "~> 1.4"
 end
 
 group :postgresql do
-  gem "pg", "~> 1.1.4"
+  gem "pg", "~> 1.2.0"
 end
 
 group :mysql do

data/gemfiles/rails_5_2.gemfile

@@ -17,11 +17,11 @@ group :test do
 end
 
 group :sqlite do
-  gem "sqlite3", "~> 1.3.13"
+  gem "sqlite3", "~> 1.4"
 end
 
 group :postgresql do
-  gem "pg", "~> 1.1.4"
+  gem "pg", "~> 1.2.0"
 end
 
 group :mysql do

data/gemfiles/rails_6_0.gemfile

@@ -21,7 +21,7 @@ group :sqlite do
 end
 
 group :postgresql do
-  gem "pg", "~> 1.1.4"
+  gem "pg", "~> 1.2.0"
 end
 
 group :mysql do

data/gemfiles/rails_6_1.gemfile

@@ -0,0 +1,31 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rake"
+gem "appraisal"
+gem "activerecord", "6.1.0.rc1"
+
+group :development do
+  gem "github_changelog_generator", "1.9.0"
+end
+
+group :test do
+  gem "minitest", "~> 5.0"
+  gem "timecop"
+  gem "mocha"
+end
+
+group :sqlite do
+  gem "sqlite3", "~> 1.4"
+end
+
+group :postgresql do
+  gem "pg", "~> 1.2.0"
+end
+
+group :mysql do
+  gem "mysql2", "~> 0.5.0"
+end
+
+gemspec path: "../"

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

@@ -226,7 +226,7 @@ module ActiveRecord
         end
 
         def acts_as_list_list
-          acts_as_list_class.unscope(:select, :where).where(scope_condition)
+          acts_as_list_class.default_scoped.unscope(:select, :where).where(scope_condition)
         end
 
         # Poorly named methods. They will insert the item at the desired position if the position

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
@@ -64,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/version.rb

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

data/test/helper.rb

@@ -51,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

@@ -314,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/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
@@ -419,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)
@@ -523,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)
@@ -643,6 +655,12 @@ class MultipleListsTest < ActsAsListTestCase
     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
+
+  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
 
 class EnumArrayScopeListMixinTest < ActsAsListTestCase

data/test/test_scope_with_user_defined_foreign_key.rb

@@ -0,0 +1,42 @@
+require 'helper'
+
+class Checklist < ActiveRecord::Base
+  has_many :checklist_items, foreign_key: 'list_id', inverse_of: :checklist
+end
+
+class ChecklistItem < ActiveRecord::Base
+  belongs_to :checklist, foreign_key: 'list_id', inverse_of: :checklist_items
+  acts_as_list scope: :checklist
+end
+
+class ScopeWithUserDefinedForeignKeyTest < Minitest::Test
+  def setup
+    ActiveRecord::Base.connection.create_table :checklists do |t|
+    end
+
+    ActiveRecord::Base.connection.create_table :checklist_items do |t|
+      t.column :list_id, :integer
+      t.column :position, :integer
+    end
+
+    ActiveRecord::Base.connection.schema_cache.clear!
+    [Checklist, ChecklistItem].each(&:reset_column_information)
+    super
+  end
+
+  def teardown
+    teardown_db
+    super
+  end
+
+  def test_scope_with_user_defined_foreign_key
+    checklist = Checklist.create
+    checklist_item_1 = checklist.checklist_items.create
+    checklist_item_2 = checklist.checklist_items.create
+    checklist_item_3 = checklist.checklist_items.create
+
+    assert_equal 1, checklist_item_1.position
+    assert_equal 2, checklist_item_2.position
+    assert_equal 3, checklist_item_3.position
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - Swanand Pagnis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -65,6 +65,7 @@ files:
 - gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
 - gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
 - init.rb
 - lib/acts_as_list.rb
 - lib/acts_as_list/active_record/acts/active_record.rb
@@ -94,6 +95,7 @@ files:
 - 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: http://github.com/brendon/acts_as_list
 licenses:
 - MIT
@@ -138,3 +140,4 @@ test_files:
 - 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