make_taggable 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75e4c687d801738a1e36a15accd18686dd13ed883941e609bbfae23f98eaaae9
-  data.tar.gz: 103971ae8293cbfaaf351c3193022332eb024581c02ca89ea1d95d8bb8a4f154
+  metadata.gz: fc110297a0bf19db2784546646da17f6ae73dc9f359383ae06e1d3502544474a
+  data.tar.gz: efa71fe953279fd9a1e16b064faff9f3eb24551759b9657b6db112b11e32f241
 SHA512:
-  metadata.gz: eaf416b1f1490f92bf44c1992bbf68519a44ef55068f4183c73fbb19f729d4864e89124a4454e65afe9e164e16c9339f3659ae4d6ed95821ddfd15371649de3d
-  data.tar.gz: 46b07f4697367374b69458d011b6770883ae36b29c519c66dedd1aa070ca22cb08defecc8d80da29d79860a82368592898ba3be5a77d7b33e308f5a4c2d630f3
+  metadata.gz: ee09cc7eb170007245f4d7e4c072699cdeadca15700deb5d356bfe1724d52d04bb0ee6e095845a2d05b9889dfd44e5a384de87cd301c5fa287f010ed901fa6cc
+  data.tar.gz: 5f443267e9ee6db3666ebc03dab51b89f41291ba5122cb040a29c3f73f7fdcd0b99fff04d772bb31537bf7760bdf2b0919fcbc371327acf8ec0a1a0e8f8e9ac9

data/README.md

@@ -37,6 +37,21 @@ Review the generated migrations then migrate :
 rails db:migrate
 ```
 
+#### For MySql users
+You can circumvent at any time the problem of special characters [issue 623](https://github.com/mbleigh/acts-as-taggable-on/issues/623) by setting in an initializer file:
+
+```ruby
+MakeTaggable.force_binary_collation = true
+```
+
+Or by running this rake task:
+
+```shell
+rails make_taggable_on_engine:tag_names:collate_bin
+```
+
+See the Configuration section for more details.
+
 ## Usage
 
 Setup

data/Rakefile

@@ -1,7 +1,10 @@
 require "bundler/gem_tasks"
 
+import "./lib/tasks/tags_collate_utf8.rake"
+
 APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
 
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 task default: :spec
+

data/UPGRADING.md

@@ -0,0 +1,5 @@
+When upgrading run the migrations generator
+
+    rake acts_as_taggable_on_engine:install:migrations
+
+This will create any new migrations and skip existing ones

data/db/migrate/3_change_tag_name_collation_mysql.rb

@@ -0,0 +1,7 @@
+class ChangeTagNameCollationMysql < ActiveRecord::Migration[5.2]
+  def change
+    if MakeTaggable::Utils.using_mysql?
+      execute("ALTER TABLE #{MakeTaggable.tags_table} MODIFY name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;")
+    end
+  end
+end

data/lib/make_taggable/taggable/tagged_with_query/query_base.rb

@@ -29,9 +29,9 @@ module MakeTaggable::Taggable::TaggedWithQuery
       matches_attribute = matches_attribute.lower unless MakeTaggable.strict_case_match
 
       if options[:wild].present?
-        matches_attribute.matches("%#{escaped_tag(tag)}%", "!")
+        matches_attribute.matches("%#{escaped_tag(tag)}%", "!", MakeTaggable.strict_case_match)
       else
-        matches_attribute.matches(escaped_tag(tag), "!")
+        matches_attribute.matches(escaped_tag(tag), "!", MakeTaggable.strict_case_match)
       end
     end
 
@@ -40,9 +40,9 @@ module MakeTaggable::Taggable::TaggedWithQuery
       matches_attribute = matches_attribute.lower unless MakeTaggable.strict_case_match
 
       if options[:wild].present?
-        matches_attribute.matches_any(tag_list.map { |tag| "%#{escaped_tag(tag)}%" }, "!")
+        matches_attribute.matches_any(tag_list.map { |tag| "%#{escaped_tag(tag)}%" }, "!", MakeTaggable.strict_case_match)
       else
-        matches_attribute.matches_any(tag_list.map { |tag| escaped_tag(tag).to_s }, "!")
+        matches_attribute.matches_any(tag_list.map { |tag| escaped_tag(tag).to_s }, "!", MakeTaggable.strict_case_match)
       end
     end
 

data/lib/make_taggable/tagger.rb

@@ -18,7 +18,7 @@ module MakeTaggable
           owned_taggings_scope = opts.delete(:scope)
 
           has_many :owned_taggings, owned_taggings_scope,
-            opts.merge(
+            **opts.merge(
               as: :tagger,
               class_name: "::MakeTaggable::Tagging",
               dependent: :destroy

data/lib/make_taggable/tagging.rb

@@ -6,7 +6,7 @@ module MakeTaggable
     belongs_to :tag, class_name: "::MakeTaggable::Tag", counter_cache: MakeTaggable.tags_counter
     belongs_to :taggable, polymorphic: true
 
-    belongs_to :tagger, {polymorphic: true, optional: true}
+    belongs_to :tagger, polymorphic: true, optional: true
 
     scope :owned_by, ->(owner) { where(tagger: owner) }
     scope :not_owned, -> { where(tagger_id: nil, tagger_type: nil) }

data/lib/make_taggable/version.rb

@@ -1,4 +1,4 @@
 # Acts As Taggable With Updates
 module MakeTaggable
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/make_taggable.gemspec

@@ -7,11 +7,15 @@ Gem::Specification.new do |spec|
   spec.version = MakeTaggable::VERSION
   spec.authors = ["Matthew Kennedy", "Michael Bleigh", "Joost Baaij"]
   spec.email = %w[m.kennedy@me.com michael@intridea.com joost@spacebabies.nl]
-  spec.description = "MakeTaggable is a fork of acts-as-taggable-on v6.5 with code updates and a new set of migrations."
+  spec.description = "A fork of acts-as-taggable-on v6.5 with code updates and a new set of migrations."
   spec.summary = "Advanced Tagging For Rails"
   spec.homepage = "https://github.com/MatthewKennedy/make_taggable"
   spec.license = "MIT"
 
+  if File.exist?('UPGRADING.md')
+    spec.post_install_message = File.read('UPGRADING.md')
+  end
+
   spec.files = `git ls-files`.split($/)
   spec.test_files = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]

data/spec/dummy/db/migrate/20201121222009_change_tag_name_collation_mysql.make_taggable_engine.rb

@@ -0,0 +1,8 @@
+# This migration comes from make_taggable_engine (originally 3)
+class ChangeTagNameCollationMysql < ActiveRecord::Migration[5.2]
+  def change
+    if MakeTaggable::Utils.using_mysql?
+      execute("ALTER TABLE #{MakeTaggable.tags_table} MODIFY name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;")
+    end
+  end
+end

data/spec/dummy/db/migrate/{20201119222431_add_index_to_tags.make_taggable_engine.rb → 20201121222010_add_index_to_tags.make_taggable_engine.rb}

@@ -1,4 +1,4 @@
-# This migration comes from make_taggable_engine (originally 3)
+# This migration comes from make_taggable_engine (originally 4)
 class AddIndexToTags < ActiveRecord::Migration[5.2]
   def change
     add_index MakeTaggable.tags_table, :name, unique: true

data/spec/dummy/db/migrate/{20201119222432_add_index_to_taggings.make_taggable_engine.rb → 20201121222011_add_index_to_taggings.make_taggable_engine.rb}

@@ -1,4 +1,4 @@
-# This migration comes from make_taggable_engine (originally 4)
+# This migration comes from make_taggable_engine (originally 5)
 class AddIndexToTaggings < ActiveRecord::Migration[5.2]
   def change
     add_index MakeTaggable.taggings_table, :taggable_id

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_11_19_222432) do
+ActiveRecord::Schema.define(version: 2020_11_21_222011) do
 
   create_table "cache_methods_injected_models", force: :cascade do |t|
     t.string "cached_tag_list"

data/spec/make_taggable/taggable_spec.rb

@@ -474,7 +474,7 @@ describe "Taggable" do
 
       expect(TaggableModel.tagged_with(%w[bob tricia], wild: true, any: true).to_a.sort_by { |o| o.id }).to eq([bob, frank, steve])
       expect(TaggableModel.tagged_with(%w[bob tricia], wild: true, exclude: true).to_a).to eq([jim])
-      expect(TaggableModel.tagged_with("ji", wild: true, any: true).to_a =~ [frank, jim])
+      expect(TaggableModel.tagged_with('ji', wild: true, any: true).to_a).to match_array([frank, jim])
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: make_taggable
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Matthew Kennedy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2020-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,8 +96,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: MakeTaggable is a fork of acts-as-taggable-on v6.5 with code updates
-  and a new set of migrations.
+description: A fork of acts-as-taggable-on v6.5 with code updates and a new set of
+  migrations.
 email:
 - m.kennedy@me.com
 - michael@intridea.com
@@ -121,12 +121,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- UPGRADING.md
 - bin/console
 - bin/setup
 - db/migrate/1_create_make_taggable_tags.rb
 - db/migrate/2_create_make_taggable_taggings.rb
-- db/migrate/3_add_index_to_tags.rb
-- db/migrate/4_add_index_to_taggings.rb
+- db/migrate/3_change_tag_name_collation_mysql.rb
+- db/migrate/4_add_index_to_tags.rb
+- db/migrate/5_add_index_to_taggings.rb
 - gemfiles/rails_5.gemfile
 - gemfiles/rails_6.gemfile
 - gemfiles/rails_master.gemfile
@@ -222,10 +224,11 @@ files:
 - spec/dummy/db/migrate/20201119221530_create_cache_methods_injected_models.rb
 - spec/dummy/db/migrate/20201119221629_create_other_cached_with_array_models.rb
 - spec/dummy/db/migrate/20201119221746_create_taggable_model_with_jsons.rb
-- spec/dummy/db/migrate/20201119222429_create_make_taggable_tags.make_taggable_engine.rb
-- spec/dummy/db/migrate/20201119222430_create_make_taggable_taggings.make_taggable_engine.rb
-- spec/dummy/db/migrate/20201119222431_add_index_to_tags.make_taggable_engine.rb
-- spec/dummy/db/migrate/20201119222432_add_index_to_taggings.make_taggable_engine.rb
+- spec/dummy/db/migrate/20201121222007_create_make_taggable_tags.make_taggable_engine.rb
+- spec/dummy/db/migrate/20201121222008_create_make_taggable_taggings.make_taggable_engine.rb
+- spec/dummy/db/migrate/20201121222009_change_tag_name_collation_mysql.make_taggable_engine.rb
+- spec/dummy/db/migrate/20201121222010_add_index_to_tags.make_taggable_engine.rb
+- spec/dummy/db/migrate/20201121222011_add_index_to_taggings.make_taggable_engine.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/tasks/.keep
@@ -264,7 +267,12 @@ homepage: https://github.com/MatthewKennedy/make_taggable
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: |
+  When upgrading run the migrations generator
+
+      rake acts_as_taggable_on_engine:install:migrations
+
+  This will create any new migrations and skip existing ones
 rdoc_options: []
 require_paths:
 - lib
@@ -351,10 +359,11 @@ test_files:
 - spec/dummy/db/migrate/20201119221530_create_cache_methods_injected_models.rb
 - spec/dummy/db/migrate/20201119221629_create_other_cached_with_array_models.rb
 - spec/dummy/db/migrate/20201119221746_create_taggable_model_with_jsons.rb
-- spec/dummy/db/migrate/20201119222429_create_make_taggable_tags.make_taggable_engine.rb
-- spec/dummy/db/migrate/20201119222430_create_make_taggable_taggings.make_taggable_engine.rb
-- spec/dummy/db/migrate/20201119222431_add_index_to_tags.make_taggable_engine.rb
-- spec/dummy/db/migrate/20201119222432_add_index_to_taggings.make_taggable_engine.rb
+- spec/dummy/db/migrate/20201121222007_create_make_taggable_tags.make_taggable_engine.rb
+- spec/dummy/db/migrate/20201121222008_create_make_taggable_taggings.make_taggable_engine.rb
+- spec/dummy/db/migrate/20201121222009_change_tag_name_collation_mysql.make_taggable_engine.rb
+- spec/dummy/db/migrate/20201121222010_add_index_to_tags.make_taggable_engine.rb
+- spec/dummy/db/migrate/20201121222011_add_index_to_taggings.make_taggable_engine.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/tasks/.keep