@@ -170,16 +170,18 @@ module ActiveRecord # :at_most - Exclude tags with a frequency greater than the given value # :on - Scope the find to only include a certain context def find_options_for_tag_counts(options = {}) - options.assert_valid_keys :start_at, :end_at, :conditions, :at_least, :at_most, :order, :limit, :on + options.assert_valid_keys :start_at, :end_at, :conditions, :at_least, :at_most, :order, :limit, :on, :id scope = scope(:find) start_at = sanitize_sql(["#{Tagging.table_name}.created_at >= ?", options.delete(:start_at)]) if options[:start_at] end_at = sanitize_sql(["#{Tagging.table_name}.created_at <= ?", options.delete(:end_at)]) if options[:end_at] - type_and_context = "#{Tagging.table_name}.taggable_type = #{quote_value(base_class.name)}" + taggable_type = sanitize_sql(["#{Tagging.table_name}.taggable_type = ?", base_class.name]) + taggable_id = sanitize_sql(["#{Tagging.table_name}.taggable_id = ?", options.delete(:id)]) if options[:id] conditions = [ - type_and_context, + taggable_type, + taggable_id, options[:conditions], start_at, end_at @@ -203,7 +205,7 @@ module ActiveRecord :joins => joins.join(" "), :conditions => conditions, :group => group_by - }.update(options) + } end def is_taggable? @@ -260,8 +262,8 @@ module ActiveRecord add_custom_context(context) end - def tag_counts_on(context,options={}) - self.class.tag_counts_on(context,{:conditions => ["#{Tag.table_name}.name IN (?)", tag_list_on(context)]}.reverse_merge!(options)) + def tag_counts_on(context, options={}) + self.class.tag_counts_on(context, options.merge(:id => self.id)) end def related_tags_for(context, klass, options = {}) @@ -321,4 +323,4 @@ module ActiveRecord end end end -end \ No newline at end of file +end lib/acts_as_taggable_on/acts_as_taggable_on.rb b1ce354f07d701c48b8f01ca3827c2768b87f3cd Marcello Barnaba vjt@openssl.it http://github.com/mbleigh/acts-as-taggable-on/commit/7c2d3763a3a7b86bb240ff659f09a70977adc74f 7c2d3763a3a7b86bb240ff659f09a70977adc74f 2009-03-26T08:46:39-07:00 2009-03-15T19:43:54-07:00 When calling .tag_counts on an instance, count only the taggings associated to that specific instance Signed-off-by: Michael Bleigh <michael@intridea.com> a0ca25a72a1c9e4252c3a390766efc3cf494633d Michael Bleigh michael@intridea.com