acts-as-taggable-on 2.0.0.pre5 → 2.0.0.rc1

data/README.rdoc

@@ -15,43 +15,53 @@ was used.
 
 == Installation
 
-=== Plugin
+=== Rails 2.3.x
+
+Acts As Taggable On is tested to work in Rails 2.3.5. 
+
+==== Plugin
 
 Acts As Taggable On is available both as a gem and as a traditional plugin. For the
-traditional plugin you can install like so (Rails 2.1 or later):
+traditional plugin you can install like so:
 
   script/plugin install git://github.com/mbleigh/acts-as-taggable-on.git
-  
-=== GemPlugin
 
 Acts As Taggable On is also available as a gem plugin using Rails 2.1's gem dependencies.
 To install the gem, add this to your config/environment.rb:
   
-  config.gem "acts-as-taggable-on", :source => "http://gemcutter.org"
+  config.gem "acts-as-taggable-on", :source => "http://gemcutter.org", :version => '2.0.0.rc1'
   
 After that, you can run "rake gems:install" to install the gem if you don't already have it.
 
+==== Post Installation
+
+1. script/generate acts_as_taggable_on_migration
+2. rake db:migrate
+
 == 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.
+and Jelle Vandebeeck.
 
-A Rails 3.0 compatible version of the gem is also available: 
+To use it, add it to your Gemfile:
   
-  gem install acts-as-taggable-on -v=2.0.0.pre1
+  gem 'acts-as-taggable-on', '2.0.0.rc1'
 
-=== Post Installation (Rails)
+=== Post Installation
 
-1. script/generate acts_as_taggable_on_migration
+1. rails generate acts_as_taggable_on:migration
 2. rake db:migrate
 
 === Testing
 
 Acts As Taggable On uses RSpec for its test coverage. Inside the plugin
-directory, you can run the specs with:
+directory, you can run the specs for RoR 3.0.0 with:
+
+  rake spec
+
+If you want to test the plugin for Rails 2.3.x, use:
 
-rake spec
+  rake rails2.3:spec
 
 If you already have RSpec on your application, the specs will run while using:
 
@@ -67,29 +77,21 @@ rake spec:plugins
     @user = User.new(:name => "Bobby")
     @user.tag_list = "awesome, slick, hefty"      # this should be familiar
     @user.skill_list = "joking, clowning, boxing" # but you can do it for any context!
-    @user.skill_list # => ["joking","clowning","boxing"] as TagList
+    @user.skill_list                              # => ["joking","clowning","boxing"] as TagList
     @user.save
 
     @user.tags # => [<Tag name:"awesome">,<Tag name:"slick">,<Tag name:"hefty">]
     @user.skills # => [<Tag name:"joking">,<Tag name:"clowning">,<Tag name:"boxing">]
 
-    # The old way
-    User.find_tagged_with("awesome", :on => :tags) # => [@user]
-    User.find_tagged_with("awesome", :on => :skills) # => []
-
-    # The better way (utilizes named_scope)
-    User.tagged_with("awesome", :on => :tags) # => [@user]
-    User.tagged_with("awesome", :on => :skills) # => []
-
     @frankie = User.create(:name => "Frankie", :skill_list => "joking, flying, eating")
     User.skill_counts # => [<Tag name="joking" count=2>,<Tag name="clowning" count=1>...]
     @frankie.skill_counts
 
 === Finding Tagged Objects
 
-Acts As Taggable On utilizes Rails 2.1's named_scope to create an association
-for tags. This way you can mix and match to filter down your results, and it
-also improves compatibility with the will_paginate gem:
+Acts As Taggable On utilizes named_scopes to create an association for tags.
+This way you can mix and match to filter down your results, and it also improves
+compatibility with the will_paginate gem:
 
     class User < ActiveRecord::Base
       acts_as_taggable_on :tags
@@ -99,8 +101,11 @@ also improves compatibility with the will_paginate gem:
     User.tagged_with("awesome").by_date
     User.tagged_with("awesome").by_date.paginate(:page => params[:page], :per_page => 20)
 
-    #Find a user with matching all tags, not just one
+    # Find a user with matching all tags, not just one
     User.tagged_with(["awesome", "cool"], :match_all => :true)
+    
+    # Find a user with any of the tags:
+    User.tagged_with(["awesome", "cool"], :any => true)
 
 === Relationships
 
@@ -195,6 +200,8 @@ CSS:
 
 * TomEric (i76) - Maintainer
 * Michael Bleigh - Original Author
+* Szymon Nowak - Rails 3.0 compatibility
+* Jelle Vandebeeck - Rails 3.0 compatibility
 * Brendan Lim - Related Objects
 * Pradeep Elankumaran - Taggers
 * Sinclair Bain - Patch King
@@ -209,4 +216,4 @@ CSS:
 * lawrencepit - cached tag work
 * sobrinho - fixed tag_cloud helper
 
-Copyright (c) 2007-2009 Michael Bleigh (http://mbleigh.com/) and Intridea Inc. (http://intridea.com/), released under the MIT license
+Copyright (c) 2007-2010 Michael Bleigh (http://mbleigh.com/) and Intridea Inc. (http://intridea.com/), released under the MIT license

data/VERSION

@@ -1 +1 @@
-2.0.0.pre5
+2.0.0.rc1

data/generators/acts_as_taggable_on_migration/acts_as_taggable_on_migration_generator.rb

@@ -0,0 +1,7 @@
+class ActsAsTaggableOnMigrationGenerator < Rails::Generator::Base 
+  def manifest 
+    record do |m| 
+      m.migration_template 'migration.rb', 'db/migrate', :migration_file_name => "acts_as_taggable_on_migration"
+    end
+  end
+end

data/generators/acts_as_taggable_on_migration/templates/migration.rb

@@ -0,0 +1,29 @@
+class ActsAsTaggableOnMigration < ActiveRecord::Migration
+  def self.up
+    create_table :tags do |t|
+      t.column :name, :string
+    end
+    
+    create_table :taggings do |t|
+      t.column :tag_id, :integer
+      t.column :taggable_id, :integer
+      t.column :tagger_id, :integer
+      t.column :tagger_type, :string
+      
+      # You should make sure that the column created is
+      # long enough to store the required class names.
+      t.column :taggable_type, :string
+      t.column :context, :string
+      
+      t.column :created_at, :datetime
+    end
+    
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+  
+  def self.down
+    drop_table :taggings
+    drop_table :tags
+  end
+end

data/lib/acts_as_taggable_on/acts_as_taggable_on/core.rb

@@ -208,7 +208,7 @@ module ActsAsTaggableOn::Taggable
 
             # Create new taggings:
             new_tags.each do |tag|
-              Tagging.create!(:tag_id => tag.id, :context => context.to_s, :taggable => self)
+              taggings.create!(:tag_id => tag.id, :context => context.to_s, :taggable => self)
             end
           end
         end

data/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb

@@ -1,3 +1,4 @@
+# WIP: dirty attributes support for tags
 module ActsAsTaggableOn::Taggable
   module Dirty
     def self.included(base)

data/lib/acts_as_taggable_on/acts_as_taggable_on/ownership.rb

@@ -90,7 +90,7 @@ module ActsAsTaggableOn::Taggable
 
               # Create new taggings:
               new_tags.each do |tag|
-                Tagging.create!(:tag_id => tag.id, :context => context.to_s, :tagger => owner, :taggable => self)
+                taggings.create!(:tag_id => tag.id, :context => context.to_s, :tagger => owner, :taggable => self)
               end
             end
           end

data/lib/acts_as_taggable_on/tag.rb

@@ -42,7 +42,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/taggable_spec.rb

@@ -215,6 +215,18 @@ describe "Taggable" do
       bob.save
     }.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 "grouped_column_names_for method" do
     it "should return all column names joined for Tag GROUP clause" do
@@ -228,7 +240,6 @@ describe "Taggable" do
 
   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/acts_as_taggable_on/tagger_spec.rb

@@ -68,6 +68,22 @@ describe "Tagger" do
     @taggable.all_tags_list.should include('awesome')
     @taggable.all_tags_list.should include('epic')
   end
+  
+  it "should not lose tags" do
+    @taggable.update_attributes(:tag_list => 'ruby')
+    @user.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
+    
+    [@taggable, @user].each(&:reload)
+    @taggable.tag_list.should == %w(ruby)
+    @taggable.all_tags_list.sort.should == %w(ruby scheme).sort
+    
+    lambda {
+      @taggable.update_attributes(:tag_list => "")
+    }.should change(Tagging, :count).by(-1)
+    
+    @taggable.tag_list.should == []
+    @taggable.all_tags_list.sort.should == %w(ruby scheme).sort
+  end
 
   it "is tagger" do
     @user.is_tagger?.should(be_true)

data/spec/models.rb

@@ -3,6 +3,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 CachedModel < ActiveRecord::Base
@@ -26,11 +27,4 @@ class TaggableUser < ActiveRecord::Base
 end
 
 class UntaggableModel < ActiveRecord::Base
-end
-
-# if ActiveRecord::VERSION::MAJOR < 3
-#   [TaggableModel, CachedModel, OtherTaggableModel, InheritingTaggableModel,
-#    AlteredInheritingTaggableModel, TaggableUser, UntaggableModel].each do |klass|
-#     klass.send(:include, ActsAsTaggableOn::ActiveRecord::Backports)
-#   end
-# end
+end

data/spec/schema.rb

@@ -21,6 +21,11 @@ ActiveRecord::Schema.define :version => 0 do
     t.column :type, :string
   end
   
+  create_table :untaggable_models, :force => true do |t|
+    t.column :taggable_model_id, :integer
+    t.column :name, :string
+  end
+  
   create_table :cached_models, :force => true do |t|
     t.column :name, :string
     t.column :type, :string
@@ -35,8 +40,4 @@ ActiveRecord::Schema.define :version => 0 do
     t.column :name, :string
     t.column :type, :string
   end
-  
-  create_table :untaggable_models, :force => true do |t|
-    t.column :name, :string
-  end
 end

data/spec/spec_helper.rb

@@ -28,6 +28,12 @@ end
 # Setup a database
 TEST_DATABASE_FILE = File.join(File.dirname(__FILE__), '..', 'test.sqlite3')
 File.unlink(TEST_DATABASE_FILE) if File.exist?(TEST_DATABASE_FILE)
+
+ActiveRecord::Base.establish_connection(
+  "adapter" => "sqlite3", "database" => TEST_DATABASE_FILE
+)
+
+ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
 ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => TEST_DATABASE_FILE
 
 ActiveRecord::Base.silence do

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 0
   - 0
-  - pre5
-  version: 2.0.0.pre5
+  - rc1
+  version: 2.0.0.rc1
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -34,6 +34,8 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- generators/acts_as_taggable_on_migration/acts_as_taggable_on_migration_generator.rb
+- generators/acts_as_taggable_on_migration/templates/migration.rb
 - lib/acts-as-taggable-on.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/cache.rb