From bef3d5417aba26531ac3fb282e124e26ebd73c72 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Sat, 14 Oct 2023 16:21:23 +0100 Subject: [PATCH] chore: remove deprecated method feat: convert tagger to recent syntax --- .github/workflows/spec.yml | 2 +- Appraisals | 10 +++++----- gemfiles/activerecord_6.1.gemfile | 1 - gemfiles/activerecord_7.0.gemfile | 1 - gemfiles/activerecord_7.1.gemfile | 1 - lib/acts_as_taggable_on/tagger.rb | 12 +++--------- lib/acts_as_taggable_on/utils.rb | 4 ---- lib/acts_as_taggable_on/version.rb | 2 +- 8 files changed, 10 insertions(+), 23 deletions(-) diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml index b8dc2927..3b119e01 100644 --- a/.github/workflows/spec.yml +++ b/.github/workflows/spec.yml @@ -60,7 +60,7 @@ jobs: --health-timeout 5s --health-retries 5 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: diff --git a/Appraisals b/Appraisals index b664fc6c..04462ba4 100644 --- a/Appraisals +++ b/Appraisals @@ -3,17 +3,17 @@ appraise 'activerecord-6.1' do gem 'activerecord', '~> 6.1.0' gem 'pg' - gem 'mysql2', '~> 0.5' +# gem 'mysql2', '~> 0.5' end appraise 'activerecord-7.0' do gem 'activerecord', '~> 7.0.1' gem 'pg' - gem 'mysql2', '~> 0.5' +# gem 'mysql2', '~> 0.5' end appraise 'activerecord-7.1' do - gem 'activerecord', '~> 7.1.0' - gem 'pg' - gem 'mysql2', '~> 0.5' + gem 'activerecord', '~> 7.1.0' + gem 'pg' +# gem 'mysql2', '~> 0.5' end \ No newline at end of file diff --git a/gemfiles/activerecord_6.1.gemfile b/gemfiles/activerecord_6.1.gemfile index 0538ded5..a016e717 100644 --- a/gemfiles/activerecord_6.1.gemfile +++ b/gemfiles/activerecord_6.1.gemfile @@ -4,7 +4,6 @@ source "https://rubygems.org" gem "activerecord", "~> 6.1.0" gem "pg" -gem "mysql2", "~> 0.5" group :local_development do gem "guard" diff --git a/gemfiles/activerecord_7.0.gemfile b/gemfiles/activerecord_7.0.gemfile index b43a6b95..e2a9fe96 100644 --- a/gemfiles/activerecord_7.0.gemfile +++ b/gemfiles/activerecord_7.0.gemfile @@ -4,7 +4,6 @@ source "https://rubygems.org" gem "activerecord", "~> 7.0.1" gem "pg" -gem "mysql2", "~> 0.5" group :local_development do gem "guard" diff --git a/gemfiles/activerecord_7.1.gemfile b/gemfiles/activerecord_7.1.gemfile index e00a1f94..71541693 100644 --- a/gemfiles/activerecord_7.1.gemfile +++ b/gemfiles/activerecord_7.1.gemfile @@ -4,7 +4,6 @@ source "https://rubygems.org" gem "activerecord", "~> 7.1.0" gem "pg" -gem "mysql2", "~> 0.5" group :local_development do gem "guard" diff --git a/lib/acts_as_taggable_on/tagger.rb b/lib/acts_as_taggable_on/tagger.rb index 1611efdc..b60acf0e 100644 --- a/lib/acts_as_taggable_on/tagger.rb +++ b/lib/acts_as_taggable_on/tagger.rb @@ -40,9 +40,7 @@ def tagger? false end - def is_tagger? - tagger? - end + alias is_tagger? tagger? end module InstanceMethods @@ -75,9 +73,7 @@ def tagger? self.class.is_tagger? end - def is_tagger? - tagger? - end + alias is_tagger? tagger? end module SingletonMethods @@ -85,9 +81,7 @@ def tagger? true end - def is_tagger? - tagger? - end + alias is_tagger? tagger? end end end diff --git a/lib/acts_as_taggable_on/utils.rb b/lib/acts_as_taggable_on/utils.rb index c7858bcd..ea58dd92 100644 --- a/lib/acts_as_taggable_on/utils.rb +++ b/lib/acts_as_taggable_on/utils.rb @@ -26,10 +26,6 @@ def like_operator using_postgresql? ? 'ILIKE' : 'LIKE' end - def legacy_activerecord? - ActiveRecord.version <= Gem::Version.new('5.3.0') - end - # escape _ and % characters in strings, since these are wildcards in SQL. def escape_like(str) str.gsub(/[!%_]/) { |x| "!#{x}" } diff --git a/lib/acts_as_taggable_on/version.rb b/lib/acts_as_taggable_on/version.rb index 2c8ce4c9..3337185e 100644 --- a/lib/acts_as_taggable_on/version.rb +++ b/lib/acts_as_taggable_on/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module ActsAsTaggableOn - VERSION = '9.0.1' + VERSION = '10.0.0' end