gutentag 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2220c5448de91dad49288b5d2370588e09a08bf863f3398b1ef0eb07e54691ef
-  data.tar.gz: 42b8046acab85218e0e3ecea86ae5d1fb27e2ca69895567b66d66227b3070ffe
+  metadata.gz: e934d0f1e941db5003a28ee2dc0ca30592db0b594f5633eeac2374f6a0ee8f9f
+  data.tar.gz: 8972fd4264e0dad5499ddbd7c9642caf8b15052fa78b63bebec6de4c57f1b9b6
 SHA512:
-  metadata.gz: a151247791c559ff523ebb8af939ed28a0d55932b1d99d0476fa77a6ae9bafe724526ed1f21a3eb38d05ea0a371540e15c659f69e062abfe90f33f337b7ee71d
-  data.tar.gz: fd7f8db5ee16bd1fb854e9d2ad3bf18dc5b48de866e307bc750a4ff525ab303981e3eddef1ac562bbe0918fdd32e088543fba7025d09a4ff2af7e87d2694c8dc
+  metadata.gz: 55961186203575a716c658bd966102d344badbe8940f88523e6e4e76d795b8a9089be43320fd40735b749ed7f4507d3fe7d509bdd6f942dd9d2fabfb0d32e89b
+  data.tar.gz: 90f27936f1f5a96b522d26ad53ce8c74309fdc62c4409cb662112ee8603e610158ae379785646217b0cc61ea5a5e4150d31eaea77ea83033828c0d0af2db8771

data/.travis.yml

@@ -6,7 +6,7 @@ rvm:
   - 2.4.6
   - 2.5.5
   - 2.6.3
-  - jruby-9.2.7.0
+  # - jruby-9.2.8.0
 before_install:
   - gem install bundler --version 1.17.3
 install:

data/Appraisals

@@ -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.beta1"
+  gem "rails",   "~> 6.0.0.rc1"
   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,12 @@
 
 All notable changes to this project (at least, from v0.5.0 onwards) will be documented in this file.
 
+## 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
@@ -10,7 +16,7 @@ All notable changes to this project (at least, from v0.5.0 onwards) will be docu
 
 ## 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/gutentag.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "gutentag"
-  s.version     = "2.5.1"
+  s.version     = "2.5.2"
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
   s.homepage    = "https://github.com/pat/gutentag"
@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   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.68.1"
+  s.add_development_dependency "rubocop",             "~> 0.72.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_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/spec/acceptance/tag_names_spec.rb

@@ -135,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/internal/app/models/comment.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Comment < ActiveRecord::Base
+  belongs_to :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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gutentag
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.68.1
+        version: 0.72.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.68.1
+        version: 0.72.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +183,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