gutentag 2.4.1 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53b60a0cb99836a7c475d6fee7b431f99e38c16976f914e3591e86530c1d5b7b
-  data.tar.gz: 564c325549cf3f51ceb24a5986a06d5ad66b81f1a07b948a1875b4e1d8ebead5
+  metadata.gz: 7af5fa8abd650550bd231819b8b4f043a17a15f0afba13dc443bf1b42ddd7a26
+  data.tar.gz: 7e22c0cc2a8c0de4840264b1e9cceb62c4504fc8df5d0e636a4894aa298152b5
 SHA512:
-  metadata.gz: dcb6dba995fc07e770dbd605d667501dba90ed153c6c40ff825e53276890a2a7fb2e5d4f13cef3573a094d0b25fb1645baa956aeccdf3e1bfad8e6b0f8ade58e
-  data.tar.gz: df7591b2ed083abb732c447ecf1b916d540edc168b4542bca99fe41e03e8135f2cee6745b2a43d2e68cc9466da411e578db4bac40264123d3cf88ee5da84b502
+  metadata.gz: 44ebaff249f6bba8798d98944177e3eac9569dc7731a3814add6e10fa1b2c5db1f491175e00bda53a25d84d6a96bdd622a5a812adac032017234c54864072002
+  data.tar.gz: fd440589741ffe77dfbde8649095c2bb5fae9a656d5b0cfb110390a8e156d49840cbead9a0e1e19d01a19a527a2d2e85dbd60e31a807fe25c6e2f746e5b59c55

data/.github/workflows/ci.yml

@@ -0,0 +1,90 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-18.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.4', '2.5', '2.6', '2.7', '3.0' ]
+        bundler: [ '1.17.3', '2.1.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'
+
+    services:
+      postgres:
+        image: postgres:10
+        env:
+          POSTGRES_USER: root
+          POSTGRES_PASSWORD: gutentag
+          POSTGRES_DB: test
+        ports: ['5432:5432']
+        # needed because the postgres container does not provide a healthcheck
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ROOT_PASSWORD: gutentag
+          MYSQL_DATABASE: test
+        ports: ['3306:3306']
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - 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: Test
+        env:
+          CI: "true"
+          DATABASE: ${{ matrix.database }}
+          DB_USERNAME: root
+          DB_PASSWORD: gutentag
+          DB_HOST: 127.0.0.1
+        run: bundle exec appraisal rspec
+
+  rubocop:
+    runs-on: ubuntu-18.04
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Set up ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+          bundler: 2.1.4
+          bundler-cache: true
+      - name: Rubocop
+        run: bundle exec rubocop

data/.rubocop.yml

@@ -1,13 +1,16 @@
 inherit_from:
   - https://gist.githubusercontent.com/pat/ba3b8ffb1901bfe5439b460943b6b019/raw/.rubocop.yml
 
+require: rubocop-performance
+
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
   Exclude:
     - gemfiles/*.gemfile
+    - vendor/**/*
 
-Layout/AlignHash:
-  EnforcedHashRocketStyle: table
+Bundler/DuplicatedGem:
+  Enabled: false
 
 Metrics/MethodLength:
   Exclude:
@@ -22,5 +25,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/Appraisals

@@ -1,10 +1,5 @@
 # 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
@@ -22,26 +17,34 @@ appraise "rails_4_2" do
   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
+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
+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
+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
+end if RUBY_VERSION.to_f >= 2.2 && RUBY_VERSION.to_f <= 2.7
 
 appraise "rails_6_0" do
-  gem "rails",  "~> 6.0.0.beta1"
-  gem "pg",     "~> 1.0",   :platform => :ruby
-  gem "mysql2", "~> 0.5.0", :platform => :ruby
+  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"
+
+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 && RUBY_PLATFORM != "java"

data/CHANGELOG.md

@@ -2,6 +2,43 @@
 
 All notable changes to this project (at least, from v0.5.0 onwards) will be documented in this file.
 
+## 2.5.4 - 2021-02-21
+
+### Fixed
+
+* Don't apply the tag length validation when `ActiveRecord::ConnectionNotEstablished` exceptions are raised. ([John Duff](https://github.com/jduff) in [#77](https://github.com/pat/gutentag/pull/77)).
+
+## 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

data/Gemfile

@@ -8,7 +8,12 @@ gem "test-unit", :platform => :ruby_22
 
 gem "mysql2",  "~> 0.3",    :platform => :ruby
 gem "pg",      "~> 0.18",   :platform => :ruby
-gem "sqlite3", "~> 1.3.13", :platform => :ruby
+
+if RUBY_VERSION.to_f < 3.0
+  gem "sqlite3", "~> 1.3.13"
+else
+  gem "sqlite3", "~> 1.4"
+end
 
 gem "activerecord-jdbcmysql-adapter",      ">= 1.3.23", :platform => :jruby
 gem "activerecord-jdbcpostgresql-adapter", ">= 1.3.23", :platform => :jruby

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.6, JRuby v9.2.5
-* Rails/ActiveRecord: v3.2-v6.0
+* 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:
@@ -149,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

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "gutentag"
-  s.version     = "2.4.1"
+  s.version     = "2.5.4"
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
   s.homepage    = "https://github.com/pat/gutentag"
@@ -16,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.17"
-  s.add_development_dependency "combustion",       "~> 1.1"
-  s.add_development_dependency "database_cleaner", "~> 1.6"
+  s.add_development_dependency "appraisal",           "~> 2.3"
+  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.64.0"
+  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'.

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

@@ -13,6 +13,7 @@ class Gutentag::TagValidations
     if ActiveRecord::VERSION::STRING.to_f > 4.0
       classes << ActiveRecord::NoDatabaseError
     end
+    classes << ActiveRecord::ConnectionNotEstablished
     classes << Mysql2::Error     if defined?(::Mysql2)
     classes << PG::ConnectionBad if defined?(::PG)
     classes
@@ -36,7 +37,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/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/config/database.yml

@@ -2,11 +2,26 @@
 test:
   adapter: mysql2
   database: gutentag
-  username: root
+  username: <%= ENV.fetch("DB_USERNAME", "root") %>
+  <% if ENV["DB_HOST"] %>
+  host: <%= ENV["DB_HOST"] %>
+  <% end %>
+  <% if ENV["DB_PASSWORD"] %>
+  password: <%= ENV["DB_PASSWORD"] %>
+  <% end %>
 <% elsif ENV["DATABASE"] == "postgres" %>
 test:
   adapter: postgresql
   database: gutentag
+  <% if ENV["DB_HOST"] %>
+  host: <%= ENV["DB_HOST"] %>
+  <% end %>
+  <% if ENV["DB_USERNAME"] %>
+  username: <%= ENV["DB_USERNAME"] %>
+  <% end %>
+  <% if ENV["DB_PASSWORD"] %>
+  password: <%= ENV["DB_PASSWORD"] %>
+  <% end %>
 <% else %>
 test:
   adapter: sqlite3

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,7 +4,7 @@ require "bundler/setup"
 
 Bundler.require :default, :development
 
-Dir["#{__dir__}/support/**/*.rb"].each { |file| require file }
+Dir["#{__dir__}/support/**/*.rb"].sort.each { |file| require file }
 
 Combustion.initialize! :active_record
 ActiveSupport.run_load_hooks :gutentag unless defined?(Gutentag::Engine)
@@ -12,6 +12,8 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gutentag
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.4
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,26 +30,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
@@ -114,14 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.64.0
+        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.64.0
+        version: '1'
 description: A good, simple, solid tagging extension for ActiveRecord
 email:
 - pat@freelancing-gods.com
@@ -129,9 +143,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -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
@@ -195,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

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-dist: xenial
-script: bundle exec appraisal rake
-rvm:
-  - 2.2.10
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.1
-  - jruby-9.2.5.0
-before_install:
-  - 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