acts-as-taggable-on 1.0.8 → 1.0.9

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -129,6 +129,10 @@ module ActiveRecord
           Tag.find(:all, find_options_for_tag_counts(options.merge({:on => context.to_s})))
         end           
         
+        def all_tag_counts(options = {})
+          Tag.find(:all, find_options_for_tag_counts(options))
+        end
+        
         def find_options_for_find_tagged_with(tags, options = {})
           tags = TagList.from(tags)
           
@@ -228,10 +232,10 @@ module ActiveRecord
           at_least  = sanitize_sql(['COUNT(*) >= ?', options.delete(:at_least)]) if options[:at_least]
           at_most   = sanitize_sql(['COUNT(*) <= ?', options.delete(:at_most)]) if options[:at_most]
           having    = [at_least, at_most].compact.join(' AND ')
-          group_by  = "#{Tag.table_name}.id, #{Tag.table_name}.name HAVING COUNT(*) > 0"
+          group_by  = "#{Tag.table_name}.id HAVING COUNT(*) > 0"
           group_by << " AND #{having}" unless having.blank?
 
-          { :select     => "#{Tag.table_name}.id, #{Tag.table_name}.name, COUNT(*) AS count", 
+          { :select     => "#{Tag.table_name}.*, COUNT(*) AS count", 
             :joins      => joins.join(" "),
             :conditions => conditions,
             :group      => group_by,

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -82,12 +82,30 @@ describe "Taggable" do
     TaggableModel.skill_counts.should_not be_empty
   end
   
-  it "should be able to get tag counts on an association" do
+  it "should be able to get all tag counts on model as whole" do
     bob = TaggableModel.create(:name => "Bob", :tag_list => "ruby, rails, css")
     frank = TaggableModel.create(:name => "Frank", :tag_list => "ruby, rails")
     charlie = TaggableModel.create(:name => "Charlie", :skill_list => "ruby")
-    bob.tag_counts.first.count.should == 2
-    charlie.skill_counts.first.count.should == 1
+    
+    TaggableModel.all_tag_counts.should_not be_empty
+    TaggableModel.all_tag_counts.first.count.should == 3 # ruby
+  end
+  
+  it "should be able to get scoped tag counts" do
+    bob = TaggableModel.create(:name => "Bob", :tag_list => "ruby, rails, css")
+    frank = TaggableModel.create(:name => "Frank", :tag_list => "ruby, rails")
+    charlie = TaggableModel.create(:name => "Charlie", :skill_list => "ruby")
+    
+    TaggableModel.tagged_with("ruby").tag_counts.first.count.should == 2   # ruby
+    TaggableModel.tagged_with("ruby").skill_counts.first.count.should == 1 # ruby
+  end
+  
+  it "should be able to get all scoped tag counts" do
+    bob = TaggableModel.create(:name => "Bob", :tag_list => "ruby, rails, css")
+    frank = TaggableModel.create(:name => "Frank", :tag_list => "ruby, rails")
+    charlie = TaggableModel.create(:name => "Charlie", :skill_list => "ruby")
+    
+    TaggableModel.tagged_with("ruby").all_tag_counts.first.count.should == 3 # ruby
   end
   
   it "should be able to set a custom tag context list" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version 
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 +01:00
+date: 2009-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: []