acts-as-taggable-on 1.1.9 → 2.0.0.pre1

data/spec/acts_as_taggable_on/tag_spec.rb

@@ -6,65 +6,65 @@ describe Tag do
     @tag = Tag.new
     @user = TaggableModel.create(:name => "Pablo")
   end
-  
+
   describe "named like any" do
     before(:each) do
       Tag.create(:name => "awesome")
       Tag.create(:name => "epic")
     end
-    
+
     it "should find both tags" do
       Tag.named_like_any(["awesome", "epic"]).should have(2).items
     end
   end
-  
+
   describe "find or create by name" do
     before(:each) do
       @tag.name = "awesome"
       @tag.save
     end
-    
+
     it "should find by name" do
       Tag.find_or_create_with_like_by_name("awesome").should == @tag
     end
-    
+
     it "should find by name case insensitive" do
       Tag.find_or_create_with_like_by_name("AWESOME").should == @tag
     end
-    
+
     it "should create by name" do
       lambda {
         Tag.find_or_create_with_like_by_name("epic")
       }.should change(Tag, :count).by(1)
     end
   end
-  
+
   describe "find or create all by any name" do
     before(:each) do
       @tag.name = "awesome"
       @tag.save
     end
-    
+
     it "should find by name" do
       Tag.find_or_create_all_with_like_by_name("awesome").should == [@tag]
     end
-    
+
     it "should find by name case insensitive" do
       Tag.find_or_create_all_with_like_by_name("AWESOME").should == [@tag]
     end
-    
+
     it "should create by name" do
       lambda {
         Tag.find_or_create_all_with_like_by_name("epic")
       }.should change(Tag, :count).by(1)
     end
-    
+
     it "should find or create by name" do
       lambda {
         Tag.find_or_create_all_with_like_by_name("awesome", "epic").map(&:name).should == ["awesome", "epic"]
-      }.should change(Tag, :count).by(1)      
+      }.should change(Tag, :count).by(1)
     end
-    
+
     it "should return an empty array if no tags are specified" do
       Tag.find_or_create_all_with_like_by_name([]).should == []
     end
@@ -72,33 +72,33 @@ describe Tag do
 
   it "should require a name" do
     @tag.valid?
-    @tag.errors.on(:name).should == "can't be blank"
+    @tag.errors[:name].should == ["can't be blank"]
     @tag.name = "something"
     @tag.valid?
-    @tag.errors.on(:name).should be_nil
+    @tag.errors[:name].should == []
   end
-  
+
   it "should equal a tag with the same name" do
     @tag.name = "awesome"
     new_tag = Tag.new(:name => "awesome")
     new_tag.should == @tag
   end
-  
+
   it "should return its name when to_s is called" do
     @tag.name = "cool"
     @tag.to_s.should == "cool"
   end
-  
+
   it "have named_scope named(something)" do
     @tag.name = "cool"
     @tag.save!
     Tag.named('cool').should include(@tag)
   end
-  
+
   it "have named_scope named_like(something)" do
     @tag.name = "cool"
     @tag.save!
     @another_tag = Tag.create!(:name => "coolip")
     Tag.named_like('cool').should include(@tag, @another_tag)
   end
-end
+end

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -14,7 +14,7 @@ describe "Taggable" do
   end
 
   it "should have tag_counts_on" do
-    TaggableModel.tag_counts_on(:tags).should be_empty
+    TaggableModel.tag_counts_on(:tags).all.should be_empty
 
     @taggable.tag_list = ["awesome", "epic"]
     @taggable.save
@@ -64,26 +64,17 @@ describe "Taggable" do
   it "should be able to find by tag" do
     @taggable.skill_list = "ruby, rails, css"
     @taggable.save
-    TaggableModel.find_tagged_with("ruby").first.should == @taggable
-  end
 
-  it "should be able to find by tag with context" do
-    @taggable.skill_list = "ruby, rails, css"
-    @taggable.tag_list = "bob, charlie"
-    @taggable.save
-    TaggableModel.find_tagged_with("ruby").first.should == @taggable
-    TaggableModel.find_tagged_with("bob", :on => :skills).first.should_not == @taggable
-    TaggableModel.find_tagged_with("bob", :on => :tags).first.should == @taggable
+    TaggableModel.tagged_with("ruby").first.should == @taggable
   end
 
-  it "should be able to use the tagged_with named scope" do
+  it "should be able to find by tag with context" do
     @taggable.skill_list = "ruby, rails, css"
     @taggable.tag_list = "bob, charlie"
     @taggable.save
 
     TaggableModel.tagged_with("ruby").first.should == @taggable
     TaggableModel.tagged_with("ruby, css").first.should == @taggable
-    TaggableModel.tagged_with("ruby, nonexistingtag").should be_empty
     TaggableModel.tagged_with("bob", :on => :skills).first.should_not == @taggable
     TaggableModel.tagged_with("bob", :on => :tags).first.should == @taggable
   end
@@ -93,15 +84,15 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "Ruby")
 
     Tag.find(:all).size.should == 1
-    TaggableModel.find_tagged_with("ruby").should == TaggableModel.find_tagged_with("Ruby")
+    TaggableModel.tagged_with("ruby").all.should == TaggableModel.tagged_with("Ruby").all
   end
 
   it "should be able to get tag counts on model as a whole" do
     bob = TaggableModel.create(:name => "Bob", :tag_list => "ruby, rails, css")
     frank = TaggableModel.create(:name => "Frank", :tag_list => "ruby, rails")
     charlie = TaggableModel.create(:name => "Charlie", :skill_list => "ruby")
-    TaggableModel.tag_counts.should_not be_empty
-    TaggableModel.skill_counts.should_not be_empty
+    TaggableModel.tag_counts.all.should_not be_empty
+    TaggableModel.skill_counts.all.should_not be_empty
   end
 
   it "should be able to get all tag counts on model as whole" do
@@ -109,7 +100,7 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "ruby, rails")
     charlie = TaggableModel.create(:name => "Charlie", :skill_list => "ruby")
 
-    TaggableModel.all_tag_counts.should_not be_empty
+    TaggableModel.all_tag_counts.all.should_not be_empty
     TaggableModel.all_tag_counts.first.count.should == 3 # ruby
   end
 
@@ -150,9 +141,9 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "weaker, depressed, inefficient", :skill_list => "ruby, rails, css")
     steve = TaggableModel.create(:name => 'Steve', :tag_list => 'fitter, happier, more productive', :skill_list => 'c++, java, ruby')
 
-    TaggableModel.find_tagged_with("ruby", :order => 'taggable_models.name').should == [bob, frank, steve]
-    TaggableModel.find_tagged_with("ruby, rails", :order => 'taggable_models.name').should == [bob, frank]
-    TaggableModel.find_tagged_with(["ruby", "rails"], :order => 'taggable_models.name').should == [bob, frank]    
+    TaggableModel.tagged_with("ruby", :order => 'taggable_models.name').all.should == [bob, frank, steve]
+    TaggableModel.tagged_with("ruby, rails", :order => 'taggable_models.name').all.should == [bob, frank]
+    TaggableModel.tagged_with(["ruby", "rails"], :order => 'taggable_models.name').all.should == [bob, frank]
   end
 
   it "should be able to find tagged with any tag" do
@@ -160,9 +151,9 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "weaker, depressed, inefficient", :skill_list => "ruby, rails, css")
     steve = TaggableModel.create(:name => 'Steve', :tag_list => 'fitter, happier, more productive', :skill_list => 'c++, java, ruby')
 
-    TaggableModel.find_tagged_with(["ruby", "java"], :order => 'taggable_models.name', :any => true).should == [bob, frank, steve]
-    TaggableModel.find_tagged_with(["c++", "fitter"], :order => 'taggable_models.name', :any => true).should == [bob, steve]
-    TaggableModel.find_tagged_with(["depressed", "css"], :order => 'taggable_models.name', :any => true).should == [bob, frank]    
+    TaggableModel.tagged_with(["ruby", "java"], :order => 'taggable_models.name', :any => true).all.should == [bob, frank, steve]
+    TaggableModel.tagged_with(["c++", "fitter"], :order => 'taggable_models.name', :any => true).all.should == [bob, steve]
+    TaggableModel.tagged_with(["depressed", "css"], :order => 'taggable_models.name', :any => true).all.should == [bob, frank]
   end
 
   it "should be able to find tagged on a custom tag context" do
@@ -170,7 +161,8 @@ describe "Taggable" do
     bob.set_tag_list_on(:rotors, "spinning, jumping")
     bob.tag_list_on(:rotors).should == ["spinning","jumping"]
     bob.save
-    TaggableModel.find_tagged_with("spinning", :on => :rotors).should == [bob]
+
+    TaggableModel.tagged_with("spinning", :on => :rotors).all.should == [bob]
   end
 
   it "should be able to use named scopes to chain tag finds" do
@@ -190,7 +182,7 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "fitter, happier, inefficient")
     steve = TaggableModel.create(:name => 'Steve', :tag_list => "fitter, happier")
 
-    TaggableModel.find_tagged_with("fitter, happier", :match_all => true).should == [steve]    
+    TaggableModel.tagged_with("fitter, happier", :match_all => true).all.should == [steve]
   end
 
   it "should be able to find tagged with some excluded tags" do
@@ -198,7 +190,7 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "happier")
     steve = TaggableModel.create(:name => 'Steve', :tag_list => "happier")
 
-    TaggableModel.find_tagged_with("lazy", :exclude => true).should == [frank, steve]    
+    TaggableModel.tagged_with("lazy", :exclude => true).all.should == [frank, steve]
   end
 
   it "should not create duplicate taggings" do
@@ -209,21 +201,10 @@ 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 "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")
@@ -232,20 +213,20 @@ describe "Taggable" do
     it "should be able to save tags for inherited models" do
       @inherited_same.tag_list = "bob, kelso"
       @inherited_same.save
-      InheritingTaggableModel.find_tagged_with("bob").first.should == @inherited_same
+      InheritingTaggableModel.tagged_with("bob").first.should == @inherited_same
     end
 
     it "should find STI tagged models on the superclass" do
       @inherited_same.tag_list = "bob, kelso"
       @inherited_same.save
-      TaggableModel.find_tagged_with("bob").first.should == @inherited_same
+      TaggableModel.tagged_with("bob").first.should == @inherited_same
     end
 
     it "should be able to add on contexts only to some subclasses" do
       @inherited_different.part_list = "fork, spoon"
       @inherited_different.save
-      InheritingTaggableModel.find_tagged_with("fork", :on => :parts).should be_empty
-      AlteredInheritingTaggableModel.find_tagged_with("fork", :on => :parts).first.should == @inherited_different
+      InheritingTaggableModel.tagged_with("fork", :on => :parts).should be_empty
+      AlteredInheritingTaggableModel.tagged_with("fork", :on => :parts).first.should == @inherited_different
     end
 
     it "should have different tag_counts_on for inherited models" do
@@ -258,14 +239,14 @@ describe "Taggable" do
       AlteredInheritingTaggableModel.tag_counts_on(:tags).map(&:name).should == %w(fork spoon)
       TaggableModel.tag_counts_on(:tags).map(&:name).should == %w(bob kelso fork spoon)
     end
-    
+
     it 'should store same tag without validation conflict' do
       @taggable.tag_list = 'one'
       @taggable.save!
-      
+
       @inherited_same.tag_list = 'one'
       @inherited_same.save!
-      
+
       @inherited_same.update_attributes! :name => 'foo'
     end
   end

data/spec/acts_as_taggable_on/tagger_spec.rb

@@ -33,22 +33,6 @@ describe "Tagger" do
     @taggable.all_tags_list_on(:tags).sort.should == %w(ruby scheme java python lisp).sort
     @taggable.all_tags_on(:tags).size.should == 6
   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/acts_as_taggable_on/tagging_spec.rb

@@ -5,22 +5,22 @@ describe Tagging do
     clean_database!
     @tagging = Tagging.new
   end
-  
+
   it "should not be valid with a invalid tag" do
     @tagging.taggable = TaggableModel.create(:name => "Bob Jones")
     @tagging.tag = Tag.new(:name => "")
     @tagging.context = "tags"
 
     @tagging.should_not be_valid
-    @tagging.errors.on(:tag_id).should == "can't be blank"
+    @tagging.errors[:tag_id].should == ["can't be blank"]
   end
-  
+
   it "should not create duplicate taggings" do
     @taggable = TaggableModel.create(:name => "Bob Jones")
     @tag = Tag.create(:name => "awesome")
-    
+
     lambda {
       2.times { Tagging.create(:taggable => @taggable, :tag => @tag, :context => 'tags') }
     }.should change(Tagging, :count).by(1)
   end
-end
+end

data/spec/schema.rb

@@ -19,10 +19,7 @@ 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
-  end
-  create_table :untaggable_models, :force => true do |t|
-    t.column :taggable_model_id, :integer
+    #t.column :cached_tag_list, :string
   end
   create_table :taggable_users, :force => true do |t|
     t.column :name, :string
@@ -30,5 +27,6 @@ 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.opts

@@ -1,3 +1,2 @@
 --colour
---reverse
---backtrace
+--backtrace

data/spec/spec_helper.rb

@@ -1,9 +1,7 @@
-# require File.dirname(__FILE__) + '/../../../../spec/spec_helper'
-require 'rubygems'
-require 'active_record'
-require 'spec'
+require File.expand_path('../../lib/acts-as-taggable-on', __FILE__)
+Bundler.require :test
 
-module Spec::Example::ExampleGroupMethods
+module Rspec::Core::ExampleGroupSubject
   alias :context :describe
 end
 
@@ -22,7 +20,7 @@ ActiveRecord::Base.establish_connection(
   "adapter" => "sqlite3", "database" => TEST_DATABASE_FILE
 )
 
-ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
+Rails.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
 
 ActiveRecord::Base.silence do
   ActiveRecord::Migration.verbose = false
@@ -30,14 +28,12 @@ ActiveRecord::Base.silence do
 end
 
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
-require File.join(File.dirname(__FILE__), '..', 'init')
 
 class TaggableModel < ActiveRecord::Base
   acts_as_taggable
   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
@@ -57,13 +53,13 @@ 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|
     model.destroy_all
   end
-end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version 
-  version: 1.1.9
+  prerelease: true
+  segments: 
+  - 2
+  - 0
+  - 0
+  - pre1
+  version: 2.0.0.pre1
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +01:00
+date: 2010-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -23,12 +29,11 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - CHANGELOG
+- Gemfile
 - MIT-LICENSE
 - 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_tagger.rb
@@ -37,7 +42,8 @@ files:
 - lib/acts_as_taggable_on/tag_list.rb
 - lib/acts_as_taggable_on/tagging.rb
 - lib/acts_as_taggable_on/tags_helper.rb
-- rails/init.rb
+- lib/generators/acts_as_taggable_on/migration/migration_generator.rb
+- lib/generators/acts_as_taggable_on/migration/templates/active_record/migration.rb
 - spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb
 - spec/acts_as_taggable_on/acts_as_tagger_spec.rb
 - spec/acts_as_taggable_on/group_helper_spec.rb
@@ -63,18 +69,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ActsAsTaggableOn is a tagging plugin for Rails that provides multiple tagging contexts on a single model.