acts-as-taggable-on 0.0.0 → 1.0.6

data/lib/acts_as_taggable_on/acts_as_tagger.rb

@@ -1,47 +1,52 @@
-module ActsAsTaggableOn
-  module Tagger
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      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, :uniq => true
-
-        include ActsAsTaggableOn::Tagger::InstanceMethods
-        extend ActsAsTaggableOn::Tagger::SingletonMethods
+module ActiveRecord
+  module Acts
+    module Tagger
+      def self.included(base)
+        base.extend ClassMethods
       end
-
-      def is_tagger?
-        false
+      
+      module ClassMethods
+        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, :uniq => true
+          include ActiveRecord::Acts::Tagger::InstanceMethods
+          extend ActiveRecord::Acts::Tagger::SingletonMethods       
+        end
+        
+        def is_tagger?
+          false
+        end
       end
-    end
-
-    module InstanceMethods
-      def tag(taggable, opts={})
-        opts.reverse_merge!(:force => true)
-
-        return false unless taggable.respond_to?(:is_taggable?) && taggable.is_taggable?
-
-        raise "You need to specify a tag context using :on"                unless opts.has_key?(:on)
-        raise "You need to specify some tags using :with"                  unless opts.has_key?(:with)
-        raise "No context :#{opts[:on]} defined in #{taggable.class.to_s}" unless (opts[:force] || taggable.tag_types.include?(opts[:on]))
-
-        taggable.set_owner_tag_list_on(self, opts[:on].to_s, opts[:with])
-        taggable.save
-      end
-
-      def is_tagger?
-        self.class.is_tagger?
+      
+      module InstanceMethods
+        def self.included(base)
+        end
+        
+        def tag(taggable, opts={})
+          opts.reverse_merge!(:force => true)
+
+          return false unless taggable.respond_to?(:is_taggable?) && taggable.is_taggable?
+          raise "You need to specify a tag context using :on" unless opts.has_key?(:on)
+          raise "You need to specify some tags using :with" unless opts.has_key?(:with)
+          raise "No context :#{opts[:on]} defined in #{taggable.class.to_s}" unless 
+              ( opts[:force] || taggable.tag_types.include?(opts[:on]) )
+
+          taggable.set_tag_list_on(opts[:on].to_s, opts[:with], self)
+          taggable.save
+        end
+        
+        def is_tagger?
+          self.class.is_tagger?
+        end
       end
-    end
-
-    module SingletonMethods
-      def is_tagger?
-        true
+      
+      module SingletonMethods
+        def is_tagger?
+          true
+        end
       end
+      
     end
   end
 end

data/lib/acts_as_taggable_on/tag.rb

@@ -1,65 +1,23 @@
 class Tag < ActiveRecord::Base
-  include ActsAsTaggableOn::ActiveRecord::Backports if ActiveRecord::VERSION::MAJOR < 3
+  has_many :taggings
   
-  attr_accessible :name
-
-  ### ASSOCIATIONS:
-
-  has_many :taggings, :dependent => :destroy
-
-  ### VALIDATIONS:
-
   validates_presence_of :name
   validates_uniqueness_of :name
-
-  ### SCOPES:
-
-  def self.named(name)
-    where(["name LIKE ?", name])
-  end
-  
-  def self.named_any(list)
-    where(list.map { |tag| sanitize_sql(["name LIKE ?", tag.to_s]) }.join(" OR "))
-  end
   
-  def self.named_like(name)
-    where(["name LIKE ?", "%#{name}%"])
-  end
-
-  def self.named_like_any(list)
-    where(list.map { |tag| sanitize_sql(["name LIKE ?", "%#{tag.to_s}%"]) }.join(" OR "))
-  end
-
-  ### CLASS METHODS:
-
+  # LIKE is used for cross-database case-insensitivity
   def self.find_or_create_with_like_by_name(name)
-    named_like(name).first || create(:name => name)
+    find(:first, :conditions => ["name LIKE ?", name]) || create(:name => name)
   end
-
-  def self.find_or_create_all_with_like_by_name(*list)
-    list = [list].flatten
-
-    return [] if list.empty?
-
-    existing_tags = Tag.named_any(list).all
-    new_tag_names = list.reject { |name| existing_tags.any? { |tag| tag.name.downcase == name.downcase } }
-    created_tags  = new_tag_names.map { |name| Tag.create(:name => name) }
-
-    existing_tags + created_tags
-  end
-
-  ### INSTANCE METHODS:
-
+  
   def ==(object)
     super || (object.is_a?(Tag) && name == object.name)
   end
-
+  
   def to_s
     name
   end
-
+  
   def count
     read_attribute(:count).to_i
   end
-
 end

data/lib/acts_as_taggable_on/tag_list.rb

@@ -1,19 +1,17 @@
 class TagList < Array
-
   cattr_accessor :delimiter
-
   self.delimiter = ','
-
+  
   def initialize(*args)
     add(*args)
   end
-
+  
   attr_accessor :owner
-
+  
   # Add tags to the tag_list. Duplicate or blank tags will be ignored.
   #
   #   tag_list.add("Fun", "Happy")
-  #
+  # 
   # Use the <tt>:parse</tt> option to add an unparsed tag string.
   #
   #   tag_list.add("Fun, Happy", :parse => true)
@@ -23,34 +21,33 @@ class TagList < Array
     clean!
     self
   end
-
+  
   # Remove specific tags from the tag_list.
-  #
+  # 
   #   tag_list.remove("Sad", "Lonely")
   #
   # Like #add, the <tt>:parse</tt> option can be used to remove multiple tags in a string.
-  #
+  # 
   #   tag_list.remove("Sad, Lonely", :parse => true)
   def remove(*names)
     extract_and_apply_options!(names)
     delete_if { |name| names.include?(name) }
     self
   end
-
+  
   # Transform the tag_list into a tag string suitable for edting in a form.
   # The tags are joined with <tt>TagList.delimiter</tt> and quoted if necessary.
   #
   #   tag_list = TagList.new("Round", "Square,Cube")
   #   tag_list.to_s # 'Round, "Square,Cube"'
   def to_s
-    tags = frozen? ? self.dup : self
-    tags.send(:clean!)
-
-    tags.map do |name|
+    clean!
+    
+    map do |name|
       name.include?(delimiter) ? "\"#{name}\"" : name
     end.join(delimiter.ends_with?(" ") ? delimiter : "#{delimiter} ")
   end
-
+  
  private
   # Remove whitespace, duplicates, and blanks.
   def clean!
@@ -58,38 +55,39 @@ class TagList < Array
     map!(&:strip)
     uniq!
   end
-
+  
   def extract_and_apply_options!(args)
     options = args.last.is_a?(Hash) ? args.pop : {}
     options.assert_valid_keys :parse
-
+    
     if options[:parse]
       args.map! { |a| self.class.from(a) }
     end
-
+    
     args.flatten!
   end
-
+  
   class << self
-
     # Returns a new TagList using the given tag string.
-    #
+    # 
     #   tag_list = TagList.from("One , Two,  Three")
     #   tag_list # ["One", "Two", "Three"]
     def from(string)
-      string = string.join(", ") if string.respond_to?(:join)
-
-      new.tap do |tag_list|
+      returning new do |tag_list|
         string = string.to_s.dup
-
+        
         # Parse the quoted tags
-        string.gsub!(/(\A|#{delimiter})\s*"(.*?)"\s*(#{delimiter}\s*|\z)/) { tag_list << $2; $3 }
-        string.gsub!(/(\A|#{delimiter})\s*'(.*?)'\s*(#{delimiter}\s*|\z)/) { tag_list << $2; $3 }
-
+        string.gsub!(/"(.*?)"\s*#{delimiter}?\s*/) { tag_list << $1; "" }
+        string.gsub!(/'(.*?)'\s*#{delimiter}?\s*/) { tag_list << $1; "" }
+        
         tag_list.add(string.split(delimiter))
       end
     end
-
+    
+    def from_owner(owner, *tags)
+      returning from(*tags) do |taglist|
+        taglist.owner = owner
+      end
+    end
   end
-
-end
+end

data/lib/acts_as_taggable_on/tagging.rb

@@ -1,23 +1,6 @@
 class Tagging < ActiveRecord::Base #:nodoc:
-  include ActsAsTaggableOn::ActiveRecord::Backports if ActiveRecord::VERSION::MAJOR < 3
-
-  attr_accessible :tag,
-                  :tag_id,
-                  :context,
-                  :taggable,
-                  :taggable_type,
-                  :taggable_id,
-                  :tagger,
-                  :tagger_type,
-                  :tagger_id
-
   belongs_to :tag
   belongs_to :taggable, :polymorphic => true
-  belongs_to :tagger,   :polymorphic => true
-
+  belongs_to :tagger, :polymorphic => true
   validates_presence_of :context
-  validates_presence_of :tag_id
-
-  validates_uniqueness_of :tag_id, :scope => [ :taggable_type, :taggable_id, :context, :tagger_id, :tagger_type ]
-
 end

data/lib/acts_as_taggable_on/tags_helper.rb

@@ -1,17 +1,11 @@
 module TagsHelper
-
   # See the README for an example using tag_cloud.
   def tag_cloud(tags, classes)
-    tags = tags.all if tags.respond_to?(:all)
-
-    return [] if tags.empty?
-
     max_count = tags.sort_by(&:count).last.count.to_f
-
+    
     tags.each do |tag|
       index = ((tag.count / max_count) * (classes.size - 1)).round
       yield tag, classes[index]
     end
   end
-
-end
+end

data/rails/init.rb

@@ -1 +1,6 @@
-require 'acts-as-taggable-on'
+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."

data/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -1,66 +1,59 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Acts As Taggable On" do
-  before(:each) do
-    clean_database!
-  end
-
   it "should provide a class method 'taggable?' that is false for untaggable models" do
     UntaggableModel.should_not be_taggable
   end
-
+  
   describe "Taggable Method Generation" do
     before(:each) do
       [TaggableModel, Tag, Tagging, TaggableUser].each(&:delete_all)
       @taggable = TaggableModel.new(:name => "Bob Jones")
     end
-
+  
     it "should respond 'true' to taggable?" do
       @taggable.class.should be_taggable
     end
-
+    
     it "should create a class attribute for tag types" do
       @taggable.class.should respond_to(:tag_types)
     end
-
-    it "should create an instance attribute for tag types" do
-      @taggable.should respond_to(:tag_types)
-    end
-    
-    it "should have all tag types" do
-      @taggable.tag_types.should == [:tags, :languages, :skills, :needs, :offerings]
-    end
-
+  
     it "should generate an association for each tag type" do
       @taggable.should respond_to(:tags, :skills, :languages)
     end
-
+    
+    it "should generate a cached column checker for each tag type" do
+     TaggableModel.should respond_to(:caching_tag_list?, :caching_skill_list?, :caching_language_list?)
+    end
+    
     it "should add tagged_with and tag_counts to singleton" do
-      TaggableModel.should respond_to(:tagged_with, :tag_counts)
+      TaggableModel.should respond_to(:find_tagged_with, :tag_counts)
     end
-
+    
+    it "should add saving of tag lists and cached tag lists to the instance" do
+      @taggable.should respond_to(:save_cached_tag_list)
+      @taggable.should respond_to(:save_tags)
+    end
+  
     it "should generate a tag_list accessor/setter for each tag type" 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 tag_list accessor, that includes owned tags, for each tag type" do
-      @taggable.should respond_to(:all_tags_list, :all_skills_list, :all_languages_list)
-    end
   end
-
+  
   describe "Single Table Inheritance" do
     before do
       @taggable = TaggableModel.new(:name => "taggable")
       @inherited_same = InheritingTaggableModel.new(:name => "inherited same")
       @inherited_different = AlteredInheritingTaggableModel.new(:name => "inherited different")
     end
-  
+    
     it "should pass on tag contexts to STI-inherited models" do
       @inherited_same.should respond_to(:tag_list, :skill_list, :language_list)
       @inherited_different.should respond_to(:tag_list, :skill_list, :language_list)
     end
-  
+    
     it "should have tag contexts added in altered STI models" do
       @inherited_different.should respond_to(:part_list)
     end
@@ -73,112 +66,70 @@ describe "Acts As Taggable On" do
       found_taggable.save
     end
   end
-
+  
   describe "Related Objects" do
     it "should find related objects based on tag names on context" do
       taggable1 = TaggableModel.create!(:name => "Taggable 1")
       taggable2 = TaggableModel.create!(:name => "Taggable 2")
       taggable3 = TaggableModel.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.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
-  
+    
     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 "Matching Contexts" do
-    it "should find objects with tags of matching contexts" do
-      taggable1 = TaggableModel.create!(:name => "Taggable 1")
-      taggable2 = TaggableModel.create!(:name => "Taggable 2")
-      taggable3 = TaggableModel.create!(:name => "Taggable 3")
-  
-      taggable1.offering_list = "one, two"
-      taggable1.save!
-  
-      taggable2.need_list = "one, two"
-      taggable2.save!
-  
-      taggable3.offering_list = "one, two"
-      taggable3.save!
-  
-      taggable1.find_matching_contexts(:offerings, :needs).should include(taggable2)
-      taggable1.find_matching_contexts(:offerings, :needs).should_not include(taggable3)
-    end
-  
-    it "should find other related objects with tags of matching contexts" do
-      taggable1 = TaggableModel.create!(:name => "Taggable 1")
-      taggable2 = OtherTaggableModel.create!(:name => "Taggable 2")
-      taggable3 = OtherTaggableModel.create!(:name => "Taggable 3")
-  
-      taggable1.offering_list = "one, two"
-      taggable1.save
-  
-      taggable2.need_list = "one, two"
-      taggable2.save
-  
-      taggable3.offering_list = "one, two"
-      taggable3.save
-  
-      taggable1.find_matching_contexts_for(OtherTaggableModel, :offerings, :needs).should include(taggable2)
-      taggable1.find_matching_contexts_for(OtherTaggableModel, :offerings, :needs).should_not include(taggable3)
-    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
+    before(:all) do
+      class Array
+        def freq
+          k=Hash.new(0)
+          self.each {|e| k[e]+=1}
+          k
+        end
+      end
+    end
+    
     it 'should eliminate duplicate tagging contexts ' do
       TaggableModel.acts_as_taggable_on(:skills, :skills)
       TaggableModel.tag_types.freq[:skills].should_not == 3
@@ -205,62 +156,10 @@ describe "Acts As Taggable On" do
         TaggableModel.acts_as_taggable_on([nil])
       }.should_not raise_error
     end
-  end
-  
-  describe 'Caching' do
-    before(:each) do
-      @taggable = CachedModel.new(:name => "Bob Jones")  
-    end
-    
-    it "should add saving of tag lists and cached tag lists to the instance" do
-      @taggable.should respond_to(:save_cached_tag_list)
-      @taggable.should respond_to(:save_tags)
-    end  
 
-    it "should generate a cached column checker for each tag type" do
-      CachedModel.should respond_to(:caching_tag_list?)
-    end  
-    
-    it 'should not have cached tags' do
-      @taggable.cached_tag_list.should be_blank  
-    end
-    
-    it 'should cache tags' do
-      @taggable.update_attributes(:tag_list => 'awesome, epic')
-      @taggable.cached_tag_list.should == 'awesome, epic'
-    end
-    
-    it 'should keep the cache' do
-      @taggable.update_attributes(:tag_list => 'awesome, epic')
-      @taggable = CachedModel.find(@taggable)  
-      @taggable.save!
-      @taggable.cached_tag_list.should == 'awesome, epic'   
-    end
-    
-    it 'should update the cache' do
-      @taggable.update_attributes(:tag_list => 'awesome, epic')
-      @taggable.update_attributes(:tag_list => 'awesome')
-      @taggable.cached_tag_list.should == 'awesome'      
-    end
-    
-    it 'should remove the cache' do
-      @taggable.update_attributes(:tag_list => 'awesome, epic')
-      @taggable.update_attributes(:tag_list => '')
-      @taggable.cached_tag_list.should be_blank  
-    end
-    
-    it 'should have a tag list' do
-      @taggable.update_attributes(:tag_list => 'awesome, epic')
-      @taggable = CachedModel.find(@taggable.id)
-      @taggable.tag_list.sort.should == %w(awesome epic).sort
-    end
-    
-    it 'should keep the tag list' do
-      @taggable.update_attributes(:tag_list => 'awesome, epic')
-      @taggable = CachedModel.find(@taggable.id)
-      @taggable.save!
-      @taggable.tag_list.sort.should == %w(awesome epic).sort
+    after(:all) do
+      class Array; remove_method :freq; end
     end
   end
-
-end
+  
+end