acts-as-taggable-on 3.2.3 → 3.3.0

data/lib/acts_as_taggable_on/tags_helper.rb

@@ -4,10 +4,10 @@ module ActsAsTaggableOn
     def tag_cloud(tags, classes)
       return [] if tags.empty?
 
-      max_count = tags.sort_by(&:count).last.count.to_f
+      max_count = tags.sort_by(&:taggings_count).last.taggings_count.to_f
 
       tags.each do |tag|
-        index = ((tag.count / max_count) * (classes.size - 1))
+        index = ((tag.taggings_count / max_count) * (classes.size - 1))
         yield tag, classes[index.nan? ? 0 : index.round]
       end
     end

data/lib/acts_as_taggable_on/utils.rb

@@ -1,3 +1,5 @@
+# This module is deprecated and will be removed in the incoming versions
+
 module ActsAsTaggableOn
   module Utils
     class << self
@@ -10,33 +12,11 @@ module ActsAsTaggableOn
         connection && connection.adapter_name == 'PostgreSQL'
       end
 
-      def postgresql_version
-        if using_postgresql?
-          connection.execute('SHOW SERVER_VERSION').first['server_version'].to_f
-        end
-      end
-
-      def postgresql_support_json?
-        postgresql_version >= 9.2
-      end
-
-      def using_sqlite?
-        connection && connection.adapter_name == 'SQLite'
-      end
-
       def using_mysql?
         #We should probably use regex for mysql to support prehistoric adapters
         connection && connection.adapter_name == 'Mysql2'
       end
 
-      def using_case_insensitive_collation?
-        using_mysql? && connection.collation =~ /_ci\Z/
-      end
-
-      def supports_concurrency?
-        !using_sqlite?
-      end
-
       def sha_prefix(string)
         Digest::SHA1.hexdigest("#{string}#{rand}")[0..6]
       end
@@ -45,10 +25,6 @@ module ActsAsTaggableOn
         ::ActiveRecord::VERSION::MAJOR == 4
       end
 
-      def active_record42?
-        active_record4? && ::ActiveRecord::VERSION::MINOR >= 2
-      end
-
       def like_operator
         using_postgresql? ? 'ILIKE' : 'LIKE'
       end

data/lib/acts_as_taggable_on/version.rb

@@ -1,4 +1,4 @@
 module ActsAsTaggableOn
-  VERSION = '3.2.3'
+  VERSION = '3.3.0'
 end
 

data/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe 'Acts As Taggable On' do

data/spec/acts_as_taggable_on/acts_as_tagger_spec.rb

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

data/spec/acts_as_taggable_on/caching_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe 'Acts As Taggable On' do

data/spec/acts_as_taggable_on/related_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe 'Acts As Taggable On' do

data/spec/acts_as_taggable_on/single_table_inheritance_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe 'Single Table Inheritance' do

data/spec/acts_as_taggable_on/tag_list_parser_spec.rb

@@ -0,0 +1,46 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe ActsAsTaggableOn::TagListParser do
+  it '#parse should return empty array if empty array is passed' do
+    expect(ActsAsTaggableOn::TagListParser.parse([])).to be_empty
+  end
+
+  describe 'Multiple Delimiter' do
+    before do
+      @old_delimiter = ActsAsTaggableOn.delimiter
+    end
+
+    after do
+      ActsAsTaggableOn.delimiter = @old_delimiter
+    end
+
+    it 'should separate tags by delimiters' do
+      ActsAsTaggableOn.delimiter = [',', ' ', '\|']
+      tag_list = ActsAsTaggableOn::TagListParser.parse('cool, data|I have')
+      expect(tag_list.to_s).to eq('cool, data, I, have')
+    end
+
+    it 'should escape quote' do
+      ActsAsTaggableOn.delimiter = [',', ' ', '\|']
+      tag_list = ActsAsTaggableOn::TagListParser.parse "'I have'|cool, data"
+      expect(tag_list.to_s).to eq('"I have", cool, data')
+
+      tag_list = ActsAsTaggableOn::TagListParser.parse '"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
+      ActsAsTaggableOn.delimiter = ['，', '的', '可能是']
+      tag_list = ActsAsTaggableOn::TagListParser.parse('我的东西可能是不见了，还好有备份')
+      expect(tag_list.to_s).to eq('我， 东西， 不见了， 还好有备份')
+    end
+
+    it 'should work for multiple quoted tags' do
+      ActsAsTaggableOn.delimiter = [',']
+      tag_list = ActsAsTaggableOn::TagListParser.parse('"Ruby Monsters","eat Katzenzungen"')
+      expect(tag_list.to_s).to eq('Ruby Monsters, eat Katzenzungen')
+    end
+  end
+
+end

data/spec/acts_as_taggable_on/tag_list_spec.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# -*- encoding : utf-8 -*-
+
 require 'spec_helper'
 
 describe ActsAsTaggableOn::TagList do
@@ -7,9 +8,7 @@ describe ActsAsTaggableOn::TagList do
 
   it { should be_kind_of Array }
 
-  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
@@ -118,41 +117,5 @@ describe ActsAsTaggableOn::TagList do
 
   end
 
-  describe 'Multiple Delimiter' do
-    before do
-      @old_delimiter = ActsAsTaggableOn.delimiter
-    end
-
-    after do
-      ActsAsTaggableOn.delimiter = @old_delimiter
-    end
-
-    it 'should separate tags by delimiters' do
-      ActsAsTaggableOn.delimiter = [',', ' ', '\|']
-      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
-      ActsAsTaggableOn.delimiter = [',', ' ', '\|']
-      tag_list = ActsAsTaggableOn::TagList.from "'I have'|cool, data"
-      expect(tag_list.to_s).to eq('"I have", cool, data')
-
-      tag_list = ActsAsTaggableOn::TagList.from '"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
-      ActsAsTaggableOn.delimiter = ['，', '的', '可能是']
-      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
 
 end

data/spec/acts_as_taggable_on/tag_spec.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 require 'db/migrate/2_add_missing_unique_indices.rb'
 
@@ -18,21 +18,19 @@ describe ActsAsTaggableOn::Tag do
 
 
   describe 'named like any' do
-    if ActsAsTaggableOn::Utils.using_case_insensitive_collation?
-      context 'case insensitive collation and unique index on tag name' do
-        before(:each) do
-          ActsAsTaggableOn::Tag.create(name: 'Awesome')
-          ActsAsTaggableOn::Tag.create(name: 'epic')
-        end
-
-        it 'should find both tags' do
-          expect(ActsAsTaggableOn::Tag.named_like_any(%w(awesome epic)).count).to eq(2)
-        end
+    context 'case insensitive collation and unique index on tag name', if: using_case_insensitive_collation? do
+      before(:each) do
+        ActsAsTaggableOn::Tag.create(name: 'Awesome')
+        ActsAsTaggableOn::Tag.create(name: 'epic')
+      end
+
+      it 'should find both tags' do
+        expect(ActsAsTaggableOn::Tag.named_like_any(%w(awesome epic)).count).to eq(2)
       end
     end
 
     context 'case insensitive collation without indexes or case sensitive collation with indexes' do
-      if ActsAsTaggableOn::Utils.using_case_insensitive_collation?
+      if using_case_insensitive_collation?
         include_context 'without unique index'
       end
 
@@ -69,28 +67,24 @@ describe ActsAsTaggableOn::Tag do
     end
   end
 
-  unless ActsAsTaggableOn::Utils.using_sqlite?
-    describe 'find or create by unicode name' do
-      before(:each) do
-        @tag.name = 'привет'
-        @tag.save
-      end
+  describe 'find or create by unicode name', unless: using_sqlite? do
+    before(:each) do
+      @tag.name = 'привет'
+      @tag.save
+    end
 
-      it 'should find by name' do
-        expect(ActsAsTaggableOn::Tag.find_or_create_with_like_by_name('привет')).to eq(@tag)
-      end
+    it 'should find by name' do
+      expect(ActsAsTaggableOn::Tag.find_or_create_with_like_by_name('привет')).to eq(@tag)
+    end
 
-      it 'should find by name case insensitive' do
-        expect(ActsAsTaggableOn::Tag.find_or_create_with_like_by_name('ПРИВЕТ')).to eq(@tag)
-      end
+    it 'should find by name case insensitive' do
+      expect(ActsAsTaggableOn::Tag.find_or_create_with_like_by_name('ПРИВЕТ')).to eq(@tag)
+    end
 
-      if ActsAsTaggableOn::Utils.using_case_insensitive_collation?
-        it 'should find by name accent insensitive' do
-          @tag.name = 'inupiat'
-          @tag.save
-          expect(ActsAsTaggableOn::Tag.find_or_create_with_like_by_name('Iñupiat')).to eq(@tag)
-        end
-      end
+    it 'should find by name accent insensitive', if: using_case_insensitive_collation? do
+      @tag.name = 'inupiat'
+      @tag.save
+      expect(ActsAsTaggableOn::Tag.find_or_create_with_like_by_name('Iñupiat')).to eq(@tag)
     end
   end
 
@@ -109,7 +103,7 @@ describe ActsAsTaggableOn::Tag do
     end
 
     context 'case sensitive' do
-      if ActsAsTaggableOn::Utils.using_case_insensitive_collation?
+      if using_case_insensitive_collation?
         include_context 'without unique index'
       end
 
@@ -128,7 +122,7 @@ describe ActsAsTaggableOn::Tag do
     end
 
     context 'case sensitive' do
-      if ActsAsTaggableOn::Utils.using_case_insensitive_collation?
+      if using_case_insensitive_collation?
         include_context 'without unique index'
       end
 
@@ -228,7 +222,7 @@ describe ActsAsTaggableOn::Tag do
     end
 
     context 'case sensitive' do
-      if ActsAsTaggableOn::Utils.using_case_insensitive_collation?
+      if using_case_insensitive_collation?
         include_context 'without unique index'
       end
 
@@ -242,7 +236,7 @@ describe ActsAsTaggableOn::Tag do
     end
 
     context 'case sensitive' do
-      if ActsAsTaggableOn::Utils.using_case_insensitive_collation?
+      if using_case_insensitive_collation?
         include_context 'without unique index'
       end
 

data/spec/acts_as_taggable_on/taggable/dirty_spec.rb

@@ -0,0 +1,127 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe ActsAsTaggableOn::Taggable::Dirty 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
+
+      context 'without order' do
+        it 'should not mark attribute if order change ' do
+          taggable = TaggableModel.create(name: 'Dirty Harry', tag_list: %w(d c b a))
+          taggable.tag_list =  %w(a b c d)
+          expect(taggable.tag_list_changed?).to be_falsey
+        end
+      end
+
+      context 'with order' do
+        it 'should mark attribute if order change' do
+          taggable = OrderedTaggableModel.create(name: 'Clean Harry', tag_list: 'd,c,b,a')
+          taggable.save
+          taggable.tag_list =  %w(a b c d)
+          expect(taggable.tag_list_changed?).to be_truthy
+        end
+      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