mbleigh-acts-as-taggable-on 1.0.2 → 1.0.3

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -266,10 +266,12 @@ module ActiveRecord
 
         def related_search_options(context, klass, options = {})
           tags_to_find = self.tags_on(context).collect { |t| t.name }
+          
+          exclude_self = "#{klass.table_name}.id != #{self.id} AND" if self.class == klass
 
           { :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],
+            :conditions => ["#{exclude_self} #{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)

data/lib/acts_as_taggable_on/acts_as_tagger.rb

@@ -9,7 +9,7 @@ module ActiveRecord
         def acts_as_tagger(opts={})
           has_many :owned_taggings, opts.merge(:as => :tagger, :dependent => :destroy, 
                                                :include => :tag, :class_name => "Tagging")
-          has_many :owned_tags, :through => :owned_taggings, :source => :tag
+          has_many :owned_tags, :through => :owned_taggings, :source => :tag, :uniq => true
           include ActiveRecord::Acts::Tagger::InstanceMethods
           extend ActiveRecord::Acts::Tagger::SingletonMethods       
         end
@@ -49,4 +49,4 @@ module ActiveRecord
       
     end
   end
-end
+end

data/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -103,6 +103,20 @@ describe "Acts As Taggable On" do
       taggable1.find_related_tags_for(OtherTaggableModel).should include(taggable3)
       taggable1.find_related_tags_for(OtherTaggableModel).should_not include(taggable2)
     end
+    
+    it "should not include the object itself in the list of related objects" do
+      taggable1 = TaggableModel.create!(:name => "Taggable 1")
+      taggable2 = TaggableModel.create!(:name => "Taggable 2")
+
+      taggable1.tag_list = "one"
+      taggable1.save
+      
+      taggable2.tag_list = "one, two"
+      taggable2.save
+      
+      taggable1.find_related_tags.should include(taggable2)
+      taggable1.find_related_tags.should_not include(taggable1)
+    end
   end
   
   describe 'Tagging Contexts' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mbleigh-acts-as-taggable-on
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Michael Bleigh