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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 080185fe1e3f5faf0542afb12518cc740f669098
-  data.tar.gz: f7647f52be3c7c26f2697e14e1bd35e53cdb1014
+  metadata.gz: d434088f73e146383bb7123506e8d4b7d89e1706
+  data.tar.gz: f046f099ce1f5cad0497278767661d8f73cceda7
 SHA512:
-  metadata.gz: 1540c2ee1a7b21a74065186193f142b41f7ca080d7e35229b39b2b706e018e8ed4614327b3379f6746933a121c3d2c20382e3f3b1a9f03f943226fc355c427d7
-  data.tar.gz: 26607de532bacdba54128430953e060c03bb282b5cd9c1284c039e78b385624d5c4cd627add5ae46050442f6653036dbae484b7c74fb157c94d0a80c2221f966
+  metadata.gz: a80faa85b005eab8e8bcf87d1ce09f4c319a912c0e1b5e593318aca0f9e72ea8b19544d4213df4855ce11bf4244f45ba77aeb46803acdcee639015cb9ec77537
+  data.tar.gz: 63b9d87fc308d757bad3b99178c2d454828ecd54b3e086ebd7de464e3765750acc61aaa4e9ef9919469a7f87bc68be90f2009b9320eaa4c2e76a05bc7fa9ec36

data/README.md

@@ -122,6 +122,12 @@ Tag cloud calculation uses subquery internally. To add scopes to the query, use
 User.tags_cloud { where name: ['ken', 'tom'] }
 ```
 
+To handle the result tags named 'tag' and 'count', prepend scopes.
+
+```ruby
+User.where('tag like ?', 'aws%').limit(10).order('count desc').tags_cloud { where name: ['ken', 'tom'] }
+```
+
 ### All Tags
 
 Can get all tags easily.
@@ -138,10 +144,15 @@ As the same to tag cloud calculation, you can use block to add scopes to the que
 User.all_tags { where name: ['ken', 'tom'] }
 ```
 
+To handle the result tags named 'tag', prepend scopes.
+
+```ruby
+User.where('tag like ?', 'aws%').all_tags { where name: ['ken', 'tom'] }
+```
 
 ## Contributing
 
-1. Fork it ( http://github.com/<my-github-username>/acts-as-taggable-array-on/fork )
+1. Fork it ( http://github.com/tmiyamon/acts-as-taggable-array-on/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

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

@@ -15,17 +15,17 @@ module ActsAsTaggableArrayOn
 
         self.class.class_eval do
           define_method :"all_#{tag_name}" do |options = {}, &block|
-            query_scope = all
-            query_scope = query_scope.merge(instance_eval(&block)) if block
+            subquery_scope = unscoped.select("unnest(#{table_name}.#{tag_name}) as tag").uniq
+            subquery_scope = subquery_scope.instance_eval(&block) if block
 
-            query_scope.uniq.pluck("unnest(#{table_name}.#{tag_name})")
+            from(subquery_scope).pluck('tag')
           end
 
           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
+            subquery_scope = unscoped.select("unnest(#{table_name}.#{tag_name}) as tag")
+            subquery_scope = subquery_scope.instance_eval(&block) if block
 
-            from(query_scope).group('tag').order('tag').pluck('tag, count(*)')
+            from(subquery_scope).group('tag').order('tag').pluck('tag, count(*) as count')
           end
         end
       end

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

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

data/spec/acts_as_tag_pgarray/taggable_spec.rb

@@ -56,6 +56,14 @@ describe ActsAsTaggableArrayOn::Taggable do
     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
+
+    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'})
+    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'})
+    end
   end
 
   describe "#colors_cloud" do
@@ -70,6 +78,18 @@ describe ActsAsTaggableArrayOn::Taggable do
         [@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'}
+      )
+    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'}
+      )
+    end
   end
 
   describe "with complex scope" do

metadata

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