acts-as-taggable-on 1.1.6 → 1.1.7

data/README.rdoc

@@ -31,6 +31,16 @@ To install the gem, add this to your config/environment.rb:
   
 After that, you can run "rake gems:install" to install the gem if you don't already have it.
 
+== Rails 3.0
+
+Acts As Taggable On is now useable in Rails 3.0, thanks to the excellent work of Szymon Nowak
+and Jelle Vandebeeck. Because backwards compatibility is hard to maintain, their work is available
+in the feature/rails3_compatibility branch.
+
+A Rails 3.0 compatible version of the gem is also available: 
+  
+  gem install acts-as-taggable-on -v=2.0.0.pre1
+
 === Post Installation (Rails)
 
 1. script/generate acts_as_taggable_on_migration

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.1.7

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -106,7 +106,6 @@ module ActiveRecord
 
             include ActiveRecord::Acts::TaggableOn::InstanceMethods
             extend ActiveRecord::Acts::TaggableOn::SingletonMethods
-            alias_method_chain :reload, :tag_list
           end
         end
       end
@@ -383,8 +382,8 @@ module ActiveRecord
 
         def save_cached_tag_list
           self.class.tag_types.map(&:to_s).each do |tag_type|
-            if self.class.send("caching_#{tag_type.singularize}_list?")              
-              self["cached_#{tag_type.singularize}_list"] = tag_list_cache_on(tag_type.singularize).to_a.flatten.compact.join(', ')
+            if self.class.send("caching_#{tag_type.singularize}_list?")
+              send(:"cached_#{tag_type.singularize}_list=", tag_list_cache_on(tag_type.singularize).to_a.flatten.compact.join(', '))
             end
           end
         end
@@ -429,14 +428,6 @@ module ActiveRecord
 
           true
         end
-
-        def reload_with_tag_list(*args)
-          self.class.tag_types.each do |tag_type|
-            instance_variable_set("@#{tag_type.to_s.singularize}_list", nil)
-          end
-
-          reload_without_tag_list(*args)
-        end
       end
     end
   end

data/lib/acts_as_taggable_on/tag.rb

@@ -30,7 +30,7 @@ class Tag < ActiveRecord::Base
     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 } }
+    new_tag_names = list.reject { |name| existing_tags.any? { |tag| tag.name.mb_chars.downcase == name.mb_chars.downcase } }
     created_tags  = new_tag_names.map { |name| Tag.create(:name => name) }
   
     existing_tags + created_tags    

data/spec/acts_as_taggable_on/group_helper_spec.rb

@@ -15,7 +15,7 @@ describe "Group Helper" do
     end
 
     it "should return all column names joined for TaggableModel GROUP clause" do
-      @taggable.grouped_column_names_for(TaggableModel).should == "taggable_models.id, taggable_models.name, taggable_models.type"
+      @taggable.grouped_column_names_for(TaggableModel).should == "taggable_models.id, taggable_models.name, taggable_models.type, taggable_models.cached_tag_list"
     end
   end
 end

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -19,8 +19,8 @@ describe "Taggable" do
     @taggable.tag_list = ["awesome", "epic"]
     @taggable.save
 
-    TaggableModel.tag_counts_on(:tags).count.should == 2
-    @taggable.tag_counts_on(:tags).count.should == 2
+    TaggableModel.tag_counts_on(:tags).length.should == 2
+    @taggable.tag_counts_on(:tags).length.should == 2
   end
 
   it "should be able to create tags" do
@@ -210,9 +210,20 @@ describe "Taggable" do
     }.should change(Tagging, :count).by(1)
   end
   
+  describe "Associations" do
+    before(:each) do
+      @taggable = TaggableModel.create(:tag_list => "awesome, epic")
+    end
+    
+    it "should not remove tags when creating associated objects" do
+      @taggable.untaggable_models.create!
+      @taggable.reload
+      @taggable.tag_list.should have(2).items
+    end
+  end
+  
   describe "Single Table Inheritance" do
     before do
-      [TaggableModel, Tag, Tagging, TaggableUser].each(&:delete_all)
       @taggable = TaggableModel.new(:name => "taggable")
       @inherited_same = InheritingTaggableModel.new(:name => "inherited same")
       @inherited_different = AlteredInheritingTaggableModel.new(:name => "inherited different")

data/spec/schema.rb

@@ -19,7 +19,10 @@ ActiveRecord::Schema.define :version => 0 do
   create_table :taggable_models, :force => true do |t|
     t.column :name, :string
     t.column :type, :string
-    #t.column :cached_tag_list, :string
+    t.column :cached_tag_list, :string
+  end
+  create_table :untaggable_models, :force => true do |t|
+    t.column :taggable_model_id, :integer
   end
   create_table :taggable_users, :force => true do |t|
     t.column :name, :string
@@ -27,6 +30,5 @@ ActiveRecord::Schema.define :version => 0 do
   create_table :other_taggable_models, :force => true do |t|
     t.column :name, :string
     t.column :type, :string
-    #t.column :cached_tag_list, :string
   end
 end

data/spec/spec_helper.rb

@@ -22,7 +22,7 @@ ActiveRecord::Base.establish_connection(
   "adapter" => "sqlite3", "database" => TEST_DATABASE_FILE
 )
 
-RAILS_DEFAULT_LOGGER = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
+ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
 
 ActiveRecord::Base.silence do
   ActiveRecord::Migration.verbose = false
@@ -37,6 +37,7 @@ class TaggableModel < ActiveRecord::Base
   acts_as_taggable_on :languages
   acts_as_taggable_on :skills
   acts_as_taggable_on :needs, :offerings
+  has_many :untaggable_models
 end
 
 class OtherTaggableModel < ActiveRecord::Base
@@ -56,10 +57,10 @@ class TaggableUser < ActiveRecord::Base
 end
 
 class UntaggableModel < ActiveRecord::Base
+  belongs_to :taggable_model, :touch => true
 end
 
 def clean_database!
-  $debug = false
   models = [Tag, Tagging, TaggableModel, OtherTaggableModel, InheritingTaggableModel,
             AlteredInheritingTaggableModel, TaggableUser]
   models.each do |model|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 6
-  version: 1.1.6
+  - 7
+  version: 1.1.7
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-27 00:00:00 +01:00
+date: 2010-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: []