acts-as-taggable-on 3.2.1 → 3.4.0

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -208,6 +208,14 @@ describe 'Taggable' do
     expect(TaggableModel.tagged_with('ruby').group(:created_at).count.count).to eq(1)
   end
 
+  it 'can be used as scope' do
+    @taggable.skill_list = 'ruby'
+    @taggable.save
+    untaggable_model = @taggable.untaggable_models.create!(name:'foobar')
+    scope_tag = TaggableModel.tagged_with('ruby', any: 'distinct', order: 'taggable_models.name asc')
+    expect(UntaggableModel.joins(:taggable_model).merge(scope_tag).except(:select)).to eq([untaggable_model])
+  end
+
   it "shouldn't generate a query with DISTINCT by default" do
     @taggable.skill_list = 'ruby, rails, css'
     @taggable.save
@@ -215,6 +223,20 @@ describe 'Taggable' do
     expect(TaggableModel.tagged_with('ruby').to_sql).to_not match /DISTINCT/
   end
 
+  it "should be able to find a tag using dates" do
+    @taggable.skill_list = "ruby"
+    @taggable.save
+
+    expect(TaggableModel.tagged_with("ruby", :start_at => Date.today, :end_at => Date.tomorrow).count).to eq(1)
+  end
+
+    it "shouldn't be able to find a tag outside date range" do
+    @taggable.skill_list = "ruby"
+    @taggable.save
+
+    expect(TaggableModel.tagged_with("ruby", :start_at => Date.today - 2.days, :end_at => Date.today - 1.day).count).to eq(0)
+  end
+
   it 'should be able to find by tag with context' do
     @taggable.skill_list = 'ruby, rails, css'
     @taggable.tag_list = 'bob, charlie'
@@ -255,16 +277,14 @@ describe 'Taggable' do
     expect(TaggableModel.select('distinct(taggable_models.id), taggable_models.*').joins(:untaggable_models).tagged_with(['rails', 'ruby'], :any => false).to_a.sort).to eq([bob, frank].sort)
   end
 
-  unless ActsAsTaggableOn::Utils.using_sqlite?
-    it 'should not care about case for unicode names' do
-      ActsAsTaggableOn.strict_case_match = false
-      TaggableModel.create(name: 'Anya', tag_list: 'ПРИВЕТ')
-      TaggableModel.create(name: 'Igor', tag_list: 'привет')
-      TaggableModel.create(name: 'Katia', tag_list: 'ПРИВЕТ')
+  it 'should not care about case for unicode names', unless: using_sqlite? do
+    ActsAsTaggableOn.strict_case_match = false
+    TaggableModel.create(name: 'Anya', tag_list: 'ПРИВЕТ')
+    TaggableModel.create(name: 'Igor', tag_list: 'привет')
+    TaggableModel.create(name: 'Katia', tag_list: 'ПРИВЕТ')
 
-      expect(ActsAsTaggableOn::Tag.all.size).to eq(1)
-      expect(TaggableModel.tagged_with('привет').to_a).to eq(TaggableModel.tagged_with('ПРИВЕТ').to_a)
-    end
+    expect(ActsAsTaggableOn::Tag.all.size).to eq(1)
+    expect(TaggableModel.tagged_with('привет').to_a).to eq(TaggableModel.tagged_with('ПРИВЕТ').to_a)
   end
 
   context 'should be able to create and find tags in languages without capitalization :' do
@@ -494,6 +514,19 @@ describe 'Taggable' do
     end
   end
 
+  it 'should options key not be deleted' do
+    options = {:exclude => true}
+    TaggableModel.tagged_with("foo", options)
+    expect(options).to eq({:exclude => true})
+  end
+
+  it 'should not delete tags if not updated' do
+    model = TaggableModel.create(name: 'foo', tag_list: 'ruby, rails, programming')
+    model.update_attributes(name: 'bar')
+    model.reload
+    expect(model.tag_list.sort).to eq(%w(ruby rails programming).sort)
+  end
+
   context 'Duplicates' do
     context 'should not create duplicate taggings' do
       let(:bob) { TaggableModel.create(name: 'Bob') }
@@ -580,28 +613,26 @@ describe 'Taggable' do
 
     end
 
-    if ActsAsTaggableOn::Utils.supports_concurrency?
-      xit 'should not duplicate tags added on different threads' do
-        #TODO, try with more threads and fix deadlock
-        thread_count = 4
-        barrier = Barrier.new thread_count
-
-        expect {
-          thread_count.times.map do |idx|
-            Thread.start do
-              connor = TaggableModel.first_or_create(name: 'Connor')
-              connor.tag_list = 'There, can, be, only, one'
-              barrier.wait
-              begin
-                connor.save
-              rescue ActsAsTaggableOn::DuplicateTagError
-                # second save should succeed
-                connor.save
-              end
+    xit 'should not duplicate tags added on different threads', if: supports_concurrency?, skip: 'FIXME, Deadlocks in travis' do
+      #TODO, try with more threads and fix deadlock
+      thread_count = 4
+      barrier = Barrier.new thread_count
+
+      expect {
+        thread_count.times.map do |idx|
+          Thread.start do
+            connor = TaggableModel.first_or_create(name: 'Connor')
+            connor.tag_list = 'There, can, be, only, one'
+            barrier.wait
+            begin
+              connor.save
+            rescue ActsAsTaggableOn::DuplicateTagError
+              # second save should succeed
+              connor.save
             end
-          end.map(&:join)
-        }.to change(ActsAsTaggableOn::Tag, :count).by(5)
-      end
+          end
+        end.map(&:join)
+      }.to change(ActsAsTaggableOn::Tag, :count).by(5)
     end
   end
 
@@ -621,8 +652,8 @@ describe 'Taggable' do
     it 'should return all column names joined for Tag GROUP clause' do
       # NOTE: type column supports an STI Tag subclass in the test suite, though
       # isn't included by default in the migration generator
-      expect(@taggable.grouped_column_names_for(ActsAsTaggableOn::Tag)).
-          to eq('tags.id, tags.name, tags.taggings_count, tags.type')
+      expect(@taggable.grouped_column_names_for(ActsAsTaggableOn::Tag))
+      .to eq('tags.id, tags.name, tags.taggings_count, tags.type')
     end
 
     it 'should return all column names joined for TaggableModel GROUP clause' do
@@ -693,114 +724,6 @@ describe 'Taggable' do
     end
   end
 
-  describe 'Dirty Objects' do
-    context 'with un-contexted tags' do
-      before(:each) do
-        @taggable = TaggableModel.create(tag_list: 'awesome, epic')
-      end
-
-      context 'when tag_list changed' do
-        before(:each) do
-          expect(@taggable.changes).to be_empty
-          @taggable.tag_list = 'one'
-        end
-
-        it 'should show changes of dirty object' do
-          expect(@taggable.changes).to eq({'tag_list' => ['awesome, epic', ['one']]})
-        end
-
-        it 'flags tag_list as changed' do
-          expect(@taggable.tag_list_changed?).to be_truthy
-        end
-
-        it 'preserves original value' do
-          expect(@taggable.tag_list_was).to eq('awesome, epic')
-        end
-
-        it 'shows what the change was' do
-          expect(@taggable.tag_list_change).to eq(['awesome, epic', ['one']])
-        end
-      end
-
-      context 'when tag_list is the same' do
-        before(:each) do
-          @taggable.tag_list = 'awesome, epic'
-        end
-
-        it 'is not flagged as changed' do
-          expect(@taggable.tag_list_changed?).to be_falsy
-        end
-
-        it 'does not show any changes to the taggable item' do
-          expect(@taggable.changes).to be_empty
-        end
-
-        context "and using a delimiter different from a ','" do
-          before do
-            @old_delimiter = ActsAsTaggableOn.delimiter
-            ActsAsTaggableOn.delimiter = ';'
-          end
-
-          after do
-            ActsAsTaggableOn.delimiter = @old_delimiter
-          end
-
-          it 'does not show any changes to the taggable item when using array assignments' do
-            @taggable.tag_list = %w(awesome epic)
-            expect(@taggable.changes).to be_empty
-          end
-        end
-      end
-    end
-
-    context 'with context tags' do
-      before(:each) do
-        @taggable = TaggableModel.create('language_list' => 'awesome, epic')
-      end
-
-      context 'when language_list changed' do
-        before(:each) do
-          expect(@taggable.changes).to be_empty
-          @taggable.language_list = 'one'
-        end
-
-        it 'should show changes of dirty object' do
-          expect(@taggable.changes).to eq({'language_list' => ['awesome, epic', ['one']]})
-        end
-
-        it 'flags language_list as changed' do
-          expect(@taggable.language_list_changed?).to be_truthy
-        end
-
-        it 'preserves original value' do
-          expect(@taggable.language_list_was).to eq('awesome, epic')
-        end
-
-        it 'shows what the change was' do
-          expect(@taggable.language_list_change).to eq(['awesome, epic', ['one']])
-        end
-
-        it 'shows what the changes were' do
-          expect(@taggable.language_list_changes).to eq(['awesome, epic', ['one']])
-        end
-      end
-
-      context 'when language_list is the same' do
-        before(:each) do
-          @taggable.language_list = 'awesome, epic'
-        end
-
-        it 'is not flagged as changed' do
-          expect(@taggable.language_list_changed?).to be_falsy
-        end
-
-        it 'does not show any changes to the taggable item' do
-          expect(@taggable.changes).to be_empty
-        end
-      end
-    end
-  end
-
   describe 'Autogenerated methods' do
     it 'should be overridable' do
       expect(TaggableModel.create(tag_list: 'woo').tag_list_submethod_called).to be_truthy
@@ -847,33 +770,30 @@ describe 'Taggable' do
   end
 end
 
+describe 'Taggable model with json columns', if: postgresql_support_json? do
+  before(:each) do
+    @taggable = TaggableModelWithJson.new(:name => 'Bob Jones')
+    @taggables = [@taggable, TaggableModelWithJson.new(:name => 'John Doe')]
+  end
 
-if ActsAsTaggableOn::Utils.using_postgresql?
-  describe 'Taggable model with json columns' do
-    before(:each) do
-      @taggable = TaggableModelWithJson.new(:name => 'Bob Jones')
-      @taggables = [@taggable, TaggableModelWithJson.new(:name => 'John Doe')]
-    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
+  it 'should be able to find by tag with context' do
+    @taggable.skill_list = 'ruby, rails, css'
+    @taggable.tag_list = 'bob, charlie'
+    @taggable.save
 
-      expect(TaggableModelWithJson.tagged_with('ruby').first).to eq(@taggable)
-      expect(TaggableModelWithJson.tagged_with('ruby, css').first).to eq(@taggable)
-      expect(TaggableModelWithJson.tagged_with('bob', :on => :skills).first).to_not eq(@taggable)
-      expect(TaggableModelWithJson.tagged_with('bob', :on => :tags).first).to eq(@taggable)
-    end
+    expect(TaggableModelWithJson.tagged_with('ruby').first).to eq(@taggable)
+    expect(TaggableModelWithJson.tagged_with('ruby, css').first).to eq(@taggable)
+    expect(TaggableModelWithJson.tagged_with('bob', :on => :skills).first).to_not eq(@taggable)
+    expect(TaggableModelWithJson.tagged_with('bob', :on => :tags).first).to eq(@taggable)
+  end
 
-    it 'should be able to find tagged with any tag' do
-      bob = TaggableModelWithJson.create(:name => 'Bob', :tag_list => 'fitter, happier, more productive', :skill_list => 'ruby, rails, css')
-      frank = TaggableModelWithJson.create(:name => 'Frank', :tag_list => 'weaker, depressed, inefficient', :skill_list => 'ruby, rails, css')
-      steve = TaggableModelWithJson.create(:name => 'Steve', :tag_list => 'fitter, happier, more productive', :skill_list => 'c++, java, ruby')
+  it 'should be able to find tagged with any tag' do
+    bob = TaggableModelWithJson.create(:name => 'Bob', :tag_list => 'fitter, happier, more productive', :skill_list => 'ruby, rails, css')
+    frank = TaggableModelWithJson.create(:name => 'Frank', :tag_list => 'weaker, depressed, inefficient', :skill_list => 'ruby, rails, css')
+    steve = TaggableModelWithJson.create(:name => 'Steve', :tag_list => 'fitter, happier, more productive', :skill_list => 'c++, java, ruby')
 
-      expect(TaggableModelWithJson.tagged_with(%w(ruby java), :order => 'taggable_model_with_jsons.name', :any => true).to_a).to eq([bob, frank, steve])
-      expect(TaggableModelWithJson.tagged_with(%w(c++ fitter), :order => 'taggable_model_with_jsons.name', :any => true).to_a).to eq([bob, steve])
-      expect(TaggableModelWithJson.tagged_with(%w(depressed css), :order => 'taggable_model_with_jsons.name', :any => true).to_a).to eq([bob, frank])
-    end
+    expect(TaggableModelWithJson.tagged_with(%w(ruby java), :order => 'taggable_model_with_jsons.name', :any => true).to_a).to eq([bob, frank, steve])
+    expect(TaggableModelWithJson.tagged_with(%w(c++ fitter), :order => 'taggable_model_with_jsons.name', :any => true).to_a).to eq([bob, steve])
+    expect(TaggableModelWithJson.tagged_with(%w(depressed css), :order => 'taggable_model_with_jsons.name', :any => true).to_a).to eq([bob, frank])
   end
 end

data/spec/acts_as_taggable_on/tagger_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe 'Tagger' do
@@ -43,7 +44,6 @@ describe 'Tagger' do
     tags = TaggableModel.tagged_with(%w(ruby java), owned_by: @user, any: true)
     expect(tags).to include(@taggable, @taggable2)
     expect(tags.size).to eq(2)
-
   end
 
   it 'only returns objects tagged by owned_by when exclude is true' do

data/spec/acts_as_taggable_on/tagging_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe ActsAsTaggableOn::Tagging do
@@ -23,5 +24,40 @@ describe ActsAsTaggableOn::Tagging do
       2.times { ActsAsTaggableOn::Tagging.create(taggable: @taggable, tag: @tag, context: 'tags') }
     }).to change(ActsAsTaggableOn::Tagging, :count).by(1)
   end
-  
+
+  it 'should not delete tags of other records' do
+    6.times { TaggableModel.create(name: 'Bob Jones', tag_list: 'very, serious, bug') }
+    expect(ActsAsTaggableOn::Tag.count).to eq(3)
+    taggable = TaggableModel.first
+    taggable.tag_list = 'bug'
+    taggable.save
+
+    expect(taggable.tag_list).to eq(['bug'])
+
+    another_taggable = TaggableModel.where('id != ?', taggable.id).sample
+    expect(another_taggable.tag_list.sort).to eq(%w(very serious bug).sort)
+  end
+
+  it 'should destroy unused tags after tagging destroyed' do
+    previous_setting = ActsAsTaggableOn.remove_unused_tags
+    ActsAsTaggableOn.remove_unused_tags = true
+    ActsAsTaggableOn::Tag.destroy_all
+    @taggable = TaggableModel.create(name: 'Bob Jones')
+    @taggable.update_attribute :tag_list, 'aaa,bbb,ccc'
+    @taggable.update_attribute :tag_list, ''
+    expect(ActsAsTaggableOn::Tag.count).to eql(0)
+    ActsAsTaggableOn.remove_unused_tags = previous_setting
+  end
+
+  pending 'context scopes' do
+    describe '.by_context'
+
+    describe '.by_contexts'
+
+    describe '.owned_by'
+
+    describe '.not_owned'
+
+  end
+
 end

data/spec/acts_as_taggable_on/tags_helper_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe ActsAsTaggableOn::TagsHelper do

data/spec/acts_as_taggable_on/utils_spec.rb

@@ -1,21 +1,16 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe ActsAsTaggableOn::Utils do
-  describe 'like_operator' do
-    before(:each) do
-      TaggableModel.acts_as_taggable_on(:tags, :languages, :skills, :needs, :offerings)
-      @taggable = TaggableModel.new(name: 'Bob Jones')
-    end
-
-
+  describe '#like_operator' do
     it 'should return \'ILIKE\' when the adapter is PostgreSQL' do
-      allow(TaggableModel.connection).to receive(:adapter_name) { 'PostgreSQL' }
-      expect(TaggableModel.send(:like_operator)).to eq('ILIKE')
+      allow(ActsAsTaggableOn::Utils.connection).to receive(:adapter_name) { 'PostgreSQL' }
+      expect(ActsAsTaggableOn::Utils.like_operator).to eq('ILIKE')
     end
 
     it 'should return \'LIKE\' when the adapter is not PostgreSQL' do
-      allow(TaggableModel.connection).to receive(:adapter_name) { 'MySQL' }
-      expect(TaggableModel.send(:like_operator)).to eq('LIKE')
+      allow(ActsAsTaggableOn::Utils.connection).to receive(:adapter_name) { 'MySQL' }
+      expect(ActsAsTaggableOn::Utils.like_operator).to eq('LIKE')
     end
   end
 end

data/spec/internal/app/models/cached_model_with_array.rb

@@ -1,4 +1,4 @@
-if ActsAsTaggableOn::Utils.using_postgresql?
+if using_postgresql?
   class CachedModelWithArray < ActiveRecord::Base
     acts_as_taggable
   end

data/spec/internal/app/models/models.rb

@@ -77,11 +77,11 @@ class OrderedTaggableModel < ActiveRecord::Base
   acts_as_ordered_taggable_on :colours
 end
 
-if ActsAsTaggableOn::Utils.using_postgresql?
+if using_postgresql?
   class CachedModelWithArray < ActiveRecord::Base
     acts_as_taggable
   end
-  if ActsAsTaggableOn::Utils.postgresql_support_json?
+  if postgresql_support_json?
     class TaggableModelWithJson < ActiveRecord::Base
       acts_as_taggable
       acts_as_taggable_on :skills

data/spec/internal/db/schema.rb

@@ -76,7 +76,7 @@ ActiveRecord::Schema.define version: 0 do
 
 
   # Special cases for postgresql
-  if ActsAsTaggableOn::Utils.using_postgresql?
+  if using_postgresql?
 
     create_table :other_cached_with_array_models, force: true do |t|
       t.column :name, :string
@@ -86,7 +86,7 @@ ActiveRecord::Schema.define version: 0 do
       t.column :cached_glass_list, :string, array: true
     end
 
-    if self.
+    if postgresql_support_json?
       create_table :taggable_model_with_jsons, :force => true do |t|
         t.column :name, :string
         t.column :type, :string

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ require File.expand_path('../../lib/acts-as-taggable-on', __FILE__)
 I18n.enforce_available_locales = true
 require 'rails'
 require 'rspec/its'
-require 'ammeter/init'  # <= You are next
 require 'barrier'
 require 'database_cleaner'
 

data/spec/support/0-helpers.rb

@@ -0,0 +1,32 @@
+def using_sqlite?
+  ActsAsTaggableOn::Utils.connection && ActsAsTaggableOn::Utils.connection.adapter_name == 'SQLite'
+end
+
+def supports_concurrency?
+  !using_sqlite?
+end
+
+def using_postgresql?
+  ActsAsTaggableOn::Utils.using_postgresql?
+end
+
+def postgresql_version
+  if using_postgresql?
+    ActsAsTaggableOn::Utils.connection.execute('SHOW SERVER_VERSION').first['server_version'].to_f
+  else
+    0.0
+  end
+end
+
+def postgresql_support_json?
+  postgresql_version >= 9.2
+end
+
+
+def using_mysql?
+  ActsAsTaggableOn::Utils.using_mysql?
+end
+
+def using_case_insensitive_collation?
+  using_mysql? && ActsAsTaggableOn::Utils.connection.collation =~ /_ci\Z/
+end

data/spec/support/database_cleaner.rb

@@ -6,6 +6,10 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
+  config.after(:suite) do
+    DatabaseCleaner.clean
+  end
+
   config.before(:each) do
     DatabaseCleaner.start
   end