acts-as-taggable-on 6.5.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4120fe17937a900a8bbe921880f0e3e8c83a4355483bfbbb6eba6e99738b7fda
-  data.tar.gz: 1b8924e2cb3a360e6be90986e5be0460652aac74225869f570200bde2a734cf2
+  metadata.gz: 5f5bbdb5779f5a9c0feb7bda9b83f6bb581d8804e07beda16b7fea7dfda45a1b
+  data.tar.gz: 6feeaec2428cbab344f795f92fb3b48e2ab06f0fd0fbceb211b845bd214fb157
 SHA512:
-  metadata.gz: 28ea6660e352e3e025311ed9a3d470b941d3b4bca6108b3ce7eaadc0fd0aac3d8ba7508baf002ab2a8ac09ecd7bf2795e1b0a26158e1d636c305722e2bff9ad7
-  data.tar.gz: 2ddf924977f9bdb6c0e6665186ce3de7d2624abb00b933b06194f64866bb39d3b98c0bb7a0f2de635c046a0b655ad084392120fbd12afb5ed06057579b38961d
+  metadata.gz: a81076cf61cf23c3a2f8ae17dc6be030bc120cc0464994ca190ded1407c2e8bc50dc78ca2a0742b85c4c6c5d996255af4267493eb3708d9abc4693da28881a61
+  data.tar.gz: 36f2d2c63c87e0f6e4086b6ec692d846d2d8a04948b485073b351968411fbb62405730e06c535279434955ddcfbfa2dc30e8a40f62cc39cb3f46515eca9e2889

data/.github/workflows/spec.yml

@@ -0,0 +1,76 @@
+name: spec
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.ruby == 'head' }}
+    env:
+      DB: ${{ matrix.db }}
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+    strategy:
+      matrix:
+        ruby:
+          - "3.0"
+          - 2.7
+          - 2.6
+          - 2.5
+        gemfile:
+          - gemfiles/activerecord_6.0.gemfile
+          - gemfiles/activerecord_6.1.gemfile
+          - gemfiles/activerecord_7.0.gemfile
+        db:
+          - mysql
+          - postgresql
+          - sqlite3
+        include:
+          - ruby: truffleruby-head
+            db: postgresql
+            gemfile: gemfiles/activerecord_6.1.gemfile
+          - ruby: truffleruby-head
+            db: postgresql
+            gemfile: gemfiles/activerecord_7.0.gemfile
+        exclude:
+          - ruby: 2.5
+            gemfile: gemfiles/activerecord_7.0.gemfile
+          - ruby: 2.6
+            gemfile: gemfiles/activerecord_7.0.gemfile
+
+    services:
+      postgres:
+        image: postgres:10
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_DB: acts_as_taggable_on
+          POSTGRES_PASSWORD: postgres
+        ports: ['5432:5432']
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      mysql:
+        image: mysql:8
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: true
+        ports: ['3306:3306']
+        options: >-
+          --health-cmd "mysqladmin ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Create MySQL test database with utf8mb4 charset
+      if: ${{ matrix.db == 'mysql' }}
+      run: |
+        mysql -uroot --host=127.0.0.1 -e "CREATE DATABASE acts_as_taggable_on CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci"
+    - name: Build and test with Rake
+      run: |
+        bundle exec rake

data/Appraisals

@@ -1,15 +1,19 @@
-appraise 'activerecord-5.2' do
-  gem 'activerecord', '~> 5.2.0'
-end
+# frozen_string_literal: true
 
-appraise 'activerecord-5.1' do
-  gem 'activerecord', "~> 5.1.1"
+appraise 'activerecord-6.0' do
+  gem 'activerecord', '~> 6.0.0'
+  gem 'pg'
+  gem 'mysql2', '~> 0.5'
 end
 
-appraise 'activerecord-5.0' do
-  gem 'activerecord', "~> 5.0.3"
+appraise 'activerecord-6.1' do
+  gem 'activerecord', '~> 6.1.0'
+  gem 'pg'
+  gem 'mysql2', '~> 0.5'
 end
 
-appraise 'activerecord-6.0' do
-  gem 'activerecord', "~> 6.0.0.beta1"
+appraise 'activerecord-7.0' do
+  gem 'activerecord', '~> 7.0.0'
+  gem 'pg'
+  gem 'mysql2', '~> 0.5'
 end

data/CHANGELOG.md

@@ -10,19 +10,49 @@ Each change should fall into categories that would affect whether the release is
 
 As such, _Breaking Changes_ are major. _Features_ would map to either major or minor. _Fixes_, _Performance_, and _Misc_ are either minor or patch, the difference being kind of fuzzy for the purposes of history. Adding _Documentation_ (including tests) would be patch level.
 
-### [Master / Unreleased](https://github.com/mbleigh/acts-as-taggable-on/compare/v6.0.1...master)
+### [v9.0.0) / 2022-01-04](https://github.com/mbleigh/acts-as-taggable-on/compare/v8.1.0...v9.0.0)
+* Fixes
+  * Support activerecord-7.0.0
+  * Support postgis adapter
+  * Fix migration syntax
+* Features
+  * [@moliver-hemasystems Add support for a list of taggable IDs in tagging conditions](https://github.com/mbleigh/acts-as-taggable-on/pull/1053)
+* Misc
+  * Add docker-compose.yml for local development
+
+### [v8.1.0) / 2021-06-19](https://github.com/mbleigh/acts-as-taggable-on/compare/v8.0.0...v8.1.0)
+* Fixes
+ * [@ngouy Fix rollbackable tenant migrations](https://github.com/mbleigh/acts-as-taggable-on/pull/1038)
+ * [@ngouy Fix gem conflict with already existing tenant model](https://github.com/mbleigh/acts-as-taggable-on/pull/1037)
+
+### [v8.0.0) / 2021-06-07](https://github.com/mbleigh/acts-as-taggable-on/compare/v7.0.0...v8.0.0)
+* Features
+  * [@lunaru Support tenants for taggings](https://github.com/mbleigh/acts-as-taggable-on/pull/1000)
+* Fixes
+  * [@gr-eg Use none? instead of count.zero?](https://github.com/mbleigh/acts-as-taggable-on/pull/1030)
+
+### [v7.0.0) / 2020-12-31](https://github.com/mbleigh/acts-as-taggable-on/compare/v6.5.0...v7.0.0)
+* Features
+  * [@kvokka Rails 6.1 support](https://github.com/mbleigh/acts-as-taggable-on/pull/1013)
+* Fixes
+  * [@nbulaj Add support for Ruby 2.7 and it's kwargs](https://github.com/mbleigh/acts-as-taggable-on/pull/910)
+  * [@Andythurlow @endorfin case sensitivity fix for tagged_with](https://github.com/mbleigh/acts-as-taggable-on/pull/965)
+
+### [6.5.0 / 2019-11-07](https://github.com/mbleigh/acts-as-taggable-on/compare/v6.0.0...v6.5.0)
+
 * Features
   * [@mizukami234 @junmoka Make table names configurable](https://github.com/mbleigh/acts-as-taggable-on/pull/910)
+  * [@damianlegawiec Rails 6.0.0.beta1 support](https://github.com/mbleigh/acts-as-taggable-on/pull/937)
 * Fixes
   * [@tonyta Avoid overriding user-defined columns cache methods](https://github.com/mbleigh/acts-as-taggable-on/pull/911)
+  * [@hengwoon tags_count only need to join on the taggable's table if using STI](https://github.com/mbleigh/acts-as-taggable-on/pull/904)
+  * [@bduran82 Avoid unnecessary queries when finding or creating tags](https://github.com/mbleigh/acts-as-taggable-on/pull/839)
+  * [@iiwo simplify relation options syntax](https://github.com/mbleigh/acts-as-taggable-on/pull/940)
 * Misc
   * [@gssbzn Remove legacy code for an empty query and replace it with ` ActiveRecord::none`](https://github.com/mbleigh/acts-as-taggable-on/pull/906)
+  * [@iiwo remove unneeded spec case](https://github.com/mbleigh/acts-as-taggable-on/pull/941)
 * Documentation
   * [@tonyta Cleanup CHANGELOG.md formatting and references](https://github.com/mbleigh/acts-as-taggable-on/pull/913)
-### [6.0.1 / 2018-06-27](https://github.com/mbleigh/acts-as-taggable-on/compare/v6.0.0...v6.0.1)
-
-* Fixes
-  * [@hengwoon tags_count only need to join on the taggable's table if using STI](https://github.com/mbleigh/acts-as-taggable-on/pull/904)
 
 ### [6.0.0 / 2018-06-19](https://github.com/mbleigh/acts-as-taggable-on/compare/v5.0.0...v6.0.0)
 

data/Gemfile

@@ -7,5 +7,6 @@ group :local_development do
   gem 'guard-rspec'
   gem 'appraisal'
   gem 'rake'
+  gem 'sqlite3'
   gem 'byebug', platforms: [:mri]
 end

data/README.md

@@ -32,7 +32,7 @@
 
 [![Join the chat at https://gitter.im/mbleigh/acts-as-taggable-on](https://badges.gitter.im/mbleigh/acts-as-taggable-on.svg)](https://gitter.im/mbleigh/acts-as-taggable-on?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Gem Version](https://badge.fury.io/rb/acts-as-taggable-on.svg)](http://badge.fury.io/rb/acts-as-taggable-on)
-[![Build Status](https://secure.travis-ci.org/mbleigh/acts-as-taggable-on.svg)](http://travis-ci.org/mbleigh/acts-as-taggable-on)
+[![Build Status](https://github.com/mbleigh/acts-as-taggable-on/workflows/spec/badge.svg)](https://github.com/mbleigh/acts-as-taggable-on/actions)
 [![Code Climate](https://codeclimate.com/github/mbleigh/acts-as-taggable-on.svg)](https://codeclimate.com/github/mbleigh/acts-as-taggable-on)
 [![Inline docs](http://inch-ci.org/github/mbleigh/acts-as-taggable-on.svg)](http://inch-ci.org/github/mbleigh/acts-as-taggable-on)
 [![Security](https://hakiri.io/github/mbleigh/acts-as-taggable-on/master.svg)](https://hakiri.io/github/mbleigh/acts-as-taggable-on/master)
@@ -57,7 +57,7 @@ was used.
 To use it, add it to your Gemfile:
 
 ```ruby
-gem 'acts-as-taggable-on', '~> 6.0'
+gem 'acts-as-taggable-on', '~> 9.0'
 ```
 
 and bundle:
@@ -80,6 +80,8 @@ Review the generated migrations then migrate :
 rake db:migrate
 ```
 
+If you do not wish or need to support multi-tenancy, the migration for `add_tenant_to_taggings` is optional and can be discarded safely.
+
 #### For MySql users
 You can circumvent at any time the problem of special characters [issue 623](https://github.com/mbleigh/acts-as-taggable-on/issues/623) by setting in an initializer file:
 
@@ -103,8 +105,8 @@ Setup
 
 ```ruby
 class User < ActiveRecord::Base
-  acts_as_taggable # Alias for acts_as_taggable_on :tags
-  acts_as_taggable_on :skills, :interests
+  acts_as_taggable_on :tags
+  acts_as_taggable_on :skills, :interests #You can also configure multiple tag types per model
 end
 
 class UsersController < ApplicationController
@@ -390,6 +392,27 @@ def remove_owned_tag
 end
 ```
 
+### Tag Tenancy
+
+Tags support multi-tenancy. This is useful for applications where a Tag belongs to a scoped set of models:
+
+```ruby
+class Account < ActiveRecord::Base
+  has_many :photos
+end
+
+class User < ActiveRecord::Base
+  belongs_to :account
+  acts_as_taggable_on :tags
+  acts_as_taggable_tenant :account_id
+end
+
+@user1.tag_list = ["foo", "bar"] # these taggings will automatically have the tenant saved
+@user2.tag_list = ["bar", "baz"]
+
+ActsAsTaggableOn::Tag.for_tenant(@user1.account.id) # returns Tag models for "foo" and "bar", but not "baz"
+```
+
 ### Dirty objects
 
 ```ruby
@@ -530,12 +553,13 @@ Versions >= 3.x are compatible with Ruby 1.9.3+ and Rails 3 and 4.
 
 Versions >= 4.x are compatible with Ruby 2.0.0+ and Rails 4 and 5.
 
-For an up-to-date roadmap, see https://github.com/mbleigh/acts-as-taggable-on/milestones
+Versions >= 7.x are compatible with Ruby 2.3.7+ and Rails 5 and 6.
+
+Versions >= 8.x are compatible with Ruby 2.3.7+ and Rails 5 and 6.
 
-## TODO
+Versions >= 9.x are compatible with Ruby 2.5.0 and Rails 6 and 7.
 
-- Write benchmark script
-- Resolve concurrency issues
+For an up-to-date roadmap, see https://github.com/mbleigh/acts-as-taggable-on/milestones
 
 ## Testing
 
@@ -547,7 +571,8 @@ bundle
 rake spec
 ```
 
-You can run all the tests across all the Rails versions by running `rake appraise`.  If you'd also like to [run the tests across all rubies and databases as configured for Travis CI, install and run `wwtd`](https://github.com/grosser/wwtd).
+You can run all the tests across all the Rails versions by running `rake appraise`.
+If you'd also like to [run the tests across all rubies and databases as configured for Github Actions, install and run `wwtd`](https://github.com/grosser/wwtd).
 
 
 ## License

data/acts-as-taggable-on.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($/)
   gem.test_files    = gem.files.grep(%r{^spec/})
   gem.require_paths = ['lib']
-  gem.required_ruby_version     = '>= 2.3.7'
+  gem.required_ruby_version     = '>= 2.5.0'
 
   if File.exist?('UPGRADING.md')
     gem.post_install_message = File.read('UPGRADING.md')
   end
 
-  gem.add_runtime_dependency 'activerecord', '>= 5.0', '< 6.1'
+  gem.add_runtime_dependency 'activerecord', '>= 6.0', '< 7.1'
 
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rspec-its'

data/db/migrate/1_acts_as_taggable_on_migration.rb

@@ -1,9 +1,6 @@
-if ActiveRecord.gem_version >= Gem::Version.new('5.0')
-  class ActsAsTaggableOnMigration < ActiveRecord::Migration[4.2]; end
-else
-  class ActsAsTaggableOnMigration < ActiveRecord::Migration; end
-end
-ActsAsTaggableOnMigration.class_eval do
+# frozen_string_literal: true
+
+class ActsAsTaggableOnMigration < ActiveRecord::Migration[6.0]
   def self.up
     create_table ActsAsTaggableOn.tags_table do |t|
       t.string :name
@@ -26,7 +23,8 @@ ActsAsTaggableOnMigration.class_eval do
     end
 
     add_index ActsAsTaggableOn.taggings_table, :tag_id
-    add_index ActsAsTaggableOn.taggings_table, [:taggable_id, :taggable_type, :context], name: 'taggings_taggable_context_idx'
+    add_index ActsAsTaggableOn.taggings_table, %i[taggable_id taggable_type context],
+              name: 'taggings_taggable_context_idx'
   end
 
   def self.down

data/db/migrate/2_add_missing_unique_indices.rb

@@ -1,16 +1,13 @@
-if ActiveRecord.gem_version >= Gem::Version.new('5.0')
-  class AddMissingUniqueIndices < ActiveRecord::Migration[4.2]; end
-else
-  class AddMissingUniqueIndices < ActiveRecord::Migration; end
-end
-AddMissingUniqueIndices.class_eval do
+# frozen_string_literal: true
+
+class AddMissingUniqueIndices < ActiveRecord::Migration[6.0]
   def self.up
     add_index ActsAsTaggableOn.tags_table, :name, unique: true
 
     remove_index ActsAsTaggableOn.taggings_table, :tag_id if index_exists?(ActsAsTaggableOn.taggings_table, :tag_id)
     remove_index ActsAsTaggableOn.taggings_table, name: 'taggings_taggable_context_idx'
     add_index ActsAsTaggableOn.taggings_table,
-              [:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type],
+              %i[tag_id taggable_id taggable_type context tagger_id tagger_type],
               unique: true, name: 'taggings_idx'
   end
 
@@ -20,6 +17,7 @@ AddMissingUniqueIndices.class_eval do
     remove_index ActsAsTaggableOn.taggings_table, name: 'taggings_idx'
 
     add_index ActsAsTaggableOn.taggings_table, :tag_id unless index_exists?(ActsAsTaggableOn.taggings_table, :tag_id)
-    add_index ActsAsTaggableOn.taggings_table, [:taggable_id, :taggable_type, :context], name: 'taggings_taggable_context_idx'
+    add_index ActsAsTaggableOn.taggings_table, %i[taggable_id taggable_type context],
+              name: 'taggings_taggable_context_idx'
   end
 end

data/db/migrate/3_add_taggings_counter_cache_to_tags.rb

@@ -1,9 +1,6 @@
-if ActiveRecord.gem_version >= Gem::Version.new('5.0')
-  class AddTaggingsCounterCacheToTags < ActiveRecord::Migration[4.2]; end
-else
-  class AddTaggingsCounterCacheToTags < ActiveRecord::Migration; end
-end
-AddTaggingsCounterCacheToTags.class_eval do
+# frozen_string_literal: true
+
+class AddTaggingsCounterCacheToTags < ActiveRecord::Migration[6.0]
   def self.up
     add_column ActsAsTaggableOn.tags_table, :taggings_count, :integer, default: 0
 

data/db/migrate/4_add_missing_taggable_index.rb

@@ -1,11 +1,9 @@
-if ActiveRecord.gem_version >= Gem::Version.new('5.0')
-  class AddMissingTaggableIndex < ActiveRecord::Migration[4.2]; end
-else
-  class AddMissingTaggableIndex < ActiveRecord::Migration; end
-end
-AddMissingTaggableIndex.class_eval do
+# frozen_string_literal: true
+
+class AddMissingTaggableIndex < ActiveRecord::Migration[6.0]
   def self.up
-    add_index ActsAsTaggableOn.taggings_table, [:taggable_id, :taggable_type, :context], name: 'taggings_taggable_context_idx'
+    add_index ActsAsTaggableOn.taggings_table, %i[taggable_id taggable_type context],
+              name: 'taggings_taggable_context_idx'
   end
 
   def self.down

data/db/migrate/5_change_collation_for_tag_names.rb

@@ -1,11 +1,9 @@
+# frozen_string_literal: true
+
 # This migration is added to circumvent issue #623 and have special characters
 # work properly
-if ActiveRecord.gem_version >= Gem::Version.new('5.0')
-  class ChangeCollationForTagNames < ActiveRecord::Migration[4.2]; end
-else
-  class ChangeCollationForTagNames < ActiveRecord::Migration; end
-end
-ChangeCollationForTagNames.class_eval do
+
+class ChangeCollationForTagNames < ActiveRecord::Migration[6.0]
   def up
     if ActsAsTaggableOn::Utils.using_mysql?
       execute("ALTER TABLE #{ActsAsTaggableOn.tags_table} MODIFY name varchar(255) CHARACTER SET utf8 COLLATE utf8_bin;")

data/db/migrate/6_add_missing_indexes_on_taggings.rb

@@ -1,22 +1,24 @@
-if ActiveRecord.gem_version >= Gem::Version.new('5.0')
-  class AddMissingIndexesOnTaggings < ActiveRecord::Migration[4.2]; end
-else
-  class AddMissingIndexesOnTaggings < ActiveRecord::Migration; end
-end
-AddMissingIndexesOnTaggings.class_eval do
+# frozen_string_literal: true
+
+class AddMissingIndexesOnTaggings < ActiveRecord::Migration[6.0]
   def change
     add_index ActsAsTaggableOn.taggings_table, :tag_id unless index_exists? ActsAsTaggableOn.taggings_table, :tag_id
-    add_index ActsAsTaggableOn.taggings_table, :taggable_id unless index_exists? ActsAsTaggableOn.taggings_table, :taggable_id
-    add_index ActsAsTaggableOn.taggings_table, :taggable_type unless index_exists? ActsAsTaggableOn.taggings_table, :taggable_type
-    add_index ActsAsTaggableOn.taggings_table, :tagger_id unless index_exists? ActsAsTaggableOn.taggings_table, :tagger_id
+    add_index ActsAsTaggableOn.taggings_table, :taggable_id unless index_exists? ActsAsTaggableOn.taggings_table,
+                                                                                 :taggable_id
+    add_index ActsAsTaggableOn.taggings_table, :taggable_type unless index_exists? ActsAsTaggableOn.taggings_table,
+                                                                                   :taggable_type
+    add_index ActsAsTaggableOn.taggings_table, :tagger_id unless index_exists? ActsAsTaggableOn.taggings_table,
+                                                                               :tagger_id
     add_index ActsAsTaggableOn.taggings_table, :context unless index_exists? ActsAsTaggableOn.taggings_table, :context
 
-    unless index_exists? ActsAsTaggableOn.taggings_table, [:tagger_id, :tagger_type]
-      add_index ActsAsTaggableOn.taggings_table, [:tagger_id, :tagger_type]
+    unless index_exists? ActsAsTaggableOn.taggings_table, %i[tagger_id tagger_type]
+      add_index ActsAsTaggableOn.taggings_table, %i[tagger_id tagger_type]
     end
 
-    unless index_exists? ActsAsTaggableOn.taggings_table, [:taggable_id, :taggable_type, :tagger_id, :context], name: 'taggings_idy'
-      add_index ActsAsTaggableOn.taggings_table, [:taggable_id, :taggable_type, :tagger_id, :context], name: 'taggings_idy'
+    unless index_exists? ActsAsTaggableOn.taggings_table, %i[taggable_id taggable_type tagger_id context],
+                         name: 'taggings_idy'
+      add_index ActsAsTaggableOn.taggings_table, %i[taggable_id taggable_type tagger_id context],
+                name: 'taggings_idy'
     end
   end
 end

data/db/migrate/7_add_tenant_to_taggings.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddTenantToTaggings < ActiveRecord::Migration[6.0]
+  def self.up
+    add_column ActsAsTaggableOn.taggings_table, :tenant, :string, limit: 128
+    add_index ActsAsTaggableOn.taggings_table, :tenant unless index_exists? ActsAsTaggableOn.taggings_table, :tenant
+  end
+
+  def self.down
+    remove_index ActsAsTaggableOn.taggings_table, :tenant
+    remove_column ActsAsTaggableOn.taggings_table, :tenant
+  end
+end

data/docker-compose.yml

@@ -0,0 +1,15 @@
+version: '3.9'
+services:
+  postgres:
+    image: postgres:10
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_DB: acts_as_taggable_on
+      POSTGRES_PASSWORD: postgres
+    ports: ['5432:5432']
+  mysql:
+    image: mysql:8
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: true
+      MYSQL_DATABASE: acts_as_taggable_on
+    ports: ['3306:3306']

data/gemfiles/activerecord_6.0.gemfile

@@ -1,20 +1,17 @@
+# This file was generated by Appraisal
+
 source "https://rubygems.org"
 
 gem "activerecord", "~> 6.0.0"
-case ENV["DB"]
-when "postgresql"
-  gem 'pg'
-when "mysql"
-  gem 'mysql2', '~> 0.3'
-else
-  gem 'sqlite3'
-end
+gem "pg"
+gem "mysql2", "~> 0.5"
 
 group :local_development do
   gem "guard"
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
+  gem "sqlite3"
   gem "byebug", platforms: [:mri]
 end
 

data/gemfiles/{activerecord_5.2.gemfile → activerecord_6.1.gemfile}

@@ -1,20 +1,17 @@
+# This file was generated by Appraisal
+
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.2.0"
-case ENV["DB"]
-when "postgresql"
-  gem 'pg'
-when "mysql"
-  gem 'mysql2', '~> 0.3'
-else
-  gem "sqlite3", "~> 1.3", "< 1.4"
-end
+gem "activerecord", "~> 6.1.0"
+gem "pg"
+gem "mysql2", "~> 0.5"
 
 group :local_development do
   gem "guard"
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
+  gem "sqlite3"
   gem "byebug", platforms: [:mri]
 end
 

data/gemfiles/{activerecord_5.0.gemfile → activerecord_7.0.gemfile}

@@ -1,20 +1,17 @@
+# This file was generated by Appraisal
+
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.3"
-case ENV["DB"]
-when "postgresql"
-  gem 'pg'
-when "mysql"
-  gem 'mysql2', '~> 0.3'
-else
-  gem "sqlite3", "~> 1.3", "< 1.4"
-end
+gem "activerecord", "~> 7.0.0"
+gem "pg"
+gem "mysql2", "~> 0.5"
 
 group :local_development do
   gem "guard"
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
+  gem "sqlite3"
   gem "byebug", platforms: [:mri]
 end
 

data/lib/acts-as-taggable-on.rb

@@ -58,7 +58,7 @@ module ActsAsTaggableOn
   def self.glue
     setting = @configuration.delimiter
     delimiter = setting.kind_of?(Array) ? setting[0] : setting
-    delimiter.ends_with?(' ') ? delimiter : "#{delimiter} "
+    delimiter.end_with?(' ') ? delimiter : "#{delimiter} "
   end
 
   class Configuration

data/lib/acts_as_taggable_on/default_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActsAsTaggableOn
   ##
   # Returns a new TagList using the given tag string.
@@ -6,7 +8,6 @@ module ActsAsTaggableOn
   #   tag_list = ActsAsTaggableOn::DefaultParser.parse("One , Two,  Three")
   #   tag_list # ["One", "Two", "Three"]
   class DefaultParser < GenericParser
-
     def parse
       string = @tag_list
 
@@ -14,33 +15,32 @@ module ActsAsTaggableOn
       TagList.new.tap do |tag_list|
         string = string.to_s.dup
 
-        string.gsub!(double_quote_pattern) {
+        string.gsub!(double_quote_pattern) do
           # Append the matched tag to the tag list
           tag_list << Regexp.last_match[2]
           # Return the matched delimiter ($3) to replace the matched items
           ''
-        }
+        end
 
-        string.gsub!(single_quote_pattern) {
+        string.gsub!(single_quote_pattern) do
           # Append the matched tag ($2) to the tag list
           tag_list << Regexp.last_match[2]
           # Return an empty string to replace the matched items
           ''
-        }
+        end
 
         # split the string by the delimiter
         # and add to the tag_list
-        tag_list.add(string.split(Regexp.new delimiter))
+        tag_list.add(string.split(Regexp.new(delimiter)))
       end
     end
 
-
     # private
     def delimiter
       # Parse the quoted tags
       d = ActsAsTaggableOn.delimiter
       # Separate multiple delimiters by bitwise operator
-      d = d.join('|') if d.kind_of?(Array)
+      d = d.join('|') if d.is_a?(Array)
       d
     end
 
@@ -73,7 +73,5 @@ module ActsAsTaggableOn
     def single_quote_pattern
       /(\A|#{delimiter})\s*'(.*?)'\s*(?=#{delimiter}\s*|\z)/
     end
-
   end
-
 end

data/lib/acts_as_taggable_on/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActsAsTaggableOn
   class Engine < Rails::Engine
   end

data/lib/acts_as_taggable_on/generic_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActsAsTaggableOn
   ##
   # Returns a new TagList using the given tag string.