gutentag 2.6.2 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98f15b646e502b6b79038023b1e36b4b1d148cb99744134254165ad0997733ff
-  data.tar.gz: d5f73cf67e7c0992a01730506a63567ecb62bf27bd934036c04c2fa80383eff6
+  metadata.gz: 5afcb64119c9fff07b6c4cb8786da632f3ad66d230ea049b45b7780440b9692a
+  data.tar.gz: ed0b54305d58152e70ec3de7b5cc324c5a443a1b0f73ade5e136cedb785b77f0
 SHA512:
-  metadata.gz: 3fcff8de1bf31f8c7c31183c868445e68e4ea22b836c55512b8b423efeaee1cc72f2b6b40cf5e7d3749371a87a3e8627318aa831ceb8b6a2aaeb6b30f30237fb
-  data.tar.gz: 538d5d06ce5ddad20ea227cc6ea090d6b2cead6afe97259fa7d01f6c7f80863c86ca13a66e9c8ab39f56d22ea6f34106e3cc1f32a5ce2a92d15021d3a055a0ef
+  metadata.gz: 4457511634f9ffee17502b8deab34ff6a306750dc0886864cd913c68f0e60c52873a4716ef6941ee23955477ca5b72847b3d644d8dfca6e0ccc16a8d7e27bf6f
+  data.tar.gz: 355801ea0a573f02a509ece9c9175786672c79d457e7ed5935ca6b73552a9fcc6cad065c9c65bb42b29adce1958957f73ef5dc1ef7244ac65dedfdcae7f4c772

data/.github/workflows/ci.yml

@@ -1,34 +1,20 @@
 name: CI
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.4', '2.5', '2.6', '2.7', '3.0', '3.1' ]
-        bundler: [ '1.17.3', '2.1.4' ]
+        ruby: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
         database: [ 'mysql', 'postgresql', 'sqlite' ]
-        exclude:
-          - ruby: '2.4'
-            bundler: '2.1.4'
-          - ruby: '2.5'
-            bundler: '2.1.4'
-          - ruby: '2.6'
-            bundler: '2.1.4'
-          - ruby: '2.7'
-            bundler: '1.17.3'
-          - ruby: '3.0'
-            bundler: '1.17.3'
-          - ruby: '3.1'
-            bundler: '1.17.3'
 
     services:
       postgres:
-        image: postgres:13.5
+        image: postgres:16
         env:
           POSTGRES_USER: root
           POSTGRES_PASSWORD: gutentag
@@ -47,26 +33,16 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler: ${{ matrix.bundler }}
           bundler-cache: true
-
-      - name: Set up Bundler
-        run: |
-          export BUNDLER_VERSION=${{ matrix.bundler }}
-          export BUNDLE_PATH=$PWD/vendor/bundle
-
-          gem update --system
-
-          bundle _${{ matrix.bundler }}_ config set path $PWD/$BUNDLE_PATH
-          bundle _${{ matrix.bundler }}_ install --jobs=4 --retry=3
-          bundle _${{ matrix.bundler }}_ update
-      - name: Set up Appraisal
-        run: bundle exec appraisal update
+      - name: Generate Appraisal gemfiles
+        run: bundle exec appraisal generate
+      - name: Install gems for each appraisal
+        run: bundle exec appraisal install
       - name: Test
         env:
           CI: "true"
@@ -77,16 +53,15 @@ jobs:
         run: bundle exec appraisal rspec
 
   rubocop:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
-          bundler: 2.1.4
+          ruby-version: 3.0
           bundler-cache: true
       - name: Rubocop
         run: bundle exec rubocop

data/.rubocop.yml

@@ -4,7 +4,7 @@ inherit_from:
 require: rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 3.0
   Exclude:
     - gemfiles/*.gemfile
     - spec/internal/db/migrate/*

data/Appraisals

@@ -1,59 +1,51 @@
 # frozen_string_literal: true
 
-appraise "rails_4_0" do
-  gem "rails",   "~> 4.0.13"
-  gem "mysql2",  "~> 0.3.10", :platform => :ruby
-end if RUBY_VERSION.to_f < 2.4
-
-appraise "rails_4_1" do
-  gem "rails",   "~> 4.1.16"
-  gem "mysql2",  "~> 0.3.13", :platform => :ruby
-end if RUBY_VERSION.to_f < 2.4
-
-appraise "rails_4_2" do
-  gem "rails",   "~> 4.2.8"
-  gem "mysql2",  "~> 0.4.0", :platform => :ruby
-
-  gem "activerecord-jdbcmysql-adapter",      "~> 1.3.23", :platform => :jruby
-  gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.23", :platform => :jruby
-  gem "activerecord-jdbcsqlite3-adapter",    "~> 1.3.23", :platform => :jruby
-end if RUBY_VERSION.to_f < 2.7
-
-appraise "rails_5_0" do
-  gem "rails",  "~> 5.0.3"
-  gem "mysql2", "~> 0.4.0", :platform => :ruby
-end if RUBY_VERSION.to_f >= 2.2 && RUBY_VERSION.to_f <= 2.7
-
-appraise "rails_5_1" do
-  gem "rails",  "~> 5.1.1"
-  gem "mysql2", "~> 0.4.0", :platform => :ruby
-end if RUBY_VERSION.to_f >= 2.2 && RUBY_VERSION.to_f <= 2.7
-
-appraise "rails_5_2" do
-  gem "rails",  "~> 5.2.0"
-  gem "pg",     "~> 1.0",   :platform => :ruby
-  gem "mysql2", "~> 0.5.0", :platform => :ruby
-end if RUBY_VERSION.to_f >= 2.2 && RUBY_VERSION.to_f <= 2.7
-
 if RUBY_PLATFORM != "java"
-  appraise "rails_6_0" do
-    gem "rails",   "~> 6.0.0"
-    gem "pg",      "~> 1.0",   :platform => :ruby
-    gem "mysql2",  "~> 0.5.0", :platform => :ruby
-    gem "sqlite3", "~> 1.4",   :platform => :ruby
-  end if RUBY_VERSION.to_f >= 2.5 && RUBY_VERSION.to_f <= 3.0
-
   appraise "rails_6_1" do
-    gem "rails",   "~> 6.1.0"
-    gem "pg",      "~> 1.0",   :platform => :ruby
-    gem "mysql2",  "~> 0.5.0", :platform => :ruby
-    gem "sqlite3", "~> 1.4",   :platform => :ruby
-  end if RUBY_VERSION.to_f >= 2.5
+    gem "rails",       "~> 6.1.0"
+    gem "rspec-rails", "~> 6.1"
+    gem "pg",          "~> 1.0",   :platform => :ruby
+    gem "mysql2",      "~> 0.5.0", :platform => :ruby
+    gem "sqlite3",     "~> 1.4",   :platform => :ruby
+  end
 
   appraise "rails_7_0" do
-    gem "rails",   "~> 7.0.1"
-    gem "pg",      "~> 1.0",   :platform => :ruby
-    gem "mysql2",  "~> 0.5.0", :platform => :ruby
-    gem "sqlite3", "~> 1.4",   :platform => :ruby
-  end if RUBY_VERSION.to_f >= 2.7
+    gem "rails",       "~> 7.0.8.6"
+    gem "rspec-rails", "~> 7.1"
+    gem "pg",          "~> 1.0",   :platform => :ruby
+    gem "mysql2",      "~> 0.5.0", :platform => :ruby
+    gem "sqlite3",     "~> 1.4",   :platform => :ruby
+  end
+
+  appraise "rails_7_1" do
+    gem "rails",       "~> 7.1.5"
+    gem "rspec-rails", "~> 7.1"
+    gem "pg",          "~> 1.0",   :platform => :ruby
+    gem "mysql2",      "~> 0.5.0", :platform => :ruby
+    gem "sqlite3",     "~> 2.0",   :platform => :ruby
+  end if RUBY_VERSION.to_f >= 3.1
+
+  appraise "rails_7_2" do
+    gem "rails",       "~> 7.2.2"
+    gem "rspec-rails", "~> 7.1"
+    gem "pg",          "~> 1.0",   :platform => :ruby
+    gem "mysql2",      "~> 0.5.0", :platform => :ruby
+    gem "sqlite3",     "~> 2.0",   :platform => :ruby
+  end if RUBY_VERSION.to_f >= 3.1
+
+  appraise "rails_8_0" do
+    gem "rails",       "~> 8.0.0"
+    gem "rspec-rails", "~> 8.0"
+    gem "pg",          "~> 1.0",   :platform => :ruby
+    gem "mysql2",      "~> 0.5.0", :platform => :ruby
+    gem "sqlite3",     "~> 2.3",   :platform => :ruby
+  end if RUBY_VERSION.to_f >= 3.2
+
+  appraise "rails_8_1" do
+    gem "rails",       "~> 8.1.0"
+    gem "rspec-rails", "~> 8.0"
+    gem "pg",          "~> 1.0",   :platform => :ruby
+    gem "mysql2",      "~> 0.5.0", :platform => :ruby
+    gem "sqlite3",     "~> 2.3",   :platform => :ruby
+  end if RUBY_VERSION.to_f >= 3.2
 end

data/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project (at least, from v0.5.0 onwards) will be documented in this file.
 
+## 3.0.1 - 2025-11-24
+
+### Fixed
+
+* Fixed dirty state after reload is called on a tagged instance. ([Michael Grosser](https://github.com/grosser) in [#54](https://github.com/pat/gutentag/pull/92))
+
+### Changed
+
+* Updated syntax to be for Ruby 3.0 and newer.
+
+## 3.0.0 - 2025-11-21
+
+### Breaking
+
+This release is all about which versions of Ruby and Rails are supported.
+
+* Removing official support for Ruby 2.4-2.7 (2.7 may continue to work, but is not covered by CI).
+* Removing official support for Rails 4.0-6.0 (5.2 and 6.0 may continue to work, but are not covered by CI).
+* Adding official support for Ruby 3.2-3.4 (though no code changes were required for this).
+* Adding official support for Rails 7.1-8.1 (one change from [Urban Hafner](https://github.com/ujh) in [#87](https://github.com/pat/gutentag/pull/87) assisted with this for Rails 8.0).
+
 ## 2.6.2 - 2022-11-05
 
 ### Fixed

data/Gemfile

@@ -4,22 +4,24 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "test-unit", :platform => :ruby_22
-
-gem "mysql2",  "~> 0.3",    :platform => :ruby
-gem "pg",      "~> 0.18",   :platform => :ruby
+gem "mysql2",  "~> 0.5", :platform => :ruby
+gem "pg",      "~> 1.0", :platform => :ruby
 
 if RUBY_VERSION.to_f < 3.0
   gem "sqlite3", "~> 1.3.13"
 else
-  gem "sqlite3", "~> 1.4"
+  gem "sqlite3", ">= 1.4"
 end
 
 gem "activerecord-jdbcmysql-adapter",      ">= 1.3.23", :platform => :jruby
 gem "activerecord-jdbcpostgresql-adapter", ">= 1.3.23", :platform => :jruby
 gem "activerecord-jdbcsqlite3-adapter",    ">= 1.3.23", :platform => :jruby
 
-gem "activerecord", [">= 3.2.22"] if RUBY_PLATFORM == "java"
+gem "activerecord", [">= 5.2"] if RUBY_PLATFORM == "java"
 
 # Required for testing Rails 6.1 on MRI 3.1+
 gem "net-smtp" if RUBY_VERSION.to_f > 3.0
+# mutex_m is no longer a default gem in MRI 3.4, warnings in 3.3
+gem "mutex_m" if RUBY_VERSION.to_f > 3.2
+# drb is no longer a default gem in MRI 4.0, warnings in 3.4
+gem "drb" if RUBY_VERSION.to_f > 3.3

data/README.md

@@ -93,19 +93,21 @@ Gutentag::Tag.names_for_scope(Article.order(created_at: :desc).limit(2))
 
 ### Dependencies
 
-These are the versions the test suite runs against. It's possible it may work on older versions of Ruby, but it definitely won't work on older versions of Rails.
+These are the versions the current test suite runs against. It's possible that the gem may work on slightly older versions (Ruby 2.7, Rails 5.2).
 
-* Ruby: MRI v2.3-v3.1, JRuby v9.2.5
-* Rails/ActiveRecord: v4.0-v7.0
+* Ruby: MRI v3.0-v3.4
+* Rails/ActiveRecord: v6.1-v8.1
 
-If you're using MRI v2.2 and/or ActiveRecord v3.2, the last version of Gutentag that fully supported those versions is v2.4.1.
+If you're using Ruby v2.4-2.7 and/or ActiveRecord v4.0-6.0, the last release of Gutentag that officially supported those versions is v2.6.2, though the v3.0.0 release may be fine.
+
+If you're using Ruby v2.2 and/or ActiveRecord v3.2, the last release of Gutentag that fully supported those versions is v2.4.1.
 
 ### Installing
 
 Get it into your Gemfile - and don't forget the version constraint!
 
 ```Ruby
-gem 'gutentag', '~> 2.6'
+gem 'gutentag', '~> 3.0'
 ```
 
 Next: your tags get persisted to your database, so let's import the migrations, update them to your current version of Rails, and then migrate:
@@ -194,4 +196,4 @@ Please note that this project now has a [Contributor Code of Conduct](http://con
 
 <h2 id="licence">Licence</h2>
 
-Copyright (c) 2013-2022, Gutentag is developed and maintained by Pat Allan, and is released under the open MIT Licence.
+Copyright (c) 2013-2025, Gutentag is developed and maintained by Pat Allan, and is released under the open MIT Licence.

data/app/models/gutentag/tag.rb

@@ -33,7 +33,7 @@ class Gutentag::Tag < ActiveRecord::Base
   end
 
   def name=(value)
-    super(Gutentag.normaliser.call(value))
+    write_attribute(:name, Gutentag.normaliser.call(value))
   end
 end
 

data/gutentag.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "gutentag"
-  s.version     = "2.6.2"
+  s.version     = "3.0.1"
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
   s.homepage    = "https://github.com/pat/gutentag"
@@ -14,14 +14,16 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = ">= 3.0.0"
+
   s.add_runtime_dependency     "activerecord", ">= 3.2.0"
 
-  s.add_development_dependency "appraisal",           "~> 2.4.1"
+  s.add_development_dependency "appraisal",           "~> 2.5.0"
   s.add_development_dependency "bundler",             ">= 1.17"
   s.add_development_dependency "combustion",          "~> 1.1"
-  s.add_development_dependency "database_cleaner",    "~> 1.6"
+  s.add_development_dependency "database_cleaner",    "~> 2.1"
   s.add_development_dependency "rails"
-  s.add_development_dependency "rspec-rails",         "~> 3.1"
-  s.add_development_dependency "rubocop",             "~> 0.81.0"
-  s.add_development_dependency "rubocop-performance", "~> 1"
+  s.add_development_dependency "rspec-rails",         ">= 5.1.2"
+  s.add_development_dependency "rubocop",             "~> 1.81.7"
+  s.add_development_dependency "rubocop-performance", "~> 1.26"
 end

data/lib/gutentag/active_record/class_methods.rb

@@ -4,20 +4,4 @@ module Gutentag::ActiveRecord::ClassMethods
   def tagged_with(options)
     Gutentag::TaggedWith.call self, options
   end
-
-  if ActiveRecord::VERSION::STRING.to_f < 4.2
-    def skip_time_zone_conversion_for_attributes
-      super + [:tag_names]
-    end
-  end
-
-  if ActiveRecord::VERSION::STRING.to_f < 4.0
-    def create_time_zone_conversion_attribute?(attr_name, column)
-      attr_name != "tag_names" && super
-    end
-
-    def attribute_cast_code(attr_name)
-      attr_name == "tag_names" ? "v" : super
-    end
-  end
 end

data/lib/gutentag/active_record/instance_methods.rb

@@ -11,12 +11,7 @@ module Gutentag::ActiveRecord::InstanceMethods
   # the instance directly (e.g. article.tags << tag), which invokes the save
   # callbacks, but the old tag_names value is stored but not updated.
   def reset_tag_names
-    # Rails 5.1 introduces major changes to how ActiveModel::Dirty works:
-    # https://github.com/pat/gutentag/pull/70#issuecomment-524605448
-    # For Rails <5.1 we'll use *_previously_changed?
-    # and for 5.1+ we'll use saved_change_to_*?
-    return if AR_VERSION < 5.1 && tag_names_previously_changed?
-    return if AR_VERSION >= 5.1 && saved_change_to_tag_names?
+    return if saved_change_to_tag_names?
 
     # Update the underlying value rather than going through the setter, to
     # ensure this update doesn't get marked as a 'change'.
@@ -47,6 +42,11 @@ module Gutentag::ActiveRecord::InstanceMethods
     super Gutentag::TagNames.call(names)
   end
 
+  def reload(*)
+    @prepared_tag_names = false
+    super
+  end
+
   private
 
   def persist_tags

data/lib/gutentag/active_record.rb

@@ -31,45 +31,20 @@ class Gutentag::ActiveRecord
   end
 
   def add_attribute
-    if ActiveRecord::VERSION::STRING.to_f <= 4.2
-      model.define_attribute_method "tag_names"
-    else
-      model.attribute "tag_names", ActiveRecord::Type::Value.new,
-        :default => default_tag_names
-    end
+    model.attribute "tag_names", ActiveRecord::Type::Value.new,
+      :default => nil
   end
 
   def add_callbacks
     model.after_save :persist_tags
-
-    if legacy?
-      model.after_save :reset_tag_names
-    else
-      model.after_commit :reset_tag_names, :on => %i[ create update ]
-    end
+    model.after_commit :reset_tag_names, :on => %i[ create update ]
   end
 
   def add_methods
-    case ActiveRecord::VERSION::STRING.to_f
-    when 3.2..4.1
-      require "gutentag/active_record/instance_methods_3_2"
-    when 4.2
-      require "gutentag/active_record/instance_methods_4_2"
-    else
-      require "gutentag/active_record/instance_methods"
-    end
-
     model.send :extend, Gutentag::ActiveRecord::ClassMethods
     model.send :include, Gutentag::ActiveRecord::InstanceMethods
   end
-
-  def default_tag_names
-    ActiveRecord::VERSION::STRING.to_f <= 4.2 ? [] : nil
-  end
-
-  def legacy?
-    ActiveRecord::VERSION::STRING.to_f < 4.2
-  end
 end
 
 require "gutentag/active_record/class_methods"
+require "gutentag/active_record/instance_methods"

data/lib/gutentag/generators/migration_versions_generator.rb

@@ -10,10 +10,6 @@ module Gutentag
       def update_migration_versions
         superclass = "ActiveRecord::Migration[#{rails_version}]"
 
-        if ::ActiveRecord::VERSION::MAJOR < 5
-          superclass = "ActiveRecord::Migration"
-        end
-
         migration_files.each do |file|
           gsub_file file,
             /< ActiveRecord::Migration\[4\.2\]$/,
@@ -32,11 +28,10 @@ module Gutentag
       end
 
       def known_migration_names
-        @known_migration_names ||= begin
+        @known_migration_names ||=
           Dir[File.join(__dir__, "../../../db/migrate/*.rb")].collect do |path|
-            File.basename(path).gsub(/\A\d+_/, "").gsub(/\.rb\z/, "")
+            File.basename(path).gsub(/\A\d+_/, "").delete_suffix(".rb")
           end
-        end
       end
 
       def rails_version

data/lib/gutentag/tag_validations.rb

@@ -9,10 +9,7 @@ class Gutentag::TagValidations
     :uniqueness => {:case_sensitive => false}
   }.freeze
   DATABASE_ERROR_CLASSES = lambda {
-    classes = []
-    if ActiveRecord::VERSION::STRING.to_f > 4.0
-      classes << ActiveRecord::NoDatabaseError
-    end
+    classes = [ActiveRecord::NoDatabaseError]
     classes << ActiveRecord::ConnectionNotEstablished
     classes << Mysql2::Error     if defined?(::Mysql2)
     classes << PG::ConnectionBad if defined?(::PG)

data/lib/gutentag.rb

@@ -3,14 +3,6 @@
 require "active_record/version"
 
 module Gutentag
-  def self.dirtier
-    @dirtier
-  end
-
-  def self.dirtier=(dirtier)
-    @dirtier = dirtier
-  end
-
   def self.normaliser
     @normaliser ||= lambda { |tag_name| tag_name.to_s.downcase }
   end
@@ -30,14 +22,11 @@ end
 
 require "gutentag/active_record"
 require "gutentag/change_state"
-require "gutentag/dirty"
 require "gutentag/persistence"
 require "gutentag/remove_unused"
 require "gutentag/tag_names"
 require "gutentag/tagged_with"
 
-Gutentag.dirtier = Gutentag::Dirty if ActiveRecord::VERSION::STRING.to_f < 4.2
-
 if defined?(Rails::Engine)
   require "gutentag/engine"
 else

data/spec/acceptance/dirty_state_spec.rb

@@ -12,17 +12,11 @@ RSpec.describe "Dirty state of tag names" do
     expect(article.tag_names_changed?).to eq(true)
     expect(article.tag_names_was).to eq([])
     expect(article.tag_names_change).to eq([[], ["pancakes"]])
-
-    if ActiveRecord::VERSION::STRING.to_f > 4.0
-      expect(article.tag_names_changed?(:from => [], :to => ["pancakes"])).
-        to eq(true)
-    end
-
-    if ActiveRecord::VERSION::STRING.to_f > 5.0
-      expect(article.will_save_change_to_tag_names?).to eq(true)
-      expect(article.tag_names_change_to_be_saved).to eq([[], ["pancakes"]])
-      expect(article.tag_names_in_database).to eq([])
-    end
+    expect(article.tag_names_changed?(:from => [], :to => ["pancakes"])).
+      to eq(true)
+    expect(article.will_save_change_to_tag_names?).to eq(true)
+    expect(article.tag_names_change_to_be_saved).to eq([[], ["pancakes"]])
+    expect(article.tag_names_in_database).to eq([])
   end
 
   it "knows what tag names have changed" do
@@ -34,20 +28,14 @@ RSpec.describe "Dirty state of tag names" do
     expect(article).to_not be_changed
     expect(article.tag_names_changed?).to eq(false)
     expect(article.previous_changes["tag_names"]).to eq([[], ["pancakes"]])
-
-    if ActiveRecord::VERSION::STRING.to_f >= 5.0
-      expect(article.tag_names_previously_changed?).to eq(true)
-      expect(article.tag_names_previous_change).to eq([[], ["pancakes"]])
-    end
-
-    if ActiveRecord::VERSION::STRING.to_f > 5.0
-      expect(article.saved_change_to_tag_names?).to eq(true)
-      expect(article.saved_change_to_tag_names).to eq([[], ["pancakes"]])
-      expect(article.saved_changes["tag_names"]).to eq([[], ["pancakes"]])
-      expect(article.tag_names_before_last_save).to eq([])
-      expect(article.tag_names_change_to_be_saved).to eq(nil)
-      expect(article.tag_names_in_database).to eq(["pancakes"])
-    end
+    expect(article.tag_names_previously_changed?).to eq(true)
+    expect(article.tag_names_previous_change).to eq([[], ["pancakes"]])
+    expect(article.saved_change_to_tag_names?).to eq(true)
+    expect(article.saved_change_to_tag_names).to eq([[], ["pancakes"]])
+    expect(article.saved_changes["tag_names"]).to eq([[], ["pancakes"]])
+    expect(article.tag_names_before_last_save).to eq([])
+    expect(article.tag_names_change_to_be_saved).to eq(nil)
+    expect(article.tag_names_in_database).to eq(["pancakes"])
   end
 
   it "knows when tags have not changed" do
@@ -57,4 +45,16 @@ RSpec.describe "Dirty state of tag names" do
     article.tag_names = ["pancakes"]
     expect(article.changes).to eq({})
   end
+
+  it "knows when a saved instance is reloaded (and thus has no changes)" do
+    article.update!(:tag_names => ["pancakes"])
+    article.reload
+    article.tag_names = ["pancakes"]
+
+    expect(article).not_to be_changed
+    expect(article.changes).to eq({})
+    expect(article.tag_names_changed?).to eq(false)
+    expect(article.tag_names_was).to eq(["pancakes"])
+    expect(article.tag_names_change).to eq(nil)
+  end
 end

data/spec/acceptance/tag_names_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe "Managing tags via names" do
   end
 
   it "allows for different tag normalisation" do
-    Gutentag.normaliser = lambda { |name| name.upcase }
+    Gutentag.normaliser = lambda(&:upcase)
 
     tag = Gutentag::Tag.create(:name => "melbourne")
     expect(tag.name).to eq("MELBOURNE")

data/spec/models/gutentag/tag_spec.rb

@@ -64,12 +64,9 @@ RSpec.describe Gutentag::Tag, :type => :model do
       expect(tag.errors[:name].length).to eq(1)
     end
 
-    if ENV["DATABASE"] == "mysql" || (
-      Gem::Version.new(Rails.version) < Gem::Version.new("4.2.0")
-    )
-      # When using MySQL or Rails before 4.2, string columns convert to
-      # VARCHAR(255), therefore the column has a limit of 255, even though we
-      # did not specify a limit
+    if ENV["DATABASE"] == "mysql"
+      # When using MySQL, string columns convert to VARCHAR(255), therefore the
+      # column has a limit of 255, even though we did not specify a limit.
       it "validates the length of the name" do
         tag = Gutentag::Tag.create(:name => "a" * 256)
         expect(tag.errors[:name].length).to eq(1)

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "bundler/setup"
+require "logger"
 
 Bundler.require :default, :development
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gutentag
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 3.0.1
 platform: ruby
 authors:
 - Pat Allan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-05 00:00:00.000000000 Z
+date: 2025-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -98,44 +98,44 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 5.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: 1.81.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: 1.81.7
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.26'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.26'
 description: A good, simple, solid tagging extension for ActiveRecord
 email:
 - pat@freelancing-gods.com
@@ -164,10 +164,7 @@ files:
 - lib/gutentag/active_record.rb
 - lib/gutentag/active_record/class_methods.rb
 - lib/gutentag/active_record/instance_methods.rb
-- lib/gutentag/active_record/instance_methods_3_2.rb
-- lib/gutentag/active_record/instance_methods_4_2.rb
 - lib/gutentag/change_state.rb
-- lib/gutentag/dirty.rb
 - lib/gutentag/engine.rb
 - lib/gutentag/generators/migration_versions_generator.rb
 - lib/gutentag/persistence.rb
@@ -195,7 +192,6 @@ files:
 - spec/models/gutentag/tagging_spec.rb
 - spec/spec_helper.rb
 - spec/support/adjust_migrations.rb
-- spec/support/mysql.rb
 homepage: https://github.com/pat/gutentag
 licenses:
 - MIT
@@ -208,14 +204,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Good Tags

data/lib/gutentag/active_record/instance_methods_3_2.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-# For Rails <= 4.1
-module Gutentag::ActiveRecord::InstanceMethods
-  # The reason we overwrite the stored value is because new tags may be added to
-  # the instance directly (e.g. article.tags << tag), which invokes the save
-  # callbacks, but the old tag_names value is stored but not updated.
-  def reset_tag_names
-    @tag_names = nil
-  end
-
-  def tag_names
-    @tag_names ||= tags.pluck(:name)
-  end
-
-  def tag_names=(names)
-    names = Gutentag::TagNames.call(names)
-
-    Gutentag.dirtier.call self, names if Gutentag.dirtier.present?
-
-    @tag_names = names
-  end
-
-  private
-
-  def persist_tags
-    Gutentag::Persistence.new(Gutentag::ChangeState.new(self)).persist
-  end
-end

data/lib/gutentag/active_record/instance_methods_4_2.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-# For Rails 4.2 only.
-module Gutentag::ActiveRecord::InstanceMethods
-  # The reason we overwrite the stored value is because new tags may be added to
-  # the instance directly (e.g. article.tags << tag), which invokes the save
-  # callbacks, but the old tag_names value is stored but not updated.
-  def reset_tag_names
-    # Update the underlying value rather than going through the setter, to
-    # ensure this update doesn't get marked as a 'change'.
-    @tag_names = nil
-  end
-
-  def tag_names
-    @tag_names ||= begin
-      raw = tags.pluck(:name)
-      raw_write_attribute "tag_names", raw
-      raw
-    end
-  end
-
-  def tag_names=(names)
-    new_names = Gutentag::TagNames.call names
-    return if new_names.sort == tag_names.sort
-
-    tag_names_will_change!
-
-    write_attribute "tag_names", new_names
-    @tag_names = new_names
-  end
-
-  private
-
-  def persist_tags
-    Gutentag::Persistence.new(Gutentag::ChangeState.new(self)).persist
-  end
-end

data/lib/gutentag/dirty.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-class Gutentag::Dirty
-  def self.call(instance, tag_names)
-    new(instance, tag_names).call
-  end
-
-  def initialize(instance, tag_names)
-    @instance  = instance
-    @tag_names = tag_names
-  end
-
-  def call
-    return unless changes.present?
-
-    instance.tag_names_will_change!
-    instance.changed_attributes[:tag_names] = existing
-  end
-
-  private
-
-  attr_reader :instance, :tag_names
-
-  def changes
-    (existing + tag_names).uniq - (existing & tag_names)
-  end
-
-  def existing
-    instance.tag_names
-  end
-end

data/spec/support/mysql.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require "active_record"
-
-# New versions of MySQL don't allow NULL values for primary keys, but old
-# versions of Rails do. To use both at the same time, we need to update Rails'
-# default primary key type to no longer have a default NULL value.
-#
-class PatchAdapter
-  def call
-    return unless using_mysql? && using_rails_pre_4_1?
-
-    require "active_record/connection_adapters/abstract_mysql_adapter"
-    ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::
-      NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY"
-  end
-
-  def using_mysql?
-    ENV.fetch("DATABASE", "sqlite") == "mysql"
-  end
-
-  def using_rails_pre_4_1?
-    ActiveRecord::VERSION::STRING.to_f < 4.1
-  end
-end
-
-PatchAdapter.new.call