acts-as-taggable-on 9.0.1 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8092ec2f51d34ba23b735fbae7cce7a4f68e4ad5900d04903b054e3607667c6b
-  data.tar.gz: 1a813362d4fd80918b68b5b1ffbf2a3ffcad35a3967d77f3f9ef8f71979b4c29
+  metadata.gz: 2a72bfb5bb88aea5ec247738610ca9010077e75742abbc6ae28b0fecb441a01e
+  data.tar.gz: 1772385e3921e9b85bbcb0d4407b5dea817f22a62dad50a268375819885541e2
 SHA512:
-  metadata.gz: e2ff8897bea6054e879775a8e50cd9f1e63624b86ec4accdfa488fb43fcff35a5e2d90ea4a4cdb7aa7ea400e00826d5e67b1585549c79d4af950662c86aa28a3
-  data.tar.gz: 05aa619c3f4b174398d20675ebc91fc04ce0ef496d54b402262acaa338a43f5ffc0f62bf69c4d9ccb5f41270b71fdeada04b74c0521a758b013b072a4ac4bafb
+  metadata.gz: 72de9a02773b616bc6a55fb4b21879aa104c5100dd9f3b6538334c08bccef904a4e680796c46699e51cafab205301be0288ca831ef26e59c011cd37ab0f9210d
+  data.tar.gz: 74a5235a9c37a7c3793bcb8a3b4c5e2a2a6fe2a74a499a5b1fb2ef208e9c8b1f778c2b120f6921019eb7961a9020f0b05bede0aab97234612039b67171a1f7a7

data/.github/workflows/spec.yml

@@ -10,16 +10,17 @@ jobs:
       DB: ${{ matrix.db }}
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     strategy:
+      fail-fast: false
       matrix:
         ruby:
+          - 3.2
+          - 3.1
           - "3.0"
           - 2.7
-          - 2.6
-          - 2.5
         gemfile:
-          - gemfiles/activerecord_6.0.gemfile
-          - gemfiles/activerecord_6.1.gemfile
+          - gemfiles/activerecord_7.1.gemfile
           - gemfiles/activerecord_7.0.gemfile
+          - gemfiles/activerecord_6.1.gemfile
         db:
           - mysql
           - postgresql
@@ -32,10 +33,8 @@ jobs:
             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
+          - ruby: 3.2
+            gemfile: gemfiles/activerecord_6.0.gemfile
 
     services:
       postgres:
@@ -61,7 +60,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/Appraisals

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'activerecord-6.0' do
-  gem 'activerecord', '~> 6.0.0'
-  gem 'pg'
-  gem 'mysql2', '~> 0.5'
-end
-
 appraise 'activerecord-6.1' do
   gem 'activerecord', '~> 6.1.0'
   gem 'pg'
@@ -17,3 +11,9 @@ appraise 'activerecord-7.0' do
   gem 'pg'
   gem 'mysql2', '~> 0.5'
 end
+
+appraise 'activerecord-7.1' do
+  gem 'activerecord', '~> 7.1.0'
+  gem 'pg'
+  gem 'mysql2', '~> 0.5'
+end

data/CHANGELOG.md

@@ -10,7 +10,13 @@ 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.1) / 2022-01-07](https://github.com/mbleigh/acts-as-taggable-on/compare/v8.1.0...v9.0.0)
+### [v10.0.0) / unreleased](https://github.com/mbleigh/acts-as-taggable-on/compare/v9.0.1...master)
+* Features
+  * [@glampr Add support for prefix and suffix searches alongside previously supported containment (wildcard) searches](https://github.com/mbleigh/acts-as-taggable-on/pull/1082)
+  * [@donquxiote Add support for horizontally sharded databases](https://github.com/mbleigh/acts-as-taggable-on/pull/1079)
+  * [aovertus Remove restriction around ActiveRecord 7.x versions allowing support until next major is released](https://github.com/mbleigh/acts-as-taggable-on/pull/1110)
+
+### [v9.0.1) / 2022-01-07](https://github.com/mbleigh/acts-as-taggable-on/compare/v9.0.0..v9.0.1)
 * Fixes
   * Fix migration that generate default index
 
@@ -39,7 +45,7 @@ As such, _Breaking Changes_ are major. _Features_ would map to either major or m
 * 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)
+  * [@nbulaj Add support for Ruby 2.7 and it's kwargs](https://github.com/mbleigh/acts-as-taggable-on/pull/999)
   * [@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/CONTRIBUTING.md

@@ -29,7 +29,7 @@
   * Use well-described, small (atomic) commits.
   * Include links to any relevant github issues.
   * *Don't* change the VERSION file.
-6. Extra Credit: [Confirm it runs and tests pass on the rubies specified in the travis config](.travis.yml). I will otherwise confirm it runs on these.
+6. Extra Credit: [Confirm it runs and tests pass on the rubies specified in the Github Actions config](.github/workflows/spec.yml). I will otherwise confirm it runs on these.
 
 How I handle pull requests:
 
@@ -44,13 +44,13 @@ How I handle pull requests:
 
 * [A Note About Git Commit Messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
 * [http://stopwritingramblingcommitmessages.com/](http://stopwritingramblingcommitmessages.com/)
-* [ThoughtBot style guide](https://github.com/thoughtbot/guides/tree/master/style#git)
+* [ThoughtBot style guide](https://github.com/thoughtbot/guides/tree/main/git)
 
 ### About Pull Requests (PR's)
 
 * [All Your Open Source Code Are Belong To Us](http://www.benjaminfleischer.com/2013/07/30/all-your-open-source-code-are-belong-to-us/)
 * [Using Pull Requests](https://help.github.com/articles/using-pull-requests)
-* [Github pull requests made easy](http://www.element84.com/github-pull-requests-made-easy.html)
+* [Github pull requests made easy](https://www.element84.com/blog/github-pull-requests-made-easy)
 
 ## Documentation
 

data/README.md

@@ -255,7 +255,11 @@ User.tagged_with(["awesome", "cool"], :exclude => true)
 User.tagged_with(['awesome', 'cool'], :on => :tags, :any => true).tagged_with(['smart', 'shy'], :on => :skills, :any => true)
 ```
 
-You can also use `:wild => true` option along with `:any` or `:exclude` option. It will be looking for `%awesome%` and `%cool%` in SQL.
+#### Wildcard tag search
+You now have the following options for prefix, suffix and containment search, along with `:any` or `:exclude` option.
+Use `wild: :suffix` to place a wildcard at the end of the tag. It will be looking for `awesome%` and `cool%` in SQL.
+Use `wild: :prefix` to place a wildcard at the beginning of the tag. It will be looking for `%awesome` and `%cool` in SQL.
+Use `wild: true` to place a wildcard both at the beginning and the end of the tag. It will be looking for `%awesome%` and `%cool%` in SQL.
 
 __Tip:__ `User.tagged_with([])` or `User.tagged_with('')` will return `[]`, an empty set of records.
 
@@ -296,6 +300,15 @@ to allow for dynamic tag contexts (this could be user generated tag contexts!)
 User.tagged_with("same", :on => :customs) # => [@user]
 ```
 
+### Finding tags based on context
+
+You can find tags for a specific context by using the ```for_context``` scope:
+
+```ruby
+ActsAsTaggableOn::Tag.for_context(:tags)
+ActsAsTaggableOn::Tag.for_context(:skills)
+```
+
 ### Tag Parsers
 
 If you want to change how tags are parsed, you can define your own implementation:

data/acts-as-taggable-on.gemspec

@@ -1,7 +1,6 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'acts_as_taggable_on/version'
+
+require_relative 'lib/acts_as_taggable_on/version'
 
 Gem::Specification.new do |gem|
   gem.name          = 'acts-as-taggable-on'
@@ -16,13 +15,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.5.0'
+  gem.required_ruby_version     = '>= 2.7.0'
 
   if File.exist?('UPGRADING.md')
     gem.post_install_message = File.read('UPGRADING.md')
   end
 
-  gem.add_runtime_dependency 'activerecord', '>= 6.0', '< 7.1'
+  gem.add_runtime_dependency 'activerecord', '>= 6.1', '< 7.2'
 
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rspec-its'

data/gemfiles/activerecord_7.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 7.0.0"
+gem "activerecord", "~> 7.0.1"
 gem "pg"
 gem "mysql2", "~> 0.5"
 

data/gemfiles/activerecord_7.1.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.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
+
+gemspec path: "../"

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

@@ -66,7 +66,7 @@ module ActsAsTaggableOn
                   :remove_unused_tags, :default_parser,
                   :tags_counter, :tags_table,
                   :taggings_table
-    attr_reader :delimiter, :strict_case_match
+    attr_reader :delimiter, :strict_case_match, :base_class
 
     def initialize
       @delimiter = ','
@@ -79,6 +79,7 @@ module ActsAsTaggableOn
       @force_binary_collation = false
       @tags_table = :tags
       @taggings_table = :taggings
+      @base_class = '::ActiveRecord::Base'
     end
 
     def strict_case_match=(force_cs)
@@ -119,6 +120,11 @@ WARNING
       end
     end
 
+    def base_class=(base_class)
+      raise "base_class must be a String" unless base_class.is_a?(String)
+      @base_class = base_class
+    end
+
   end
 
   setup

data/lib/acts_as_taggable_on/tag.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActsAsTaggableOn
-  class Tag < ::ActiveRecord::Base
+  class Tag < ActsAsTaggableOn.base_class.constantize
     self.table_name = ActsAsTaggableOn.tags_table
 
     ### ASSOCIATIONS:
@@ -84,10 +84,11 @@ module ActsAsTaggableOn
         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)
+        next existing_tag if existing_tag
+
+        transaction(requires_new: true) { create(name: tag_name) }
       rescue ActiveRecord::RecordNotUnique
         if (tries -= 1).positive?
-          ActiveRecord::Base.connection.execute 'ROLLBACK'
           existing_tags = named_any(list)
           retry
         end

data/lib/acts_as_taggable_on/taggable/tagged_with_query/query_base.rb

@@ -33,7 +33,7 @@ module ActsAsTaggableOn
           matches_attribute = matches_attribute.lower unless ActsAsTaggableOn.strict_case_match
 
           if options[:wild].present?
-            matches_attribute.matches("%#{escaped_tag(tag)}%", '!', ActsAsTaggableOn.strict_case_match)
+            matches_attribute.matches(wildcard_escaped_tag(tag), '!', ActsAsTaggableOn.strict_case_match)
           else
             matches_attribute.matches(escaped_tag(tag), '!', ActsAsTaggableOn.strict_case_match)
           end
@@ -45,7 +45,7 @@ module ActsAsTaggableOn
 
           if options[:wild].present?
             matches_attribute.matches_any(tag_list.map do |tag|
-                                            "%#{escaped_tag(tag)}%"
+                                            wildcard_escaped_tag(tag)
                                           end, '!', ActsAsTaggableOn.strict_case_match)
           else
             matches_attribute.matches_any(tag_list.map do |tag|
@@ -59,6 +59,15 @@ module ActsAsTaggableOn
           ActsAsTaggableOn::Utils.escape_like(tag)
         end
 
+        def wildcard_escaped_tag(tag)
+          case options[:wild]
+          when :suffix then "#{escaped_tag(tag)}%"
+          when :prefix then "%#{escaped_tag(tag)}"
+          when true then "%#{escaped_tag(tag)}%"
+          else escaped_tag(tag)
+          end
+        end
+
         def adjust_taggings_alias(taggings_alias)
           taggings_alias = "taggings_alias_#{Digest::SHA1.hexdigest(taggings_alias)}" if taggings_alias.size > 75
           taggings_alias

data/lib/acts_as_taggable_on/tagger.rb

@@ -40,9 +40,7 @@ module ActsAsTaggableOn
         false
       end
 
-      def is_tagger?
-        tagger?
-      end
+      alias is_tagger? tagger?
     end
 
     module InstanceMethods
@@ -75,9 +73,7 @@ module ActsAsTaggableOn
         self.class.is_tagger?
       end
 
-      def is_tagger?
-        tagger?
-      end
+      alias is_tagger? tagger?
     end
 
     module SingletonMethods
@@ -85,9 +81,7 @@ module ActsAsTaggableOn
         true
       end
 
-      def is_tagger?
-        tagger?
-      end
+      alias is_tagger? tagger?
     end
   end
 end

data/lib/acts_as_taggable_on/tagging.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActsAsTaggableOn
-  class Tagging < ::ActiveRecord::Base # :nodoc:
+  class Tagging < ActsAsTaggableOn.base_class.constantize # :nodoc:
     self.table_name = ActsAsTaggableOn.taggings_table
 
     DEFAULT_CONTEXT = 'tags'

data/lib/acts_as_taggable_on/utils.rb

@@ -26,10 +26,6 @@ module ActsAsTaggableOn
         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}" }

data/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

data/lib/tasks/example/acts_as_taggable_on.rb.example

@@ -0,0 +1,8 @@
+ActsAsTaggableOn.setup do |config|
+  # This works because the classes where the base class is a concern, Tag and Tagging
+  # are autoloaded, and won't be started until after the initializers run. The value
+  # must be a String, as the Rails Zeitwerk autoloader will not allow models to be
+  # referenced at initialization time.
+  #
+  # config.base_class = 'ApplicationRecord'
+end

data/lib/tasks/install_initializer.rake

@@ -0,0 +1,23 @@
+namespace :acts_as_taggable_on do
+
+  namespace :sharded_db do
+
+    desc "Install initializer setting custom base class"
+    task :install_initializer => [:environment, "config/initializers/foo"] do
+      source = File.join(
+        Gem.loaded_specs["acts-as-taggable-on"].full_gem_path,
+        "lib",
+        "tasks",
+        "examples",
+        "acts_as_taggable_on.rb.example"
+      )
+
+      destination = "config/initializers/acts_as_taggable_on.rb"
+
+      cp source, destination
+    end
+
+    directory "config/initializers"
+  end
+
+end

data/spec/acts_as_taggable_on/acts_as_tagger_spec.rb

@@ -70,9 +70,9 @@ describe 'acts_as_tagger' do
 
       it 'should throw an exception when the default is over-ridden' do
         expect(@taggable.tag_list_on(:foo_boo)).to be_empty
-        expect(-> {
+        expect {
           @tagger.tag(@taggable, with: 'this, and, that', on: :foo_boo, force: false)
-        }).to raise_error(RuntimeError)
+        }.to raise_error(RuntimeError)
       end
 
       it 'should not create the tag context on-the-fly when the default is over-ridden' do

data/spec/acts_as_taggable_on/tag_list_spec.rb

@@ -104,8 +104,8 @@ describe ActsAsTaggableOn::TagList do
 
     it 'should be able to call to_s on a frozen tag list' do
       tag_list.freeze
-      expect(-> { tag_list.add('cool', 'rad,bodacious') }).to raise_error(RuntimeError)
-      expect(-> { tag_list.to_s }).to_not raise_error
+      expect { tag_list.add('cool', 'rad,bodacious') }.to raise_error(RuntimeError)
+      expect { tag_list.to_s }.to_not raise_error
     end
   end
 

data/spec/acts_as_taggable_on/tag_spec.rb

@@ -100,9 +100,9 @@ describe ActsAsTaggableOn::Tag do
     end
 
     it 'should create by name' do
-      expect(-> {
+      expect {
         ActsAsTaggableOn::Tag.find_or_create_with_like_by_name('epic')
-      }).to change(ActsAsTaggableOn::Tag, :count).by(1)
+      }.to change(ActsAsTaggableOn::Tag, :count).by(1)
     end
   end
 
@@ -182,6 +182,25 @@ describe ActsAsTaggableOn::Tag do
     it 'should return an empty array if no tags are specified' do
       expect(ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name([])).to be_empty
     end
+
+    context 'another tag is created concurrently', :database_cleaner_delete, if: supports_concurrency?  do
+      it 'retries and finds tag if tag with same name created concurrently' do
+        tag_name = 'super'
+
+        expect(ActsAsTaggableOn::Tag).to receive(:create).with(name: tag_name) do
+          # Simulate concurrent tag creation
+          Thread.new do
+            ActsAsTaggableOn::Tag.new(name: tag_name).save!
+          end.join
+
+          raise ActiveRecord::RecordNotUnique
+        end
+
+        expect {
+          ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name(tag_name)
+        }.to change(ActsAsTaggableOn::Tag, :count).by(1)
+      end
+    end
   end
 
   it 'should require a name' do
@@ -352,4 +371,28 @@ describe ActsAsTaggableOn::Tag do
     end
   end
 
+  describe 'base_class' do
+    before do
+      class Foo < ActiveRecord::Base; end
+    end
+
+    context "default" do
+      it "inherits from ActiveRecord::Base" do
+
+        expect(ActsAsTaggableOn::Tag.ancestors).to include(ActiveRecord::Base)
+        expect(ActsAsTaggableOn::Tag.ancestors).to_not include(Foo)
+      end
+    end
+
+    context "custom" do
+      it "inherits from custom class" do
+
+        ActsAsTaggableOn.base_class = 'Foo'
+        hide_const("ActsAsTaggableOn::Tag")
+        load("lib/acts_as_taggable_on/tag.rb")
+
+        expect(ActsAsTaggableOn::Tag.ancestors).to include(Foo)
+      end
+    end
+  end
 end

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -27,9 +27,9 @@ describe 'Taggable To Preserve Order' do
     @taggable.tag_list = 'rails, ruby, css'
     expect(@taggable.instance_variable_get('@tag_list').instance_of?(ActsAsTaggableOn::TagList)).to be_truthy
 
-    expect(-> {
+    expect{
       @taggable.save
-    }).to change(ActsAsTaggableOn::Tag, :count).by(3)
+    }.to change(ActsAsTaggableOn::Tag, :count).by(3)
 
     @taggable.reload
     expect(@taggable.tag_list).to eq(%w(rails ruby css))
@@ -61,9 +61,9 @@ describe 'Taggable To Preserve Order' do
     @taggable.tag_list = 'pow, ruby, rails'
     expect(@taggable.instance_variable_get('@tag_list').instance_of?(ActsAsTaggableOn::TagList)).to be_truthy
 
-    expect(-> {
+    expect {
       @taggable.save
-    }).to change(ActsAsTaggableOn::Tag, :count).by(3)
+    }.to change(ActsAsTaggableOn::Tag, :count).by(3)
 
     @taggable.reload
     expect(@taggable.tags.map { |t| t.name }).to eq(%w(pow ruby rails))
@@ -157,9 +157,9 @@ describe 'Taggable' do
     @taggable.skill_list = 'ruby, rails, css'
     expect(@taggable.instance_variable_get('@skill_list').instance_of?(ActsAsTaggableOn::TagList)).to be_truthy
 
-    expect(-> {
+    expect{
       @taggable.save
-    }).to change(ActsAsTaggableOn::Tag, :count).by(3)
+    }.to change(ActsAsTaggableOn::Tag, :count).by(3)
 
     @taggable.reload
     expect(@taggable.skill_list.sort).to eq(%w(ruby rails css).sort)
@@ -480,6 +480,10 @@ describe 'Taggable' do
       jim = TaggableModel.create(name: 'Jim', tag_list: 'jim, steve')
 
       expect(TaggableModel.tagged_with(%w(bob tricia), wild: true, any: true).to_a.sort_by { |o| o.id }).to eq([bob, frank, steve])
+      expect(TaggableModel.tagged_with(%w(bob tricia), wild: :prefix, any: true).to_a.sort_by { |o| o.id }).to eq([bob, steve])
+      expect(TaggableModel.tagged_with(%w(bob tricia), wild: :suffix, any: true).to_a.sort_by { |o| o.id }).to eq([bob, frank])
+      expect(TaggableModel.tagged_with(%w(cia), wild: :prefix, any: true).to_a.sort_by { |o| o.id }).to eq([bob, steve])
+      expect(TaggableModel.tagged_with(%w(j), wild: :suffix, any: true).to_a.sort_by { |o| o.id }).to eq([frank, steve, jim])
       expect(TaggableModel.tagged_with(%w(bob tricia), wild: true, exclude: true).to_a).to eq([jim])
       expect(TaggableModel.tagged_with('ji', wild: true, any: true).to_a).to match_array([frank, jim])
     end
@@ -555,39 +559,39 @@ describe 'Taggable' do
       let(:bob) { TaggableModel.create(name: 'Bob') }
       context 'case sensitive' do
         it '#add' do
-          expect(lambda {
+          expect {
             bob.tag_list.add 'happier'
             bob.tag_list.add 'happier'
             bob.tag_list.add 'happier', 'rich', 'funny'
             bob.save
-          }).to change(ActsAsTaggableOn::Tagging, :count).by(3)
+          }.to change(ActsAsTaggableOn::Tagging, :count).by(3)
         end
         it '#<<' do
-          expect(lambda {
+          expect {
             bob.tag_list << 'social'
             bob.tag_list << 'social'
             bob.tag_list << 'social' << 'wow'
             bob.save
-          }).to change(ActsAsTaggableOn::Tagging, :count).by(2)
+          }.to change(ActsAsTaggableOn::Tagging, :count).by(2)
 
         end
 
         it 'unicode' do
 
-          expect(lambda {
+          expect {
             bob.tag_list.add 'ПРИВЕТ'
             bob.tag_list.add 'ПРИВЕТ'
             bob.tag_list.add 'ПРИВЕТ', 'ПРИВЕТ'
             bob.save
-          }).to change(ActsAsTaggableOn::Tagging, :count).by(1)
+          }.to change(ActsAsTaggableOn::Tagging, :count).by(1)
 
         end
 
         it '#=' do
-          expect(lambda {
+          expect {
             bob.tag_list = ['Happy', 'Happy']
             bob.save
-          }).to change(ActsAsTaggableOn::Tagging, :count).by(1)
+          }.to change(ActsAsTaggableOn::Tagging, :count).by(1)
         end
       end
       context 'case insensitive' do
@@ -595,39 +599,39 @@ describe 'Taggable' do
         after(:all) { ActsAsTaggableOn.force_lowercase = false }
 
         it '#<<' do
-          expect(lambda {
+          expect {
             bob.tag_list << 'Alone'
             bob.tag_list << 'AloNe'
             bob.tag_list << 'ALONE' << 'In The dark'
             bob.save
-          }).to change(ActsAsTaggableOn::Tagging, :count).by(2)
+          }.to change(ActsAsTaggableOn::Tagging, :count).by(2)
 
         end
 
         it '#add' do
-          expect(lambda {
+          expect {
             bob.tag_list.add 'forever'
             bob.tag_list.add 'ForEver'
             bob.tag_list.add 'FOREVER', 'ALONE'
             bob.save
-          }).to change(ActsAsTaggableOn::Tagging, :count).by(2)
+          }.to change(ActsAsTaggableOn::Tagging, :count).by(2)
         end
 
         it 'unicode' do
 
-          expect(lambda {
+          expect {
             bob.tag_list.add 'ПРИВЕТ'
             bob.tag_list.add 'привет', 'Привет'
             bob.save
-          }).to change(ActsAsTaggableOn::Tagging, :count).by(1)
+          }.to change(ActsAsTaggableOn::Tagging, :count).by(1)
 
         end
 
         it '#=' do
-          expect(lambda {
+          expect {
             bob.tag_list = ['Happy', 'HAPPY']
             bob.save
-          }).to change(ActsAsTaggableOn::Tagging, :count).by(1)
+          }.to change(ActsAsTaggableOn::Tagging, :count).by(1)
         end
 
 
@@ -636,26 +640,29 @@ describe 'Taggable' do
 
     end
 
-    xit 'should not duplicate tags added on different threads', if: supports_concurrency?, skip: 'FIXME, Deadlocks in travis' do
-      #TODO, try with more threads and fix deadlock
-      thread_count = 4
-      barrier = Barrier.new thread_count
+    it 'should not duplicate tags' do
+      connor = TaggableModel.new(name: 'Connor', tag_list: 'There, can, be, only, one')
 
-      expect {
-        thread_count.times.map do |idx|
-          Thread.start do
-            connor = TaggableModel.first_or_create(name: 'Connor')
-            connor.tag_list = 'There, can, be, only, one'
-            barrier.wait
-            begin
-              connor.save
-            rescue ActsAsTaggableOn::DuplicateTagError
-              # second save should succeed
-              connor.save
-            end
-          end
-        end.map(&:join)
-      }.to change(ActsAsTaggableOn::Tag, :count).by(5)
+      allow(ActsAsTaggableOn::Tag).to receive(:create).and_call_original
+      expect(ActsAsTaggableOn::Tag).to receive(:create).with(name: 'can') do
+        # Simulate concurrent tag creation
+        ActsAsTaggableOn::Tag.new(name: 'can').save!
+
+        raise ActiveRecord::RecordNotUnique
+      end
+
+      expect(ActsAsTaggableOn::Tag).to receive(:create).with(name: 'be') do
+        # Simulate concurrent tag creation
+        ActsAsTaggableOn::Tag.new(name: 'be').save!
+
+        raise ActiveRecord::RecordNotUnique
+      end
+
+      expect { connor.save! }.to change(ActsAsTaggableOn::Tag, :count).by(5)
+
+      %w[There can only be one].each do |tag|
+        expect(TaggableModel.tagged_with(tag).count).to eq(1)
+      end
     end
   end
 
@@ -726,9 +733,9 @@ describe 'Taggable' do
       @taggable.skill_list = 'ruby, rails, css'
       expect(@taggable.instance_variable_get('@skill_list').instance_of?(ActsAsTaggableOn::TagList)).to be_truthy
 
-      expect(-> {
+      expect {
         @taggable.save
-      }).to change(ActsAsTaggableOn::Tag, :count).by(3)
+      }.to change(ActsAsTaggableOn::Tag, :count).by(3)
 
       @taggable.reload
       expect(@taggable.skill_list.sort).to eq(%w(ruby rails css).sort)

data/spec/acts_as_taggable_on/tagger_spec.rb

@@ -61,10 +61,10 @@ describe 'Tagger' do
 
   it 'should not overlap tags from different taggers' do
     @user2 = User.new
-    expect(-> {
+    expect {
       @user.tag(@taggable, with: 'ruby, scheme', on: :tags)
       @user2.tag(@taggable, with: 'java, python, lisp, ruby', on: :tags)
-    }).to change(ActsAsTaggableOn::Tagging, :count).by(6)
+    }.to change(ActsAsTaggableOn::Tagging, :count).by(6)
 
     [@user, @user2, @taggable].each(&:reload)
 
@@ -83,9 +83,9 @@ describe 'Tagger' do
     @user2.tag(@taggable, with: 'java, python, lisp, ruby', on: :tags)
     @user.tag(@taggable, with: 'ruby, scheme', on: :tags)
 
-    expect(-> {
+    expect {
       @user2.tag(@taggable, with: 'java, python, lisp', on: :tags)
-    }).to change(ActsAsTaggableOn::Tagging, :count).by(-1)
+    }.to change(ActsAsTaggableOn::Tagging, :count).by(-1)
 
     [@user, @user2, @taggable].each(&:reload)
 
@@ -102,9 +102,9 @@ describe 'Tagger' do
     @user.tag(@taggable, with: 'awesome', on: :tags)
     @user2.tag(@taggable, with: 'awesome, epic', on: :tags)
 
-    expect(-> {
+    expect {
       @user2.tag(@taggable, with: 'epic', on: :tags)
-    }).to change(ActsAsTaggableOn::Tagging, :count).by(-1)
+    }.to change(ActsAsTaggableOn::Tagging, :count).by(-1)
 
     @taggable.reload
     expect(@taggable.all_tags_list).to include('awesome')
@@ -119,9 +119,9 @@ describe 'Tagger' do
     expect(@taggable.tag_list).to eq(%w(ruby))
     expect(@taggable.all_tags_list.sort).to eq(%w(ruby scheme).sort)
 
-    expect(-> {
+    expect {
       @taggable.update(tag_list: '')
-    }).to change(ActsAsTaggableOn::Tagging, :count).by(-1)
+    }.to change(ActsAsTaggableOn::Tagging, :count).by(-1)
 
     expect(@taggable.tag_list).to be_empty
     expect(@taggable.all_tags_list.sort).to eq(%w(ruby scheme).sort)

data/spec/acts_as_taggable_on/tagging_spec.rb

@@ -20,9 +20,9 @@ describe ActsAsTaggableOn::Tagging do
     @taggable = TaggableModel.create(name: 'Bob Jones')
     @tag = ActsAsTaggableOn::Tag.create(name: 'awesome')
 
-    expect(-> {
+    expect {
       2.times { ActsAsTaggableOn::Tagging.create(taggable: @taggable, tag: @tag, context: 'tags') }
-    }).to change(ActsAsTaggableOn::Tagging, :count).by(1)
+    }.to change(ActsAsTaggableOn::Tagging, :count).by(1)
   end
 
   it 'should not delete tags of other records' do
@@ -140,4 +140,30 @@ describe ActsAsTaggableOn::Tagging do
       end
     end
   end
+
+  describe 'base_class' do
+    before do
+      class Foo < ActiveRecord::Base; end
+    end
+
+    context "default" do
+      it "inherits from ActiveRecord::Base" do
+
+        expect(ActsAsTaggableOn::Tagging.ancestors).to include(ActiveRecord::Base)
+        expect(ActsAsTaggableOn::Tagging.ancestors).to_not include(Foo)
+      end
+    end
+
+    context "custom" do
+      it "inherits from custom class" do
+
+        ActsAsTaggableOn.base_class = 'Foo'
+        hide_const("ActsAsTaggableOn::Tagging")
+        load("lib/acts_as_taggable_on/tagging.rb")
+
+        expect(ActsAsTaggableOn::Tagging.ancestors).to include(Foo)
+      end
+    end
+  end
+
 end

data/spec/support/database.rb

@@ -18,18 +18,14 @@ if ActiveRecord.version >= Gem::Version.new('7.0.0.alpha2')
 else
   ActiveRecord::Base.default_timezone = :utc
 end
-config = if ActiveRecord.version >= Gem::Version.new('6.1.0')
-           ActiveRecord::Base.configurations.configs_for(env_name: db_name)
-         else
-           ActiveSupport::HashWithIndifferentAccess.new(ActiveRecord::Base.configurations[db_name])
-         end
+config = ActiveRecord::Base.configurations.configs_for(env_name: db_name)
 
 begin
   ActiveRecord::Base.establish_connection(db_name.to_sym)
   ActiveRecord::Base.connection
 rescue StandardError
   case db_name
-  when /mysql/
+  when /(mysql)/
     ActiveRecord::Base.establish_connection(config.merge('database' => nil))
     ActiveRecord::Base.connection.create_database(config['database'],
                                                   { charset: 'utf8', collation: 'utf8_unicode_ci' })

data/spec/support/database_cleaner.rb

@@ -6,6 +6,10 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
+  config.before(:each, :database_cleaner_delete) do
+    DatabaseCleaner.strategy = :truncation
+  end
+
   config.after(:suite) do
     DatabaseCleaner.clean
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 10.0.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2023-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ files:
 - gemfiles/activerecord_6.0.gemfile
 - gemfiles/activerecord_6.1.gemfile
 - gemfiles/activerecord_7.0.gemfile
+- gemfiles/activerecord_7.1.gemfile
 - lib/acts-as-taggable-on.rb
 - lib/acts_as_taggable_on.rb
 - lib/acts_as_taggable_on/default_parser.rb
@@ -157,6 +158,8 @@ files:
 - lib/acts_as_taggable_on/tags_helper.rb
 - lib/acts_as_taggable_on/utils.rb
 - lib/acts_as_taggable_on/version.rb
+- lib/tasks/example/acts_as_taggable_on.rb.example
+- lib/tasks/install_initializer.rake
 - lib/tasks/tags_collate_utf8.rake
 - spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb
 - spec/acts_as_taggable_on/acts_as_tagger_spec.rb
@@ -207,14 +210,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Advanced tagging for Rails.