gutentag 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e934d0f1e941db5003a28ee2dc0ca30592db0b594f5633eeac2374f6a0ee8f9f
-  data.tar.gz: 8972fd4264e0dad5499ddbd7c9642caf8b15052fa78b63bebec6de4c57f1b9b6
+  metadata.gz: 9b86cbc2c649e92b40be12e9be738e3b57f57cb10241103e02d2aa5ea82a0d0a
+  data.tar.gz: 916b5eabf6121b235ca9136ac2eaf0113bde665f532bd21afe5b728825718fee
 SHA512:
-  metadata.gz: 55961186203575a716c658bd966102d344badbe8940f88523e6e4e76d795b8a9089be43320fd40735b749ed7f4507d3fe7d509bdd6f942dd9d2fabfb0d32e89b
-  data.tar.gz: 90f27936f1f5a96b522d26ad53ce8c74309fdc62c4409cb662112ee8603e610158ae379785646217b0cc61ea5a5e4150d31eaea77ea83033828c0d0af2db8771
+  metadata.gz: 3e3dcd7dcae2889b2ab496966bbb5b57c332f46546cbc7dd8f3e557f710c5ae89cfebe833a25bc6efb73c18fb74b858422943072407b328f59251543a000da4e
+  data.tar.gz: e7c60af1366e1afbc647162cbd72618be7884c9dc3bf8f580a8b6ddfa61684c7c1546f2fd9f85f0aadceaa2ac7b1dd22b70332b1061c162c2b3695d1fea111ac

data/.rubocop.yml

@@ -20,3 +20,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/.travis.yml

@@ -3,9 +3,10 @@ dist: xenial
 script: bundle exec appraisal rake
 rvm:
   - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
   # - jruby-9.2.8.0
 before_install:
   - gem install bundler --version 1.17.3

data/Appraisals

@@ -17,7 +17,7 @@ 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"
@@ -36,7 +36,7 @@ appraise "rails_5_2" do
 end if RUBY_VERSION.to_f >= 2.2
 
 appraise "rails_6_0" do
-  gem "rails",   "~> 6.0.0.rc1"
+  gem "rails",   "~> 6.0.0"
   gem "pg",      "~> 1.0",   :platform => :ruby
   gem "mysql2",  "~> 0.5.0", :platform => :ruby
   gem "sqlite3", "~> 1.4", :platform => :ruby

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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

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.
 

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/gutentag.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "gutentag"
-  s.version     = "2.5.2"
+  s.version     = "2.5.3"
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
   s.homepage    = "https://github.com/pat/gutentag"
@@ -17,11 +17,11 @@ 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 "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.72.0"
+  s.add_development_dependency "rubocop",             "~> 0.81.0"
   s.add_development_dependency "rubocop-performance", "~> 1"
 end

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

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/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.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2020-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -42,14 +42,14 @@ dependencies:
   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,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.72.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.72.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Good Tags