gutentag 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab338132cb66484c650c46037b6c5133b4ee72c90e7397fbf045cb909029bc3c
-  data.tar.gz: 7f4d9166ed7d9ef6a0b44a677f0a182434abcc1ceecfe26ea0ab137714b2c6c3
+  metadata.gz: 53b60a0cb99836a7c475d6fee7b431f99e38c16976f914e3591e86530c1d5b7b
+  data.tar.gz: 564c325549cf3f51ceb24a5986a06d5ad66b81f1a07b948a1875b4e1d8ebead5
 SHA512:
-  metadata.gz: 57eaa6e0442287f4a07dfb612cbb2c18dda900fe8cf7b274f12eecd299b70355711ff786ab20bf0616716e0ba7b1dc8520458d90a779c3cc715fa78e7842304a
-  data.tar.gz: 067b316bba0642bfedd777ff8cf7d0d85a08f326fd4959466ca3b831be3496fe9aad93872e16a7c3830f29b2ef8aafba8194628188784aed4d60413951d38c6e
+  metadata.gz: dcb6dba995fc07e770dbd605d667501dba90ed153c6c40ff825e53276890a2a7fb2e5d4f13cef3573a094d0b25fb1645baa956aeccdf3e1bfad8e6b0f8ade58e
+  data.tar.gz: df7591b2ed083abb732c447ecf1b916d540edc168b4542bca99fe41e03e8135f2cee6745b2a43d2e68cc9466da411e578db4bac40264123d3cf88ee5da84b502

data/.rubocop.yml

@@ -3,6 +3,11 @@ inherit_from:
 
 AllCops:
   TargetRubyVersion: 2.2
+  Exclude:
+    - gemfiles/*.gemfile
+
+Layout/AlignHash:
+  EnforcedHashRocketStyle: table
 
 Metrics/MethodLength:
   Exclude:

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.5
+  - 2.5.3
+  - 2.6.1
+  - jruby-9.2.5.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,47 @@
 # frozen_string_literal: true
 
 appraise "rails_3_2" do
-  gem "rails",  "~> 3.2.22.5"
-  gem "mysql2", "~> 0.3.10", :platform => :ruby
+  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
+  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
 
 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.beta1"
+  gem "pg",     "~> 1.0",   :platform => :ruby
+  gem "mysql2", "~> 0.5.0", :platform => :ruby
+end if RUBY_VERSION.to_f >= 2.5 && RUBY_PLATFORM != "java"

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project (at least, from v0.5.0 onwards) will be documented in this file.
 
+## 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

@@ -72,8 +72,8 @@ 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.2-v2.6, JRuby v9.2.5
+* Rails/ActiveRecord: v3.2-v6.0
 
 ### Installing
 
@@ -90,31 +90,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>

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.4.1"
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
   s.homepage    = "https://github.com/pat/gutentag"
@@ -18,10 +17,10 @@ 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 "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 "rubocop",          "~> 0.64.0"
 end

data/lib/gutentag/active_record/instance_methods.rb

@@ -28,7 +28,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/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/internal/app/models/thinkpiece.rb

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

data/spec/spec_helper.rb

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

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.4.1
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -42,30 +42,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     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,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.64.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.64.0
 description: A good, simple, solid tagging extension for ActiveRecord
 email:
 - pat@freelancing-gods.com
@@ -175,6 +175,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