acts-as-taggable-on 2.1.0 → 2.2.0

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -25,14 +25,19 @@ describe "Taggable" do
     @taggable.tag_counts_on(:tags).length.should == 2
   end
 
+  it "should return [] right after create" do
+    blank_taggable = TaggableModel.new(:name => "Bob Jones")
+    blank_taggable.tag_list.should == []
+  end
+
   it "should be able to create tags" do
     @taggable.skill_list = "ruby, rails, css"
     @taggable.instance_variable_get("@skill_list").instance_of?(ActsAsTaggableOn::TagList).should be_true
-    
+
     lambda {
       @taggable.save
     }.should change(ActsAsTaggableOn::Tag, :count).by(3)
-    
+
     @taggable.reload
     @taggable.skill_list.sort.should == %w(ruby rails css).sort
   end
@@ -41,10 +46,10 @@ describe "Taggable" do
     @taggable.tag_list_on(:test).add("hello")
     @taggable.tag_list_cache_on(:test).should_not be_empty
     @taggable.tag_list_on(:test).should == ["hello"]
-    
+
     @taggable.save
     @taggable.save_tags
-    
+
     @taggable.reload
     @taggable.tag_list_on(:test).should == ["hello"]
   end
@@ -75,7 +80,7 @@ describe "Taggable" do
     @taggables[0].skill_list = "ruby"
     @taggables[1].skill_list = "css"
     @taggables.each{|taggable| taggable.save}
-    
+
     @found_taggables_by_tag = TaggableModel.joins(:tags).where(:tags => {:name => ["bob"]})
     @found_taggables_by_skill = TaggableModel.joins(:skills).where(:tags => {:name => ["ruby"]})
 
@@ -84,7 +89,7 @@ describe "Taggable" do
     @found_taggables_by_skill.should include @taggables[0]
     @found_taggables_by_skill.should_not include @taggables[1]
   end
-  
+
   it "should be able to find by tag" do
     @taggable.skill_list = "ruby, rails, css"
     @taggable.save
@@ -136,7 +141,7 @@ describe "Taggable" do
     # Let's only find those who need rails or css and are offering c++ or java
     TaggableModel.tagged_with(['rails, css'], :on => :needs, :any => true).tagged_with(['c++', 'java'], :on => :offerings, :any => true).to_a.should == [bob]
   end
-  
+
   if ActiveRecord::VERSION::MAJOR >= 3
     it "should not return read-only records" do
       TaggableModel.create(:name => "Bob", :tag_list => "ruby, rails, css")
@@ -146,10 +151,10 @@ describe "Taggable" do
     xit "should not return read-only records" do
       # apparantly, there is no way to set readonly to false in a scope if joins are made
     end
-    
+
     it "should be possible to return writable records" do
       TaggableModel.create(:name => "Bob", :tag_list => "ruby, rails, css")
-      TaggableModel.tagged_with("ruby").first(:readonly => false).should_not be_readonly      
+      TaggableModel.tagged_with("ruby").first(:readonly => false).should_not be_readonly
     end
   end
 
@@ -174,10 +179,10 @@ describe "Taggable" 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, java")
- 
+
     TaggableModel.tagged_with('rails').all_tag_counts.should have(3).items
     TaggableModel.tagged_with('rails').all_tag_counts.any? { |tag| tag.name == 'java' }.should be_false
-    
+
     # Test specific join syntaxes:
     frank.untaggable_models.create!
     TaggableModel.tagged_with('rails').scoped(:joins => :untaggable_models).all_tag_counts.should have(2).items
@@ -203,15 +208,15 @@ describe "Taggable" do
     TaggableModel.tagged_with("ruby, rails", :order => 'taggable_models.name').to_a.should == [bob, frank]
     TaggableModel.tagged_with(["ruby", "rails"], :order => 'taggable_models.name').to_a.should == [bob, frank]
   end
-  
+
   it "should be able to find tagged with quotation marks" do
     bob = TaggableModel.create(:name => "Bob", :tag_list => "fitter, happier, more productive, 'I love the ,comma,'")
     TaggableModel.tagged_with("'I love the ,comma,'").should include(bob)
   end
-  
+
   it "should be able to find tagged with invalid tags" do
-    bob = TaggableModel.create(:name => "Bob", :tag_list => "fitter, happier, more productive")    
-    TaggableModel.tagged_with("sad, happier").should_not include(bob)    
+    bob = TaggableModel.create(:name => "Bob", :tag_list => "fitter, happier, more productive")
+    TaggableModel.tagged_with("sad, happier").should_not include(bob)
   end
 
   it "should be able to find tagged with any tag" do
@@ -260,11 +265,12 @@ describe "Taggable" do
 
     TaggableModel.tagged_with("lazy", :exclude => true).to_a.should == [frank, steve]
   end
-  
+
   it "should return an empty scope for empty tags" do
     TaggableModel.tagged_with('').should == []
     TaggableModel.tagged_with(' ').should == []
-    TaggableModel.tagged_with(nil).should == []    
+    TaggableModel.tagged_with(nil).should == []
+    TaggableModel.tagged_with([]).should == []
   end
 
   it "should not create duplicate taggings" do
@@ -275,12 +281,12 @@ describe "Taggable" do
       bob.save
     }.should change(ActsAsTaggableOn::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
@@ -296,6 +302,10 @@ describe "Taggable" do
     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"
     end
+
+    it "should return all column names joined for NonStandardIdTaggableModel GROUP clause" do
+      @taggable.grouped_column_names_for(TaggableModel).should == "taggable_models.#{TaggableModel.primary_key}, taggable_models.name, taggable_models.type"
+    end
   end
 
   describe "Single Table Inheritance" do
@@ -304,45 +314,97 @@ describe "Taggable" do
       @inherited_same = InheritingTaggableModel.new(:name => "inherited same")
       @inherited_different = AlteredInheritingTaggableModel.new(:name => "inherited different")
     end
-  
+
     it "should be able to save tags for inherited models" do
       @inherited_same.tag_list = "bob, kelso"
       @inherited_same.save
       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.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.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
       @inherited_same.tag_list = "bob, kelso"
       @inherited_same.save!
       @inherited_different.tag_list = "fork, spoon"
       @inherited_different.save!
-  
+
       InheritingTaggableModel.tag_counts_on(:tags, :order => 'tags.id').map(&:name).should == %w(bob kelso)
       AlteredInheritingTaggableModel.tag_counts_on(:tags, :order => 'tags.id').map(&:name).should == %w(fork spoon)
       TaggableModel.tag_counts_on(:tags, :order => 'tags.id').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
+
+  describe "NonStandardIdTaggable" do
+    before(:each) do
+      clean_database!
+      @taggable = NonStandardIdTaggableModel.new(:name => "Bob Jones")
+      @taggables = [@taggable, NonStandardIdTaggableModel.new(:name => "John Doe")]
+    end
+
+    it "should have tag types" do
+      [:tags, :languages, :skills, :needs, :offerings].each do |type|
+        NonStandardIdTaggableModel.tag_types.should include type
+      end
+
+      @taggable.tag_types.should == NonStandardIdTaggableModel.tag_types
+    end
+
+    it "should have tag_counts_on" do
+      NonStandardIdTaggableModel.tag_counts_on(:tags).all.should be_empty
+
+      @taggable.tag_list = ["awesome", "epic"]
+      @taggable.save
+
+      NonStandardIdTaggableModel.tag_counts_on(:tags).length.should == 2
+      @taggable.tag_counts_on(:tags).length.should == 2
+    end
+
+    it "should be able to create tags" do
+      @taggable.skill_list = "ruby, rails, css"
+      @taggable.instance_variable_get("@skill_list").instance_of?(ActsAsTaggableOn::TagList).should be_true
+
+      lambda {
+        @taggable.save
+      }.should change(ActsAsTaggableOn::Tag, :count).by(3)
+
+      @taggable.reload
+      @taggable.skill_list.sort.should == %w(ruby rails css).sort
+    end
+
+    it "should be able to create tags through the tag list directly" do
+      @taggable.tag_list_on(:test).add("hello")
+      @taggable.tag_list_cache_on(:test).should_not be_empty
+      @taggable.tag_list_on(:test).should == ["hello"]
+
+      @taggable.save
+      @taggable.save_tags
+
+      @taggable.reload
+      @taggable.tag_list_on(:test).should == ["hello"]
+    end
+  end
 end
+
+

data/spec/acts_as_taggable_on/tagger_spec.rb

@@ -17,6 +17,20 @@ describe "Tagger" do
     @user.owned_tags.size == 2
   end
   
+  it "should scope objects returned by tagged_with by owners" do
+    @taggable2 = TaggableModel.create(:name => "Jim Jones")
+    @taggable3 = TaggableModel.create(:name => "Jane Doe")
+
+    @user2 = TaggableUser.new
+    @user.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
+    @user2.tag(@taggable2, :with => 'ruby, scheme', :on => :tags)
+    @user2.tag(@taggable3, :with => 'ruby, scheme', :on => :tags)
+
+    TaggableModel.tagged_with(%w(ruby scheme), :owned_by => @user).count.should == 1
+    TaggableModel.tagged_with(%w(ruby scheme), :owned_by => @user2).count.should == 2
+
+  end
+  
   it "should not overlap tags from different taggers" do
     @user2 = TaggableUser.new
     lambda{

data/spec/acts_as_taggable_on/utils_spec.rb

@@ -4,16 +4,15 @@ describe ActsAsTaggableOn::Utils do
   describe "like_operator" do
     before(:each) do
       clean_database!
-      TaggableModel.write_inheritable_attribute(:tag_types, [])
       TaggableModel.acts_as_taggable_on(:tags, :languages, :skills, :needs, :offerings)
       @taggable = TaggableModel.new(:name => "Bob Jones")
     end
-  
+
     it "should return 'ILIKE' when the adapter is PostgreSQL" do
       TaggableModel.connection.stub(:adapter_name).and_return("PostgreSQL")
       TaggableModel.send(:like_operator).should == "ILIKE"
     end
-  
+
     it "should return 'LIKE' when the adapter is not PostgreSQL" do
       TaggableModel.connection.stub(:adapter_name).and_return("MySQL")
       TaggableModel.send(:like_operator).should == "LIKE"

data/spec/database.yml.sample

@@ -16,4 +16,4 @@ postgresql:
   username: postgres
   password:
   database: acts_as_taggable_on
-  encoding: utf8
+  encoding: utf8

data/spec/generators/acts_as_taggable_on/migration/migration_generator_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/acts_as_taggable_on/migration/migration_generator'
+
+describe ActsAsTaggableOn::MigrationGenerator do
+  # Tell the generator where to put its output (what it thinks of as Rails.root)
+  destination File.expand_path("../../../../../tmp", __FILE__)
+
+  before do
+    prepare_destination
+    Rails::Generators.options[:rails][:orm] = :active_record
+  end
+  describe 'no arguments' do
+    before { run_generator  }
+
+    describe 'db/migrate/acts_as_taggable_on_migration.rb' do
+      subject { file('db/migrate/acts_as_taggable_on_migration.rb') }
+      it { should be_a_migration }
+    end
+  end
+end

data/spec/models.rb

@@ -11,7 +11,7 @@ class CachedModel < ActiveRecord::Base
 end
 
 class OtherCachedModel < ActiveRecord::Base
-  acts_as_taggable_on :languages
+  acts_as_taggable_on :languages, :statuses, :glasses
 end
 
 class OtherTaggableModel < ActiveRecord::Base
@@ -32,4 +32,13 @@ end
 
 class UntaggableModel < ActiveRecord::Base
   belongs_to :taggable_model
-end
+end
+
+class NonStandardIdTaggableModel < ActiveRecord::Base
+  set_primary_key "an_id"
+  acts_as_taggable
+  acts_as_taggable_on :languages
+  acts_as_taggable_on :skills
+  acts_as_taggable_on :needs, :offerings
+  has_many :untaggable_models
+end

data/spec/schema.rb

@@ -21,6 +21,11 @@ ActiveRecord::Schema.define :version => 0 do
     t.column :type, :string
   end
   
+  create_table :non_standard_id_taggable_models, :primary_key => "an_id", :force => true do |t|
+    t.column :name, :string
+    t.column :type, :string
+  end
+  
   create_table :untaggable_models, :force => true do |t|
     t.column :taggable_model_id, :integer
     t.column :name, :string
@@ -36,6 +41,8 @@ ActiveRecord::Schema.define :version => 0 do
     t.column :name, :string
     t.column :type, :string
     t.column :cached_language_list, :string    
+    t.column :cached_status_list, :string
+    t.column :cached_glass_list, :string
   end
   
   create_table :taggable_users, :force => true do |t|

data/spec/spec_helper.rb

@@ -19,6 +19,7 @@ end
 
 Bundler.require
 require File.expand_path('../../lib/acts-as-taggable-on', __FILE__)
+require 'ammeter/init'
 
 unless [].respond_to?(:freq)
   class Array

metadata

@@ -1,132 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 2.2.0
   prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 0
-  version: 2.1.0
 platform: ruby
-authors: 
+authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-05-19 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+date: 2011-12-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2153284680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
   prerelease: false
+  version_requirements: *2153284680
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &2153284100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *2153284100
+- !ruby/object:Gem::Dependency
+  name: ammeter
+  requirement: &2153283600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :development
   prerelease: false
+  version_requirements: *2153283600
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2153283220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *2153283220
+- !ruby/object:Gem::Dependency
   name: mysql2
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2153282280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.7
+  type: :development
   prerelease: false
+  version_requirements: *2153282280
+- !ruby/object:Gem::Dependency
   name: pg
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2153281780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *2153281780
+- !ruby/object:Gem::Dependency
   name: guard
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2153281300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *2153281300
+- !ruby/object:Gem::Dependency
   name: guard-rspec
+  requirement: &2153280680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-description: With ActsAsTaggableOn, you can tag a single model on several contexts, such as skills, interests, and awards. It also provides other advanced functionality.
+  prerelease: false
+  version_requirements: *2153280680
+description: With ActsAsTaggableOn, you can tag a single model on several contexts,
+  such as skills, interests, and awards. It also provides other advanced functionality.
 email: michael@intridea.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -136,10 +115,7 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - acts-as-taggable-on.gemspec
-- 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/version.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on.rb
@@ -149,8 +125,6 @@ files:
 - lib/acts_as_taggable_on/acts_as_taggable_on/ownership.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/related.rb
 - lib/acts_as_taggable_on/acts_as_tagger.rb
-- lib/acts_as_taggable_on/compatibility/Gemfile
-- lib/acts_as_taggable_on/compatibility/active_record_backports.rb
 - lib/acts_as_taggable_on/tag.rb
 - lib/acts_as_taggable_on/tag_list.rb
 - lib/acts_as_taggable_on/tagging.rb
@@ -170,45 +144,42 @@ files:
 - spec/acts_as_taggable_on/utils_spec.rb
 - spec/bm.rb
 - spec/database.yml.sample
+- spec/generators/acts_as_taggable_on/migration/migration_generator_spec.rb
 - spec/models.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 - uninstall.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2237132345428656164
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2237132345428656164
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Advanced tagging for Rails.
-test_files: 
+test_files:
 - 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/tag_list_spec.rb
@@ -220,6 +191,7 @@ test_files:
 - spec/acts_as_taggable_on/utils_spec.rb
 - spec/bm.rb
 - spec/database.yml.sample
+- spec/generators/acts_as_taggable_on/migration/migration_generator_spec.rb
 - spec/models.rb
 - spec/schema.rb
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-2.0.6