gutentag 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fe6d98b81a4c392bb7591418821697ceb622e80e
-  data.tar.gz: 5299b1efed9975a5bb902d704617c41dc0a1dd38
+SHA256:
+  metadata.gz: b49f3b3dd099ef714f2b23fa1d0e1b08059c59c15447cdece6ee07ac1a0a1272
+  data.tar.gz: c0ef3dd657f3c0b6fe216b80807f74bed2abbdefcbd2c6c467176a8ca16b38a2
 SHA512:
-  metadata.gz: 1ae92f80e7bd6b60bd7623a976b910ba4a9a43e97aac6b2dab3b0f2d72ee76bce9d1eaddc6a70c2bbbe4500c36cfa9ea2f055635f4e6a0b0182dd6842b43af83
-  data.tar.gz: 2a07b209873183a7ed92d47bd2c6cecf153af767d14c2fe6e664272c6ee22032134ce4a0b194d5a0837206716cd5f99388b1c5a325c60d7c5c4bdd79aa9d0396
+  metadata.gz: ffeef43eb46712c0a261fc569db0571cc2ad66b68254cac89afbba58df15b8f41142b9401f170997608d692d81c353b744b1d71756520f7a80e4cb9c84caeb37
+  data.tar.gz: 80996c6d6b7f8addfb86092b80c8ffed4c28f60629db98e126fab4303865b215c4efbf76de30e9d5c8ab74e7a76859fbdfb9fff5d1c16905153f9a91d1aa6e7c

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/.gitignore

@@ -2,4 +2,5 @@
 gemfiles
 pkg/*
 spec/internal/db/*.sqlite
+spec/internal/db/migrate/
 .rubocop-*-yml

data/.rubocop.yml

@@ -1,10 +1,16 @@
 inherit_from:
   - https://gist.githubusercontent.com/pat/ba3b8ffb1901bfe5439b460943b6b019/raw/.rubocop.yml
 
+require: rubocop-performance
+
 AllCops:
   TargetRubyVersion: 2.3
   Exclude:
     - gemfiles/*.gemfile
+    - vendor/**/*
+
+Bundler/DuplicatedGem:
+  Enabled: false
 
 Metrics/MethodLength:
   Exclude:
@@ -18,3 +24,19 @@ Style/MultilineIfModifier:
 Style/MultilineTernaryOperator:
   Exclude:
     - db/migrate/*.rb
+
+# 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

@@ -17,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,9 +2,45 @@
 
 All notable changes to this project (at least, from v0.5.0 onwards) will be documented in this file.
 
+## 2.6.0 - 2021-07-10
+
+### Added
+
+* Queries can now be made for objects that have _none_ of the specified tags using `:match => :none` ([Rares S](https://github.com/laleshii) in [#79](https://github.com/pat/gutentag/pull/79)).
+* Added a generator `gutentag:migration_versions` to update generated migrations so they use the current version of Rails/ActiveRecord's Migration superclass. See discussion in [#80](https://github.com/pat/gutentag/issues/80).
+
+### Changed
+
+* When adding Gutentag to a new app, the migrations require the `gutentag:migration_versions` generator to be run to ensure the latest ActiveRecord migration superclass is used. This change has no impact to existing apps. See discussion in [#80](https://github.com/pat/gutentag/issues/80).
+
+## 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
 
-**Pleease 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.
+**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
 

data/Gemfile

@@ -4,11 +4,20 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "appraisal",
+  :git    => "https://github.com/marcotc/appraisal.git",
+  :branch => "explicit-require-set"
+
 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,14 +1,14 @@
 # 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.
 
 This was initially built partly as a proof-of-concept, partly to see how a tagging gem could work when it's not all stuffed within models, and partly just because I wanted a simpler tagging library. It's now a solid little tagging Rails engine.
 
-If you want to know more, read [this blog post](http://freelancing-gods.com/posts/gutentag_simple_rails_tagging).
+If you want to know more, read [this blog post](http://freelancing-gods.com/posts/gutentag_simple_rails_tagging), or have a look at [the Examples page](https://github.com/pat/gutentag/wiki/Examples) in the wiki (which includes a starting point for accepting tag values in a form).
 
 ## Contents
 
@@ -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)
 
@@ -66,6 +67,13 @@ To return records that have _all_ specified tags, use `:match => :all`:
 Article.tagged_with(:ids => [tag_a.id, tag_b.id], :match => :all)
 ```
 
+To return records that have _none_ of the specified tags, use `:match => :none`:
+
+```ruby
+# Returns all articles that have *neither* tag_a nor tag_b.
+Article.tagged_with(:ids => [tag_a.id, tag_b.id], :match => :none)
+```
+
 <h2 id="installation">Installation</h2>
 
 ### Dependencies
@@ -85,11 +93,12 @@ Get it into your Gemfile - and don't forget the version constraint!
 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:
+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:
 
 ```Bash
-rake gutentag:install:migrations
-rake db:migrate
+bundle exec rake gutentag:install:migrations
+bundle exec rails generate gutentag:migration_versions
+bundle exec 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).)
@@ -151,6 +160,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

@@ -21,7 +21,9 @@ class Gutentag::Tag < ActiveRecord::Base
 
   def self.names_for_scope(scope)
     join_conditions = {:taggable_type => scope.name}
-    if scope.current_scope.present?
+    if scope.is_a?(ActiveRecord::Relation)
+      return Gutentag::Tag.none unless scope.current_scope.present?
+
       join_conditions[:taggable_id] = scope.select(:id)
     end
 

data/db/migrate/1_gutentag_tables.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-superclass = ActiveRecord::VERSION::MAJOR < 5 ?
-  ActiveRecord::Migration : ActiveRecord::Migration[4.2]
-class GutentagTables < superclass
+class GutentagTables < ActiveRecord::Migration
   def up
     create_table :gutentag_taggings do |t|
       t.integer :tag_id,        :null => false

data/db/migrate/2_gutentag_cache_counter.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-superclass = ActiveRecord::VERSION::MAJOR < 5 ?
-  ActiveRecord::Migration : ActiveRecord::Migration[4.2]
-class GutentagCacheCounter < superclass
+class GutentagCacheCounter < ActiveRecord::Migration
   def up
     add_column :gutentag_tags, :taggings_count, :integer, :default => 0
     add_index  :gutentag_tags, :taggings_count

data/db/migrate/3_no_null_counters.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-superclass = ActiveRecord::VERSION::MAJOR < 5 ?
-  ActiveRecord::Migration : ActiveRecord::Migration[4.2]
-class NoNullCounters < superclass
+class NoNullCounters < ActiveRecord::Migration
   def up
     change_column :gutentag_tags, :taggings_count, :integer,
       :default => 0,

data/gutentag.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "gutentag"
-  s.version     = "2.5.0"
+  s.version     = "2.6.0"
   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_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/engine.rb

@@ -2,4 +2,8 @@
 
 class Gutentag::Engine < Rails::Engine
   engine_name :gutentag
+
+  generators do
+    require "gutentag/generators/migration_versions_generator"
+  end
 end

data/lib/gutentag/generators/migration_versions_generator.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "rails/generators"
+
+module Gutentag
+  module Generators
+    class MigrationVersionsGenerator < Rails::Generators::Base
+      desc "Update the ActiveRecord version in Gutentag migrations"
+
+      def update_migration_versions
+        if ::ActiveRecord::VERSION::MAJOR < 5
+          puts "No changes required"
+        else
+          migration_files.each do |file|
+            gsub_file file,
+              /< ActiveRecord::Migration$/,
+              "< ActiveRecord::Migration[#{rails_version}]"
+          end
+        end
+      end
+
+      private
+
+      def migration_files
+        Dir[Rails.root.join("db/migrate/*.rb")].select do |path|
+          known_migration_names.any? do |known|
+            File.basename(path)[/\A\d+_#{known}\.gutentag.rb\z/]
+          end
+        end
+      end
+
+      def known_migration_names
+        @known_migration_names ||= begin
+          Dir[File.join(__dir__, "../../../db/migrate/*.rb")].collect do |path|
+            File.basename(path).gsub(/\A\d+_/, "").gsub(/\.rb\z/, "")
+          end
+        end
+      end
+
+      def rails_version
+        @rails_version ||= [
+          ::ActiveRecord::VERSION::MAJOR,
+          ::ActiveRecord::VERSION::MINOR
+        ].join(".")
+      end
+    end
+  end
+end

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/lib/gutentag/tagged_with/query.rb

@@ -8,7 +8,7 @@ class Gutentag::TaggedWith::Query
   end
 
   def call
-    model.where "#{model_id} IN (#{query.to_sql})"
+    model.where "#{model_id} #{operator} (#{query.to_sql})"
   end
 
   private
@@ -20,8 +20,16 @@ class Gutentag::TaggedWith::Query
   end
 
   def query
-    return taggable_ids_query if match == :any || values.length == 1
+    return taggable_ids_query if match_any_or_none? || values.length == 1
 
     taggable_ids_query.having("COUNT(*) = #{values.length}").group(:taggable_id)
   end
+
+  def operator
+    match == :none ? "NOT IN" : "IN"
+  end
+
+  def match_any_or_none?
+    %i[any none].include?(match)
+  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

@@ -27,4 +27,12 @@ RSpec.describe "Tag names for scopes" do
     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"
@@ -160,6 +160,26 @@ describe Gutentag::ActiveRecord do
       it { is_expected.not_to include oregon_article }
     end
 
+    context "matching excluding one tag" do
+      subject do
+        Article.tagged_with(:names => %w[ melbourne ], :match => :none)
+      end
+
+      it { expect(subject.count).to eq 1 }
+      it { is_expected.to include oregon_article }
+      it do
+        is_expected.not_to include melbourne_oregon_article, melbourne_article
+      end
+    end
+
+    context "matching excluding all tags" do
+      subject do
+        Article.tagged_with(:names => %w[ melbourne oregon ], :match => :none)
+      end
+
+      it { expect(subject.count).to eq 0 }
+    end
+
     it "should work on STI subclasses" do
       thinkpiece = Thinkpiece.create! :tag_names => ["pancakes"]
 

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,14 +4,17 @@ 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
+Combustion.initialize! :active_record, :database_migrate => false
+AdjustMigrations.call(Combustion::Application)
 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/adjust_migrations.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require "fileutils"
+require "gutentag/generators/migration_versions_generator"
+
+class AdjustMigrations
+  def self.call(application)
+    new(application).call
+  end
+
+  def initialize(application)
+    @application = application
+  end
+
+  def call
+    copy_migrations_to_app
+    run_generator
+    run_migrations
+  end
+
+  private
+
+  attr_reader :application
+
+  def copy_migrations_to_app
+    FileUtils.mkdir_p application.root.join("db/migrate")
+
+    Dir["#{__dir__}/../../db/migrate/*.rb"].each do |file|
+      name = File.basename(file.gsub(/rb\z/, "gutentag.rb"))
+      destination = application.root.join("db/migrate/#{name}")
+
+      FileUtils.cp file, destination.to_s
+    end
+  end
+
+  def migration_context
+    if ActiveRecord::MigrationContext.instance_method(:initialize).arity <= 1
+      ActiveRecord::MigrationContext.new migration_paths
+    else
+      ActiveRecord::MigrationContext.new(
+        migration_paths, ActiveRecord::Base.connection.schema_migration
+      )
+    end
+  end
+
+  def migration_paths
+    application.root.join("db/migrate")
+  end
+
+  def run_generator
+    Gutentag::Generators::MigrationVersionsGenerator.start(
+      ["--quiet"], :destination_root => application.root
+    )
+  end
+
+  def run_migrations
+    if ActiveRecord::VERSION::STRING.to_f >= 5.2
+      migration_context.migrate
+    else
+      ActiveRecord::Migrator.migrate migration_paths, nil
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gutentag
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2021-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,32 +24,18 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
 - !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 +100,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 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -153,6 +153,7 @@ files:
 - lib/gutentag/change_state.rb
 - lib/gutentag/dirty.rb
 - lib/gutentag/engine.rb
+- lib/gutentag/generators/migration_versions_generator.rb
 - lib/gutentag/persistence.rb
 - lib/gutentag/remove_unused.rb
 - lib/gutentag/tag_names.rb
@@ -169,6 +170,7 @@ files:
 - 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
@@ -176,6 +178,7 @@ files:
 - spec/models/gutentag/tag_spec.rb
 - 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:
@@ -196,8 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.5
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Good Tags

data/.travis.yml

@@ -1,22 +0,0 @@
-language: ruby
-dist: xenial
-script: bundle exec appraisal rake
-rvm:
-  - 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