johnsbrn-acts-as-taggable-on 1.0.5 → 1.1.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 5
+:patch: 0
 :major: 1
-:minor: 0
+:minor: 1

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -22,7 +22,7 @@ module ActiveRecord
             self.class_eval do
               has_many "#{tag_type.singularize}_taggings".to_sym, :as => :taggable, :dependent => :destroy, 
                 :include => :tag, :conditions => ["context = ?",tag_type], :class_name => "Tagging"
-              has_many "#{tag_type}".to_sym, :through => "#{tag_type.singularize}_taggings".to_sym, :source => :tag
+              has_many "#{tag_type}".to_sym, :through => "#{tag_type.singularize}_taggings".to_sym, :source => :tag, :order => Tagging.column_names.include?("position") ? "taggings.position ASC" : nil
             end
             
             self.class_eval <<-RUBY
@@ -242,6 +242,7 @@ module ActiveRecord
           else
             opts = {:conditions => ["context = ?", context.to_s]}
           end
+          opts.merge!(:order => "taggings.position ASC") if Tagging.column_names.include?("position")
           base_tags.find(:all, opts)
         end
         
@@ -266,10 +267,11 @@ 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)
@@ -287,15 +289,25 @@ module ActiveRecord
           (custom_contexts + self.class.tag_types.map(&:to_s)).each do |tag_type|
             next unless instance_variable_get("@#{tag_type.singularize}_list")
             owner = instance_variable_get("@#{tag_type.singularize}_list").owner
-            new_tag_names = instance_variable_get("@#{tag_type.singularize}_list") - tags_on(tag_type).map(&:name)
+            all_tag_names = instance_variable_get("@#{tag_type.singularize}_list")
+            new_tag_names = all_tag_names - tags_on(tag_type).map(&:name)
             old_tags = tags_on(tag_type).reject { |tag| instance_variable_get("@#{tag_type.singularize}_list").include?(tag.name) }
           
             self.class.transaction do
               base_tags.delete(*old_tags) if old_tags.any?
-              new_tag_names.each do |new_tag_name|
+              all_tag_names.each_index do |index|
+                new_tag_name = all_tag_names[index]
                 new_tag = Tag.find_or_create_with_like_by_name(new_tag_name)
-                Tagging.create(:tag_id => new_tag.id, :context => tag_type, 
-                               :taggable => self, :tagger => owner)
+                if new_tag.name != new_tag_name
+                  new_tag.name = new_tag_name
+                  new_tag.save
+                end
+                tagging = 
+                  taggings.find(:first, :conditions => {:tag_id => new_tag.id, :context => tag_type}) || 
+                  Tagging.new(:tag_id => new_tag.id, :context => tag_type, 
+                                 :taggable => self, :tagger => owner)
+                tagging.position = index if tagging.respond_to?(:position)
+                tagging.save
               end
             end
           end

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
@@ -148,4 +162,43 @@ describe "Acts As Taggable On" do
     end
   end
   
+  describe "Tag Handling" do
+    it "should save case changes" do
+      taggable1 = TaggableModel.create!(:name => "Taggable 1")
+
+      taggable1.tag_list = "one, two"
+      taggable1.save
+        
+      taggable1.tag_list.should include("one")
+      taggable1.tag_list.should include("two")
+      taggable1.tag_list.should_not include("One")
+      taggable1.tag_list.should_not include("Two")
+      
+      taggable1.tag_list = "One, Two"
+      taggable1.save
+      taggable1.reload
+      
+      taggable1.tag_list.should include("One")
+      taggable1.tag_list.should include("Two")
+      taggable1.tag_list.should_not include("one")
+      taggable1.tag_list.should_not include("two")
+    end
+    
+    it "should order tags if there is a position column" do
+      taggable1 = TaggableModel.create!(:name => "Taggable 1")
+      Tagging.column_names.should include("position")
+
+      taggable1.tag_list = "one, two"
+      taggable1.save
+      taggable1.reload
+      taggable1.tag_list.should == ["one", "two"]
+      
+      taggable1.tag_list = "two, one"
+      taggable1.save
+      taggable1.reload
+      
+      taggable1.tag_list.should == ["two", "one"]
+    end
+    
+  end
 end

data/spec/acts_as_taggable_on/tag_spec.rb

@@ -7,9 +7,10 @@ describe Tag do
   end
   
   it "should require a name" do
-    @tag.should have(1).errors_on(:name)
+    @tag.should_not be_valid
+    @tag.should have(1).error
     @tag.name = "something"
-    @tag.should have(0).errors_on(:name)    
+    @tag.should be_valid
   end
   
   it "should equal a tag with the same name" do
@@ -22,4 +23,5 @@ describe Tag do
     @tag.name = "cool"
     @tag.to_s.should == "cool"
   end
+  
 end

data/spec/schema.rb

@@ -7,6 +7,7 @@ ActiveRecord::Schema.define :version => 0 do
     t.datetime "created_at"
     t.integer  "tagger_id",     :limit => 11
     t.string   "tagger_type"
+    t.integer  "position",  :limit => 11
   end
 
   add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"

data/spec/spec_helper.rb

@@ -1,12 +1,25 @@
-require File.dirname(__FILE__) + '/../../../../spec/spec_helper'
+# To run these specs on a live Rails App, you'll have to change
+# the following requirements. Chances are, you want to replace
+# ALL of the following code with "require /my/rails/app/spec/spec_helper"
+
+require 'rubygems'
+require 'activerecord'
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3',
+                                        :database => ':memory:',
+                                        :timeout => 5000,
+                                        :encoding => 'utf8')
+
+plugin_spec_dir = File.dirname(__FILE__)
+Object::RAILS_DEFAULT_LOGGER = ActiveRecord::Base.logger = Logger.new(plugin_spec_dir + "/debug.log")
+
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+
+require File.join(File.dirname(__FILE__), '..', 'lib/acts-as-taggable-on')
 
 module Spec::Example::ExampleGroupMethods
   alias :context :describe
 end
 
-plugin_spec_dir = File.dirname(__FILE__)
-ActiveRecord::Base.logger = Logger.new(plugin_spec_dir + "/debug.log")
-
 load(File.dirname(__FILE__) + '/schema.rb')
 
 class TaggableModel < ActiveRecord::Base
@@ -30,4 +43,4 @@ class TaggableUser < ActiveRecord::Base
 end
 
 class UntaggableModel < ActiveRecord::Base
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: johnsbrn-acts-as-taggable-on
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-26 00:00:00 -08:00
+date: 2009-03-07 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -36,7 +36,6 @@ files:
 - lib/acts_as_taggable_on/tagging.rb
 - lib/acts_as_taggable_on/tags_helper.rb
 - lib/autotest
-- lib/autotest/discover.rb
 - spec/acts_as_taggable_on
 - spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb
 - spec/acts_as_taggable_on/acts_as_tagger_spec.rb
@@ -45,6 +44,7 @@ files:
 - spec/acts_as_taggable_on/taggable_spec.rb
 - spec/acts_as_taggable_on/tagger_spec.rb
 - spec/acts_as_taggable_on/tagging_spec.rb
+- spec/debug.log
 - spec/schema.rb
 - spec/spec.opts
 - spec/spec_helper.rb

data/lib/autotest/discover.rb

@@ -1,6 +0,0 @@
-# Need this to get picked up by autotest?
-$:.push(File.join(File.dirname(__FILE__), %w[.. .. rspec]))  
-   
-Autotest.add_discovery do  
-  "rspec" 
-end