crowdint_acts-as-taggable-on 2.3.2 → 2.3.3

data/lib/acts-as-taggable-on/version.rb

@@ -1,4 +1,4 @@
 module ActsAsTaggableOn
-  VERSION = '2.3.2'
+  VERSION = '2.3.3'
 end
 

data/lib/acts_as_taggable_on/acts_as_taggable_on/ownership.rb

@@ -57,13 +57,13 @@ module ActsAsTaggableOn::Taggable
         cache[owner] ||= ActsAsTaggableOn::TagList.new(*owner_tags_on(owner, context).map(&:name))
       end
       
-      def set_owner_tag_list_on(owner, context, new_list)
+      def set_owner_tag_list_on(owner, context, tag_ids)
         add_custom_context(context)
         
         cache = cached_owned_tag_list_on(context)
         cache.delete_if { |key, value| key.id == owner.id && key.class == owner.class }
 
-        cache[owner] = ActsAsTaggableOn::TagList.from(new_list)
+        cache[owner] = ActsAsTaggableOn::TagList.from(tag_ids)
       end
       
       def reload(*args)
@@ -79,7 +79,7 @@ module ActsAsTaggableOn::Taggable
           cached_owned_tag_list_on(context).each do |owner, tag_list|
             
             # Find existing tags or create non-existing tags:
-            tags = ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name(tag_list.uniq)            
+            tags = ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name(tag_list.uniq, owner, context)
 
             # Tag objects for owned tags
             owned_tags = owner_tags_on(owner, context)

data/lib/acts_as_taggable_on/tag.rb

@@ -2,16 +2,16 @@ module ActsAsTaggableOn
   class Tag < ::ActiveRecord::Base
     include ActsAsTaggableOn::Utils
 
-    attr_accessible :name
+    attr_accessible :name, :tagger_id, :context
 
     ### ASSOCIATIONS:
 
     has_many :taggings, :dependent => :destroy, :class_name => 'ActsAsTaggableOn::Tagging'
+    belongs_to :user
 
     ### VALIDATIONS:
 
     validates_presence_of :name
-    validates_uniqueness_of :name
     validates_length_of :name, :maximum => 255
 
     ### SCOPES:
@@ -20,8 +20,8 @@ module ActsAsTaggableOn
       where(["lower(name) = ?", name.downcase])
     end
 
-    def self.named_any(list)
-      where(list.map { |tag| sanitize_sql(["lower(name) = ?", tag.to_s.downcase]) }.join(" OR "))
+    def self.named_any(list, owner, context)
+      where(list.map { |tag| sanitize_sql(["lower(name) = ? and tagger_id = ? and context = ?", tag.to_s.downcase, owner, context]) }.join(" OR "))
     end
 
     def self.named_like(name)
@@ -38,12 +38,12 @@ module ActsAsTaggableOn
       named_like(name).first || create(:name => name)
     end
 
-    def self.find_or_create_all_with_like_by_name(*list)
+    def self.find_or_create_all_with_like_by_name(*list, owner, context)
       list = [list].flatten
 
       return [] if list.empty?
 
-      existing_tags = Tag.named_any(list).all
+      existing_tags = Tag.named_any(list, owner, context).all
       new_tag_names = list.reject do |name|
                         name = comparable_name(name)
                         existing_tags.any? { |tag| comparable_name(tag.name) == name }

data/lib/acts_as_taggable_on/tag_list.rb

@@ -14,7 +14,10 @@ module ActsAsTaggableOn
     # Example:
     #   tag_list = TagList.from("One , Two,  Three")
     #   tag_list # ["One", "Two", "Three"]
-    def self.from(string)
+    def self.from(tag_ids)
+
+      string = ActsAsTaggableOn::Tag.find(tag_ids)
+      string = string.respond_to?(:map) ? string.map(&:name) : string.name
       string = string.join(ActsAsTaggableOn.glue) if string.respond_to?(:join)
 
       new.tap do |tag_list|

data/lib/acts_as_taggable_on/tagger.rb

@@ -15,9 +15,10 @@ module ActsAsTaggableOn
       #   end
       def acts_as_tagger(opts={})
         class_eval do
+
           has_many :owned_taggings, opts.merge(:as => :tagger, :dependent => :destroy,
                                                :include => :tag, :class_name => "ActsAsTaggableOn::Tagging")
-          has_many :owned_tags, :through => :owned_taggings, :source => :tag, :uniq => true, :class_name => "ActsAsTaggableOn::Tag"
+          has_many :owned_tags, :class_name => "ActsAsTaggableOn::Tag" , :as => :tagger
         end
 
         include ActsAsTaggableOn::Tagger::InstanceMethods

data/lib/generators/acts_as_taggable_on/migration/templates/active_record/migration.rb

@@ -2,6 +2,9 @@ class ActsAsTaggableOnMigration < ActiveRecord::Migration
   def self.up
     create_table :tags do |t|
       t.string :name
+      t.string :context, :limit => 128
+      t.references :tagger, :polymorphic => true
+
     end
 
     create_table :taggings do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crowdint_acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -206,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2685907933581763096
+      hash: 3126823082438894058
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2685907933581763096
+      hash: 3126823082438894058
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23