acts-as-taggable-on 8.1.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86ed71e7fcf66346a4afcaac85e33d318aafb9d6dcf58a787511161f57908be9
-  data.tar.gz: add5ececd0bd17f3942ee5cbd102e9de65a46ed74e1382c87cb7ba0e3a071d87
+  metadata.gz: 5f5bbdb5779f5a9c0feb7bda9b83f6bb581d8804e07beda16b7fea7dfda45a1b
+  data.tar.gz: 6feeaec2428cbab344f795f92fb3b48e2ab06f0fd0fbceb211b845bd214fb157
 SHA512:
-  metadata.gz: afdaa14e7584c82b022c0f763528eb09dbfb9e928fcefee8810649b7fc55d4d0035fb273d413d378404575aa7a49fa0d927042c170c86ae1af138674c752aa08
-  data.tar.gz: 79d100efe8a7f140f73058cb54ef365251642e9668fc492923ff09348a3f42e0c66ba011afcbe494393778b598d1fb2fc804727239d046491b66bb9d5d7d80aa
+  metadata.gz: a81076cf61cf23c3a2f8ae17dc6be030bc120cc0464994ca190ded1407c2e8bc50dc78ca2a0742b85c4c6c5d996255af4267493eb3708d9abc4693da28881a61
+  data.tar.gz: 36f2d2c63c87e0f6e4086b6ec692d846d2d8a04948b485073b351968411fbb62405730e06c535279434955ddcfbfa2dc30e8a40f62cc39cb3f46515eca9e2889

data/.github/workflows/spec.yml

@@ -12,49 +12,30 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.3
-          - 2.4
-          - 2.5
-          - 2.6
+          - "3.0"
           - 2.7
-          - 3.0
-          - head
+          - 2.6
+          - 2.5
         gemfile:
-          - gemfiles/activerecord_5.0.gemfile
-          - gemfiles/activerecord_5.2.gemfile
-          - gemfiles/activerecord_5.1.gemfile
           - gemfiles/activerecord_6.0.gemfile
           - gemfiles/activerecord_6.1.gemfile
+          - gemfiles/activerecord_7.0.gemfile
         db:
           - mysql
           - postgresql
           - sqlite3
-        exclude:
-          # Unfortunately, the mysql2 gem encounters a segfault in the ruby 2.3 environment:
-          - ruby: 2.3
-            db: mysql
-          # Exclude ActiveRecord 6.x for Ruby < 2.5
-          - ruby: 2.3
-            gemfile: gemfiles/activerecord_6.0.gemfile
-          - ruby: 2.3
-            gemfile: gemfiles/activerecord_6.1.gemfile
-          - ruby: 2.4
-            gemfile: gemfiles/activerecord_6.0.gemfile
-          - ruby: 2.4
+        include:
+          - ruby: truffleruby-head
+            db: postgresql
             gemfile: gemfiles/activerecord_6.1.gemfile
-          # Exclude ActiveRecord 5.x for Ruby >= 3.0
-          - ruby: 3.0
-            gemfile: gemfiles/activerecord_5.0.gemfile
-          - ruby: 3.0
-            gemfile: gemfiles/activerecord_5.1.gemfile
-          - ruby: 3.0
-            gemfile: gemfiles/activerecord_5.2.gemfile
-          - ruby: head
-            gemfile: gemfiles/activerecord_5.0.gemfile
-          - ruby: head
-            gemfile: gemfiles/activerecord_5.1.gemfile
-          - ruby: head
-            gemfile: gemfiles/activerecord_5.2.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:

data/Appraisals

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

data/CHANGELOG.md

@@ -10,6 +10,16 @@ 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.
 
+### [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)
@@ -20,13 +30,13 @@ As such, _Breaking Changes_ are major. _Features_ would map to either major or m
   * [@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)  
+  * [@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)
 

data/README.md

@@ -57,7 +57,7 @@ was used.
 To use it, add it to your Gemfile:
 
 ```ruby
-gem 'acts-as-taggable-on', '~> 7.0'
+gem 'acts-as-taggable-on', '~> 9.0'
 ```
 
 and bundle:
@@ -555,12 +555,11 @@ Versions >= 4.x are compatible with Ruby 2.0.0+ and Rails 4 and 5.
 
 Versions >= 7.x are compatible with Ruby 2.3.7+ and Rails 5 and 6.
 
-For an up-to-date roadmap, see https://github.com/mbleigh/acts-as-taggable-on/milestones
+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
 
@@ -572,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.2'
+  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

@@ -1,16 +1,13 @@
-if ActiveRecord.gem_version >= Gem::Version.new('5.0')
-  class AddTenantToTaggings < ActiveRecord::Migration[4.2]; end
-else
-  class AddTenantToTaggings < ActiveRecord::Migration; end
-end
-AddTenantToTaggings.class_eval do
+# frozen_string_literal: true
+
+class AddTenantToTaggings < ActiveRecord::Migration[6.0]
   def self.up
-    add_column :taggings, :tenant, :string, limit: 128
-    add_index :taggings, :tenant unless index_exists? :taggings, :tenant
+    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 :taggings, :tenant
-    remove_column :taggings, :tenant
+    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.4'
-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_6.1.gemfile

@@ -3,20 +3,15 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 6.1.0"
-case ENV["DB"]
-when "postgresql"
-  gem 'pg'
-when "mysql"
-  gem 'mysql2', '~> 0.5'
-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.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/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.

data/lib/acts_as_taggable_on/tag.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module ActsAsTaggableOn
   class Tag < ::ActiveRecord::Base
     self.table_name = ActsAsTaggableOn.tags_table
@@ -31,41 +32,43 @@ module ActsAsTaggableOn
     end
 
     def self.named_any(list)
-      clause = list.map { |tag|
+      clause = list.map do |tag|
         sanitize_sql_for_named_any(tag).force_encoding('BINARY')
-      }.join(' OR ')
+      end.join(' OR ')
       where(clause)
     end
 
     def self.named_like(name)
-      clause = ["name #{ActsAsTaggableOn::Utils.like_operator} ? ESCAPE '!'", "%#{ActsAsTaggableOn::Utils.escape_like(name)}%"]
+      clause = ["name #{ActsAsTaggableOn::Utils.like_operator} ? ESCAPE '!'",
+                "%#{ActsAsTaggableOn::Utils.escape_like(name)}%"]
       where(clause)
     end
 
     def self.named_like_any(list)
-      clause = list.map { |tag|
-        sanitize_sql(["name #{ActsAsTaggableOn::Utils.like_operator} ? ESCAPE '!'", "%#{ActsAsTaggableOn::Utils.escape_like(tag.to_s)}%"])
-      }.join(' OR ')
+      clause = list.map do |tag|
+        sanitize_sql(["name #{ActsAsTaggableOn::Utils.like_operator} ? ESCAPE '!'",
+                      "%#{ActsAsTaggableOn::Utils.escape_like(tag.to_s)}%"])
+      end.join(' OR ')
       where(clause)
     end
 
     def self.for_context(context)
-      joins(:taggings).
-        where(["#{ActsAsTaggableOn.taggings_table}.context = ?", context]).
-        select("DISTINCT #{ActsAsTaggableOn.tags_table}.*")
+      joins(:taggings)
+        .where(["#{ActsAsTaggableOn.taggings_table}.context = ?", context])
+        .select("DISTINCT #{ActsAsTaggableOn.tags_table}.*")
     end
 
     def self.for_tenant(tenant)
-      joins(:taggings).
-        where("#{ActsAsTaggableOn.taggings_table}.tenant = ?", tenant.to_s).
-        select("DISTINCT #{ActsAsTaggableOn.tags_table}.*")
+      joins(:taggings)
+        .where("#{ActsAsTaggableOn.taggings_table}.tenant = ?", tenant.to_s)
+        .select("DISTINCT #{ActsAsTaggableOn.tags_table}.*")
     end
 
     ### CLASS METHODS:
 
     def self.find_or_create_with_like_by_name(name)
       if ActsAsTaggableOn.strict_case_match
-        self.find_or_create_all_with_like_by_name([name]).first
+        find_or_create_all_with_like_by_name([name]).first
       else
         named_like(name).first || create(name: name)
       end
@@ -78,27 +81,25 @@ module ActsAsTaggableOn
 
       existing_tags = named_any(list)
       list.map do |tag_name|
-        begin
-          tries ||= 3
-          comparable_tag_name = comparable_name(tag_name)
-          existing_tag = existing_tags.find { |tag| comparable_name(tag.name) == comparable_tag_name }
-          existing_tag || create(name: tag_name)
-        rescue ActiveRecord::RecordNotUnique
-          if (tries -= 1).positive?
-            ActiveRecord::Base.connection.execute 'ROLLBACK'
-            existing_tags = named_any(list)
-            retry
-          end
-
-          raise DuplicateTagError.new("'#{tag_name}' has already been taken")
+        tries ||= 3
+        comparable_tag_name = comparable_name(tag_name)
+        existing_tag = existing_tags.find { |tag| comparable_name(tag.name) == comparable_tag_name }
+        existing_tag || create(name: tag_name)
+      rescue ActiveRecord::RecordNotUnique
+        if (tries -= 1).positive?
+          ActiveRecord::Base.connection.execute 'ROLLBACK'
+          existing_tags = named_any(list)
+          retry
         end
+
+        raise DuplicateTagError, "'#{tag_name}' has already been taken"
       end
     end
 
     ### INSTANCE METHODS:
 
-    def ==(object)
-      super || (object.is_a?(Tag) && name == object.name)
+    def ==(other)
+      super || (other.is_a?(Tag) && name == other.name)
     end
 
     def to_s
@@ -110,7 +111,6 @@ module ActsAsTaggableOn
     end
 
     class << self
-
       private
 
       def comparable_name(str)