acts-as-taggable-array-on 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 571322f949adda3190c96102b3f5c5884aab591a
-  data.tar.gz: 35675504cfeb7e6bba4bb2616da65403abe91904
+  metadata.gz: 9a9425d37517e5fe36a4248c6dc73d7b07f624ed
+  data.tar.gz: 7dfb8aba8ed94a45b021a386022e4817f06c015b
 SHA512:
-  metadata.gz: cdf1581fb54a72305b93c52c09ce192bef5bb7b88dd6647a5e2be90e32a6c094a643c4475a5de44224c94ef894314f47bf25f34e35c8096f99d178fb1a811681
-  data.tar.gz: 1ad9dbef4a56e0aca0de2e39c9af3bd6b263fe9a079893dc700fba14c11fa247492f4b83d08e25f69d09d3e083c5dd16870d467e62077dc24d7d6335e0cf14fe
+  metadata.gz: ced512be1adc28265254dab4f10950f3c14d537efd63d686b87c4a4282c427116ad7cc0666214a6b4dc1cd2e4ad716aaaec08ae459b351bd7736f3c7d7f2d524
+  data.tar.gz: 48fe26c163b62f53f243e053d677c1fe19a1cb9dfa3b434fa5fe78cfc3be6ae9be86b55afbbf72cd3c8c3e75f5af0933290366dde2f4ec9409d08a3c3f85563b

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.1
-  - 2.2.2
-  - 2.3.0
+  - 2.1.10
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.4.3
+  - 2.5.0
 addons:
   postgresql: 9.3
 gemfile:
@@ -17,9 +19,5 @@ script:
   - bundle exec rspec
 matrix:
   exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_5.gemfile
-    - rvm: 2.1.1
-      gemfile: gemfiles/rails_5.gemfile
-    - rvm: 2.1.2
+    - rvm: 2.1.10
       gemfile: gemfiles/rails_5.gemfile

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

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activerecord',  ['>= 4']
   spec.add_runtime_dependency 'activesupport', ['>= 4']
 
-  spec.add_development_dependency 'pg'
+  spec.add_development_dependency 'pg', '~> 0.18'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/gemfiles/rails_5.gemfile

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 gemspec path: '../'
 
 gem 'activerecord',  '~> 5.0.0'
-gem 'activesupport', '~> 5.0.0'
+gem 'activesupport', '~> 5.0.0'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActsAsTaggableArrayOn
   class Parser
     def parse tags

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

@@ -1,18 +1,23 @@
+# frozen_string_literal: true
+
 module ActsAsTaggableArrayOn
   module Taggable
     def self.included(base)
       base.extend(ClassMethod)
     end
 
+    TYPE_MATCHER = { string: 'varchar', text: 'text' }
+
     module ClassMethod
       def acts_as_taggable_array_on(*tag_def)
         tag_name = tag_def.first
+        tag_array_type = TYPE_MATCHER[columns_hash[tag_name.to_s].type]
         parser = ActsAsTaggableArrayOn.parser
 
-        scope :"with_any_#{tag_name}", ->(tags){ where("#{tag_name} && ARRAY[?]::varchar[]", parser.parse(tags)) }
-        scope :"with_all_#{tag_name}", ->(tags){ where("#{tag_name} @> ARRAY[?]::varchar[]", parser.parse(tags)) }
-        scope :"without_any_#{tag_name}", ->(tags){ where.not("#{tag_name} && ARRAY[?]::varchar[]", parser.parse(tags)) }
-        scope :"without_all_#{tag_name}", ->(tags){ where.not("#{tag_name} @> ARRAY[?]::varchar[]", parser.parse(tags)) }
+        scope :"with_any_#{tag_name}", ->(tags){ where("#{tag_name} && ARRAY[?]::#{tag_array_type}[]", parser.parse(tags)) }
+        scope :"with_all_#{tag_name}", ->(tags){ where("#{tag_name} @> ARRAY[?]::#{tag_array_type}[]", parser.parse(tags)) }
+        scope :"without_any_#{tag_name}", ->(tags){ where.not("#{tag_name} && ARRAY[?]::#{tag_array_type}[]", parser.parse(tags)) }
+        scope :"without_all_#{tag_name}", ->(tags){ where.not("#{tag_name} @> ARRAY[?]::#{tag_array_type}[]", parser.parse(tags)) }
 
         self.class.class_eval do
           define_method :"all_#{tag_name}" do |options = {}, &block|

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

@@ -1,3 +1,3 @@
 module ActsAsTagPgarray
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/acts_as_tag_pgarray/taggable_spec.rb

@@ -2,11 +2,12 @@ require 'spec_helper'
 
 describe ActsAsTaggableArrayOn::Taggable do
   before do
-    @user1 = User.create name: 'Tom', colors: ['red', 'blue']
-    @user2 = User.create name: 'Ken', colors: ['black', 'white', 'red']
-    @user3 = User.create name: 'Joe', colors: ['black', 'blue']
+    @user1 = User.create name: 'Tom', colors: ['red', 'blue'], sizes: ['medium', 'large']
+    @user2 = User.create name: 'Ken', colors: ['black', 'white', 'red'], sizes: ['small', 'large']
+    @user3 = User.create name: 'Joe', colors: ['black', 'blue'], sizes: ['small', 'medium', 'large']
 
     User.acts_as_taggable_array_on :colors
+    User.acts_as_taggable_array_on :sizes
   end
 
   describe "#acts_as_taggable_array_on" do
@@ -24,6 +25,13 @@ describe ActsAsTaggableArrayOn::Taggable do
     end
   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])
+  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])

data/spec/spec_helper.rb

@@ -38,6 +38,7 @@ def create_database
     create_table :users do |t|
       t.string :name
       t.string :colors, array: true, default: []
+      t.text :sizes, array:true, default: []
       t.timestamps null: true
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-array-on
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Takuya Miyamoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -42,16 +42,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Simple tagging gem for Rails using postgres array.