gutentag 2.4.0 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab338132cb66484c650c46037b6c5133b4ee72c90e7397fbf045cb909029bc3c
-  data.tar.gz: 7f4d9166ed7d9ef6a0b44a677f0a182434abcc1ceecfe26ea0ab137714b2c6c3
+  metadata.gz: 9b86cbc2c649e92b40be12e9be738e3b57f57cb10241103e02d2aa5ea82a0d0a
+  data.tar.gz: 916b5eabf6121b235ca9136ac2eaf0113bde665f532bd21afe5b728825718fee
 SHA512:
-  metadata.gz: 57eaa6e0442287f4a07dfb612cbb2c18dda900fe8cf7b274f12eecd299b70355711ff786ab20bf0616716e0ba7b1dc8520458d90a779c3cc715fa78e7842304a
-  data.tar.gz: 067b316bba0642bfedd777ff8cf7d0d85a08f326fd4959466ca3b831be3496fe9aad93872e16a7c3830f29b2ef8aafba8194628188784aed4d60413951d38c6e
+  metadata.gz: 3e3dcd7dcae2889b2ab496966bbb5b57c332f46546cbc7dd8f3e557f710c5ae89cfebe833a25bc6efb73c18fb74b858422943072407b328f59251543a000da4e
+  data.tar.gz: e7c60af1366e1afbc647162cbd72618be7884c9dc3bf8f580a8b6ddfa61684c7c1546f2fd9f85f0aadceaa2ac7b1dd22b70332b1061c162c2b3695d1fea111ac

data/.rubocop.yml

@@ -1,8 +1,12 @@
 inherit_from:
   - https://gist.githubusercontent.com/pat/ba3b8ffb1901bfe5439b460943b6b019/raw/.rubocop.yml
 
+require: rubocop-performance
+
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
+  Exclude:
+    - gemfiles/*.gemfile
 
 Metrics/MethodLength:
   Exclude:
@@ -17,5 +21,18 @@ Style/MultilineTernaryOperator:
   Exclude:
     - db/migrate/*.rb
 
-Style/SafeNavigation:
-  Enabled: false
+# 0.80
+
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+
+# 0.81
+
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true

data/.travis.yml

@@ -1,16 +1,23 @@
 language: ruby
+dist: xenial
 script: bundle exec appraisal rake
 rvm:
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-  - jruby-9.1.16.0
+  - 2.3.8
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
+  # - jruby-9.2.8.0
 before_install:
-  - gem install bundler
+  - gem install bundler --version 1.17.3
+install:
+  - bundle _1.17.3_ install --jobs=3 --retry=3
 before_script:
   - bundle exec appraisal install
 env:
   - DATABASE=postgres
   - DATABASE=mysql
   - DATABASE=sqlite
+services:
+- mysql
+- postgresql

data/Appraisals

@@ -1,37 +1,43 @@
 # frozen_string_literal: true
 
-appraise "rails_3_2" do
-  gem "rails",  "~> 3.2.22.5"
-  gem "mysql2", "~> 0.3.10", :platform => :ruby
-end if RUBY_VERSION.to_f <= 2.2
-
 appraise "rails_4_0" do
-  gem "rails",  "~> 4.0.13"
-  gem "mysql2", "~> 0.3.10", :platform => :ruby
+  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
+  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
-end
+  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_PLATFORM != "java"
+end if RUBY_VERSION.to_f >= 2.2
 
 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_PLATFORM != "java"
+end if RUBY_VERSION.to_f >= 2.2
 
 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_PLATFORM != "java"
+end if RUBY_VERSION.to_f >= 2.2
+
+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_PLATFORM != "java"

data/CHANGELOG.md

@@ -2,6 +2,48 @@
 
 All notable changes to this project (at least, from v0.5.0 onwards) will be documented in this file.
 
+## 2.5.3 - 2020-06-28
+
+### Fixed
+
+* Use `saved_change_to_tag_names?` instead of `tag_names_previously_changed?` for Rails 5.1+ ([Morten Trolle](https://github.com/mtrolle) in [70](https://github.com/pat/gutentag/pull/70)).
+* `Gutentag::Tag.names_for_scope` now handles empty scopes ([Mike Gunderloy](https://github.com/ffmike) in [#73](https://github.com/pat/gutentag/pull/73)).
+
+## 2.5.2 - 2019-07-08
+
+### Fixed
+
+* `tag_names` will no longer be referenced as a database column when tagged models are requested in joins in Rails 4.2 (as reported in [issue #67](https://github.com/pat/gutentag/issues/67)).
+
+## 2.5.1 - 2019-05-10
+
+### Fixed
+
+* Ensuring consistent behaviour for tag_names array - names are not duplicated, and are normalised prior to saving (as discussed in [issue #66](https://github.com/pat/gutentag/issues/66)).
+
+## 2.5.0 - 2019-03-15
+
+**Please note this release ends official support of Rails 3.2 and Ruby (MRI) 2.2.** The code currently still works on Ruby 2.2, and all features except for the new `Gutentag::Tag.names_for_scope` method work in Rails 3.2, but they're no longer tested against, and cannot be guaranteed to work in future releases.
+
+### Added
+
+* Added the `Gutentag::Tag.names_for_scope(scope)` method, which accepts an ActiveRecord model or a relation, and returns all tag names associated to that model/relation.
+
+### Changed
+
+* Removing support for MRI 2.2 and Rails 3.2.
+
+## 2.4.1 - 2019-02-22
+
+### Changed
+
+* Tests are now run against Rails 6.0, MRI 2.6, JRuby 9.2.5.
+* The README documents a simpler migration ([seelensonne](https://github.com/seelensonne) in [#55](https://github.com/pat/gutentag/pull/55)).
+
+### Fixed
+
+* Do not record changes when tag_names did not change ([Stephen Oberther](https://github.com/smo921) in [#60](https://github.com/pat/gutentag/pull/60)).
+
 ## 2.4.0 - 2018-05-18
 
 ### Changed

data/Gemfile

@@ -6,12 +6,12 @@ gemspec
 
 gem "test-unit", :platform => :ruby_22
 
-gem "mysql2",  "~> 0.3",  :platform => :ruby
-gem "pg",      "~> 0.18", :platform => :ruby
-gem "sqlite3", "~> 1.3",  :platform => :ruby
+gem "mysql2",  "~> 0.3",    :platform => :ruby
+gem "pg",      "~> 0.18",   :platform => :ruby
+gem "sqlite3", "~> 1.3.13", :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
+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", "< 5"] if RUBY_PLATFORM == "java"
+gem "activerecord", [">= 3.2.22"] if RUBY_PLATFORM == "java"

data/README.md

@@ -1,8 +1,8 @@
 # Gutentag
 
-[![Gem Version](https://badge.fury.io/rb/gutentag.png)](http://badge.fury.io/rb/gutentag)
-[![Build Status](https://travis-ci.org/pat/gutentag.png?branch=master)](https://travis-ci.org/pat/gutentag)
-[![Code Climate](https://codeclimate.com/github/pat/gutentag.png)](https://codeclimate.com/github/pat/gutentag)
+[![Gem Version](https://badge.fury.io/rb/gutentag.svg)](http://badge.fury.io/rb/gutentag)
+[![Build Status](https://travis-ci.org/pat/gutentag.svg?branch=master)](https://travis-ci.org/pat/gutentag)
+[![Code Climate](https://codeclimate.com/github/pat/gutentag.svg)](https://codeclimate.com/github/pat/gutentag)
 
 A good, simple, solid tagging extension for ActiveRecord.
 
@@ -16,6 +16,7 @@ If you want to know more, read [this blog post](http://freelancing-gods.com/post
 * [Installation](#installation)
 * [Upgrading](#upgrading)
 * [Configuration](#configuration)
+* [Extending](#extending)
 * [Contribution](#contribution)
 * [Licence](#licence)
 
@@ -72,15 +73,17 @@ Article.tagged_with(:ids => [tag_a.id, tag_b.id], :match => :all)
 
 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.
 
-* Ruby: MRI v2.2-v2.5, JRuby v9.1
-* Rails/ActiveRecord: v3.2-v5.2
+* Ruby: MRI v2.3-v2.6, JRuby v9.2.5
+* Rails/ActiveRecord: v4.0-v6.0
+
+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.
 
 ### Installing
 
 Get it into your Gemfile - and don't forget the version constraint!
 
 ```Ruby
-gem 'gutentag', '~> 2.4'
+gem 'gutentag', '~> 2.5'
 ```
 
 Next: your tags get persisted to your database, so let's import and run the migrations to get the tables set up:
@@ -90,31 +93,25 @@ rake gutentag:install:migrations
 rake db:migrate
 ```
 
+If you're using UUID primary keys, make sure you alter the migration files before running `db:migrate` to use UUIDs for the `taggable_id` foreign key column (as noted in [issue 57](https://github.com/pat/gutentag/issues/57).)
+
 ### Without Rails
 
 If you want to use Gutentag outside of Rails, you can. However, there is one caveat: You'll want to set up your database with the same schema (as importing in the migrations isn't possible without Rails). The schema from 0.7.0 onwards is below:
 
-```Ruby
-create_table :gutentag_taggings do |t|
-  t.integer :tag_id,        null: false
-  t.integer :taggable_id,   null: false
-  t.string  :taggable_type, null: false
-  t.timestamps null: false
-end
-
-add_index :gutentag_taggings, :tag_id
-add_index :gutentag_taggings, [:taggable_type, :taggable_id]
-add_index :gutentag_taggings, [:taggable_type, :taggable_id, :tag_id],
-  unique: true, name: 'unique_taggings'
-
+```ruby
 create_table :gutentag_tags do |t|
-  t.string  :name,           null: false
-  t.integer :taggings_count, null: false, default: 0
-  t.timestamps null: false
+  t.string :name,           null: false, index: {unique: true}
+  t.bigint :taggings_count, null: false, index: true, default: 0
+  t.timestamps              null: false
 end
 
-add_index :gutentag_tags, :name, unique: true
-add_index :gutentag_tags, :taggings_count
+create_table :gutentag_taggings do |t|
+  t.references :tag,      null: false, index: true, foreign_key: {to_table: :gutentag_tags}
+  t.references :taggable, null: false, index: true, polymorphic: true
+  t.timestamps            null: false
+end
+add_index :gutentag_taggings, [:taggable_type, :taggable_id, :tag_id], unique: true, name: "gutentag_taggings_uniqueness"
 ```
 
 <h2 id="upgrading">Upgrading</h2>
@@ -155,6 +152,19 @@ Gutentag.normaliser = lambda { |value| value.to_s.upcase }
 
 Gutentag ignores case by default, but can be customised to be case-sensitive by supplying your own validations and normaliser, as outlined by [Robin Mehner](https://github.com/rmehner) in [issue 42](https://github.com/pat/gutentag/issues/42). Further changes may be required for your schema though, depending on your database.
 
+<h2 id="extending">Extending</h2>
+
+If you need to extend Gutentag's models, you will need to wrap the `include` inside a `to_prepare` hook to ensure it's loaded consistently in all Rails environments:
+
+```ruby
+# config/initializers/gutentag.rb or equivalent
+Rails.application.config.to_prepare do
+  Gutentag::Tag.include TagExtensions
+end
+```
+
+Further discussion and examples of this can be found in [issue 65](https://github.com/pat/gutentag/issues/65).
+
 <h2 id="contribution">Contribution</h2>
 
 Please note that this project now has a [Contributor Code of Conduct](http://contributor-covenant.org/version/1/0/0/). By participating in this project you agree to abide by its terms.

data/app/models/gutentag/tag.rb

@@ -19,6 +19,19 @@ class Gutentag::Tag < ActiveRecord::Base
     find_by_name(name) || create(:name => name)
   end
 
+  def self.names_for_scope(scope)
+    join_conditions = {:taggable_type => scope.name}
+    if scope.is_a?(ActiveRecord::Relation)
+      return Gutentag::Tag.none unless scope.current_scope.present?
+
+      join_conditions[:taggable_id] = scope.select(:id)
+    end
+
+    joins(:taggings).where(
+      Gutentag::Tagging.table_name => join_conditions
+    ).distinct.pluck(:name)
+  end
+
   def name=(value)
     super(Gutentag.normaliser.call(value))
   end

data/gutentag.gemspec

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
-# -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name        = "gutentag"
-  s.version     = "2.4.0"
+  s.version     = "2.5.3"
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
   s.homepage    = "https://github.com/pat/gutentag"
@@ -17,11 +16,12 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency     "activerecord", ">= 3.2.0"
 
-  s.add_development_dependency "appraisal",        "~> 2.1.0"
-  s.add_development_dependency "bundler",          ">= 1.7.12"
-  s.add_development_dependency "combustion",       "0.8.0"
-  s.add_development_dependency "database_cleaner", "~> 1.6"
+  s.add_development_dependency "appraisal",           "~> 2.1.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 "rails"
-  s.add_development_dependency "rspec-rails",      "~> 3.1"
-  s.add_development_dependency "rubocop",          "~> 0.52.1"
+  s.add_development_dependency "rspec-rails",         "~> 3.1"
+  s.add_development_dependency "rubocop",             "~> 0.81.0"
+  s.add_development_dependency "rubocop-performance", "~> 1"
 end

data/lib/gutentag/active_record.rb

@@ -31,7 +31,7 @@ class Gutentag::ActiveRecord
   end
 
   def add_attribute
-    if legacy?
+    if ActiveRecord::VERSION::STRING.to_f <= 4.2
       model.define_attribute_method "tag_names"
     else
       model.attribute "tag_names", ActiveRecord::Type::Value.new,

data/lib/gutentag/active_record/instance_methods.rb

@@ -2,6 +2,8 @@
 
 # For Rails 5.0+
 module Gutentag::ActiveRecord::InstanceMethods
+  AR_VERSION = ActiveRecord::VERSION::STRING.to_f
+
   # If the tag_names attribute was one of the modified values, then let's just
   # use the modifications, rather than overwriting the stored value.
   #
@@ -9,7 +11,12 @@ 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
-    return if tag_names_previously_changed?
+    # 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?
 
     # Update the underlying value rather than going through the setter, to
     # ensure this update doesn't get marked as a 'change'.
@@ -28,7 +35,7 @@ module Gutentag::ActiveRecord::InstanceMethods
   def tag_names=(names)
     # This value is about to be overwritten, but we want to make sure the change
     # tracking doesn't think the original value was nil.
-    @attributes.write_from_database "tag_names", []
+    @attributes.write_from_database "tag_names", tags.pluck(:name)
 
     super Gutentag::TagNames.call(names)
   end

data/lib/gutentag/active_record/instance_methods_3_2.rb

@@ -16,7 +16,7 @@ module Gutentag::ActiveRecord::InstanceMethods
   def tag_names=(names)
     names = Gutentag::TagNames.call(names)
 
-    Gutentag.dirtier.call self, names if Gutentag.dirtier
+    Gutentag.dirtier.call self, names if Gutentag.dirtier.present?
 
     @tag_names = names
   end

data/lib/gutentag/active_record/instance_methods_4_2.rb

@@ -8,22 +8,25 @@ module Gutentag::ActiveRecord::InstanceMethods
   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'.
-    self.tag_names = nil
+    @tag_names = nil
   end
 
   def tag_names
-    # If the underlying value is nil, we've not requested this from the
-    # database yet.
-    if read_attribute("tag_names") { nil }.nil?
-      self.tag_names = tags.pluck(:name)
+    @tag_names ||= begin
+      raw = tags.pluck(:name)
+      raw_write_attribute "tag_names", raw
+      raw
     end
-
-    # Use ActiveRecord's underlying implementation with change tracking.
-    super
   end
 
   def tag_names=(names)
-    super Gutentag::TagNames.call(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

data/lib/gutentag/tag_names.rb

@@ -4,6 +4,8 @@ class Gutentag::TagNames
   def self.call(names)
     return nil if names.nil?
 
-    names.reject(&:blank?)
+    names.reject(&:blank?).uniq.collect do |name|
+      Gutentag.normaliser.call(name)
+    end
   end
 end

data/lib/gutentag/tag_validations.rb

@@ -36,7 +36,7 @@ class Gutentag::TagValidations
 
   def add_length_validation?
     klass.table_exists? && limit.present?
-  rescue *DATABASE_ERROR_CLASSES
+  rescue *DATABASE_ERROR_CLASSES => _error
     warn <<-MESSAGE
   The database is not currently available, and so Gutentag was not able to set
   up tag validations completely (in particular: adding a length limit to match

data/spec/acceptance/dirty_state_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe "Dirty state of tag names" do
 
   it "knows what tag names have changed" do
     article.tag_names = ["pancakes"]
-    article.save
+    article.save!
 
     expect(article.tag_names).to eq(["pancakes"])
 
@@ -49,4 +49,12 @@ RSpec.describe "Dirty state of tag names" do
       expect(article.tag_names_in_database).to eq(["pancakes"])
     end
   end
+
+  it "knows when tags have not changed" do
+    article.tag_names = ["pancakes"]
+    article.save!
+
+    article.tag_names = ["pancakes"]
+    expect(article.changes).to eq({})
+  end
 end

data/spec/acceptance/removing_unused_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Removing unused" do
+RSpec.describe "Removing unused" do
   let(:article) { Article.create }
 
   it "deletes only unused tags" do

data/spec/acceptance/tag_names_for_scope_spec.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Tag names for scopes" do
+  it "returns tag names for a given model" do
+    Article.create :tag_names => %w[ koala wombat ]
+    Article.create :tag_names => %w[ cassowary ]
+
+    expect(Gutentag::Tag.names_for_scope(Article)).
+      to match_array(%w[ koala wombat cassowary ])
+  end
+
+  it "returns tag names for a given scope" do
+    Article.create :title => "mammals", :tag_names => %w[ koala wombat ]
+    Article.create :title => "birds",   :tag_names => %w[ cassowary ]
+
+    expect(Gutentag::Tag.names_for_scope(Article.where(:title => "mammals"))).
+      to match_array(%w[ koala wombat ])
+  end
+
+  it "does not duplicate tag names for a given model/scope" do
+    Article.create :tag_names => %w[ koala wombat ]
+    Article.create :tag_names => %w[ cassowary ]
+    Article.create :tag_names => %w[ cassowary wombat ]
+
+    expect(Gutentag::Tag.names_for_scope(Article)).
+      to match_array(%w[ koala wombat cassowary ])
+  end
+
+  it "returns an empty array for an empty scope" do
+    Article.create :title => "mammals", :tag_names => %w[ koala wombat ]
+    Article.create :title => "birds",   :tag_names => %w[ cassowary ]
+
+    expect(Gutentag::Tag.names_for_scope(Article.where(:title => "reptiles"))).
+      to match_array([])
+  end
+end

data/spec/acceptance/tag_names_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Managing tags via names" do
+RSpec.describe "Managing tags via names" do
   let(:article) { Article.create }
 
   it "returns tag names" do
@@ -70,6 +70,13 @@ describe "Managing tags via names" do
     expect(article.tags.collect(&:name)).to eq(%w[ portland oregon ruby ])
   end
 
+  it "does not repeat appended names that exist in the array of strings" do
+    article.tag_names  = %w[ portland oregon ]
+    article.tag_names += %w[ oregon ruby ]
+
+    expect(article.tag_names).to match(%w[ portland oregon ruby ])
+  end
+
   it "removes a single tag name" do
     article.tag_names = %w[ portland oregon ]
     article.tag_names.delete "oregon"
@@ -99,6 +106,11 @@ describe "Managing tags via names" do
     expect(article.tags.collect(&:name)).to eq(%w[ portland ])
   end
 
+  it "normalises tag names" do
+    article.tag_names = %w[ Perth ]
+    expect(article.tag_names).to eq(%w[ perth ])
+  end
+
   it "allows setting of tag names on unpersisted objects" do
     article = Article.new :tag_names => %w[ melbourne pancakes ]
     article.save!
@@ -123,4 +135,8 @@ describe "Managing tags via names" do
 
     expect(article.tag_names).to eq(%w[ melbourne ])
   end
+
+  it "allows eager-loading of the model via an association" do
+    expect { Comment.eager_load(:article).to_a }.to_not raise_error
+  end
 end

data/spec/acceptance/tags_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Adding and removing tags" do
+RSpec.describe "Adding and removing tags" do
   let(:article)  { Article.create }
   let(:pancakes) { Gutentag::Tag.create :name => "pancakes" }
 

data/spec/gutentag/active_record_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Gutentag::ActiveRecord do
+RSpec.describe Gutentag::ActiveRecord do
   describe ".tagged_with" do
     let!(:melbourne_article) do
       article = Article.create :title => "Overview"

data/spec/gutentag_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Gutentag do
+RSpec.describe Gutentag do
   describe ".normalizer" do
     it "downcases the provided name" do
       expect(Gutentag.normaliser.call("Tasty Pancakes")).to eq("tasty pancakes")

data/spec/internal/app/models/comment.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Comment < ActiveRecord::Base
+  belongs_to :article
+end

data/spec/internal/app/models/thinkpiece.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
 
 class Thinkpiece < Article
-  #
 end

data/spec/internal/db/schema.rb

@@ -6,4 +6,10 @@ ActiveRecord::Schema.define do
     t.string :type
     t.timestamps :null => false
   end
+
+  create_table :comments, :force => true do |t|
+    t.references :article
+    t.string :name
+    t.text :text
+  end
 end

data/spec/models/gutentag/tag_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Gutentag::Tag, :type => :model do
+RSpec.describe Gutentag::Tag, :type => :model do
   describe ".find_by_name" do
     it "returns a tag with the same name" do
       existing = Gutentag::Tag.create! :name => "pancakes"

data/spec/models/gutentag/tagging_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Gutentag::Tagging, :type => :model do
+RSpec.describe Gutentag::Tagging, :type => :model do
   describe "#valid?" do
     let(:tag)      { Gutentag::Tag.create! :name => "pancakes" }
     let(:taggable) { Article.create! }

data/spec/spec_helper.rb

@@ -4,12 +4,16 @@ require "bundler/setup"
 
 Bundler.require :default, :development
 
+Dir["#{__dir__}/support/**/*.rb"].sort.each { |file| require file }
+
 Combustion.initialize! :active_record
 ActiveSupport.run_load_hooks :gutentag unless defined?(Gutentag::Engine)
 
 require "rspec/rails"
 
 RSpec.configure do |config|
+  config.disable_monkey_patching!
+
   if config.respond_to?(:use_transactional_tests)
     config.use_transactional_tests = false
   else

data/spec/support/mysql.rb

@@ -0,0 +1,27 @@
+# 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gutentag
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.3
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2020-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.12
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.12
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.81.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.81.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '1'
 description: A good, simple, solid tagging extension for ActiveRecord
 email:
 - pat@freelancing-gods.com
@@ -163,11 +177,13 @@ files:
 - lib/gutentag/tagged_with/query.rb
 - spec/acceptance/dirty_state_spec.rb
 - spec/acceptance/removing_unused_spec.rb
+- spec/acceptance/tag_names_for_scope_spec.rb
 - spec/acceptance/tag_names_spec.rb
 - spec/acceptance/tags_spec.rb
 - spec/gutentag/active_record_spec.rb
 - spec/gutentag_spec.rb
 - spec/internal/app/models/article.rb
+- spec/internal/app/models/comment.rb
 - spec/internal/app/models/thinkpiece.rb
 - spec/internal/config/database.yml
 - spec/internal/db/schema.rb
@@ -175,6 +191,7 @@ files:
 - spec/models/gutentag/tag_spec.rb
 - spec/models/gutentag/tagging_spec.rb
 - spec/spec_helper.rb
+- spec/support/mysql.rb
 homepage: https://github.com/pat/gutentag
 licenses:
 - MIT
@@ -194,8 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Good Tags