acts-as-taggable-on 3.1.1 → 3.2.1

data/spec/acts_as_taggable_on/single_table_inheritance_spec.rb

@@ -1,149 +1,145 @@
 require 'spec_helper'
 
-describe "Single Table Inheritance" do
+describe 'Single Table Inheritance' do
+  let(:taggable) { TaggableModel.new(name: 'taggable model') }
 
-  before(:each) do
-    clean_database!
-  end
-
-  let(:taggable)            { TaggableModel.new(:name => "taggable model") }
-
-  let(:inheriting_model)    { InheritingTaggableModel.new(:name => "Inheriting Taggable Model") }
-  let(:altered_inheriting)  { AlteredInheritingTaggableModel.new(:name => "Altered Inheriting Model") }
+  let(:inheriting_model) { InheritingTaggableModel.new(name: 'Inheriting Taggable Model') }
+  let(:altered_inheriting) { AlteredInheritingTaggableModel.new(name: 'Altered Inheriting Model') }
 
   1.upto(4) do |n|
-    let(:"inheriting_#{n}") { InheritingTaggableModel.new(:name => "Inheriting Model #{n}") }
+    let(:"inheriting_#{n}") { InheritingTaggableModel.new(name: "Inheriting Model #{n}") }
   end
 
-  let(:student)             { Student.create! }
+  let(:student) { Student.create! }
 
-  describe "tag contexts" do
-    it "should pass on to STI-inherited models" do
-      inheriting_model.should respond_to(:tag_list, :skill_list, :language_list)
-      altered_inheriting.should respond_to(:tag_list, :skill_list, :language_list)
+  describe 'tag contexts' do
+    it 'should pass on to STI-inherited models' do
+      expect(inheriting_model).to respond_to(:tag_list, :skill_list, :language_list)
+      expect(altered_inheriting).to respond_to(:tag_list, :skill_list, :language_list)
     end
 
-    it "should pass on to altered STI models" do
-      altered_inheriting.should respond_to(:part_list)
+    it 'should pass on to altered STI models' do
+      expect(altered_inheriting).to respond_to(:part_list)
     end
   end
 
-  context "matching contexts" do
+  context 'matching contexts' do
 
     before do
-      inheriting_1.offering_list = "one, two"
-      inheriting_1.need_list = "one, two"
+      inheriting_1.offering_list = 'one, two'
+      inheriting_1.need_list = 'one, two'
       inheriting_1.save!
 
-      inheriting_2.need_list = "one, two"
+      inheriting_2.need_list = 'one, two'
       inheriting_2.save!
 
-      inheriting_3.offering_list = "one, two"
+      inheriting_3.offering_list = 'one, two'
       inheriting_3.save!
 
-      inheriting_4.tag_list = "one, two, three, four"
+      inheriting_4.tag_list = 'one, two, three, four'
       inheriting_4.save!
 
-      taggable.need_list = "one, two"
+      taggable.need_list = 'one, two'
       taggable.save!
     end
 
-    it "should find objects with tags of matching contexts" do
-      inheriting_1.find_matching_contexts(:offerings, :needs).should      include(inheriting_2)
-      inheriting_1.find_matching_contexts(:offerings, :needs).should_not  include(inheriting_3)
-      inheriting_1.find_matching_contexts(:offerings, :needs).should_not  include(inheriting_4)
-      inheriting_1.find_matching_contexts(:offerings, :needs).should_not  include(taggable)
+    it 'should find objects with tags of matching contexts' do
+      expect(inheriting_1.find_matching_contexts(:offerings, :needs)).to include(inheriting_2)
+      expect(inheriting_1.find_matching_contexts(:offerings, :needs)).to_not include(inheriting_3)
+      expect(inheriting_1.find_matching_contexts(:offerings, :needs)).to_not include(inheriting_4)
+      expect(inheriting_1.find_matching_contexts(:offerings, :needs)).to_not include(taggable)
 
-      inheriting_1.find_matching_contexts_for(TaggableModel, :offerings, :needs).should     include(inheriting_2)
-      inheriting_1.find_matching_contexts_for(TaggableModel, :offerings, :needs).should_not include(inheriting_3)
-      inheriting_1.find_matching_contexts_for(TaggableModel, :offerings, :needs).should_not include(inheriting_4)
-      inheriting_1.find_matching_contexts_for(TaggableModel, :offerings, :needs).should     include(taggable)
+      expect(inheriting_1.find_matching_contexts_for(TaggableModel, :offerings, :needs)).to include(inheriting_2)
+      expect(inheriting_1.find_matching_contexts_for(TaggableModel, :offerings, :needs)).to_not include(inheriting_3)
+      expect(inheriting_1.find_matching_contexts_for(TaggableModel, :offerings, :needs)).to_not include(inheriting_4)
+      expect(inheriting_1.find_matching_contexts_for(TaggableModel, :offerings, :needs)).to include(taggable)
     end
 
-    it "should not include the object itself in the list of related objects with tags of matching contexts" do
-      inheriting_1.find_matching_contexts(:offerings, :needs).should_not include(inheriting_1)
-      inheriting_1.find_matching_contexts_for(InheritingTaggableModel, :offerings, :needs).should_not include(inheriting_1)
-      inheriting_1.find_matching_contexts_for(TaggableModel, :offerings, :needs).should_not include(inheriting_1)
+    it 'should not include the object itself in the list of related objects with tags of matching contexts' do
+      expect(inheriting_1.find_matching_contexts(:offerings, :needs)).to_not include(inheriting_1)
+      expect(inheriting_1.find_matching_contexts_for(InheritingTaggableModel, :offerings, :needs)).to_not include(inheriting_1)
+      expect(inheriting_1.find_matching_contexts_for(TaggableModel, :offerings, :needs)).to_not include(inheriting_1)
     end
   end
 
-  context "find related tags" do
+  context 'find related tags' do
     before do
-      inheriting_1.tag_list = "one, two"
+      inheriting_1.tag_list = 'one, two'
       inheriting_1.save
 
-      inheriting_2.tag_list = "three, four"
+      inheriting_2.tag_list = 'three, four'
       inheriting_2.save
 
-      inheriting_3.tag_list = "one, four"
+      inheriting_3.tag_list = 'one, four'
       inheriting_3.save
 
-      taggable.tag_list = "one, two, three, four"
+      taggable.tag_list = 'one, two, three, four'
       taggable.save
     end
 
-    it "should find related objects based on tag names on context" do
-      inheriting_1.find_related_tags.should include(inheriting_3)
-      inheriting_1.find_related_tags.should_not include(inheriting_2)
-      inheriting_1.find_related_tags.should_not include(taggable)
+    it 'should find related objects based on tag names on context' do
+      expect(inheriting_1.find_related_tags).to include(inheriting_3)
+      expect(inheriting_1.find_related_tags).to_not include(inheriting_2)
+      expect(inheriting_1.find_related_tags).to_not include(taggable)
 
-      inheriting_1.find_related_tags_for(TaggableModel).should include(inheriting_3)
-      inheriting_1.find_related_tags_for(TaggableModel).should_not include(inheriting_2)
-      inheriting_1.find_related_tags_for(TaggableModel).should include(taggable)
+      expect(inheriting_1.find_related_tags_for(TaggableModel)).to include(inheriting_3)
+      expect(inheriting_1.find_related_tags_for(TaggableModel)).to_not include(inheriting_2)
+      expect(inheriting_1.find_related_tags_for(TaggableModel)).to include(taggable)
     end
 
-    it "should not include the object itself in the list of related objects" do
-      inheriting_1.find_related_tags.should_not include(inheriting_1)
-      inheriting_1.find_related_tags_for(InheritingTaggableModel).should_not include(inheriting_1)
-      inheriting_1.find_related_tags_for(TaggableModel).should_not include(inheriting_1)
+    it 'should not include the object itself in the list of related objects' do
+      expect(inheriting_1.find_related_tags).to_not include(inheriting_1)
+      expect(inheriting_1.find_related_tags_for(InheritingTaggableModel)).to_not include(inheriting_1)
+      expect(inheriting_1.find_related_tags_for(TaggableModel)).to_not include(inheriting_1)
     end
   end
 
-  describe "tag list" do
+  describe 'tag list' do
     before do
-      @inherited_same = InheritingTaggableModel.new(:name => "inherited same")
-      @inherited_different = AlteredInheritingTaggableModel.new(:name => "inherited different")
+      @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
-      inheriting_model.tag_list = "bob, kelso"
+    #TODO, shared example
+    it 'should be able to save tags for inherited models' do
+      inheriting_model.tag_list = 'bob, kelso'
       inheriting_model.save
-      InheritingTaggableModel.tagged_with("bob").first.should == inheriting_model
+      expect(InheritingTaggableModel.tagged_with('bob').first).to eq(inheriting_model)
     end
 
-    it "should find STI tagged models on the superclass" do
-      inheriting_model.tag_list = "bob, kelso"
+    it 'should find STI tagged models on the superclass' do
+      inheriting_model.tag_list = 'bob, kelso'
       inheriting_model.save
-      TaggableModel.tagged_with("bob").first.should == inheriting_model
+      expect(TaggableModel.tagged_with('bob').first).to eq(inheriting_model)
     end
 
-    it "should be able to add on contexts only to some subclasses" do
-      altered_inheriting.part_list = "fork, spoon"
+    it 'should be able to add on contexts only to some subclasses' do
+      altered_inheriting.part_list = 'fork, spoon'
       altered_inheriting.save
-      InheritingTaggableModel.tagged_with("fork", :on => :parts).should be_empty
-      AlteredInheritingTaggableModel.tagged_with("fork", :on => :parts).first.should == altered_inheriting
+      expect(InheritingTaggableModel.tagged_with('fork', on: :parts)).to be_empty
+      expect(AlteredInheritingTaggableModel.tagged_with('fork', on: :parts).first).to eq(altered_inheriting)
     end
 
-    it "should have different tag_counts_on for inherited models" do
-      inheriting_model.tag_list = "bob, kelso"
+    it 'should have different tag_counts_on for inherited models' do
+      inheriting_model.tag_list = 'bob, kelso'
       inheriting_model.save!
-      altered_inheriting.tag_list = "fork, spoon"
+      altered_inheriting.tag_list = 'fork, spoon'
       altered_inheriting.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)
+      expect(InheritingTaggableModel.tag_counts_on(:tags, order: 'tags.id').map(&:name)).to eq(%w(bob kelso))
+      expect(AlteredInheritingTaggableModel.tag_counts_on(:tags, order: 'tags.id').map(&:name)).to eq(%w(fork spoon))
+      expect(TaggableModel.tag_counts_on(:tags, order: 'tags.id').map(&:name)).to eq(%w(bob kelso fork spoon))
     end
 
-    it "should have different tags_on for inherited models" do
-      inheriting_model.tag_list = "bob, kelso"
+    it 'should have different tags_on for inherited models' do
+      inheriting_model.tag_list = 'bob, kelso'
       inheriting_model.save!
-      altered_inheriting.tag_list = "fork, spoon"
+      altered_inheriting.tag_list = 'fork, spoon'
       altered_inheriting.save!
 
-      InheritingTaggableModel.tags_on(:tags, :order => 'tags.id').map(&:name).should == %w(bob kelso)
-      AlteredInheritingTaggableModel.tags_on(:tags, :order => 'tags.id').map(&:name).should == %w(fork spoon)
-      TaggableModel.tags_on(:tags, :order => 'tags.id').map(&:name).should == %w(bob kelso fork spoon)
+      expect(InheritingTaggableModel.tags_on(:tags, order: 'tags.id').map(&:name)).to eq(%w(bob kelso))
+      expect(AlteredInheritingTaggableModel.tags_on(:tags, order: 'tags.id').map(&:name)).to eq(%w(fork spoon))
+      expect(TaggableModel.tags_on(:tags, order: 'tags.id').map(&:name)).to eq(%w(bob kelso fork spoon))
     end
 
     it 'should store same tag without validation conflict' do
@@ -153,35 +149,62 @@ describe "Single Table Inheritance" do
       inheriting_model.tag_list = 'one'
       inheriting_model.save!
 
-      inheriting_model.update_attributes! :name => 'foo'
+      inheriting_model.update_attributes! name: 'foo'
     end
   end
 
-  describe "ownership" do
-    it "should have taggings" do
-      student.tag(taggable, :with=>'ruby,scheme', :on=>:tags)
-      student.owned_taggings.should have(2).tags
+  describe 'ownership' do
+    it 'should have taggings' do
+      student.tag(taggable, with: 'ruby,scheme', on: :tags)
+      expect(student.owned_taggings.count).to eq(2)
     end
 
-    it "should have tags" do
-      student.tag(taggable, :with=>'ruby,scheme', :on=>:tags)
-      student.owned_tags.should have(2).tags
+    it 'should have tags' do
+      student.tag(taggable, with: 'ruby,scheme', on: :tags)
+      expect(student.owned_tags.count).to eq(2)
     end
 
-    it "should return tags for the inheriting tagger" do
-      student.tag(taggable, :with => 'ruby, scheme', :on => :tags)
-      taggable.tags_from(student).should match_array(%w(ruby scheme))
+    it 'should return tags for the inheriting tagger' do
+      student.tag(taggable, with: 'ruby, scheme', on: :tags)
+      expect(taggable.tags_from(student)).to eq(%w(ruby scheme))
     end
 
-    it "returns owner tags on the tagger" do
-      student.tag(taggable, :with => 'ruby, scheme', :on => :tags)
-      taggable.owner_tags_on(student, :tags).should have(2).tags
+    it 'returns owner tags on the tagger' do
+      student.tag(taggable, with: 'ruby, scheme', on: :tags)
+      expect(taggable.owner_tags_on(student, :tags).count).to eq(2)
     end
 
-    it "should scope objects returned by tagged_with by owners" do
-      student.tag(taggable, :with => 'ruby, scheme', :on => :tags)
-      TaggableModel.tagged_with(%w(ruby scheme), :owned_by => student).should have(1).tag
+    it 'should scope objects returned by tagged_with by owners' do
+      student.tag(taggable, with: 'ruby, scheme', on: :tags)
+      expect(TaggableModel.tagged_with(%w(ruby scheme), owned_by: student).count).to eq(1)
     end
   end
 
+  describe 'a subclass of Tag' do
+    let(:company) { Company.new(:name => 'Dewey, Cheatham & Howe') }
+    let(:user) { User.create! }
+
+    subject { Market.create! :name => 'finance' }
+
+    its(:type) { should eql 'Market' }
+
+    it 'sets STI type through string list' do
+      company.market_list = 'law, accounting'
+      company.save!
+      expect(Market.count).to eq(2)
+    end
+
+    it 'does not interfere with a normal Tag context on the same model' do
+      company.location_list = 'cambridge'
+      company.save!
+      expect(ActsAsTaggableOn::Tag.where(name: 'cambridge', type: nil)).to_not be_empty
+    end
+
+    it 'is returned with proper type through ownership' do
+      user.tag(company, :with => 'ripoffs, rackets', :on => :markets)
+      tags = company.owner_tags_on(user, :markets)
+      expect(tags.all? { |tag| tag.is_a? Market }).to be_truthy
+    end
+  end
 end
+

data/spec/acts_as_taggable_on/tag_list_spec.rb

@@ -2,124 +2,156 @@
 require 'spec_helper'
 
 describe ActsAsTaggableOn::TagList do
-  let(:tag_list) { ActsAsTaggableOn::TagList.new("awesome","radical") }
+  let(:tag_list) { ActsAsTaggableOn::TagList.new('awesome', 'radical') }
+  let(:another_tag_list) { ActsAsTaggableOn::TagList.new('awesome','crazy', 'alien') }
 
   it { should be_kind_of Array }
 
-  it "#from should return empty array if empty array is passed" do
-    ActsAsTaggableOn::TagList.from([]).should be_empty
+  it '#from should return empty array if empty array is passed' do
+    expect(ActsAsTaggableOn::TagList.from([])).to be_empty
   end
 
-  describe "#add" do
-    it "should be able to be add a new tag word" do
-      tag_list.add("cool")
-      tag_list.include?("cool").should be_true
+  describe '#add' do
+    it 'should be able to be add a new tag word' do
+      tag_list.add('cool')
+      expect(tag_list.include?('cool')).to be_truthy
     end
 
-    it "should be able to add delimited lists of words" do
-      tag_list.add("cool, wicked", :parse => true)
-      tag_list.should include("cool", "wicked")
+    it 'should be able to add delimited lists of words' do
+      tag_list.add('cool, wicked', parse: true)
+      expect(tag_list).to include('cool', 'wicked')
     end
 
-    it "should be able to add delimited list of words with quoted delimiters" do
-      tag_list.add("'cool, wicked', \"really cool, really wicked\"", :parse => true)
-      tag_list.should include("cool, wicked", "really cool, really wicked")
+    it 'should be able to add delimited list of words with quoted delimiters' do
+      tag_list.add("'cool, wicked', \"really cool, really wicked\"", parse: true)
+      expect(tag_list).to include('cool, wicked', 'really cool, really wicked')
     end
 
-    it "should be able to handle other uses of quotation marks correctly" do
-      tag_list.add("john's cool car, mary's wicked toy", :parse => true)
-      tag_list.should include("john's cool car", "mary's wicked toy")
+    it 'should be able to handle other uses of quotation marks correctly' do
+      tag_list.add("john's cool car, mary's wicked toy", parse: true)
+      expect(tag_list).to include("john's cool car", "mary's wicked toy")
     end
 
-    it "should be able to add an array of words" do
-      tag_list.add(["cool", "wicked"], :parse => true)
-      tag_list.should include("cool", "wicked")
+    it 'should be able to add an array of words' do
+      tag_list.add(%w(cool wicked), parse: true)
+      expect(tag_list).to include('cool', 'wicked')
     end
 
-    it "should quote escape tags with commas in them" do
-      tag_list.add("cool","rad,bodacious")
-      tag_list.to_s.should == "awesome, radical, cool, \"rad,bodacious\""
+    it 'should quote escape tags with commas in them' do
+      tag_list.add('cool', 'rad,bodacious')
+      expect(tag_list.to_s).to eq("awesome, radical, cool, \"rad,bodacious\"")
     end
 
   end
 
-  describe "#remove" do
-    it "should be able to remove words" do
-      tag_list.remove("awesome")
-      tag_list.should_not include("awesome")
+  describe '#remove' do
+    it 'should be able to remove words' do
+      tag_list.remove('awesome')
+      expect(tag_list).to_not include('awesome')
     end
 
-    it "should be able to remove delimited lists of words" do
-      tag_list.remove("awesome, radical", :parse => true)
-      tag_list.should be_empty
+    it 'should be able to remove delimited lists of words' do
+      tag_list.remove('awesome, radical', parse: true)
+      expect(tag_list).to be_empty
     end
 
-    it "should be able to remove an array of words" do
-      tag_list.remove(["awesome", "radical"], :parse => true)
-      tag_list.should be_empty
+    it 'should be able to remove an array of words' do
+      tag_list.remove(%w(awesome radical), parse: true)
+      expect(tag_list).to be_empty
     end
   end
 
-  describe "#to_s" do
-    it "should give a delimited list of words when converted to string" do
-      tag_list.to_s.should == "awesome, radical"
+  describe '#+' do
+    it 'should not have duplicate tags' do
+      new_tag_list = tag_list + another_tag_list
+      expect(tag_list).to eq(%w[awesome radical])
+      expect(another_tag_list).to eq(%w[awesome crazy alien])
+      expect(new_tag_list).to eq(%w[awesome radical crazy alien])
     end
 
-    it "should be able to call to_s on a frozen tag list" do
+    it 'should have class : ActsAsTaggableOn::TagList' do
+      new_tag_list = tag_list + another_tag_list
+      expect(new_tag_list.class).to eq(ActsAsTaggableOn::TagList)
+    end
+  end
+
+  describe '#concat' do
+    it 'should not have duplicate tags' do
+      expect(tag_list.concat(another_tag_list)).to eq(%w[awesome radical crazy alien])
+    end
+
+    it 'should have class : ActsAsTaggableOn::TagList' do
+      new_tag_list = tag_list.concat(another_tag_list)
+      expect(new_tag_list.class).to eq(ActsAsTaggableOn::TagList)
+    end
+  end
+
+  describe '#to_s' do
+    it 'should give a delimited list of words when converted to string' do
+      expect(tag_list.to_s).to eq('awesome, radical')
+    end
+
+    it 'should be able to call to_s on a frozen tag list' do
       tag_list.freeze
-      lambda { tag_list.add("cool","rad,bodacious") }.should raise_error
-      lambda { tag_list.to_s }.should_not raise_error
+      expect(-> { tag_list.add('cool', 'rad,bodacious') }).to raise_error
+      expect(-> { tag_list.to_s }).to_not raise_error
     end
   end
 
-  describe "cleaning" do
-    it "should parameterize if force_parameterize is set to true" do
+  describe 'cleaning' do
+    it 'should parameterize if force_parameterize is set to true' do
       ActsAsTaggableOn.force_parameterize = true
-      tag_list = ActsAsTaggableOn::TagList.new("awesome()","radical)(cc")
+      tag_list = ActsAsTaggableOn::TagList.new('awesome()', 'radical)(cc')
 
-      tag_list.to_s.should == "awesome, radical-cc"
+      expect(tag_list.to_s).to eq('awesome, radical-cc')
       ActsAsTaggableOn.force_parameterize = false
     end
 
-    it "should lowercase if force_lowercase is set to true" do
+    it 'should lowercase if force_lowercase is set to true' do
       ActsAsTaggableOn.force_lowercase = true
 
-      tag_list = ActsAsTaggableOn::TagList.new("aweSomE","RaDicaL","Entrée")
-      tag_list.to_s.should == "awesome, radical, entrée"
+      tag_list = ActsAsTaggableOn::TagList.new('aweSomE', 'RaDicaL', 'Entrée')
+      expect(tag_list.to_s).to eq('awesome, radical, entrée')
 
       ActsAsTaggableOn.force_lowercase = false
     end
 
   end
 
-  describe "Multiple Delimiter" do
-    before do 
+  describe 'Multiple Delimiter' do
+    before do
       @old_delimiter = ActsAsTaggableOn.delimiter
     end
 
-    after do 
+    after do
       ActsAsTaggableOn.delimiter = @old_delimiter
     end
 
-    it "should separate tags by delimiters" do
+    it 'should separate tags by delimiters' do
       ActsAsTaggableOn.delimiter = [',', ' ', '\|']
-      tag_list = ActsAsTaggableOn::TagList.from "cool, data|I have"
-      tag_list.to_s.should == 'cool, data, I, have'
+      tag_list = ActsAsTaggableOn::TagList.from 'cool, data|I have'
+      expect(tag_list.to_s).to eq('cool, data, I, have')
     end
 
-    it "should escape quote" do 
+    it 'should escape quote' do
       ActsAsTaggableOn.delimiter = [',', ' ', '\|']
       tag_list = ActsAsTaggableOn::TagList.from "'I have'|cool, data"
-      tag_list.to_s.should == '"I have", cool, data'
+      expect(tag_list.to_s).to eq('"I have", cool, data')
 
       tag_list = ActsAsTaggableOn::TagList.from '"I, have"|cool, data'
-      tag_list.to_s.should == '"I, have", cool, data'
+      expect(tag_list.to_s).to eq('"I, have", cool, data')
     end
 
-    it "should work for utf8 delimiter and long delimiter" do 
+    it 'should work for utf8 delimiter and long delimiter' do
       ActsAsTaggableOn.delimiter = ['，', '的', '可能是']
-      tag_list = ActsAsTaggableOn::TagList.from "我的东西可能是不见了，还好有备份"
-      tag_list.to_s.should == "我， 东西， 不见了， 还好有备份"
+      tag_list = ActsAsTaggableOn::TagList.from '我的东西可能是不见了，还好有备份'
+      expect(tag_list.to_s).to eq('我， 东西， 不见了， 还好有备份')
+    end
+
+    it 'should work for multiple quoted tags' do
+      ActsAsTaggableOn.delimiter = [',']
+      tag_list = ActsAsTaggableOn::TagList.from '"Ruby Monsters","eat Katzenzungen"'
+      expect(tag_list.to_s).to eq('Ruby Monsters, eat Katzenzungen')
     end
   end