gutentag 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 506e53c384365bbd56d66a31a5a6956955d4098c31dd9bda30c5fe4d9f6822f7
-  data.tar.gz: e905db1b576c5ee5cd52a834b776232b7f3339d62f8517d9d9262f7c840151c1
+  metadata.gz: 06163432b93d4590113c493220800afa305a1f982aaa52384648aad8f1646213
+  data.tar.gz: 4cec16fcaa7b11d5a47e45533c956f42762c65235f11819bdae36d5b485181c4
 SHA512:
-  metadata.gz: a0039255e81ca547cfe1fa5ea9591b4edaedff4982835dbe4faf1788e5661b61d2ed25622242f641b3226b8d494a7c3ff54ca34e21859418b319a7aa701c8d78
-  data.tar.gz: 38d36b39b9d935cc32f1e0cdc80267d0d7e347d3c747b02f6270000beae2fe4bb60206f8ef5ccab8f3179c6cdeb6983fc3c3079f3b8452b843373c98b24b704c
+  metadata.gz: 3c08959b80eddd4cbaad7587a0aed5e5942089aa1107a800e62fab91d81099f6801c0b8a89f8627507fe0489907441f0d92b2c7e45d3f8d30b02456f4d8fc942
+  data.tar.gz: d38bfaef36f64adbaa59049b8cac7a5d4183a119dd496a92aceaaffbad059af1f7e5a74d6597273756d307b798555d95bbdb79785e178089fb52e3396c368d69

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project (at least, from v0.5.0 onwards) will be documented in this file.
 
+## 2.3.0 - 2018-03-19
+
+### Changed
+
+* Filter out blank tag names when provided via `tag_names=` (as discussed in [#51](https://github.com/pat/gutentag/issues/51)).
+
+### Fixed
+
+* Tag validations logic fails gracefully when the database server cannot be reached.
+
 ## 2.2.1 - 2018-03-06
 
 ### Fixed

data/README.md

@@ -80,7 +80,7 @@ These are the versions the test suite runs against. It's possible it may work on
 Get it into your Gemfile - and don't forget the version constraint!
 
 ```Ruby
-gem 'gutentag', '~> 2.2.1'
+gem 'gutentag', '~> 2.3'
 ```
 
 Next: your tags get persisted to your database, so let's import and run the migrations to get the tables set up:

data/gutentag.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "gutentag"
-  s.version     = "2.2.1"
+  s.version     = "2.3.0"
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
   s.homepage    = "https://github.com/pat/gutentag"

data/lib/gutentag.rb

@@ -33,6 +33,7 @@ require "gutentag/change_state"
 require "gutentag/dirty"
 require "gutentag/persistence"
 require "gutentag/remove_unused"
+require "gutentag/tag_names"
 require "gutentag/tag_validations"
 require "gutentag/tagged_with"
 

data/lib/gutentag/active_record/instance_methods.rb

@@ -30,7 +30,7 @@ module Gutentag::ActiveRecord::InstanceMethods
     # tracking doesn't think the original value was nil.
     @attributes.write_from_database "tag_names", []
 
-    super
+    super Gutentag::TagNames.call(names)
   end
 
   private

data/lib/gutentag/active_record/instance_methods_3_2.rb

@@ -14,6 +14,8 @@ module Gutentag::ActiveRecord::InstanceMethods
   end
 
   def tag_names=(names)
+    names = Gutentag::TagNames.call(names)
+
     Gutentag.dirtier.call self, names if Gutentag.dirtier
 
     @tag_names = names

data/lib/gutentag/active_record/instance_methods_4_2.rb

@@ -22,6 +22,10 @@ module Gutentag::ActiveRecord::InstanceMethods
     super
   end
 
+  def tag_names=(names)
+    super Gutentag::TagNames.call(names)
+  end
+
   private
 
   def persist_tags

data/lib/gutentag/tag_names.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Gutentag::TagNames
+  def self.call(names)
+    return nil if names.nil?
+
+    names.reject(&:blank?)
+  end
+end

data/lib/gutentag/tag_validations.rb

@@ -1,10 +1,22 @@
 # frozen_string_literal: true
 
+require "active_model/errors"
+require "active_record/errors"
+
 class Gutentag::TagValidations
   DEFAULTS = {
     :presence   => true,
     :uniqueness => {:case_sensitive => false}
   }.freeze
+  DATABASE_ERROR_CLASSES = lambda {
+    classes = []
+    if ActiveRecord::VERSION::STRING.to_f > 4.0
+      classes << ActiveRecord::NoDatabaseError
+    end
+    classes << Mysql2::Error     if defined?(::Mysql2)
+    classes << PG::ConnectionBad if defined?(::PG)
+    classes
+  }.call.freeze
 
   def self.call(klass)
     new(klass).call
@@ -15,7 +27,7 @@ class Gutentag::TagValidations
   end
 
   def call
-    klass.validates :name, validation_options
+    klass.validates :name, validation_options.dup
   end
 
   private
@@ -24,7 +36,7 @@ class Gutentag::TagValidations
 
   def add_length_validation?
     klass.table_exists? && limit.present?
-  rescue ActiveRecord::NoDatabaseError
+  rescue *DATABASE_ERROR_CLASSES
     false
   end
 

data/spec/acceptance/tag_names_spec.rb

@@ -116,4 +116,11 @@ describe "Managing tags via names" do
 
     expect(Article.find(article.id).tag_names).to eq(["melbourne"])
   end
+
+  it "ignores blank tags" do
+    article = Article.new :tag_names => ["", "melbourne"]
+    article.save!
+
+    expect(article.tag_names).to eq(%w[ melbourne ])
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gutentag
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -155,6 +155,7 @@ files:
 - lib/gutentag/engine.rb
 - lib/gutentag/persistence.rb
 - lib/gutentag/remove_unused.rb
+- lib/gutentag/tag_names.rb
 - lib/gutentag/tag_validations.rb
 - lib/gutentag/tagged_with.rb
 - lib/gutentag/tagged_with/id_query.rb