yury-acts-as-taggable-on 1.0.3 → 1.0.4

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -19,9 +19,11 @@ module ActiveRecord
           args.compact! if args
           for tag_type in args
             tag_type = tag_type.to_s
+            # use aliased_join_table_name for context condition so that sphix can join multiple
+            # tag references from same model without getting an ambiguous column error
             self.class_eval do
               has_many "#{tag_type.singularize}_taggings".to_sym, :as => :taggable, :dependent => :destroy, 
-                :include => :tag, :conditions => ["#{Tagging.table_name}.context = ?",tag_type], :class_name => "Tagging"
+                :include => :tag, :conditions => ['#{aliased_join_table_name rescue "taggings"}.context = ?',tag_type], :class_name => "Tagging"
               has_many "#{tag_type}".to_sym, :through => "#{tag_type.singularize}_taggings".to_sym, :source => :tag
             end
             
@@ -45,6 +47,14 @@ module ActiveRecord
               def #{tag_type.singularize}_list=(new_tags)
                 set_tag_list_on('#{tag_type}',new_tags)
               end
+              
+              def #{tag_type.singularize}_list_changed=(changed)
+                instance_variable_set("@#{tag_type.singularize}_list_changed", changed)
+              end
+              
+              def #{tag_type.singularize}_list_changed?
+                instance_variable_get("@#{tag_type.singularize}_list_changed") || false
+              end
             
               def #{tag_type.singularize}_counts(options = {})
                 tag_counts_on('#{tag_type}',options)
@@ -183,7 +193,7 @@ module ActiveRecord
           conditions = merge_conditions(conditions, scope[:conditions]) if scope
 
           joins = ["LEFT OUTER JOIN #{Tagging.table_name} ON #{Tag.table_name}.id = #{Tagging.table_name}.tag_id"]
-          joins << sanitize_sql(["AND context = ?",options.delete(:on).to_s]) unless options[:on].nil?
+          joins << sanitize_sql(["AND #{Tagging.table_name}.context = ?",options.delete(:on).to_s]) unless options[:on].nil?
           joins << "LEFT OUTER JOIN #{table_name} ON #{table_name}.#{primary_key} = #{Tagging.table_name}.taggable_id"
           joins << scope[:joins] if scope && scope[:joins]
 
@@ -226,21 +236,27 @@ module ActiveRecord
         def tag_list_on(context, owner=nil)
           var_name = context.to_s.singularize + "_list"
           add_custom_context(context)
-          return instance_variable_get("@#{var_name}") unless instance_variable_get("@#{var_name}").nil?
-        
-          if !owner && self.class.caching_tag_list_on?(context) and !(cached_value = cached_tag_list_on(context)).nil?
-            instance_variable_set("@#{var_name}", TagList.from(self["cached_#{var_name}"]))
-          else
-            instance_variable_set("@#{var_name}", TagList.new(*tags_on(context, owner).map(&:name)))
+          list = instance_variable_get("@#{var_name}")
+
+          if list.nil?
+            if !owner && self.class.caching_tag_list_on?(context) and !(cached_value = cached_tag_list_on(context)).nil?
+              list = instance_variable_set("@#{var_name}", TagList.from(self["cached_#{var_name}"]))
+            else
+              list = instance_variable_set("@#{var_name}", TagList.new(*tags_on(context, owner).map(&:name)))
+            end
           end
+
+          list.context = context.to_s
+          list.taggable = self
+          list
         end
         
         def tags_on(context, owner=nil)
           if owner
-            opts = {:conditions => ["#{Tagging.table_name}.context = ? AND tagger_id = ? AND tagger_type = ?",
+            opts = {:conditions => ["context = ? AND tagger_id = ? AND tagger_type = ?",
                                     context.to_s, owner.id, owner.class.to_s]}
           else
-            opts = {:conditions => ["#{Tagging.table_name}.context = ?", context.to_s]}
+            opts = {:conditions => ["context = ?", context.to_s]}
           end
           base_tags.find(:all, opts)
         end
@@ -250,8 +266,13 @@ module ActiveRecord
         end
         
         def set_tag_list_on(context,new_list, tagger=nil)
+          old_list = instance_variable_get("@#{context.to_s.singularize}_list")
           instance_variable_set("@#{context.to_s.singularize}_list", TagList.from_owner(tagger, new_list))
           add_custom_context(context)
+          
+          if old_list != instance_variable_get("@#{context.to_s.singularize}_list")
+            instance_variable_set("@#{context.to_s.singularize}_list_changed", true)
+          end
         end
         
         def tag_counts_on(context,options={})
@@ -266,10 +287,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)
@@ -283,7 +306,7 @@ module ActiveRecord
           end
         end
         
-        def save_tags
+        def save_tags          
           (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
@@ -298,6 +321,8 @@ module ActiveRecord
                                :taggable => self, :tagger => owner)
               end
             end
+            
+            instance_variable_set("@#{tag_type.singularize}_list_changed", false)
           end
           
           true

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/lib/acts_as_taggable_on/tag.rb

@@ -1,12 +1,29 @@
-class Tag < ActiveRecord::Base
+class Tag < ActiveRecord::Base  
   has_many :taggings
   
   validates_presence_of :name
   validates_uniqueness_of :name
   
+  def self.cleanup(name)
+    n = name.to_s.downcase.gsub(/[^a-z0-9_-]+/, '').strip
+    n.blank? ? nil : n
+  end
+  
+  def name=(name)
+    #strip any non-alphanumeric and downcase
+    self["name"] = Tag.cleanup(name)
+  end
+  
   # LIKE is used for cross-database case-insensitivity
   def self.find_or_create_with_like_by_name(name)
-    find(:first, :conditions => ["name LIKE ?", name]) || create(:name => name)
+    name = Tag.cleanup(name)
+    
+    begin
+      find(:first, :conditions => ["name LIKE ?", name]) || create(:name => name)
+    rescue ActiveRecord::StatementInvalid
+      # If we can't insert the tag (perhaps a dupe), try to refetch.
+      find(:first, :conditions => ["name LIKE ?", name])
+    end
   end
   
   def ==(object)
@@ -17,7 +34,11 @@ class Tag < ActiveRecord::Base
     name
   end
   
-  def count
+  def count    
     read_attribute(:count).to_i
   end
+  
+  def self.per_page
+    10
+  end
 end

data/lib/acts_as_taggable_on/tag_list.rb

@@ -7,6 +7,8 @@ class TagList < Array
   end
   
   attr_accessor :owner
+  attr :context, true
+  attr :taggable, true
   
   # Add tags to the tag_list. Duplicate or blank tags will be ignored.
   #
@@ -16,6 +18,7 @@ class TagList < Array
   #
   #   tag_list.add("Fun, Happy", :parse => true)
   def add(*names)
+    taggable.send("#{context.singularize}_list_changed=", true) if (taggable && context)
     extract_and_apply_options!(names)
     concat(names)
     clean!
@@ -30,6 +33,7 @@ class TagList < Array
   # 
   #   tag_list.remove("Sad, Lonely", :parse => true)
   def remove(*names)
+    taggable.send("#{context.singularize}_list_changed=", true) if (taggable && context)
     extract_and_apply_options!(names)
     delete_if { |name| names.include?(name) }
     self
@@ -77,8 +81,8 @@ class TagList < Array
         string = string.to_s.dup
         
         # Parse the quoted tags
-        string.gsub!(/"(.*?)"\s*#{delimiter}?\s*/) { tag_list << $1; "" }
-        string.gsub!(/'(.*?)'\s*#{delimiter}?\s*/) { tag_list << $1; "" }
+        string.gsub!(/"(.*?)"\s*#{delimiter}?\s*/) { tag_list.add $1; "" }
+        string.gsub!(/'(.*?)'\s*#{delimiter}?\s*/) { tag_list.add $1; "" }
         
         tag_list.add(string.split(delimiter))
       end

data/lib/acts_as_taggable_on/tagging.rb

@@ -3,4 +3,6 @@ class Tagging < ActiveRecord::Base #:nodoc:
   belongs_to :taggable, :polymorphic => true
   belongs_to :tagger, :polymorphic => true
   validates_presence_of :context
+  
+  named_scope :type_pictures, :conditions => "taggable_type = 'Picture'"  
 end

data/rails/init.rb

@@ -1,6 +1,4 @@
 require 'acts-as-taggable-on'
 
 ActiveRecord::Base.send :include, ActiveRecord::Acts::TaggableOn
-ActiveRecord::Base.send :include, ActiveRecord::Acts::Tagger
-
-RAILS_DEFAULT_LOGGER.info "** acts_as_taggable_on: initialized properly."
+ActiveRecord::Base.send :include, ActiveRecord::Acts::Tagger

data/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -40,6 +40,11 @@ describe "Acts As Taggable On" do
       @taggable.should respond_to(:tag_list, :skill_list, :language_list)
       @taggable.should respond_to(:tag_list=, :skill_list=, :language_list=)
     end
+    
+    it "should generate a dirty field tracking accessor/setter for each tag type" do
+      @taggable.should respond_to(:tag_list_changed?, :skill_list_changed?, :language_list_changed?)
+      @taggable.should respond_to(:tag_list_changed=, :skill_list_changed=, :language_list_changed=)
+    end
   end
   
   describe "Single Table Inheritance" do
@@ -103,6 +108,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

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -106,6 +106,51 @@ describe "Taggable" do
     TaggableModel.find_tagged_with("spinning", :on => :rotors).should_not be_empty
   end
   
+  it "should support dirty field tracking on assign" do
+    @taggable.tag_list_changed?.should == false
+    
+    @taggable.tag_list = "bob, charlie"
+    @taggable.tag_list_changed?.should == true
+    
+    @taggable.save
+    @taggable.tag_list_changed?.should == false
+    
+    @taggable.tag_list = "bob, charlie"
+    @taggable.tag_list_changed?.should == false
+  end
+  
+  it "should support dirty field tracking on append" do
+    @taggable.tag_list_changed?.should == false
+    
+    @taggable.tag_list.add "bob, charlie"
+    @taggable.tag_list_changed?.should == true
+    
+    @taggable.save
+    @taggable.tag_list_changed?.should == false
+    
+    @taggable.tag_list.add "bob, charlie"
+    @taggable.tag_list_changed?.should == false
+  end
+  
+  it "should support dirty field tracking on append" do
+    @taggable.tag_list_changed?.should == false
+    
+    @taggable.tag_list = "bob, charlie"
+    @taggable.tag_list_changed?.should == true
+    
+    @taggable.save
+    @taggable.tag_list_changed?.should == false
+    
+    @taggable.tag_list.remove "bob"
+    @taggable.tag_list_changed?.should == true
+    
+    @taggable.save
+    @taggable.tag_list_changed?.should == false
+    
+    @taggable.tag_list.remove "bob"
+    @taggable.tag_list_changed?.should == false
+  end
+  
   describe "Single Table Inheritance" do
     before do
       [TaggableModel, Tag, Tagging, TaggableUser].each(&:delete_all)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yury-acts-as-taggable-on
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,12 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-10 00:00:00 -07:00
+date: 2009-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
 description: Acts As Taggable On provides the ability to have multiple tag contexts on a single model in ActiveRecord. It also has support for tag clouds, related items, taggers, and more.
-email: yury.korolev@gmail.com
+email: michael@intridea.com
 executables: []
 
 extensions: []
@@ -28,6 +28,7 @@ files:
 - generators/acts_as_taggable_on_migration
 - generators/acts_as_taggable_on_migration/acts_as_taggable_on_migration_generator.rb
 - generators/acts_as_taggable_on_migration/templates
+- generators/acts_as_taggable_on_migration/templates/add_users_migration.rb
 - generators/acts_as_taggable_on_migration/templates/migration.rb
 - init.rb
 - lib/acts-as-taggable-on.rb
@@ -45,6 +46,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_helper.rb
 - uninstall.rb