make_taggable 0.6.6 → 0.7.0

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).to match_array([frank, jim])
+      expect(TaggableModel.tagged_with("ji", wild: true, any: true).to_a).to match_array([frank, jim])
     end
   end
 

data/spec/spec_helper.rb

@@ -2,8 +2,6 @@
 ENV["RAILS_ENV"] = "test"
 
 require_relative "../spec/dummy/config/environment"
-ActiveRecord::Migrator.migrations_paths = [File.expand_path("../spec/dummy/db/migrate", __dir__)]
-ActiveRecord::Migration.maintain_test_schema!
 
 require "rspec/rails"
 require "rails"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: make_taggable
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - Matthew Kennedy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-21 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,30 +18,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -55,7 +55,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,7 +111,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,22 +124,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A fork of acts-as-taggable-on v6.5 with code updates and a new set of
-  migrations.
+description: MakeTaggable is a fork of Acts-As-Taggable-On with code updates & fresh
+  migrations
 email:
 - m.kennedy@me.com
-- michael@intridea.com
-- joost@spacebabies.nl
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ci.yml"
+- ".github/workflows/mysql_tests.yml"
+- ".github/workflows/pg_tests.yml"
+- ".github/workflows/sqlite_tests.yml"
+- ".github/workflows/standardrb-check.yml"
 - ".gitignore"
 - ".rspec"
 - ".standard.yml"
 - ".standard_todo.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -129,9 +157,6 @@ files:
 - 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
 - lib/make_taggable.rb
 - lib/make_taggable/default_parser.rb
 - lib/make_taggable/engine.rb
@@ -155,6 +180,7 @@ files:
 - lib/make_taggable/tags_helper.rb
 - lib/make_taggable/utils.rb
 - lib/make_taggable/version.rb
+- lib/tasks/setup_test_db.rake
 - lib/tasks/tags_collate_utf8.rake
 - make_taggable.gemspec
 - spec/dummy/README.md
@@ -181,6 +207,7 @@ files:
 - spec/dummy/app/models/other_taggable_model.rb
 - spec/dummy/app/models/student.rb
 - spec/dummy/app/models/taggable_model.rb
+- spec/dummy/app/models/taggable_model_with_json.rb
 - spec/dummy/app/models/untaggable_model.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/mailer.html.erb
@@ -207,30 +234,25 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/master.key
+- spec/dummy/config/mysql_database.yml.ci
+- spec/dummy/config/pg_database.yml.ci
 - spec/dummy/config/puma.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/config/spring.rb
 - spec/dummy/config/storage.yml
-- spec/dummy/db/migrate/20201119220853_create_taggable_models.rb
-- spec/dummy/db/migrate/20201119221037_create_columns_override_models.rb
-- spec/dummy/db/migrate/20201119221121_create_non_standard_id_taggable_models.rb
-- spec/dummy/db/migrate/20201119221228_create_untaggable_models.rb
-- spec/dummy/db/migrate/20201119221247_create_cached_models.rb
-- spec/dummy/db/migrate/20201119221314_create_other_cached_models.rb
-- spec/dummy/db/migrate/20201119221343_create_companies.rb
-- spec/dummy/db/migrate/20201119221416_create_users.rb
-- spec/dummy/db/migrate/20201119221434_create_other_taggable_models.rb
-- spec/dummy/db/migrate/20201119221507_create_ordered_taggable_models.rb
-- 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/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/db/migrate/020201119220853_create_taggable_models.rb
+- spec/dummy/db/migrate/020201119221037_create_columns_override_models.rb
+- spec/dummy/db/migrate/020201119221121_create_non_standard_id_taggable_models.rb
+- spec/dummy/db/migrate/020201119221228_create_untaggable_models.rb
+- spec/dummy/db/migrate/020201119221247_create_cached_models.rb
+- spec/dummy/db/migrate/020201119221314_create_other_cached_models.rb
+- spec/dummy/db/migrate/020201119221343_create_companies.rb
+- spec/dummy/db/migrate/020201119221416_create_users.rb
+- spec/dummy/db/migrate/020201119221434_create_other_taggable_models.rb
+- spec/dummy/db/migrate/020201119221507_create_ordered_taggable_models.rb
+- spec/dummy/db/migrate/020201119221530_create_cache_methods_injected_models.rb
+- spec/dummy/db/migrate/020201119221629_create_other_cached_with_array_models.rb
+- spec/dummy/db/migrate/020201119221746_create_taggable_model_with_jsons.rb
 - spec/dummy/lib/tasks/.keep
 - spec/dummy/log/.keep
 - spec/dummy/public/robots.txt
@@ -316,6 +338,7 @@ test_files:
 - spec/dummy/app/models/other_taggable_model.rb
 - spec/dummy/app/models/student.rb
 - spec/dummy/app/models/taggable_model.rb
+- spec/dummy/app/models/taggable_model_with_json.rb
 - spec/dummy/app/models/untaggable_model.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/mailer.html.erb
@@ -342,30 +365,25 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/master.key
+- spec/dummy/config/mysql_database.yml.ci
+- spec/dummy/config/pg_database.yml.ci
 - spec/dummy/config/puma.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/config/spring.rb
 - spec/dummy/config/storage.yml
-- spec/dummy/db/migrate/20201119220853_create_taggable_models.rb
-- spec/dummy/db/migrate/20201119221037_create_columns_override_models.rb
-- spec/dummy/db/migrate/20201119221121_create_non_standard_id_taggable_models.rb
-- spec/dummy/db/migrate/20201119221228_create_untaggable_models.rb
-- spec/dummy/db/migrate/20201119221247_create_cached_models.rb
-- spec/dummy/db/migrate/20201119221314_create_other_cached_models.rb
-- spec/dummy/db/migrate/20201119221343_create_companies.rb
-- spec/dummy/db/migrate/20201119221416_create_users.rb
-- spec/dummy/db/migrate/20201119221434_create_other_taggable_models.rb
-- spec/dummy/db/migrate/20201119221507_create_ordered_taggable_models.rb
-- 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/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/db/migrate/020201119220853_create_taggable_models.rb
+- spec/dummy/db/migrate/020201119221037_create_columns_override_models.rb
+- spec/dummy/db/migrate/020201119221121_create_non_standard_id_taggable_models.rb
+- spec/dummy/db/migrate/020201119221228_create_untaggable_models.rb
+- spec/dummy/db/migrate/020201119221247_create_cached_models.rb
+- spec/dummy/db/migrate/020201119221314_create_other_cached_models.rb
+- spec/dummy/db/migrate/020201119221343_create_companies.rb
+- spec/dummy/db/migrate/020201119221416_create_users.rb
+- spec/dummy/db/migrate/020201119221434_create_other_taggable_models.rb
+- spec/dummy/db/migrate/020201119221507_create_ordered_taggable_models.rb
+- spec/dummy/db/migrate/020201119221530_create_cache_methods_injected_models.rb
+- spec/dummy/db/migrate/020201119221629_create_other_cached_with_array_models.rb
+- spec/dummy/db/migrate/020201119221746_create_taggable_model_with_jsons.rb
 - spec/dummy/lib/tasks/.keep
 - spec/dummy/log/.keep
 - spec/dummy/public/robots.txt

data/.travis.yml

@@ -1,36 +0,0 @@
----
-os: linux
-dist: bionic
-language: ruby
-cache: bundler
-
-services:
-  - mysql
-  - postgresql
-
-rvm:
-  - 2.7
-  - 2.6
-  - 2.5
-
-env:
-  - DB=sqlite3
-  - DB=mysql
-  - DB=postgresql
-
-gemfile:
-  - gemfiles/rails_5.gemfile
-  - gemfiles/rails_6.gemfile
-  - gemfiles/rails_master.gemfile
-
-bundler_args: '--without local_development --jobs 3 --retry 3'
-
-before_install:
-  - gem update bundler
-
-script: bundle exec rake
-
-jobs:
-  allow_failures:
-    - rvm: ruby-head
-  fast_finish: true

data/gemfiles/rails_5.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "byebug", group: [:development, :test]
-gem "listen", group: [:development, :test]
-gem "rails", "~> 5.2.0"
-
-gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "byebug", group: [:development, :test]
-gem "listen", group: [:development, :test]
-gem "rails", "~> 6.0.0"
-
-gemspec path: "../"

data/gemfiles/rails_master.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "byebug", group: [:development, :test]
-gem "listen", group: [:development, :test]
-gem "rails", git: "https://github.com/rails/rails.git"
-
-gemspec path: "../"

data/spec/dummy/db/migrate/20201121222007_create_make_taggable_tags.make_taggable_engine.rb

@@ -1,11 +0,0 @@
-# This migration comes from make_taggable_engine (originally 1)
-class CreateMakeTaggableTags < ActiveRecord::Migration[5.2]
-  def change
-    create_table MakeTaggable.tags_table do |t|
-      t.string :name
-      t.integer :taggings_count, default: 0
-
-      t.timestamps
-    end
-  end
-end

data/spec/dummy/db/migrate/20201121222008_create_make_taggable_taggings.make_taggable_engine.rb

@@ -1,13 +0,0 @@
-# This migration comes from make_taggable_engine (originally 2)
-class CreateMakeTaggableTaggings < ActiveRecord::Migration[5.2]
-  def change
-    create_table MakeTaggable.taggings_table do |t|
-      t.references :tag, foreign_key: {to_table: MakeTaggable.tags_table}
-      t.references :taggable, polymorphic: true
-      t.references :tagger, polymorphic: true
-      t.string :context, limit: 128
-
-      t.timestamps
-    end
-  end
-end

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

@@ -1,8 +0,0 @@
-# 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/20201121222010_add_index_to_tags.make_taggable_engine.rb

@@ -1,6 +0,0 @@
-# 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
-  end
-end

data/spec/dummy/db/migrate/20201121222011_add_index_to_taggings.make_taggable_engine.rb

@@ -1,13 +0,0 @@
-# This migration comes from make_taggable_engine (originally 5)
-class AddIndexToTaggings < ActiveRecord::Migration[5.2]
-  def change
-    add_index MakeTaggable.taggings_table, :taggable_id
-    add_index MakeTaggable.taggings_table, :tagger_id
-    add_index MakeTaggable.taggings_table, :taggable_type
-    add_index MakeTaggable.taggings_table, :context
-    add_index MakeTaggable.taggings_table, [:tagger_id, :tagger_type]
-    add_index MakeTaggable.taggings_table, [:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type], unique: true, name: "taggings_idx"
-    add_index MakeTaggable.taggings_table, [:taggable_id, :taggable_type, :context], name: "taggings_taggable_context_idx"
-    add_index MakeTaggable.taggings_table, [:taggable_id, :taggable_type, :tagger_id, :context], name: "taggings_idy"
-  end
-end

data/spec/dummy/db/schema.rb

@@ -1,117 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
-# be faster and is potentially less error prone than running all of your
-# migrations from scratch. Old migrations may fail to apply correctly if those
-# migrations use external dependencies or application code.
-#
-# It's strongly recommended that you check this file into your version control system.
-
-ActiveRecord::Schema.define(version: 2020_11_21_222011) do
-
-  create_table "cache_methods_injected_models", force: :cascade do |t|
-    t.string "cached_tag_list"
-  end
-
-  create_table "cached_models", force: :cascade do |t|
-    t.string "name"
-    t.string "type"
-    t.string "cached_tag_list"
-  end
-
-  create_table "columns_override_models", force: :cascade do |t|
-    t.string "name"
-    t.string "type"
-    t.string "ignored_column"
-  end
-
-  create_table "companies", force: :cascade do |t|
-    t.string "name"
-  end
-
-  create_table "non_standard_id_taggable_models", primary_key: "an_id", force: :cascade do |t|
-    t.string "name"
-    t.string "type"
-  end
-
-  create_table "ordered_taggable_models", force: :cascade do |t|
-    t.string "name"
-    t.string "type"
-  end
-
-  create_table "other_cached_models", force: :cascade do |t|
-    t.string "name"
-    t.string "type"
-    t.string "cached_language_list"
-    t.string "cached_status_list"
-    t.string "cached_glass_list"
-  end
-
-  create_table "other_cached_with_array_models", force: :cascade do |t|
-    t.string "name"
-    t.string "type"
-    t.string "cached_language_list"
-    t.string "cached_status_list"
-    t.string "cached_glass_list"
-  end
-
-  create_table "other_taggable_models", force: :cascade do |t|
-    t.string "name"
-    t.string "type"
-  end
-
-  create_table "taggable_model_with_jsons", force: :cascade do |t|
-    t.string "name"
-    t.string "type"
-    t.json "opts"
-  end
-
-  create_table "taggable_models", force: :cascade do |t|
-    t.string "name"
-    t.string "type"
-  end
-
-  create_table "taggings", force: :cascade do |t|
-    t.integer "tag_id"
-    t.string "taggable_type"
-    t.integer "taggable_id"
-    t.string "tagger_type"
-    t.integer "tagger_id"
-    t.string "context", limit: 128
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["context"], name: "index_taggings_on_context"
-    t.index ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true
-    t.index ["tag_id"], name: "index_taggings_on_tag_id"
-    t.index ["taggable_id", "taggable_type", "context"], name: "taggings_taggable_context_idx"
-    t.index ["taggable_id", "taggable_type", "tagger_id", "context"], name: "taggings_idy"
-    t.index ["taggable_id"], name: "index_taggings_on_taggable_id"
-    t.index ["taggable_type", "taggable_id"], name: "index_taggings_on_taggable_type_and_taggable_id"
-    t.index ["taggable_type"], name: "index_taggings_on_taggable_type"
-    t.index ["tagger_id", "tagger_type"], name: "index_taggings_on_tagger_id_and_tagger_type"
-    t.index ["tagger_id"], name: "index_taggings_on_tagger_id"
-    t.index ["tagger_type", "tagger_id"], name: "index_taggings_on_tagger_type_and_tagger_id"
-  end
-
-  create_table "tags", force: :cascade do |t|
-    t.string "name"
-    t.integer "taggings_count", default: 0
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["name"], name: "index_tags_on_name", unique: true
-  end
-
-  create_table "untaggable_models", force: :cascade do |t|
-    t.integer "taggable_model_id"
-    t.string "name"
-  end
-
-  create_table "users", force: :cascade do |t|
-    t.string "name"
-  end
-
-  add_foreign_key "taggings", "tags"
-end