make_taggable 0.6.3 → 0.7.1

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
 

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.3
+  version: 0.7.1
 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-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,100 +18,134 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.0
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !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.
+        version: 1.4.0
+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
@@ -121,15 +155,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
-- gemfiles/rails_5.gemfile
-- gemfiles/rails_6.gemfile
-- gemfiles/rails_master.gemfile
+- 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
 - lib/make_taggable.rb
 - lib/make_taggable/default_parser.rb
 - lib/make_taggable/engine.rb
@@ -153,6 +186,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
@@ -179,6 +213,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
@@ -205,29 +240,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/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/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
@@ -263,8 +294,16 @@ files:
 homepage: https://github.com/MatthewKennedy/make_taggable
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  homepage_uri: https://github.com/MatthewKennedy/make_taggable
+  source_code_uri: https://github.com/MatthewKennedy/make_taggable
+  changelog_uri: https://github.com/MatthewKennedy/make_taggable/blob/master/CHANGELOG.md
+post_install_message: |
+  When upgrading run the migrations generator
+
+      rails make_taggable_engine:install:migrations
+
+  This will create any new migrations and skip existing ones
 rdoc_options: []
 require_paths:
 - lib
@@ -272,7 +311,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -308,6 +347,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
@@ -334,29 +374,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/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/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/20201119222429_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/20201119222430_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