acts_as_list 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b697b0a1f7de57449d3b08718d3092b4d3415b482ced1e3f8451255f756d8f9
-  data.tar.gz: e6450636ddb5a4a581be40b48b85dc540c739f7c04e2dd8a298b4193083d929c
+  metadata.gz: cfe49b92bf1cb2d1fe15c55eacacf23c5355368a193b0d5fe5c3d279280fc79b
+  data.tar.gz: 71a11063d260b88cbbe59b4dd66c9475d4aa8fc7bdead764af44bd372ab3d753
 SHA512:
-  metadata.gz: d5167239a2867ebe360247dd874689be782e71377ca484a6fcbeea400fc35e076bf9137db424fdf311370cc965c41f74e1703ea5f6b5ba3f00cfffb235b5c5e2
-  data.tar.gz: a19ab76d2c215c735c1d42890a9d322c0cccc95eb594093cf5dd13d4c830a91a02ff7cf74ea2c71072fddfb3f6898415527b28780e70383cd2554a06e171afc0
+  metadata.gz: 8559b0028cb19c2872d6a16bc9b78bcf720a3d1571a9ba8373b4c7a0e1594dc1d0325afa45b7225666291c77183eaf42dc32eba64614006ed341586adbdbb1bf
+  data.tar.gz: 90173182d8b93c012b70c64b0981fc5ff3599342c61c454e61455ebce03d23100b9af1432eff979bd18325f2f3873e6e4997f8b2fb31308be752494fdd0b358b

data/.travis.yml

@@ -23,7 +23,10 @@ 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
       gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: 2.4.7
+      gemfile: gemfiles/rails_6_1.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

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 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

data/Gemfile

@@ -16,7 +16,7 @@ group :test do
 end
 
 group :sqlite do
-  gem "sqlite3", "~> 1.3.13"
+  gem "sqlite3", "~> 1.4"
 end
 
 group :postgresql do

data/gemfiles/rails_5_1.gemfile

@@ -17,7 +17,7 @@ group :test do
 end
 
 group :sqlite do
-  gem "sqlite3", "~> 1.3.13"
+  gem "sqlite3", "~> 1.4"
 end
 
 group :postgresql do

data/gemfiles/rails_5_2.gemfile

@@ -17,7 +17,7 @@ group :test do
 end
 
 group :sqlite do
-  gem "sqlite3", "~> 1.3.13"
+  gem "sqlite3", "~> 1.4"
 end
 
 group :postgresql 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.1.4"
+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,4 +1,5 @@
 # frozen_string_literal: true
+require "active_support/inflector"
 
 module ActiveRecord::Acts::List::ScopeMethodDefiner #:nodoc:
   extend ActiveSupport::Inflector

data/lib/acts_as_list/version.rb

@@ -3,7 +3,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '1.0.2'
+      VERSION = '1.0.3'
     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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Swanand Pagnis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-13 00:00:00.000000000 Z
+date: 2020-12-24 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