bborn-acts_as_taggable_on_steroids 2.0.beta2 → 2.0.beta3

data/acts_as_taggable_on_steroids.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "bborn-acts_as_taggable_on_steroids"
-  s.version  = "2.0.beta2"
+  s.version  = "2.0.beta3"
   s.date     = "2011-02-07"
   s.summary  = "Rails 3 plugin that is based on acts_as_taggable by jviney that is based on acts_as_taggable by DHH."
   s.email    = "ysbaddaden@gmail.com"

data/lib/tag.rb

@@ -40,9 +40,9 @@ class Tag < ActiveRecord::Base
     # - +:order+
     # 
     def counts(options = {})
-      options.assert_valid_keys :start_at, :end_at, :at_least, :at_most, :conditions, :limit, :order
+      options.assert_valid_keys :start_at, :end_at, :at_least, :at_most, :conditions, :limit, :order, :joins
       
-      tags = joins(:taggings).group(:name)
+      tags = joins(:taggings)
       tags = tags.having(['count >= ?', options[:at_least]]) if options[:at_least]
       tags = tags.having(['count <= ?', options[:at_most]])  if options[:at_most]
       tags = tags.where("#{Tagging.quoted_table_name}.created_at >= ?", options[:start_at]) if options[:start_at]
@@ -53,7 +53,11 @@ class Tag < ActiveRecord::Base
       tags = tags.limit(options[:limit])      if options[:limit]
       tags = tags.order(options[:order])      if options[:order]
       
-      tags.select("#{quoted_table_name}.*, COUNT(#{quoted_table_name}.id) AS count")
+      if joins = options.delete(:joins)
+        tags = tags.joins(joins)
+      end
+      
+      tags.select("#{quoted_table_name}.id, #{quoted_table_name}.name, COUNT(#{quoted_table_name}.id) AS count").group('tags.id, tags.name')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bborn-acts_as_taggable_on_steroids
 version: !ruby/object:Gem::Version
-  version: 2.0.beta2
+  version: 2.0.beta3
   prerelease: 4
 platform: ruby
 authors: