acts-as-taggable-array-on 0.4.2 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a77a0ec0610eefe1f30f46cdceea0506283044dc
-  data.tar.gz: d3a309690f4f0277752d68c270f937a6c67a66d1
+SHA256:
+  metadata.gz: 6e9634fcc6fb7b4ddff2df2ae5e71bd237e89dcfbebdbec0cecc9d414d095821
+  data.tar.gz: 33745344b55b6a5ec70e530d530ccab286e606cfa925dc3cc06899b9f0bba54d
 SHA512:
-  metadata.gz: dfef9bc472538240ea718500f4f3295c3bdf684ede2e4d35d81055406a8ab51040d7a8dd864ab30264d7bbed12c8055a6e3a3e36406ec54c522ee3287306a23a
-  data.tar.gz: 5a7de21d8081ad1dfc2916cdb0e7f19c4c14219fb8f89ad619d069e2e7d636715f5b1d143dc9b677edb95a8ac2091e5e90d8809b19690e0be4fca7ad4722ebf9
+  metadata.gz: d4ef02fa959e7e24bfd78eb338de5b7f05d6a139357766db145c158f547a31af119d9e9a566180fdb3764ee98484f962e0619e00bf61cb0fb62a981137a84ff6
+  data.tar.gz: 75419a2e0d898ab7f6ce2a3a61e24298b8635e4a4bea5c3d87f95449b155bf260e42f53ff39470bccfd0d408e5ad195d09ac37885beff858f3419effa146e9a1

data/.editorconfig

@@ -0,0 +1,13 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+# Two spaces for indenting
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+max_line_length = 120

data/.travis.yml

@@ -12,8 +12,7 @@ gemfile:
   - gemfiles/rails_4.gemfile
   - gemfiles/rails_5.gemfile
 before_script:
-  - createuser -d acts-as-taggable-array-on -U postgres
-  - createdb --username=acts-as-taggable-array-on acts-as-taggable-array-on_test
+  - bundle exec rake db:create
 script:
   - bundle
   - bundle exec rspec

data/README.md

@@ -216,6 +216,9 @@ Using Postgres Arrays   0.030000   0.000000   0.030000 (  0.033001)
 rake bench:write bench:find_by_id bench:find_by_tag  20.29s user 1.52s system 77% cpu 28.322 total
 ```
 
+## Development
+To run testsuite you'll need to setup local PG database/user with `rake db:create`
+After that just running `rspec` should work.
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+
+namespace :db do
+	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 )
+  end
+end

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

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "listen",  "~> 3.0.0"
+  spec.add_development_dependency 'temping'
 end

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

@@ -11,13 +11,13 @@ module ActsAsTaggableArrayOn
     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]
+        tag_array_type = TYPE_MATCHER[columns_hash[tag_name.to_s].try(:type)]
         parser = ActsAsTaggableArrayOn.parser
 
-        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)) }
+        scope :"with_any_#{tag_name}", ->(tags){ where("#{table_name}.#{tag_name} && ARRAY[?]::#{tag_array_type}[]", parser.parse(tags)) }
+        scope :"with_all_#{tag_name}", ->(tags){ where("#{table_name}.#{tag_name} @> ARRAY[?]::#{tag_array_type}[]", parser.parse(tags)) }
+        scope :"without_any_#{tag_name}", ->(tags){ where.not("#{table_name}.#{tag_name} && ARRAY[?]::#{tag_array_type}[]", parser.parse(tags)) }
+        scope :"without_all_#{tag_name}", ->(tags){ where.not("#{table_name}.#{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.2"
+  VERSION = "0.5"
 end

data/spec/acts_as_tag_pgarray/taggable_spec.rb

@@ -11,6 +11,18 @@ describe ActsAsTaggableArrayOn::Taggable do
     User.acts_as_taggable_array_on :codes
   end
 
+
+  context "without database table" do
+    it "doesn't fail on class method call" do
+      Temping.create :dummy
+
+      class Dummy < ActiveRecord::Base; end
+      Dummy.acts_as_taggable_array_on :tags
+
+      Temping.teardown
+    end
+  end
+
   describe "#acts_as_taggable_array_on" do
     it "defines named scope to match any tags" do
       expect(User).to respond_to(:with_any_colors)
@@ -26,6 +38,20 @@ describe ActsAsTaggableArrayOn::Taggable do
     end
   end
 
+  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
+    expect(sql).to eql("SELECT \"users\".* FROM \"users\" WHERE (users.sizes @> ARRAY['small']::text[])")
+
+    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
+    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])

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'active_record/railtie'
+require 'temping'
 ActiveRecord::Base.logger = Logger.new(STDERR)
 ActiveRecord::Base.logger.level = 3
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-array-on
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: '0.5'
 platform: ruby
 authors:
 - Takuya Miyamoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: temping
+  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'
 description: Simple tagging gem for Rails using postgres array.
 email:
 - miyamototakuya@gmail.com
@@ -129,6 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -167,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Simple tagging gem for Rails using postgres array.