acts-as-taggable-array-on 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad1ac43607f0f09763e87b8f283f01652a6176d74d7bb5d2c8685453a10501fc
-  data.tar.gz: 31dadff61892909368696d09fb5248ec08786ac41333e315581325cf17b707a1
+  metadata.gz: 02127b9b3ed01db1bf067d182c677ec562e8c8030670019897f34af8ba44d231
+  data.tar.gz: 52feb971a781b61175d31b68b181fac94d2b60e8ad092cfcef0b2195ed6c6ce7
 SHA512:
-  metadata.gz: ae034e443e607c4de43fe8df98fdccd89f15eb9cba552fd98c6fd8d97f238207271fbf2861adb5aef45c1ad9c3c534ad100a45eaad252baf62bf8c232037f44a
-  data.tar.gz: e4b432be275ff891566b7f336c794980a74e6943cd7152610190c386e54c11c3a1c12b79466678a4e27d72cf945dd247960a917de8504733c6f3fa51a3b28754
+  metadata.gz: 54ed464914256f747d5bc784a237da30629ae5c5f57bc7dea2c40c48c19f427541cbc264a2b41da17dc49f394a3e7f0362b7ab7f00806f0a856ab32c1e22d900
+  data.tar.gz: dd87d5d2ff3272b4613a48fa79de16e70d8c7535b980cc6ddd2be7967725a761451273abb4dbc04c915481c2dba386ee6d1271f5054975c2a1f133d9cbebdbe8

data/.github/workflows/tests.yml

@@ -0,0 +1,48 @@
+name: "Running Tests"
+
+on:
+  - pull_request
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: ['2.7', '3.0', '3.1', 'head']
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:11.6
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: ""
+          POSTGRES_DB: postgres
+        ports: ["5432:5432"]
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+    env:
+      RAILS_ENV: test
+      PGHOST: localhost
+      PGUSER: postgres
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          # runs 'bundle install' and caches installed gems automatically
+          bundler-cache: true
+
+      - name: Create a database
+        run: rake db:create
+
+      - name: Install citext extension
+        run: |
+          psql -U postgres -d "acts-as-taggable-array-on_test" -c "CREATE EXTENSION IF NOT EXISTS citext;"
+
+      - name: Running a test
+        run: bundle exec rspec

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea

data/.travis.yml

@@ -1,13 +1,15 @@
 language: ruby
 rvm:
-  - 2.4.8
   - 2.5.7
   - 2.6.5
+  - 2.7.0
+  - 3.0.0
 services:
   - postgresql
 gemfile:
   - gemfiles/rails_5_2.gemfile
   - gemfiles/rails_6_0.gemfile
+  - gemfiles/rails_6_1.gemfile
 before_script:
   - cp config/database.yml.travis config/database.yml
   - bundle exec rake db:create
@@ -16,5 +18,5 @@ script:
   - bundle exec rspec
 matrix:
   exclude:
-    - rvm: 2.4.8
-      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: 3.0.0
+      gemfile: gemfiles/rails_5_2.gemfile

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.7.0
+- Standard linter used as a style guide
+- Ruby 2.4 support dropped
+- Support for Ruby 3.0 added
+- Support for Rails 6.1 added
+- Support for citext arrays added
+
 ## 0.6
 - Drop support for `EOL` versions of Ruby (below `2.4)`, and Rails (below `5.2`)
 - Alias `acts_as_taggable_on` to `taggable_array`

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in acts-as-pgarray-taggable-on.gemspec
 gemspec

data/Guardfile

@@ -1,5 +1,5 @@
-guard 'rspec', cmd: 'rspec --drb --color' do
+guard "rspec", cmd: "rspec --drb --color" do
   watch(%r{^spec/.+_spec\.rb})
-  watch(%r{^lib/(.+)\.rb})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb') { "spec" }
+  watch(%r{^lib/(.+)\.rb}) { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch("spec/spec_helper.rb") { "spec" }
 end

data/README.md

@@ -1,15 +1,14 @@
 # ActsAsTaggableArrayOn
 [![Build Status](https://travis-ci.org/tmiyamon/acts-as-taggable-array-on.svg?branch=master)](https://travis-ci.org/tmiyamon/acts-as-taggable-array-on)
 
-A simple implementation for tagging system with postgres array. Please note, only PostgreSql database is supported.
-
+A simple implementation for tagging system based on a database array type. Only PostgreSQL Arrays are currently supported.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'acts-as-taggable-array-on'
+gem "acts-as-taggable-array-on"
 ```
 
 And then execute:
@@ -20,152 +19,157 @@ bundle
 
 
 ## Setup
-
-To use it, you need to have an array column to act as taggable.
+To use it, you need to have an array column to act as taggable - `tags`. 
 
 ```ruby
 class CreateUser < ActiveRecord::Migration
   def change
     create_table :users do |t|
-      t.string :tags, array: true, default: '{}'
+      t.string :tags, array: true, default: []
       t.timestamps
     end
-    add_index :users, :tags, using: 'gin'
+    add_index :users, :tags, using: "gin"
   end
 end
 ```
 
-and bundle:
+- You can change from `string` to any other type here. But in case of any doubt, `string` is a great default.
+- Make sure not to lose `default: []`, it's important to always have empty array as default.
+
+Run a migration:
 
 ```shell
 rake db:migrate
 ```
 
-then
+Indicate that attribute is "taggable" in a Rails model, like this:
 
 ```ruby
 class User < ActiveRecord::Base
   taggable_array :tags
 end
-@user = User.new(:name => "Bobby")
 ```
 
-acts_as_taggable_array_on defines 4 scope and 2 class methods as below.
-
-### types
-
-currently, these types supported
-
-- varchar[]
-- text[]
-- integer[]
+### Types
+We currently tested only following types for underlying arrays:
 
-### scopes
-
-- with_any_#{tag_name}
-- with_all_#{tag_name}
-- without_any_#{tag_name}
-- without_all_#{tag_name}
-
-### class methods
-
-- all_#{tag_name}
-- #{tag_name}_cloud
+- `varchar[]`
+  - `t.string :tags, array: true, default: []`
+  - `add_column :users, :tags, :string, array: true, default: []`
+- `text[]`
+  - `t.text :tags, array: true, default: []`
+  - `add_column :users, :tags, :text, array: true, default: []`
+- `integer[]`
+  - `t.integer :tags, array: true, default: []`
+  - `add_column :users, :tags, :integer, array: true, default: []`
 
 
 ## Usage
 
-Set, add and remove
-
 ```ruby
 #set
-@user.tags = ["awesome", "slick"]
-@user.tags = '{awesome,slick}'
+user.tags = ["awesome", "slick"]
+user.tags = "{awesome,slick}"
 
 #add
-@user.tags += ["awesome"]
-@user.tags += ["awesome", "slick"]
+user.tags += ["awesome"]
+user.tags += ["awesome", "slick"]
+user.tags << "awesome"
 
 #remove
-@user.tags -= ["awesome"]
-@user.tags -= ["awesome", "slick"]
+user.tags -= ["awesome"]
+user.tags -= ["awesome", "slick"]
 ```
 
-### Finding Tagged Objects
+### Scopes
+
+#### `with_any_#{tag_name}`
 
 ```ruby
-class User < ActiveRecord::Base
-  taggable_array :tags
-  scope :by_join_date, ->{order("created_at DESC")}
-end
+# Find a user with any of the tags
+User.with_any_tags("awesome, slick")
+User.with_any_tags(["awesome", "slick"])
+```
 
+#### `with_all_#{tag_name}`
+
+```ruby
 # Find a user with all of the tags
 User.with_all_tags("awesome, slick")
 User.with_all_tags(["awesome", "slick"])
+```
 
-# Find a user with any of the tags
-User.with_any_tags("awesome, slick")
-User.with_any_tags(["awesome", "slick"])
-
-# Find a user without all of the tags
-User.without_all_tags("awesome, slick")
-User.without_all_tags(["awesome", "slick"])
+#### `without_any_#{tag_name}`
 
+```ruby
 # Find a user without any of the tags
 User.without_any_tags("awesome, slick")
 User.without_any_tags(["awesome", "slick"])
+```
 
-# Chain with the other scopes
-User.with_any_tags("awesome").without_any_tags("slick").by_join_date.paginate(:page => params[:page], :per_page => 20)
+#### `without_all_#{tag_name}`
+
+```ruby
+# Find a user without all of the tags
+User.without_all_tags("awesome, slick")
+User.without_all_tags(["awesome", "slick"])
 ```
 
-### Tag cloud calculations
 
-Calculation to count for each tags is supported. Currently, it does not care its order.
+### Class methods
+
+#### `all_#{tag_name}`
 
 ```ruby
-User.tags_cloud
-# [['awesome' => 1], ['slick' => 2]]
+User.all_tags
+# ["awesome", "slick"]
 ```
 
-Tag cloud calculation uses subquery internally. To add scopes to the query, use block.
+You can use block to add scopes to the query.
 
 ```ruby
-User.tags_cloud { where name: ['ken', 'tom'] }
+User.all_tags { where(name: ["ken", "tom"]) }
 ```
 
-To handle the result tags named 'tag' and 'count', prepend scopes.
+Or simply use your existing scopes:
 
 ```ruby
-User.where('tag like ?', 'aws%').limit(10).order('count desc').tags_cloud { where name: ['ken', 'tom'] }
+# scope :by_join_date, ->{order("created_at DESC")}
+User.all_tags.by_join_date
 ```
 
-### All Tags
-
-Can get all tags easily.
+SQL field is named "tag" and you can use it to modify the query.
 
 ```ruby
-User.all_tags
-# ['awesome', 'slick']
+User.where("tag like ?", "aws%").all_tags { where(name: ["ken", "tom"]) }
 ```
 
-As the same to tag cloud calculation, you can use block to add scopes to the query.
+#### `#{tag_name}_cloud`
 
+Calculates the number of occurrences of each tag.
 
 ```ruby
-User.all_tags { where name: ['ken', 'tom'] }
+User.tags_cloud
+# [["slick" => 2], ["awesome" => 1]]
 ```
 
-To handle the result tags named 'tag', prepend scopes.
+You can use block to add scopes to the query.
 
 ```ruby
-User.where('tag like ?', 'aws%').all_tags { where name: ['ken', 'tom'] }
+User.tags_cloud { where(name: ["ken", "tom"]) }
 ```
 
+SQL fields are named "tag" and "count" and you can use them to modify the query.
+
+```ruby
+User.where("tag like ?", "aws%").limit(10).order("count desc").tags_cloud { where(name: ["ken", "tom"]) }
+```
+
+
 ## Benchmark
-Based on the [article](https://adamnengland.wordpress.com/2014/02/19/benchmarks-acts-as-taggable-on-vs-postgresql-arrays/), I built [simple benchmark app](https://github.com/tmiyamon/acts-as-taggable-benchmark/) to compare only the main features acts-as-taggable-array-on has.
+Based on the [article](https://adamnengland.wordpress.com/2014/02/19/benchmarks-acts-as-taggable-on-vs-postgresql-arrays/), I built [simple benchmark app](https://github.com/tmiyamon/acts-as-taggable-benchmark/) to compare only the main features ActsAsTaggableArrayOn has.
 
-This result does NOT insist acts-as-taggable-array-on is better than acts-as-taggable-on since it provides much more features than this gem.
+This result does NOT insist ActsAsTaggableArrayOn is better than acts-as-taggable-on since it provides much more features than this gem.
 In the case you need simple tag functionality, acts-as-taggable-array-on may be helpful to improve its performance.
 
 ```bash
@@ -216,8 +220,10 @@ rake bench:write bench:find_by_id bench:find_by_tag  20.29s user 1.52s system 77
 ```
 
 ## Development
-To run testsuite you'll need to setup local PG database/user with `rake db:create`
+
+- To run testsuite you'll need to setup local PG database/user with `rake db:create`
 After that just running `rspec` should work.
+- Before submitting code for a review, please be sure to run `bundle exec standardrb --fix`
 
 ## Contributing
 

data/Rakefile

@@ -1,9 +1,9 @@
 require "bundler/gem_tasks"
 
 namespace :db do
-	desc "Create database for tests"
+  desc "Create database for tests"
   task :create do
-    puts %x( createuser -d acts-as-taggable-array-on -U postgres )
-    puts %x( createdb --username=acts-as-taggable-array-on acts-as-taggable-array-on_test )
+    puts `createuser -d acts-as-taggable-array-on -U postgres`
+    puts `createdb --username=acts-as-taggable-array-on acts-as-taggable-array-on_test`
   end
 end

data/acts-as-taggable-array-on.gemspec

@@ -1,31 +1,31 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'acts-as-taggable-array-on/version'
+require "acts-as-taggable-array-on/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "acts-as-taggable-array-on"
-  spec.version       = ActsAsTagPgarray::VERSION
-  spec.authors       = ["Takuya Miyamoto"]
-  spec.email         = ["miyamototakuya@gmail.com"]
-  spec.summary       = %q{Simple tagging gem for Rails using postgres array.}
-  spec.description   = %q{Simple tagging gem for Rails using postgres array.}
-  spec.homepage      = "https://github.com/tmiyamon/acts-as-taggable-array-on"
-  spec.license       = "MIT"
+  spec.name = "acts-as-taggable-array-on"
+  spec.version = ActsAsTagPgarray::VERSION
+  spec.authors = ["Takuya Miyamoto"]
+  spec.email = ["miyamototakuya@gmail.com"]
+  spec.summary = "Simple tagging gem for Rails using postgres array."
+  spec.description = "Simple tagging gem for Rails using postgres array."
+  spec.homepage = "https://github.com/tmiyamon/acts-as-taggable-array-on"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'activerecord',  ['>= 5.2']
-  spec.add_runtime_dependency 'activesupport', ['>= 5.2']
+  spec.add_runtime_dependency "activerecord", [">= 5.2"]
+  spec.add_runtime_dependency "activesupport", [">= 5.2"]
 
-  spec.add_development_dependency 'pg', '~> 1.1'
+  spec.add_development_dependency "pg", "~> 1.1"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "listen", "> 3.0"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "standard"
 end

data/gemfiles/rails_5_2.gemfile

@@ -1,7 +1,7 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in acts-as-pgarray-taggable-on.gemspec
-gemspec path: '../'
+gemspec path: "../"
 
-gem 'activerecord',  '~> 5.2.0'
-gem 'activesupport', '~> 5.2.0'
+gem "activerecord", "~> 5.2.0"
+gem "activesupport", "~> 5.2.0"

data/gemfiles/rails_6_0.gemfile

@@ -1,7 +1,7 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in acts-as-pgarray-taggable-on.gemspec
-gemspec path: '../'
+# Specify your gem's dependencies in acts-as-taggable-array-on.gemspec
+gemspec path: "../"
 
-gem 'activerecord',  '~> 6.0.0'
-gem 'activesupport', '~> 6.0.0'
+gem "activerecord", "~> 6.0.3.4"
+gem "activesupport", "~> 6.0.3.4"

data/gemfiles/rails_6_1.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in acts-as-taggable-array-on.gemspec
+gemspec path: "../"
+
+gem "activerecord", "~> 6.1.0"
+gem "activesupport", "~> 6.1.0"

data/lib/acts-as-taggable-array-on/parser.rb

@@ -5,7 +5,7 @@ module ActsAsTaggableArrayOn
     def parse tags
       case tags
       when String
-        tags.split(/[ ]*,[ ]*/)
+        tags.split(/ *, */)
       else
         tags
       end

data/lib/acts-as-taggable-array-on/taggable.rb

@@ -6,7 +6,7 @@ module ActsAsTaggableArrayOn
       base.extend(ClassMethod)
     end
 
-    TYPE_MATCHER = { string: 'varchar', text: 'text', integer: 'integer' }
+    TYPE_MATCHER = {string: "varchar", text: "text", integer: "integer", citext: "citext"}
 
     module ClassMethod
       def acts_as_taggable_array_on(tag_name, *)
@@ -22,19 +22,19 @@ module ActsAsTaggableArrayOn
           define_method :"all_#{tag_name}" do |options = {}, &block|
             subquery_scope = unscoped.select("unnest(#{table_name}.#{tag_name}) as tag").distinct
             subquery_scope = subquery_scope.instance_eval(&block) if block
-
-            from(subquery_scope).pluck('tag')
+            # Remove the STI inheritance type from the outer query since it is in the subquery
+            unscope(where: :type).from(subquery_scope).pluck(:tag)
           end
 
           define_method :"#{tag_name}_cloud" do |options = {}, &block|
             subquery_scope = unscoped.select("unnest(#{table_name}.#{tag_name}) as tag")
             subquery_scope = subquery_scope.instance_eval(&block) if block
-
-            from(subquery_scope).group('tag').order('tag').pluck(Arel.sql('tag, count(*) as count'))
+            # Remove the STI inheritance type from the outer query since it is in the subquery
+            unscope(where: :type).from(subquery_scope).group(:tag).order(:tag).count(:tag)
           end
         end
       end
-      alias taggable_array acts_as_taggable_array_on
+      alias_method :taggable_array, :acts_as_taggable_array_on
     end
   end
 end

data/lib/acts-as-taggable-array-on/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTagPgarray
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/acts-as-taggable-array-on.rb

@@ -1,4 +1,4 @@
-require 'active_record'
+require "active_record"
 
 require "acts-as-taggable-array-on/version"
 require "acts-as-taggable-array-on/taggable"

data/spec/acts_as_tag_pgarray/parser_spec.rb

@@ -1,22 +1,22 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe ActsAsTaggableArrayOn::Parser do
   let(:parser) { ActsAsTaggableArrayOn.parser }
 
-  describe '#parse' do
+  describe "#parse" do
     it "return unprocessed tags if array" do
-      tags = %w(red green)
+      tags = %w[red green]
       expect(parser.parse(tags)).to eq tags
     end
 
     it "return parsed tags if comma separated string" do
-      tags = 'red,green'
-      expect(parser.parse(tags)).to eq %w(red green)
+      tags = "red,green"
+      expect(parser.parse(tags)).to eq %w[red green]
     end
 
     it "return parsed tags if comma separated string including white spaces" do
-      tags = 'red   , gre  en'
-      expect(parser.parse(tags)).to eq ['red', 'gre  en']
+      tags = "red   , gre  en"
+      expect(parser.parse(tags)).to eq ["red", "gre  en"]
     end
   end
 end

data/spec/acts_as_tag_pgarray/taggable_spec.rb

@@ -1,16 +1,19 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe ActsAsTaggableArrayOn::Taggable do
   before do
-    @user1 = User.create name: 'Tom', colors: ['red', 'blue'], sizes: ['medium', 'large'], codes: [456, 789]
-    @user2 = User.create name: 'Ken', colors: ['black', 'white', 'red'], sizes: ['small', 'large'], codes: [123, 789]
-    @user3 = User.create name: 'Joe', colors: ['black', 'blue'], sizes: ['small', 'medium', 'large'], codes: [123, 456, 789]
+    @user1 = User.create name: "Tom", colors: ["red", "blue"], sizes: ["medium", "large"], codes: [456, 789], roles: ["user"]
+    @user2 = User.create name: "Ken", colors: ["black", "white", "red"], sizes: ["small", "large"], codes: [123, 789], roles: ["User"]
+    @user3 = User.create name: "Joe", colors: ["black", "blue"], sizes: ["small", "medium", "large"], codes: [123, 456, 789], roles: ["login"]
+    @admin1 = Admin.create name: "Dick", colors: ["purple", "orange"], sizes: ["medium", "large"], codes: [123, 456, 789], roles: ["USER", "Admin"]
+    @admin2 = Admin.create name: "Harry", colors: ["white", "blue"], sizes: ["small", "large"], codes: [456, 123], roles: ["Admin"]
 
     User.acts_as_taggable_array_on :colors
     User.acts_as_taggable_array_on :sizes
+    User.acts_as_taggable_array_on :roles
     User.taggable_array :codes
-  end
 
+  end
 
   context "without database table" do
     it "doesn't fail on class method call" do
@@ -49,109 +52,119 @@ describe ActsAsTaggableArrayOn::Taggable do
     end
   end
 
-  it 'should define table name un-ambiguously' do
-    sql = User.with_any_sizes(['small']).to_sql
+  it "should define table name un-ambiguously" do
+    sql = User.with_any_sizes(["small"]).to_sql
     expect(sql).to eql("SELECT \"users\".* FROM \"users\" WHERE (users.sizes && ARRAY['small']::text[])")
 
-    sql = User.with_all_sizes(['small']).to_sql
+    sql = User.with_all_sizes(["small"]).to_sql
     expect(sql).to eql("SELECT \"users\".* FROM \"users\" WHERE (users.sizes @> ARRAY['small']::text[])")
 
-    sql = User.without_any_sizes(['small']).to_sql
+    sql = User.without_any_sizes(["small"]).to_sql
     expect(sql).to eql("SELECT \"users\".* FROM \"users\" WHERE NOT (users.sizes && ARRAY['small']::text[])")
 
-    sql = User.without_all_sizes(['small']).to_sql
+    sql = User.without_all_sizes(["small"]).to_sql
     expect(sql).to eql("SELECT \"users\".* FROM \"users\" WHERE NOT (users.sizes @> ARRAY['small']::text[])")
   end
 
   it "should work with ::text typed array" do
-    expect(User.with_any_sizes(['small'])).to match_array([@user2,@user3])
-    expect(User.with_all_sizes(['small', 'large'])).to match_array([@user2,@user3])
-    expect(User.without_any_sizes('medium')).to match_array([@user2])
-    expect(User.without_all_sizes('medium')).to match_array([@user2])
+    expect(User.with_any_sizes(["small"])).to match_array([@user2, @user3, @admin2])
+    expect(User.with_all_sizes(["small", "large"])).to match_array([@user2, @user3, @admin2])
+    expect(User.without_any_sizes("medium")).to match_array([@user2, @admin2])
+    expect(User.without_all_sizes("medium")).to match_array([@user2, @admin2])
+  end
+
+  it "should work with ::citext typed array" do
+    expect(User.with_any_roles(["admin"])).to match_array([@admin1, @admin2])
+    expect(User.with_all_roles(["User", "Admin"])).to match_array([@admin1])
+    expect(User.without_any_roles("USER")).to match_array([@user3, @admin2])
+    expect(User.without_all_roles("UseR")).to match_array([@user3, @admin2])
   end
 
   it "should work with ::integer typed array" do
-    expect(User.with_any_codes([123])).to match_array([@user2,@user3])
-    expect(User.with_all_codes([123, 789])).to match_array([@user2,@user3])
+    expect(User.with_any_codes([123])).to match_array([@user2, @user3, @admin1, @admin2])
+    expect(User.with_all_codes([123, 789])).to match_array([@user2, @user3, @admin1])
     expect(User.without_any_codes(456)).to match_array([@user2])
     expect(User.without_all_codes(456)).to match_array([@user2])
   end
 
   describe "#with_any_tags" do
     it "returns users having any tags of args" do
-      expect(User.with_any_colors(['red', 'blue'])).to match_array([@user1,@user2,@user3])
-      expect(User.with_any_colors('red, blue')).to match_array([@user1,@user2,@user3])
+      expect(User.with_any_colors(["red", "blue"])).to match_array([@user1, @user2, @user3, @admin2])
+      expect(User.with_any_colors("red, blue")).to match_array([@user1, @user2, @user3, @admin2])
     end
   end
 
   describe "#with_all_tags" do
     it "returns users having all tags of args" do
-      expect(User.with_all_colors(['red', 'blue'])).to match_array([@user1])
-      expect(User.with_all_colors('red, blue')).to match_array([@user1])
+      expect(User.with_all_colors(["red", "blue"])).to match_array([@user1])
+      expect(User.with_all_colors("red, blue")).to match_array([@user1])
     end
   end
 
   describe "#without_any_tags" do
     it "returns users not having any tags of args" do
-      expect(User.without_any_colors(['red', 'blue'])).to match_array([])
-      expect(User.without_any_colors('red, blue')).to match_array([])
+      expect(User.without_any_colors(["red", "blue"])).to match_array([@admin1])
+      expect(User.without_any_colors("red, blue")).to match_array([@admin1])
     end
   end
 
   describe "#without_all_tags" do
     it "returns users not having all tags of args" do
-      expect(User.without_all_colors(['red', 'blue'])).to match_array([@user2,@user3])
-      expect(User.without_all_colors('red, blue')).to match_array([@user2,@user3])
+      expect(User.without_all_colors(["red", "blue"])).to match_array([@user2, @user3, @admin1, @admin2])
+      expect(User.without_all_colors("red, blue")).to match_array([@user2, @user3, @admin1, @admin2])
     end
   end
 
   describe "#all_colors" do
     it "returns all of tag_name" do
-      expect(User.all_colors).to match_array([@user1,@user2,@user3].map(&:colors).flatten.uniq)
+      expect(User.all_colors).to match_array([@user1, @user2, @user3, @admin1, @admin2].map(&:colors).flatten.uniq)
+      expect(Admin.all_colors).to match_array([@admin1, @admin2].map(&:colors).flatten.uniq)
     end
 
     it "returns filtered tags for tag_name with block" do
-      expect(User.all_colors{where(name: ["Ken", "Joe"])}).to match_array([@user2,@user3].map(&:colors).flatten.uniq)
+      expect(User.all_colors { where(name: ["Ken", "Joe"]) }).to match_array([@user2, @user3].map(&:colors).flatten.uniq)
+      expect(Admin.all_colors { where(name: ["Dick", "Harry"]) }).to match_array([@admin1, @admin2].map(&:colors).flatten.uniq)
     end
 
     it "returns filtered tags for tag_name with prepended scope" do
-      expect(User.where('tag like ?', 'bl%').all_colors).to match_array([@user1,@user2,@user3].map(&:colors).flatten.uniq.select{|name| name.start_with? 'bl'})
+      expect(User.where("tag like ?", "bl%").all_colors).to match_array([@user1, @user2, @user3].map(&:colors).flatten.uniq.select { |name| name.start_with? "bl" })
+      expect(Admin.where("tag like ?", "bl%").all_colors).to match_array([@admin2].map(&:colors).flatten.uniq.select { |name| name.start_with? "bl" })
     end
 
     it "returns filtered tags for tag_name with prepended scope and bock" do
-      expect(User.where('tag like ?', 'bl%').all_colors{where(name: ["Ken", "Joe"])}).to match_array([@user2,@user3].map(&:colors).flatten.uniq.select{|name| name.start_with? 'bl'})
+      expect(User.where("tag like ?", "bl%").all_colors { where(name: ["Ken", "Joe"]) }).to match_array([@user2, @user3].map(&:colors).flatten.uniq.select { |name| name.start_with? "bl" })
     end
   end
 
   describe "#colors_cloud" do
     it "returns tag cloud for tag_name" do
       expect(User.colors_cloud).to match_array(
-        [@user1,@user2,@user3].map(&:colors).flatten.group_by(&:to_s).map{|k,v| [k,v.count]}
+        [@user1, @user2, @user3, @admin1, @admin2].map(&:colors).flatten.group_by(&:to_s).map { |k, v| [k, v.count] }
       )
     end
 
     it "returns filtered tag cloud for tag_name with block" do
-      expect(User.colors_cloud{where(name: ["Ken", "Joe"])}).to match_array(
-        [@user2,@user3].map(&:colors).flatten.group_by(&:to_s).map{|k,v| [k,v.count]}
+      expect(User.colors_cloud { where(name: ["Ken", "Joe"]) }).to match_array(
+        [@user2, @user3].map(&:colors).flatten.group_by(&:to_s).map { |k, v| [k, v.count] }
       )
     end
 
     it "returns filtered tag cloud for tag_name with prepended scope" do
-      expect(User.where('tag like ?', 'bl%').colors_cloud).to match_array(
-        [@user1,@user2,@user3].map(&:colors).flatten.group_by(&:to_s).map{|k,v| [k,v.count]}.select{|name,count| name.start_with? 'bl'}
+      expect(User.where("tag like ?", "bl%").colors_cloud).to match_array(
+        [@user1, @user2, @user3, @admin2].map(&:colors).flatten.group_by(&:to_s).map { |k, v| [k, v.count] }.select { |name, count| name.start_with? "bl" }
       )
     end
 
     it "returns filtered tag cloud for tag_name with prepended scope and block" do
-      expect(User.where('tag like ?', 'bl%').colors_cloud{where(name: ["Ken", "Joe"])}).to match_array(
-        [@user2,@user3].map(&:colors).flatten.group_by(&:to_s).map{|k,v| [k,v.count]}.select{|name,count| name.start_with? 'bl'}
+      expect(User.where("tag like ?", "bl%").colors_cloud { where(name: ["Ken", "Joe"]) }).to match_array(
+        [@user2, @user3].map(&:colors).flatten.group_by(&:to_s).map { |k, v| [k, v.count] }.select { |name, count| name.start_with? "bl" }
       )
     end
   end
 
   describe "with complex scope" do
     it "works properly" do
-      expect(User.without_any_colors('white').with_any_colors('blue').order(:created_at).limit(10)).to eq [@user1, @user3]
+      expect(User.without_any_colors("white").with_any_colors("blue").order(:created_at).limit(10)).to eq [@user1, @user3]
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,23 +1,24 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'active_record/railtie'
+require "rspec"
+require "active_record/railtie"
 ActiveRecord::Base.logger = Logger.new(STDERR)
 ActiveRecord::Base.logger.level = 3
 
-require 'acts-as-taggable-array-on'
+require "acts-as-taggable-array-on"
 
-#Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+# Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 ActiveRecord::Migration.verbose = false
 
 class User < ActiveRecord::Base; end
+class Admin < User; end
 
 RSpec.configure do |config|
   config.before(:all) do
     ActiveRecord::Base.establish_connection(
       adapter: "postgresql",
-      encoding: 'unicode',
+      encoding: "unicode",
       database: "acts-as-taggable-array-on_test",
       username: "acts-as-taggable-array-on"
     )
@@ -34,12 +35,16 @@ RSpec.configure do |config|
 end
 
 def create_database
-  ActiveRecord::Schema.define(:version => 1) do
+  ActiveRecord::Schema.define(version: 1) do
+    enable_extension("citext") unless extensions.include?("citext")
+
     create_table :users do |t|
       t.string :name
+      t.string :type
       t.string :colors, array: true, default: []
-      t.text :sizes, array:true, default: []
+      t.text :sizes, array: true, default: []
       t.integer :codes, array: true, default: []
+      t.citext :roles, array: true, default: []
       t.timestamps null: true
     end
   end

data/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'rubygems'
+require "rubygems"
 
 RSpec::Matchers.define :my_matcher do |expected|
   match do |actual|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-array-on
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Takuya Miyamoto
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2023-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: standard
   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'
 description: Simple tagging gem for Rails using postgres array.
 email:
 - miyamototakuya@gmail.com
@@ -130,6 +144,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -142,6 +157,7 @@ files:
 - config/database.yml.travis
 - gemfiles/rails_5_2.gemfile
 - gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
 - lib/acts-as-taggable-array-on.rb
 - lib/acts-as-taggable-array-on/parser.rb
 - lib/acts-as-taggable-array-on/taggable.rb
@@ -154,7 +170,7 @@ homepage: https://github.com/tmiyamon/acts-as-taggable-array-on
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,8 +185,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Simple tagging gem for Rails using postgres array.
 test_files: