acts-as-taggable-array-on 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d434088f73e146383bb7123506e8d4b7d89e1706
-  data.tar.gz: f046f099ce1f5cad0497278767661d8f73cceda7
+  metadata.gz: d7015d2509416188e45cc5c3cf1504167a311a96
+  data.tar.gz: 96d19346e51a44233258a2b150a9b3eeb80c6633
 SHA512:
-  metadata.gz: a80faa85b005eab8e8bcf87d1ce09f4c319a912c0e1b5e593318aca0f9e72ea8b19544d4213df4855ce11bf4244f45ba77aeb46803acdcee639015cb9ec77537
-  data.tar.gz: 63b9d87fc308d757bad3b99178c2d454828ecd54b3e086ebd7de464e3765750acc61aaa4e9ef9919469a7f87bc68be90f2009b9320eaa4c2e76a05bc7fa9ec36
+  metadata.gz: c81cef96b1bb5a2c418760dcafd67f68161708cd73bfebdcc89eebdb512bc162e6500c56298e7c5f671d8cf2f2b8d696cfefe9263c7776271dcfcac49ff4fec8
+  data.tar.gz: 269914c72de99a97d53ec456b1071e8d43ebeb031c608b102919d77e33dd06757d6ffadee571949672dd700719a94ecb8e9898a434fcc8c5998fbcad24edd6d1

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1.1
+  - 2.1.2
 addons:
   postgresql: 9.3
 gemfile:

data/README.md

@@ -1,7 +1,8 @@
 # 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 sysytem with postgres array.
+A simple implementation for tagging system with postgres array.
+So, this gem works only on postgres.
 
 
 ## Installation
@@ -27,7 +28,7 @@ To use it, you need to have an array column to act as taggable.
 class CreateUser < ActiveRecord::Migration
   def change
     create_table :users do |t|
-      t.text :tags, array: true, default: '{}'
+      t.string :tags, array: true, default: '{}'
       t.timestamps
     end
     add_index :users, :tags, using: 'gin'
@@ -92,16 +93,20 @@ class User < ActiveRecord::Base
 end
 
 # Find a user with all of the tags
-User.with_all_tags("awesome")
+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")
+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")
+User.without_all_tags("awesome, slick")
+User.without_all_tags(["awesome", "slick"])
 
 # Find a user without any of the tags
-User.without_any_tags("awesome")
+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)

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

@@ -2,6 +2,7 @@ require 'active_record'
 
 require "acts-as-taggable-array-on/version"
 require "acts-as-taggable-array-on/taggable"
+require "acts-as-taggable-array-on/parser"
 
 ActiveSupport.on_load(:active_record) do
   include ActsAsTaggableArrayOn::Taggable

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

@@ -0,0 +1,16 @@
+module ActsAsTaggableArrayOn
+  class Parser
+    def parse tags
+      case tags
+      when String
+        tags.split(/[ ]*,[ ]*/)
+      else
+        tags
+      end
+    end
+  end
+
+  def self.parser
+    @parser ||= Parser.new
+  end
+end

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

@@ -7,11 +7,12 @@ module ActsAsTaggableArrayOn
     module ClassMethod
       def acts_as_taggable_array_on(*tag_def)
         tag_name = tag_def.first
+        parser = ActsAsTaggableArrayOn.parser
 
-        scope :"with_any_#{tag_name}", ->(* tags){where("#{tag_name} && ARRAY[?]", tags)}
-        scope :"with_all_#{tag_name}", ->(* tags){where("#{tag_name} @> ARRAY[?]", tags)}
-        scope :"without_any_#{tag_name}", ->(* tags){where.not("#{tag_name} && ARRAY[?]", tags)}
-        scope :"without_all_#{tag_name}", ->(* tags){where.not("#{tag_name} @> ARRAY[?]", tags)}
+        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)) }
 
         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.2.1"
+  VERSION = "0.3.0"
 end

data/spec/acts_as_tag_pgarray/parser_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe ActsAsTaggableArrayOn::Parser do
+  let(:parser) { ActsAsTaggableArrayOn.parser }
+
+  describe '#parse' do
+    it "return unprocessed tags if array" do
+      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)
+    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']
+    end
+  end
+end

data/spec/acts_as_tag_pgarray/taggable_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ActsAsTaggableArrayOn::Taggable do
-  before 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']
@@ -26,25 +26,29 @@ describe ActsAsTaggableArrayOn::Taggable do
 
   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])
     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])
     end
   end
-  
+
   describe "#without_any_tags" do
-    it "returns users having any tags of args" do
-      expect(User.without_any_colors('red', 'blue')).to match_array([])
+    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([])
     end
   end
 
   describe "#without_all_tags" do
-    it "returns users having all tags of args" do
-      expect(User.without_all_colors('red', 'blue')).to match_array([@user2,@user3])
+    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])
     end
   end
 

data/spec/spec_helper.rb

@@ -37,7 +37,7 @@ def create_database
   ActiveRecord::Schema.define(:version => 1) do
     create_table :users do |t|
       t.string :name
-      t.text :colors, array: true, defualt: '{}'
+      t.string :colors, array: true, defualt: '{}'
       t.timestamps
     end
   end

metadata

@@ -1,123 +1,123 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-array-on
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Takuya Miyamoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: pg
   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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   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'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   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.
@@ -127,8 +127,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -136,8 +136,10 @@ files:
 - Rakefile
 - acts-as-taggable-array-on.gemspec
 - lib/acts-as-taggable-array-on.rb
+- lib/acts-as-taggable-array-on/parser.rb
 - lib/acts-as-taggable-array-on/taggable.rb
 - lib/acts-as-taggable-array-on/version.rb
+- spec/acts_as_tag_pgarray/parser_spec.rb
 - spec/acts_as_tag_pgarray/taggable_spec.rb
 - spec/spec_helper.rb
 - spec_helper.rb
@@ -151,12 +153,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -166,5 +168,6 @@ signing_key:
 specification_version: 4
 summary: Simple tagging gem for Rails using postgres array.
 test_files:
+- spec/acts_as_tag_pgarray/parser_spec.rb
 - spec/acts_as_tag_pgarray/taggable_spec.rb
 - spec/spec_helper.rb