acts-as-taggable-array-on 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a1821ff8bc469e1985a7e6665d7b1f638496c39
-  data.tar.gz: 04372ef127103e5776a70fdf1be68eaee568c9bb
+  metadata.gz: 080185fe1e3f5faf0542afb12518cc740f669098
+  data.tar.gz: f7647f52be3c7c26f2697e14e1bd35e53cdb1014
 SHA512:
-  metadata.gz: f3525e2849380326dbe6dfe65d1537af4457090b8b4041bd9fa2b6d9c3470cf0119bd4850a1644a479739e1da161949d3a802dea91616d151016d05f85ef9978
-  data.tar.gz: 6eec97ff89f380542bfb6c09cc733506df1b1dfed65f5ced049d722d5f8261d707d2a8747d99977206d92b94e6e478e86e043ff663af0c69cff329d2070cec44
+  metadata.gz: 1540c2ee1a7b21a74065186193f142b41f7ca080d7e35229b39b2b706e018e8ed4614327b3379f6746933a121c3d2c20382e3f3b1a9f03f943226fc355c427d7
+  data.tar.gz: 26607de532bacdba54128430953e060c03bb282b5cd9c1284c039e78b385624d5c4cd627add5ae46050442f6653036dbae484b7c74fb157c94d0a80c2221f966

data/README.md

@@ -116,6 +116,12 @@ User.tags_cloud
 # [['awesome' => 1], ['slick' => 2]]
 ```
 
+Tag cloud calculation uses subquery internally. To add scopes to the query, use block.
+
+```ruby
+User.tags_cloud { where name: ['ken', 'tom'] }
+```
+
 ### All Tags
 
 Can get all tags easily.
@@ -125,6 +131,14 @@ User.all_tags
 # ['awesome', 'slick']
 ```
 
+As the same to tag cloud calculation, you can use block to add scopes to the query.
+
+
+```ruby
+User.all_tags { where name: ['ken', 'tom'] }
+```
+
+
 ## Contributing
 
 1. Fork it ( http://github.com/<my-github-username>/acts-as-taggable-array-on/fork )

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

@@ -14,12 +14,18 @@ module ActsAsTaggableArrayOn
         scope :"without_all_#{tag_name}", ->(* tags){where.not("#{tag_name} @> ARRAY[?]", tags)}
 
         self.class.class_eval do
-          define_method :"all_#{tag_name}" do
-            all.uniq.pluck("unnest(#{tag_name})")
+          define_method :"all_#{tag_name}" do |options = {}, &block|
+            query_scope = all
+            query_scope = query_scope.merge(instance_eval(&block)) if block
+
+            query_scope.uniq.pluck("unnest(#{table_name}.#{tag_name})")
           end
 
-          define_method :"#{tag_name}_cloud" do
-            from(select("unnest(#{tag_name}) as tag")).group('tag').order('tag').pluck('tag, count(*) as count')
+          define_method :"#{tag_name}_cloud" do |options = {}, &block|
+            query_scope = select("unnest(#{table_name}.#{tag_name}) as tag")
+            query_scope = query_scope.merge(instance_eval(&block)) if block
+
+            from(query_scope).group('tag').order('tag').pluck('tag, count(*)')
           end
         end
       end

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

@@ -1,3 +1,3 @@
 module ActsAsTagPgarray
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/acts_as_tag_pgarray/taggable_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe ActsAsTaggableArrayOn::Taggable do
   before do 
-    @user1 = User.create colors: ['red', 'blue']
-    @user2 = User.create colors: ['black', 'white', 'red']
-    @user3 = User.create colors: ['black', 'blue']
+    @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']
 
     User.acts_as_taggable_array_on :colors
   end
@@ -52,6 +52,10 @@ describe ActsAsTaggableArrayOn::Taggable do
     it "returns all of tag_name" do
       expect(User.all_colors).to match_array([@user1,@user2,@user3].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)
+    end
   end
 
   describe "#colors_cloud" do
@@ -60,6 +64,12 @@ describe ActsAsTaggableArrayOn::Taggable do
         [@user1,@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 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]}
+      )
+    end
   end
 
   describe "with complex scope" do

data/spec/spec_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-array-on
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Takuya Miyamoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord