make_taggable 0.7.0 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 511214c161094fadf92adb61f5735dc86af08370b92d492634170494fc5d4d8a
-  data.tar.gz: c20794c8e81c9eba4163763b86aaf1545022947d7a863f99bd3f14c8a2b6d0df
+  metadata.gz: 418910d2f9e9a651f3101d4e9d1688d970e1fa5aa4bd4036ba7bcf8e0efff02b
+  data.tar.gz: 6aeadae682477523982efee1f9a4903613c5a23e3512580d32f7c8e319516a16
 SHA512:
-  metadata.gz: 0e10cad86c423641043013316807a1cf62eedb55be1521425bfd3d7cb235c76bf89bf832e07f520982263578c5a095ecf36f8817a5d1847df71b06f1185a98e7
-  data.tar.gz: 0d58d6f106d4031dcded133e0716577649f51c975d75675a8dc357833946d282fff3776932fe4626714fc2c92c29d213c0dd5eb361f524efef9f6a45c020b9b6
+  metadata.gz: e63d4adb3aff65c339dc11359b908b93afd8f3cf142862b27868238af14f7e885a0b9076ca7ac4915090caa4dad591b7ad809d9177c1d4433a2b9f35d526808c
+  data.tar.gz: '097d51f1401b7112455748cdd3be4e6024c87f6ffef95005c74dc384d67726b0451de624053e8d7d4e19dfe03b59c7387df4ab16e24643fe63ab0b91e4f0487c'

data/.dummyrc

@@ -0,0 +1,17 @@
+--skip-bootsnap
+--skip-webpack
+--skip-action-cable
+--skip-spring
+--skip-coffee
+--skip-turbolinks
+--skip-listen
+--skip-action-text
+--skip-active-storage
+--skip-action-cable
+--skip-action-mailer
+--skip-action-mailbox
+--skip-active-job
+--skip-javascript
+--skip-test
+
+--template=spec/template/test_app_template.rb

data/.github/workflows/ci.yml

@@ -0,0 +1,140 @@
+---
+name: CI
+
+on:
+  pull_request:
+    branches:
+      - '*'
+  push:
+    branches:
+      - master
+jobs:
+  # SQLITE
+  sqlite:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.6', '2.7', '3.0']
+        gemfile:
+          - rails_5
+          - rails_6
+          - rails_6_1
+          - rails_master
+        exclude:
+          - ruby: '3.0'
+            gemfile: rails_5
+          # Rails 7 requires Ruby 2.7 or higher
+          - ruby: '2.6'
+            gemfile: rails_master
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+      BUNDLE_PATH_RELATIVE_TO_CWD: true
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run tests
+        env:
+          RAILS_ENV: test
+        run: |
+          bundle exec rake create_test_app
+          bundle exec rake
+
+
+  # MYSQL
+  mysql:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.6', '2.7', '3.0']
+        gemfile:
+          - rails_5
+          - rails_6
+          - rails_6_1
+          - rails_master
+        exclude:
+          - ruby: '3.0'
+            gemfile: rails_5
+          # Rails 7 requires Ruby 2.7 or higher
+          - ruby: '2.6'
+            gemfile: rails_master
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+      BUNDLE_PATH_RELATIVE_TO_CWD: true
+
+    services:
+      mysql:
+        image: mysql:8
+        env:
+          MYSQL_ROOT_PASSWORD: password
+          MSQL_DATABASE: test
+        ports: ['3306:3306']
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run tests
+        env:
+          DATABASE_URL: mysql2://root:password@127.0.0.1:3306/test
+          RAILS_ENV: test
+        run: |
+          bundle exec rake create_test_app
+          bundle exec rake
+
+
+  # POSTGRES
+  postgres:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.6', '2.7', '3.0']
+        gemfile:
+          - rails_5
+          - rails_6
+          - rails_6_1
+          - rails_master
+        exclude:
+          - ruby: '3.0'
+            gemfile: rails_5
+          # Rails 7 requires Ruby 2.7 or higher
+          - ruby: '2.6'
+            gemfile: rails_master
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+      BUNDLE_PATH_RELATIVE_TO_CWD: true
+
+    services:
+      postgres:
+        image: postgres:12
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: test
+        ports: ['5432:5432']
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run tests
+        env:
+          DATABASE_URL: postgres://postgres:password@localhost:5432/test
+          RAILS_ENV: test
+        run: |
+          bundle exec rake create_test_app
+          bundle exec rake

data/.github/workflows/standard-ci.yml

@@ -0,0 +1,27 @@
+---
+name: Standard Rb
+
+on:
+  pull_request:
+    branches:
+      - '*'
+  push:
+    branches:
+      - master
+jobs:
+  # STANDARD RB
+  standard:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['3.0']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run Standard Rb
+        run: bundle exec standardrb --format progress

data/.gitignore

@@ -4,6 +4,8 @@
 .bundle
 .ruby-version
 spec/internal/config/database.yml
+dummy
+spec/dummy
 tmp*.sw?
 *.sw?
 tmp
@@ -13,4 +15,3 @@ tmp
 /.idea
 spec/dummy/db/schema.rb
 spec/dummy/db/migrate/[!0]*
-/gemfiles/*

data/CONTRIBUTING.md

@@ -1,21 +1,8 @@
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
-
-- [How to contribute:](#how-to-contribute)
-  - [Bug reports / Issues](#bug-reports--issues)
-  - [Code](#code)
-    - [Commit Messages](#commit-messages)
-    - [About Pull Requests (PR's)](#about-pull-requests-prs)
-  - [Documentation](#documentation)
-
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-
 # How to contribute:
 
 ## Bug reports / Issues
 
-  * Is something broken or not working as expected? Check for an existing issue or [create a new one](https://github.com/mbleigh/acts-as-taggable-on/issues/new)
+  * Is something broken or not working as expected? Check for an existing issue or [create a new one](https://github.com/MatthewKennedy/make_taggable/issues/new)
   * IMPORTANT: Include the version of the gem, if you've install from git, what Ruby and Rails you are running, etc.
 
 ## Code
@@ -23,15 +10,14 @@
 1. [Fork and clone the repo](https://help.github.com/articles/fork-a-repo)
 2. Install the gem dependencies: `bundle install`
 3. Make the changes you want and back them up with tests.
-  * [Run the tests](https://github.com/mbleigh/acts-as-taggable-on#testing) (`bundle exec rake spec`)
-4. Update the CHANGELOG.md file with your changes and give yourself credit
-5. Commit and create a pull request with details as to what has been changed and why
+4. Run the tests](https://github.com/MatthewKennedy/make_taggable#testing)
+5. Update the CHANGELOG.md file with your changes and give yourself credit
+6. Commit and create a pull request with details as to what has been changed and why
   * Use well-described, small (atomic) commits.
   * Include links to any relevant github issues.
   * *Don't* change the VERSION file.
-6. Extra Credit: [Confirm it runs and tests pass on the rubies specified in the travis config](.travis.yml). I will otherwise confirm it runs on these.
 
-How I handle pull requests:
+## How I handle pull requests:
 
 * If the tests pass and the pull request looks good, I will merge it.
 * If the pull request needs to be changed,
@@ -40,18 +26,6 @@ How I handle pull requests:
     * by force pushing to it
   * I can make any changes myself and manually merge the code in.
 
-### Commit Messages
-
-* [A Note About Git Commit Messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
-* [http://stopwritingramblingcommitmessages.com/](http://stopwritingramblingcommitmessages.com/)
-* [ThoughtBot style guide](https://github.com/thoughtbot/guides/tree/master/style#git)
-
-### About Pull Requests (PR's)
-
-* [All Your Open Source Code Are Belong To Us](http://www.benjaminfleischer.com/2013/07/30/all-your-open-source-code-are-belong-to-us/)
-* [Using Pull Requests](https://help.github.com/articles/using-pull-requests)
-* [Github pull requests made easy](http://www.element84.com/github-pull-requests-made-easy.html)
-
 ## Documentation
 
 * Update the wiki

data/README.md

@@ -1,13 +1,9 @@
 # MakeTaggable
 [![Gem Version](https://badge.fury.io/rb/make_taggable.svg)](https://badge.fury.io/rb/make_taggable)
-![Postgres Tests](https://github.com/MatthewKennedy/make_taggable/workflows/Postgres%20Tests/badge.svg)
-![MySQL Tests](https://github.com/MatthewKennedy/make_taggable/workflows/MySQL%20Tests/badge.svg)
-![SQLite Tests](https://github.com/MatthewKennedy/make_taggable/workflows/SQLite%20Tests/badge.svg)
-![Standard Rb](https://github.com/MatthewKennedy/make_taggable/workflows/Standard%20Rb/badge.svg)
+![CI](https://github.com/MatthewKennedy/make_taggable/workflows/CI/badge.svg)
+[![Standard Rb](https://github.com/MatthewKennedy/make_taggable/actions/workflows/standard-ci.yml/badge.svg)](https://github.com/MatthewKennedy/make_taggable/actions/workflows/standard-ci.yml)
 
-MakeTaggable is a fork of Acts-As-Taggable-On with code updates, fresh migrations that work on MySQL, and tested against a dummy Rails app.
-
-All credit goes to those who contributed to Acts-As-Taggable-On: Michael Bleigh & Joost Baaij.
+MakeTaggable is a tagging gem for Rails applications that allows custom tagging along dynamic contexts.
 
 ## Installation
 
@@ -497,11 +493,26 @@ bundle exec appraisal install
 bundle exec appraisal rake
 ```
 
+## Contributing
+
+Please use the following Standard Rb commands to format your code before creating a pull request:
+
+Check for code errors:
 
-## Contributors
+```shell
+bundle exec standardrb
+```
+
+Fix code errors:
+
+```shell
+bundle exec standardrb --fix
+```
+For more information please review the [Contributing](https://github.com/MatthewKennedy/make_taggable/blob/master/CONTRIBUTING.md) section.
 
+#### Contributors
 List of valued contributors From Acts-As-Taggable-On: [Check them all](https://github.com/mbleigh/acts-as-taggable-on/contributors)
 
 
 ## License
-This gem is available as open source under the terms of the [MIT License](https://github.com/MatthewKennedy/make_taggable/blob/master/LICENSE.txt).
+This gem is available as open source under the terms of the [MIT License](https://github.com/MatthewKennedy/make_taggable/blob/master/LICENSE.md).

data/Rakefile

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

data/gemfiles/rails_5.gemfile

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

@@ -0,0 +1,9 @@
+# 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_6_1.gemfile

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

data/gemfiles/rails_master.gemfile

@@ -0,0 +1,9 @@
+# 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/lib/make_taggable.rb

@@ -60,7 +60,7 @@ module MakeTaggable
   def self.glue
     setting = @configuration.delimiter
     delimiter = setting.is_a?(Array) ? setting[0] : setting
-    delimiter.ends_with?(" ") ? delimiter : "#{delimiter} "
+    delimiter.end_with?(" ") ? delimiter : "#{delimiter} "
   end
 
   class Configuration

data/lib/make_taggable/tag.rb

@@ -7,7 +7,7 @@ module MakeTaggable
 
     ### VALIDATIONS:
     validates_presence_of :name
-    validates_uniqueness_of :name, if: :validates_name_uniqueness?
+    validates_uniqueness_of :name, if: :validates_name_uniqueness?, case_sensitive: true
     validates_length_of :name, maximum: 255
 
     # Monkey patch this method if don't need name uniqueness validation

data/lib/make_taggable/version.rb

@@ -1,3 +1,3 @@
 module MakeTaggable
-  VERSION = "0.7.0"
+  VERSION = "0.7.5"
 end

data/lib/tasks/setup_test_db.rake

@@ -1,6 +1,8 @@
 require "fileutils"
 
-desc "Set up the test app for"
-task :test_app do
-  exec "cd spec/dummy && rake make_taggable_engine:install:migrations && rake db:create RAILS_ENV=test && rake db:migrate RAILS_ENV=test"
+desc "Create a test app"
+task :create_test_app do
+  ENV["RAILS_ENV"] = "test"
+  ENV["ENGINE"] = "make_taggable_engine"
+  Rake::Task["dummy:app"].invoke
 end

data/make_taggable.gemspec

@@ -1,32 +1,44 @@
-$:.push File.expand_path("../lib", __FILE__)
-
-require "make_taggable/version"
+require_relative "lib/make_taggable/version"
 
 Gem::Specification.new do |spec|
   spec.name = "make_taggable"
   spec.version = MakeTaggable::VERSION
   spec.authors = ["Matthew Kennedy", "Michael Bleigh", "Joost Baaij"]
   spec.email = %w[m.kennedy@me.com]
-  spec.description = "MakeTaggable is a fork of Acts-As-Taggable-On with code updates & fresh migrations"
+
+  spec.required_ruby_version = ">= 2.5"
+
   spec.summary = "Advanced Tagging For Rails"
+  spec.description = "MakeTaggable is a fork of Acts-As-Taggable-On with code updates & fresh migrations"
+
   spec.homepage = "https://github.com/MatthewKennedy/make_taggable"
   spec.license = "MIT"
 
-  if File.exist?("UPGRADING.md")
-    spec.post_install_message = File.read("UPGRADING.md")
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata["changelog_uri"] = "https://github.com/MatthewKennedy/make_taggable/blob/master/CHANGELOG.md"
+
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }
   end
 
-  spec.files = `git ls-files`.split($/)
-  spec.test_files = spec.files.grep(%r{^spec/})
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails"
+  spec.add_dependency "activerecord", ">= 5.2.0", "<= 7.5.0"
+
+  spec.add_development_dependency "rails", ">= 5.2.0", "<= 7.5.0"
+  spec.add_development_dependency "appraisal", "~> 2.3.0"
+  spec.add_development_dependency "mysql2", "~> 0.5.0"
+  spec.add_development_dependency "pg", "~> 1.2.0"
+  spec.add_development_dependency "rspec", "~> 3.10.0"
+  spec.add_development_dependency "rspec-rails", "~> 4.0.0"
+  spec.add_development_dependency "standard", "~> 0.10.0"
+  spec.add_development_dependency "sqlite3", "~> 1.4.0"
+  spec.add_development_dependency "rails-dummy", "~> 0.1.0"
 
-  spec.add_development_dependency "appraisal"
-  spec.add_development_dependency "mysql2"
-  spec.add_development_dependency "pg"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rspec-rails"
-  spec.add_development_dependency "standard"
-  spec.add_development_dependency "sqlite3"
+  if File.exist?("UPGRADING.md")
+    spec.post_install_message = File.read("UPGRADING.md")
+  end
 end