@@ -58,6 +58,10 @@ module ActiveRecord related_tags_on('#{tag_type}',options) end alias_method :find_related_on_#{tag_type}, :find_related_#{tag_type} + + def find_related_#{tag_type}_for(klass, options = {}) + related_tags_for('#{tag_type}', klass, options) + end RUBY end @@ -249,16 +253,26 @@ module ActiveRecord end def related_tags_on(context, options={}) - tags_to_find = self.tags_on(context).collect {|t| t.name} - search_conditions = { - :select => "#{self.class.table_name}.*, COUNT(#{Tag.table_name}.id) AS count", - :from => "#{self.class.table_name}, #{Tag.table_name}, #{Tagging.table_name}", - :conditions => ["#{self.class.table_name}.id != #{self.id} AND #{self.class.table_name}.id = #{Tagging.table_name}.taggable_id AND #{Tagging.table_name}.taggable_type = '#{self.class.to_s}' AND #{Tagging.table_name}.tag_id = #{Tag.table_name}.id AND #{Tag.table_name}.name IN (?)",tags_to_find], - :group => "#{self.class.table_name}.id", + search_conditions = related_search_options(context, self.class, options) + + self.class.find(:all, search_conditions) + end + + def related_tags_for(context, klass, options = {}) + search_conditions = related_search_options(context, klass, options) + + klass.find(:all, search_conditions) + end + + def related_search_options(context, klass, options = {}) + tags_to_find = self.tags_on(context).collect { |t| t.name } + + { :select => "#{klass.table_name}.*, COUNT(#{Tag.table_name}.id) AS count", + :from => "#{klass.table_name}, #{Tag.table_name}, #{Tagging.table_name}", + :conditions => ["#{klass.table_name}.id = #{Tagging.table_name}.taggable_id AND #{Tagging.table_name}.taggable_type = '#{klass.to_s}' AND #{Tagging.table_name}.tag_id = #{Tag.table_name}.id AND #{Tag.table_name}.name IN (?)", tags_to_find], + :group => "#{klass.table_name}.id", :order => "count DESC" }.update(options) - - self.class.find(:all, search_conditions) end def save_cached_tag_list lib/acts_as_taggable_on/acts_as_taggable_on.rb @@ -85,6 +85,24 @@ describe "Acts As Taggable On" do taggable1.find_related_tags.should include(taggable3) taggable1.find_related_tags.should_not include(taggable2) end + + it "should find other related objects based on tag names on context" do + taggable1 = TaggableModel.create!(:name => "Taggable 1") + taggable2 = OtherTaggableModel.create!(:name => "Taggable 2") + taggable3 = OtherTaggableModel.create!(:name => "Taggable 3") + + taggable1.tag_list = "one, two" + taggable1.save + + taggable2.tag_list = "three, four" + taggable2.save + + taggable3.tag_list = "one, four" + taggable3.save + + taggable1.find_related_tags_for(OtherTaggableModel).should include(taggable3) + taggable1.find_related_tags_for(OtherTaggableModel).should_not include(taggable2) + end end describe 'Tagging Contexts' do spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb @@ -24,4 +24,9 @@ ActiveRecord::Schema.define :version => 0 do create_table :taggable_users, :force => true do |t| t.column :name, :string end + create_table :other_taggable_models, :force => true do |t| + t.column :name, :string + t.column :type, :string + #t.column :cached_tag_list, :string + end end spec/schema.rb @@ -14,6 +14,10 @@ class TaggableModel < ActiveRecord::Base acts_as_taggable_on :skills end +class OtherTaggableModel < ActiveRecord::Base + acts_as_taggable_on :tags, :languages +end + class InheritingTaggableModel < TaggableModel end spec/spec_helper.rb 8b261f2641aaeb46d5d1892badd69a6f75fde401 Tristan Dunn tristanzdunn@gmail.com http://github.com/mbleigh/acts-as-taggable-on/commit/3393b42bf328e7805bc6444a174e3656ce19e1c9 3393b42bf328e7805bc6444a174e3656ce19e1c9 2008-06-22T10:39:55-07:00 2008-06-22T10:39:55-07:00 Added support to find other related objects. 3d66ad36343aae5eaef2e6c8f6f403aff065ae8d Tristan Dunn tristanzdunn@gmail.com