acts-as-taggable-on 3.5.0 → 4.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92222646174fc38e87d9972cea2022c78e9ba337
-  data.tar.gz: 62d819d54ea8d538ce67d1f30c4c640e63333328
+  metadata.gz: 8c10b1bdc1cfdce1f5faa7db0cb813257657bcda
+  data.tar.gz: fdc07fbeaf0a0fe45e1410b2f6a52078a168ff8d
 SHA512:
-  metadata.gz: 6a17ce74f9d91e98037faa3348449813632f2f1ba2a4ca92a297beaafa8e544b650c2e12586c03a9aab8c2c6b0b5c1c1de21571d860be49aed971b0d20b8338e
-  data.tar.gz: d50ea8e8200c3eaef6f1d80b53412637604e74de62dd3a2e6385e22d1fbf579bbb372f2bbd9b6c026f3f062e4959a288a5a890360d5f98cde6df222ebc72947f
+  metadata.gz: 1542dd8c7ebafeed4794f6f734da1e98f9641d7ddda18fa93c7e49ec4d5b14867353e065a6f3598050d0606f3e2809c5034a07c9f91385f22c90159dad202c50
+  data.tar.gz: aba26b02cbc655676003bfb6d73092ab49dae44013985a6838b187b3f4920507e684e73fab8a53c7d8b11e036cbc58a608943e3116ebee4ff10bf7df8fea6e80

data/.gitignore

@@ -9,3 +9,5 @@ tmp*.sw?
 tmp
 *.gem
 *.lock
+
+/.idea

data/.travis.yml

@@ -1,11 +1,11 @@
 language: ruby
+cache: bundler
 
 rvm:
+  - 2.3.1
+  - 2.2.5
   - 2.1
-  - 2.2
   - 2.0.0
-  - 1.9.3
-  - rbx-2
 
 env:
   - DB=sqlite3
@@ -13,28 +13,24 @@ env:
   - DB=postgresql
 
 gemfile:
-  - gemfiles/activerecord_3.2.gemfile
-  - gemfiles/activerecord_4.0.gemfile
+  - gemfiles/activerecord_5.0.gemfile
+  - gemfiles/activerecord_4.2.gemfile
   - gemfiles/activerecord_4.1.gemfile
+  - gemfiles/activerecord_4.0.gemfile
 
 sudo: false
 
 bundler_args: '--without local_development --jobs 3 --retry 3'
 
+before_install:
+   - gem install bundler
+
 script: bundle exec rake
 
 matrix:
-  fast_finish: true
-  allow_failures:
-      - gemfile: gemfiles/activerecord_edge.gemfile
-      - rvm: rbx-2
   exclude:
-      - rvm: 2.2
-        gemfile: gemfiles/activerecord_3.2.gemfile
-      - rvm: 1.9.3
-        gemfile: gemfiles/activerecord_4.0.gemfile
-      - rvm: 1.9.3
-        gemfile: gemfiles/activerecord_4.1.gemfile
-      - rvm: rbx-2
-        gemfile: gemfiles/activerecord_3.2.gemfile
-
+    - rvm: 2.0.0
+      gemfile: gemfiles/activerecord_5.0.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/activerecord_5.0.gemfile
+  fast_finish: true

data/Appraisals

@@ -1,16 +1,17 @@
-appraise "activerecord-3.2" do
-  gem "activerecord", github: "rails/rails" , branch: '3-2-stable'
+appraise 'activerecord-5.0' do
+  gem 'activerecord', "~> 5.0.0"
 end
 
-appraise "activerecord-4.0" do
-  gem "activerecord", github: "rails/rails" , branch: '4-0-stable'
+appraise "activerecord-4.2" do
+  gem "activerecord", "~> 4.2.0"
 end
 
 appraise "activerecord-4.1" do
-  gem "activerecord", github: "rails/rails" , branch: '4-1-stable'
+  gem "activerecord", "~> 4.1.0"
+  gem 'mysql2', '~> 0.3.21'
 end
 
-appraise "activerecord-4.2" do
-  gem "railties", github: "rails/rails" , branch: '4-2-stable'
-  gem "activerecord", github: "rails/rails"  , branch: '4-2-stable'
+appraise "activerecord-4.0" do
+  gem "activerecord", "~> 4.0.0"
+  gem 'mysql2', '~> 0.3.21'
 end

data/CHANGELOG.md

@@ -4,10 +4,12 @@ Each change should fall into categories that would affect whether the release is
 
 As such, a _Feature_ would map to either major or minor. A _bug fix_ to a patch.  And _misc_ is either minor or patch, the difference being kind of fuzzy for the purposes of history.  Adding tests would be patch level.
 
-### [3.5.0 / 2015-02-11](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.4.4...v3.5.0)
+### [3.5.0 / 2015-03-03](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.4.4...v3.5.0)
 
   * Fixes
    * [@rikettsie Fixed collation for MySql via rake rule or config parameter](https://github.com/mbleigh/acts-as-taggable-on/pull/634)
+  *Misc
+   * [@pcupueran Add rspec test for tagging_spec completeness]()
 
 ### [3.4.4 / 2015-02-11](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.4.3...v3.4.4)
 

data/Gemfile

@@ -7,5 +7,5 @@ group :local_development do
   gem 'guard-rspec'
   gem 'appraisal'
   gem 'rake'
-  gem 'byebug' , platform: :mri_21
+  gem 'byebug' , platforms: [:mri_21, :mri_22, :mri_23]
 end

data/README.md

@@ -1,4 +1,6 @@
 # ActsAsTaggableOn
+
+[![Join the chat at https://gitter.im/mbleigh/acts-as-taggable-on](https://badges.gitter.im/mbleigh/acts-as-taggable-on.svg)](https://gitter.im/mbleigh/acts-as-taggable-on?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Gem Version](https://badge.fury.io/rb/acts-as-taggable-on.svg)](http://badge.fury.io/rb/acts-as-taggable-on)
 [![Build Status](https://secure.travis-ci.org/mbleigh/acts-as-taggable-on.png)](http://travis-ci.org/mbleigh/acts-as-taggable-on)
 [![Code Climate](https://codeclimate.com/github/mbleigh/acts-as-taggable-on.png)](https://codeclimate.com/github/mbleigh/acts-as-taggable-on)
@@ -89,7 +91,7 @@ end
 
 class UsersController < ApplicationController
   def user_params
-    params.require(:user).permit(:name, :tag_list => []) ## Rails 4 strong params usage
+    params.require(:user).permit(:name, :tag_list) ## Rails 4 strong params usage
   end
 end
 
@@ -273,7 +275,7 @@ User.tagged_with("same", :on => :customs) # => [@user]
 
 ### Tag Parsers
 
-If you want to change how tags are parsed, you can define a your own implementation:
+If you want to change how tags are parsed, you can define your own implementation:
 
 ```ruby
 class MyParser < ActsAsTaggableOn::GenericParser
@@ -302,7 +304,7 @@ Now you can use this parser, passing it as parameter:
 Or change it globally:
 
 ```ruby
-ActsAsTaggable.default_parser = MyParser
+ActsAsTaggableOn.default_parser = MyParser
 @user = User.new(:name => "Bobby")
 @user.tag_list = "east|south"
 @user.tag_list # => ["east", "south"]
@@ -331,6 +333,42 @@ Photo.tagged_with("paris", :on => :locations, :owned_by => @some_user)
 @some_user.tag(@some_photo, :with => "paris, normandy", :on => :locations, :skip_save => true) #won't save @some_photo object
 ```
 
+#### Working with Owned Tags
+Note that `tag_list` only returns tags whose taggings do not have an owner. Continuing from the above example:
+```ruby
+@some_photo.tag_list # => []
+```
+To retrieve all tags of an object (regardless of ownership) or if only one owner can tag the object, use `all_tags_list`.
+
+##### Adding owned tags
+Note that **owned tags** are added all at once, in the form of ***comma seperated tags*** in string.
+Also, when you try to add **owned tags** again, it simply overwrites the previous set of **owned tags**.
+So to append tags in previously existing **owned tags** list, go as follows:
+```ruby
+def add_owned_tag 
+    @some_item = Item.find(params[:id])
+    owned_tag_list = @some_item.all_tag_list - @some_item.tag_list
+    owned_tag_list += [(params[:tag])]
+    @tag_owner.tag(@some_item, :with => stringify(owned_tag_list), :on => :tags)
+    @some_item.save   
+end
+
+def stringify(tag_list)
+    tag_list.inject('') { |memo, tag| memo += (tag + ',') }[0..-1]
+end
+```
+##### Removing owned tags
+Similarly as above, removing will be as follows:
+```ruby
+def remove_owned_tag 
+    @some_item = Item.find(params[:id])
+    owned_tag_list = @some_item.all_tag_list - @some_item.tag_list
+    owned_tag_list -= [(params[:tag])]
+    @tag_owner.tag(@some_item, :with => stringify(owned_tag_list), :on => :tags)
+    @some_item.save   
+end
+```
+
 ### Dirty objects
 
 ```ruby

data/acts-as-taggable-on.gemspec

@@ -16,16 +16,16 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($/)
   gem.test_files    = gem.files.grep(%r{^spec/})
   gem.require_paths = ['lib']
-  gem.required_ruby_version     = '>= 1.9.3'
+  gem.required_ruby_version     = '>= 2.0.0'
 
   if File.exist?('UPGRADING.md')
     gem.post_install_message = File.read('UPGRADING.md')
   end
 
-  gem.add_runtime_dependency 'activerecord',  ['>= 3.2', '< 5']
+  gem.add_runtime_dependency 'activerecord', ['>= 4.0']
 
   gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency 'mysql2', '~> 0.3.7'
+  gem.add_development_dependency 'mysql2', '~> 0.3'
   gem.add_development_dependency 'pg'
 
   gem.add_development_dependency 'rspec-rails'

data/db/migrate/2_add_missing_unique_indices.rb

@@ -2,7 +2,7 @@ class AddMissingUniqueIndices < ActiveRecord::Migration
   def self.up
     add_index :tags, :name, unique: true
 
-    remove_index :taggings, :tag_id
+    remove_index :taggings, :tag_id if index_exists?(:taggings, :tag_id)
     remove_index :taggings, [:taggable_id, :taggable_type, :context]
     add_index :taggings,
               [:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type],
@@ -13,7 +13,8 @@ class AddMissingUniqueIndices < ActiveRecord::Migration
     remove_index :tags, :name
 
     remove_index :taggings, name: 'taggings_idx'
-    add_index :taggings, :tag_id
+
+    add_index :taggings, :tag_id unless index_exists?(:taggings, :tag_id)
     add_index :taggings, [:taggable_id, :taggable_type, :context]
   end
 end

data/db/migrate/6_add_missing_indexes.rb

@@ -0,0 +1,12 @@
+class AddMissingIndexes < ActiveRecord::Migration
+  def change
+    add_index :taggings, :tag_id
+    add_index :taggings, :taggable_id
+    add_index :taggings, :taggable_type
+    add_index :taggings, :tagger_id
+    add_index :taggings, :context
+
+    add_index :taggings, [:tagger_id, :tagger_type]
+    add_index :taggings, [:taggable_id, :taggable_type, :tagger_id, :context], name: 'taggings_idy'
+  end
+end

data/gemfiles/activerecord_4.0.gemfile

@@ -2,14 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", :github => "rails/rails", :branch => "4-0-stable"
+gem "activerecord", "~> 4.0.0"
+gem "mysql2", "~> 0.3.21"
 
 group :local_development do
   gem "guard"
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
-  gem "byebug", :platform => :mri_21
+  gem "byebug", :platforms => [:mri_21, :mri_22, :mri_23]
 end
 
 gemspec :path => "../"

data/gemfiles/activerecord_4.1.gemfile

@@ -2,14 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", :github => "rails/rails", :branch => "4-1-stable"
+gem "activerecord", "~> 4.1.0"
+gem "mysql2", "~> 0.3.21"
 
 group :local_development do
   gem "guard"
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
-  gem "byebug", :platform => :mri_21
+  gem "byebug", :platforms => [:mri_21, :mri_22, :mri_23]
 end
 
 gemspec :path => "../"

data/gemfiles/activerecord_4.2.gemfile

@@ -2,15 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "railties", :github => "rails/rails", :branch => "4-2-stable"
-gem "activerecord", :github => "rails/rails", :branch => "4-2-stable"
+gem "activerecord", "~> 4.2.0"
 
 group :local_development do
   gem "guard"
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
-  gem "byebug", :platform => :mri_21
+  gem "byebug", :platforms => [:mri_21, :mri_22, :mri_23]
 end
 
 gemspec :path => "../"

data/gemfiles/{activerecord_3.2.gemfile → activerecord_5.0.gemfile}

@@ -2,14 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", :github => "rails/rails", :branch => "3-2-stable"
+gem "activerecord", "~> 5.0.0"
 
 group :local_development do
   gem "guard"
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
-  gem "byebug", :platform => :mri_21
+  gem "byebug", :platforms => [:mri_21, :mri_22, :mri_23]
 end
 
 gemspec :path => "../"

data/lib/acts-as-taggable-on.rb

@@ -2,7 +2,12 @@ require 'active_record'
 require 'active_record/version'
 require 'active_support/core_ext/module'
 
-require_relative 'acts_as_taggable_on/engine'  if defined?(Rails)
+begin
+  require 'rails/engine'
+  require 'acts_as_taggable_on/engine'
+  rescue LoadError
+
+end
 
 require 'digest/sha1'
 
@@ -13,7 +18,6 @@ module ActsAsTaggableOn
   autoload :TagList
   autoload :GenericParser
   autoload :DefaultParser
-  autoload :TagListParser
   autoload :Taggable
   autoload :Tagger
   autoload :Tagging
@@ -57,9 +61,10 @@ module ActsAsTaggableOn
   end
 
   class Configuration
-    attr_accessor :delimiter, :force_lowercase, :force_parameterize,
-                  :strict_case_match, :remove_unused_tags, :default_parser,
+    attr_accessor :force_lowercase, :force_parameterize,
+                  :remove_unused_tags, :default_parser,
                   :tags_counter
+    attr_reader :delimiter, :strict_case_match
 
     def initialize
       @delimiter = ','
@@ -73,9 +78,7 @@ module ActsAsTaggableOn
     end
 
     def strict_case_match=(force_cs)
-      if @force_binary_collation == false
-        @strict_case_match = force_cs
-      end
+      @strict_case_match = force_cs unless @force_binary_collation
     end
 
     def delimiter=(string)
@@ -89,7 +92,7 @@ WARNING
 
     def force_binary_collation=(force_bin)
       if Utils.using_mysql?
-        if force_bin == true
+        if force_bin
           Configuration.apply_binary_collation(true)
           @force_binary_collation = true
           @strict_case_match = true
@@ -103,10 +106,12 @@ WARNING
     def self.apply_binary_collation(bincoll)
       if Utils.using_mysql?
         coll = 'utf8_general_ci'
-        if bincoll == true
-          coll = 'utf8_bin'
+        coll = 'utf8_bin' if bincoll
+        begin
+          ActiveRecord::Migration.execute("ALTER TABLE #{Tag.table_name} MODIFY name varchar(255) CHARACTER SET utf8 COLLATE #{coll};")
+        rescue Exception => e
+          puts "Trapping #{e.class}: collation parameter ignored while migrating for the first time."
         end
-        ActiveRecord::Migration.execute("ALTER TABLE tags MODIFY name varchar(255) CHARACTER SET utf8 COLLATE #{coll};")
       end
     end
 
@@ -116,7 +121,6 @@ WARNING
 end
 
 ActiveSupport.on_load(:active_record) do
-  extend ActsAsTaggableOn::Compatibility
   extend ActsAsTaggableOn::Taggable
   include ActsAsTaggableOn::Tagger
 end

data/lib/acts_as_taggable_on/engine.rb

@@ -1,4 +1,3 @@
-require 'rails/engine'
 module ActsAsTaggableOn
   class Engine < Rails::Engine
   end

data/lib/acts_as_taggable_on/tag.rb

@@ -2,8 +2,6 @@
 module ActsAsTaggableOn
   class Tag < ::ActiveRecord::Base
 
-    attr_accessible :name if defined?(ActiveModel::MassAssignmentSecurity)
-
     ### ASSOCIATIONS:
 
     has_many :taggings, dependent: :destroy, class_name: '::ActsAsTaggableOn::Tagging'
@@ -50,6 +48,12 @@ module ActsAsTaggableOn
       where(clause)
     end
 
+    def self.for_context(context)
+      joins(:taggings).
+        where(["taggings.context = ?", context]).
+        select("DISTINCT tags.*")
+    end
+
     ### CLASS METHODS:
 
     def self.find_or_create_with_like_by_name(name)

data/lib/acts_as_taggable_on/tag_list.rb

@@ -84,7 +84,8 @@ module ActsAsTaggableOn
       map! { |tag| tag.mb_chars.downcase.to_s } if ActsAsTaggableOn.force_lowercase
       map!(&:parameterize) if ActsAsTaggableOn.force_parameterize
 
-      uniq!
+      ActsAsTaggableOn.strict_case_match ? uniq! : uniq!{ |tag| tag.downcase }
+      self
     end
 
 
@@ -99,18 +100,6 @@ module ActsAsTaggableOn
       args.flatten!
     end
 
-
-    ## DEPRECATED
-    def self.from(string)
-      ActiveRecord::Base.logger.warn <<WARNING
-ActsAsTaggableOn::TagList.from is deprecated \
-and will be removed from v4.0+, use  \
-ActsAsTaggableOn::DefaultParser.new instead
-WARNING
-      @parser.new(string).parse
-    end
-
-
   end
 end
 

data/lib/acts_as_taggable_on/taggable/cache.rb

@@ -73,7 +73,7 @@ module ActsAsTaggableOn::Taggable
         tag_types.map(&:to_s).each do |tag_type|
           if self.class.send("caching_#{tag_type.singularize}_list?")
             if tag_list_cache_set_on(tag_type)
-              list = tag_list_cache_on(tag_type).to_a.flatten.compact.join(', ')
+              list = tag_list_cache_on(tag_type).to_a.flatten.compact.join("#{ActsAsTaggableOn.delimiter} ")
               self["cached_#{tag_type.singularize}_list"] = list
             end
           end

data/lib/acts_as_taggable_on/taggable/collection.rb

@@ -138,7 +138,7 @@ module ActsAsTaggableOn::Taggable
           scoped_ids = pluck(table_name_pkey)
           tagging_scope = tagging_scope.where("#{ActsAsTaggableOn::Tagging.table_name}.taggable_id IN (?)", scoped_ids)
         else
-          tagging_scope = tagging_scope.where("#{ActsAsTaggableOn::Tagging.table_name}.taggable_id IN(#{safe_to_sql(select(table_name_pkey))})")
+          tagging_scope = tagging_scope.where("#{ActsAsTaggableOn::Tagging.table_name}.taggable_id IN(#{safe_to_sql(except(:select).select(table_name_pkey))})")
         end
 
         tagging_scope
@@ -169,9 +169,12 @@ module ActsAsTaggableOn::Taggable
     end
 
     module CalculationMethods
-      def count(column_name=:all, options = {})
+      # Rails 5 TODO: Remove options argument as soon we remove support to
+      # activerecord-deprecated_finders.
+      # See https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/calculations.rb#L38
+      def count(column_name = :all, options = {})
         # https://github.com/rails/rails/commit/da9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2
-        super
+        ActsAsTaggableOn::Utils.active_record5? ? super(column_name) : super(column_name, options)
       end
     end
   end

data/lib/acts_as_taggable_on/taggable/core.rb

@@ -23,18 +23,15 @@ module ActsAsTaggableOn::Taggable
           class_eval do
             # when preserving tag order, include order option so that for a 'tags' context
             # the associations tag_taggings & tags are always returned in created order
-            has_many_with_taggable_compatibility context_taggings, as: :taggable,
-                                                 dependent: :destroy,
-                                                 class_name: 'ActsAsTaggableOn::Tagging',
-                                                 order: taggings_order,
-                                                 conditions: {context: tags_type},
-                                                 include: :tag
-
-            has_many_with_taggable_compatibility context_tags, through: context_taggings,
-                                                 source: :tag,
-                                                 class_name: 'ActsAsTaggableOn::Tag',
-                                                 order: taggings_order
-
+            has_many context_taggings, -> { includes(:tag).order(taggings_order).where(context: tags_type) },
+                     as: :taggable,
+                     class_name: ActsAsTaggableOn::Tagging,
+                     dependent: :destroy
+
+            has_many context_tags, -> { order(taggings_order) },
+                     class_name: ActsAsTaggableOn::Tag,
+                     through: context_taggings,
+                     source: :tag
           end
 
           taggable_mixin.class_eval <<-RUBY, __FILE__, __LINE__ + 1
@@ -246,6 +243,14 @@ module ActsAsTaggableOn::Taggable
       def taggable_mixin
         @taggable_mixin ||= Module.new
       end
+
+      private
+
+      # Rails 5 has merged sanitize and quote_value
+      # See https://github.com/rails/rails/blob/master/activerecord/lib/active_record/sanitization.rb#L10
+      def quote_value(value, column = nil)
+        ActsAsTaggableOn::Utils.active_record5? ? super(value) : super(value, column)
+      end
     end
 
     # all column names are necessary for PostgreSQL group clause
@@ -254,7 +259,7 @@ module ActsAsTaggableOn::Taggable
     end
 
     def custom_contexts
-      @custom_contexts ||= []
+      @custom_contexts ||= taggings.map(&:context).uniq
     end
 
     def is_taggable?
@@ -333,7 +338,7 @@ module ActsAsTaggableOn::Taggable
     end
 
     def tagging_contexts
-      custom_contexts + self.class.tag_types.map(&:to_s)
+      self.class.tag_types.map(&:to_s) + custom_contexts
     end
 
     def process_dirty_object(context, new_list)
@@ -407,7 +412,7 @@ module ActsAsTaggableOn::Taggable
 
         # Destroy old taggings:
         if old_tags.present?
-          taggings.not_owned.by_context(context).destroy_all(tag_id: old_tags)
+          taggings.not_owned.by_context(context).where(tag_id: old_tags).destroy_all
         end
 
         # Create new taggings:
@@ -432,7 +437,7 @@ module ActsAsTaggableOn::Taggable
       tag_lists = tag_types.map {|tags_type| "#{tags_type.to_s.singularize}_list"}
       super.delete_if {|attr| tag_lists.include? attr }
     end
-    
+
     ##
     # Override this hook if you wish to subclass {ActsAsTaggableOn::Tag} --
     # context is provided so that you may conditionally use a Tag subclass

data/lib/acts_as_taggable_on/taggable/ownership.rb

@@ -108,9 +108,9 @@ module ActsAsTaggableOn::Taggable
 
           # Find all taggings that belong to the taggable (self), are owned by the owner,
           # have the correct context, and are removed from the list.
-          ActsAsTaggableOn::Tagging.destroy_all(taggable_id: id, taggable_type: self.class.base_class.to_s,
-                                                            tagger_type: owner.class.base_class.to_s, tagger_id: owner.id,
-                                                            tag_id: old_tags, context: context) if old_tags.present?
+          ActsAsTaggableOn::Tagging.where(taggable_id: id, taggable_type: self.class.base_class.to_s,
+                                          tagger_type: owner.class.base_class.to_s, tagger_id: owner.id,
+                                          tag_id: old_tags, context: context).destroy_all if old_tags.present?
 
           # Create new taggings:
           new_tags.each do |tag|

data/lib/acts_as_taggable_on/tagger.rb

@@ -15,18 +15,19 @@ module ActsAsTaggableOn
       #   end
       def acts_as_tagger(opts={})
         class_eval do
-          has_many_with_taggable_compatibility :owned_taggings,
-                                               opts.merge(
-                                                   as: :tagger,
-                                                   dependent: :destroy,
-                                                   class_name: '::ActsAsTaggableOn::Tagging'
-                                               )
+          owned_taggings_scope = opts.delete(:scope)
 
-          has_many_with_taggable_compatibility :owned_tags,
-                                               through: :owned_taggings,
-                                               source: :tag,
-                                               class_name: '::ActsAsTaggableOn::Tag',
-                                               uniq: true
+          has_many :owned_taggings, owned_taggings_scope,
+                   opts.merge(
+                     as: :tagger,
+                     class_name: ::ActsAsTaggableOn::Tagging,
+                     dependent: :destroy
+                   )
+
+          has_many :owned_tags, -> { distinct },
+                   class_name: ::ActsAsTaggableOn::Tag,
+                   source: :tag,
+                   through: :owned_taggings
         end
 
         include ActsAsTaggableOn::Tagger::InstanceMethods

data/lib/acts_as_taggable_on/tagging.rb

@@ -1,25 +1,15 @@
 module ActsAsTaggableOn
   class Tagging < ::ActiveRecord::Base #:nodoc:
-    #TODO, remove from 4.0.0
-    attr_accessible :tag,
-                    :tag_id,
-                    :context,
-                    :taggable,
-                    :taggable_type,
-                    :taggable_id,
-                    :tagger,
-                    :tagger_type,
-                    :tagger_id if defined?(ActiveModel::MassAssignmentSecurity)
-
     belongs_to :tag, class_name: '::ActsAsTaggableOn::Tag', counter_cache: ActsAsTaggableOn.tags_counter
     belongs_to :taggable, polymorphic: true
-    belongs_to :tagger,   polymorphic: true
+
+    belongs_to :tagger, {polymorphic: true}.tap {|o| o.merge!(optional: true) if ActsAsTaggableOn::Utils.active_record5? }
 
     scope :owned_by, ->(owner) { where(tagger: owner) }
     scope :not_owned, -> { where(tagger_id: nil, tagger_type: nil) }
 
-    scope :by_contexts, ->(contexts = ['tags']) { where(context: contexts) }
-    scope :by_context, ->(context= 'tags') { by_contexts(context.to_s) }
+    scope :by_contexts, ->(contexts) { where(context: (contexts || 'tags')) }
+    scope :by_context, ->(context = 'tags') { by_contexts(context.to_s) }
 
     validates_presence_of :context
     validates_presence_of :tag_id

data/lib/acts_as_taggable_on/utils.rb

@@ -13,7 +13,6 @@ module ActsAsTaggableOn
       end
 
       def using_mysql?
-        #We should probably use regex for mysql to support prehistoric adapters
         connection && connection.adapter_name == 'Mysql2'
       end
 
@@ -21,8 +20,8 @@ module ActsAsTaggableOn
         Digest::SHA1.hexdigest(string)[0..6]
       end
 
-      def active_record4?
-        ::ActiveRecord::VERSION::MAJOR == 4
+      def active_record5?
+        ::ActiveRecord::VERSION::MAJOR == 5
       end
 
       def like_operator

data/lib/acts_as_taggable_on/version.rb

@@ -1,4 +1,4 @@
 module ActsAsTaggableOn
-  VERSION = '3.5.0'
+  VERSION = '4.0.0.pre'
 end
 

data/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -154,7 +154,7 @@ describe 'Acts As Taggable On' do
   describe 'Tagging Contexts' do
     it 'should eliminate duplicate tagging contexts ' do
       TaggableModel.acts_as_taggable_on(:skills, :skills)
-      expect(TaggableModel.tag_types.freq[:skills]).to_not eq(3)
+      expect(TaggableModel.tag_types.freq[:skills]).to eq(1)
     end
 
     it 'should not contain embedded/nested arrays' do
@@ -178,6 +178,15 @@ describe 'Acts As Taggable On' do
         TaggableModel.acts_as_taggable_on([nil])
       }).to_not raise_error
     end
+
+    it 'should include dynamic contexts in tagging_contexts' do
+      taggable = TaggableModel.create!(name: 'Dynamic Taggable')
+      taggable.set_tag_list_on :colors, 'tag1, tag2, tag3'
+      expect(taggable.tagging_contexts).to eq(%w(tags languages skills needs offerings array colors))
+      taggable.save
+      taggable = TaggableModel.where(name: 'Dynamic Taggable').first
+      expect(taggable.tagging_contexts).to eq(%w(tags languages skills needs offerings array colors))
+    end
   end
 
   context 'when tagging context ends in an "s" when singular (ex. "status", "glass", etc.)' do

data/spec/acts_as_taggable_on/acts_as_tagger_spec.rb

@@ -72,7 +72,7 @@ describe 'acts_as_tagger' do
         expect(@taggable.tag_list_on(:foo_boo)).to be_empty
         expect(-> {
           @tagger.tag(@taggable, with: 'this, and, that', on: :foo_boo, force: false)
-        }).to raise_error
+        }).to raise_error(RuntimeError)
       end
 
       it 'should not create the tag context on-the-fly when the default is over-ridden' do

data/spec/acts_as_taggable_on/caching_spec.rb

@@ -77,6 +77,28 @@ describe 'Acts As Taggable On' do
     end
   end
 
+  describe 'with a custom delimiter' do
+    before(:each) do
+      @taggable = CachedModel.new(name: 'Bob Jones')
+      @another_taggable = OtherCachedModel.new(name: 'John Smith')
+      ActsAsTaggableOn.delimiter = ';'
+    end
+
+    after(:all) do
+      ActsAsTaggableOn.delimiter = ','
+    end
+
+    it 'should cache tags with custom delimiter' do
+      @taggable.update_attributes(tag_list: 'awesome; epic')
+      expect(@taggable.tag_list).to eq(['awesome', 'epic'])
+      expect(@taggable.cached_tag_list).to eq('awesome; epic')
+
+      @taggable = CachedModel.find_by_name('Bob Jones')
+      expect(@taggable.tag_list).to eq(['awesome', 'epic'])
+      expect(@taggable.cached_tag_list).to eq('awesome; epic')
+    end
+  end
+
   describe 'CachingWithArray' do
     pending '#TODO'
   end

data/spec/acts_as_taggable_on/tag_list_spec.rb

@@ -83,6 +83,18 @@ describe ActsAsTaggableOn::TagList do
       new_tag_list = tag_list.concat(another_tag_list)
       expect(new_tag_list.class).to eq(ActsAsTaggableOn::TagList)
     end
+
+    context 'without duplicates' do
+      let(:arr) { ['crazy', 'alien'] }
+      let(:another_tag_list) { ActsAsTaggableOn::TagList.new(*arr) }
+      it 'adds other list' do
+        expect(tag_list.concat(another_tag_list)).to eq(%w[awesome radical crazy alien])
+      end
+
+      it 'adds other array' do
+        expect(tag_list.concat(arr)).to eq(%w[awesome radical crazy alien])
+      end
+    end
   end
 
   describe '#to_s' do
@@ -92,7 +104,7 @@ describe ActsAsTaggableOn::TagList do
 
     it 'should be able to call to_s on a frozen tag list' do
       tag_list.freeze
-      expect(-> { tag_list.add('cool', 'rad,bodacious') }).to raise_error
+      expect(-> { tag_list.add('cool', 'rad,bodacious') }).to raise_error(RuntimeError)
       expect(-> { tag_list.to_s }).to_not raise_error
     end
   end
@@ -114,6 +126,20 @@ describe ActsAsTaggableOn::TagList do
 
       ActsAsTaggableOn.force_lowercase = false
     end
+
+    it 'should ignore case when removing duplicates if strict_case_match is false' do
+      tag_list = ActsAsTaggableOn::TagList.new('Junglist', 'JUNGLIST', 'Junglist', 'Massive', 'MASSIVE', 'MASSIVE')
+
+      expect(tag_list.to_s).to eq('Junglist, Massive')
+    end
+
+    it 'should not ignore case when removing duplicates if strict_case_match is true' do
+      ActsAsTaggableOn.strict_case_match = true
+      tag_list = ActsAsTaggableOn::TagList.new('Junglist', 'JUNGLIST', 'Junglist', 'Massive', 'MASSIVE', 'MASSIVE')
+
+      expect(tag_list.to_s).to eq('Junglist, JUNGLIST, Massive, MASSIVE')
+      ActsAsTaggableOn.strict_case_match = false
+    end
   end
 
   describe 'custom parser' do

data/spec/acts_as_taggable_on/tag_spec.rb

@@ -55,6 +55,21 @@ describe ActsAsTaggableOn::Tag do
     end
   end
 
+  describe 'for context' do
+    before(:each) do
+      @user.skill_list.add('ruby')
+      @user.save
+    end
+
+    it 'should return tags that have been used in the given context' do
+      expect(ActsAsTaggableOn::Tag.for_context('skills').pluck(:name)).to include('ruby')
+    end
+
+    it 'should not return tags that have been used in other contexts' do
+      expect(ActsAsTaggableOn::Tag.for_context('needs').pluck(:name)).to_not include('ruby')
+    end
+  end
+
   describe 'find or create by name' do
     before(:each) do
       @tag.name = 'awesome'

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -119,6 +119,21 @@ describe 'Taggable' do
     expect(@taggable.tag_counts_on(:tags).length).to eq(2)
   end
 
+  context 'tag_counts on a collection' do
+    context 'a select clause is specified on the collection' do
+      it 'should return tag counts without raising an error' do
+        expect(TaggableModel.tag_counts_on(:tags)).to be_empty
+
+        @taggable.tag_list = %w(awesome epic)
+        @taggable.save
+
+        expect {
+          expect(TaggableModel.select(:name).tag_counts_on(:tags).length).to eq(2)
+        }.not_to raise_error
+      end
+    end
+  end
+
   it 'should have tags_on' do
     expect(TaggableModel.tags_on(:tags)).to be_empty
 
@@ -226,8 +241,10 @@ describe 'Taggable' do
   it "should be able to find a tag using dates" do
     @taggable.skill_list = "ruby"
     @taggable.save
+    today = Date.today.to_time.utc
+    tomorrow = Date.tomorrow.to_time.utc
 
-    expect(TaggableModel.tagged_with("ruby", :start_at => Date.today, :end_at => Date.tomorrow).count).to eq(1)
+    expect(TaggableModel.tagged_with("ruby", :start_at => today, :end_at => tomorrow).count).to eq(1)
   end
 
     it "shouldn't be able to find a tag outside date range" do
@@ -380,7 +397,6 @@ describe 'Taggable' do
     # Test specific join syntaxes:
     frank.untaggable_models.create!
     expect(TaggableModel.tagged_with('rails').joins(:untaggable_models).all_tag_counts.size).to eq(2)
-    expect(TaggableModel.tagged_with('rails').joins(untaggable_models: :taggable_model).all_tag_counts.size).to eq(2)
     expect(TaggableModel.tagged_with('rails').joins([:untaggable_models]).all_tag_counts.size).to eq(2)
   end
 
@@ -395,7 +411,6 @@ describe 'Taggable' do
     # Test specific join syntaxes:
     frank.untaggable_models.create!
     expect(TaggableModel.tagged_with('rails').joins(:untaggable_models).all_tags.size).to eq(2)
-    expect(TaggableModel.tagged_with('rails').joins(untaggable_models: :taggable_model).all_tags.size).to eq(2)
     expect(TaggableModel.tagged_with('rails').joins([:untaggable_models]).all_tags.size).to eq(2)
   end
 
@@ -459,7 +474,7 @@ describe 'Taggable' do
 
       expect(TaggableModel.tagged_with(%w(bob tricia), wild: true, any: true).to_a.sort_by { |o| o.id }).to eq([bob, frank, steve])
       expect(TaggableModel.tagged_with(%w(bob tricia), wild: true, exclude: true).to_a).to eq([jim])
-      expect(TaggableModel.tagged_with('ji', wild: true, any: true).to_a).to eq([frank, jim])
+      expect(TaggableModel.tagged_with('ji', wild: true, any: true).to_a =~ [frank, jim])
     end
   end
 
@@ -743,7 +758,6 @@ describe 'Taggable' do
 
     context 'Model.limit(x).tag_counts.sum(:tags_count)' do
       it 'should not break on Mysql' do
-        # Activerecord 3.2 return a string
         expect(TaggableModel.limit(2).tag_counts.sum('tags_count').to_i).to eq(5)
       end
     end

data/spec/acts_as_taggable_on/tagging_spec.rb

@@ -49,15 +49,69 @@ describe ActsAsTaggableOn::Tagging do
     ActsAsTaggableOn.remove_unused_tags = previous_setting
   end
 
-  pending 'context scopes' do
-    describe '.by_context'
-
-    describe '.by_contexts'
-
-    describe '.owned_by'
-
-    describe '.not_owned'
-
+  describe 'context scopes' do
+    before do
+      @tagging_2 = ActsAsTaggableOn::Tagging.new
+      @tagging_3 = ActsAsTaggableOn::Tagging.new
+
+      @tagger = User.new
+      @tagger_2 = User.new
+
+      @tagging.taggable = TaggableModel.create(name: "Black holes")
+      @tagging.tag = ActsAsTaggableOn::Tag.create(name: "Physics")
+      @tagging.tagger = @tagger
+      @tagging.context = 'Science'
+      @tagging.save
+
+      @tagging_2.taggable = TaggableModel.create(name: "Satellites")
+      @tagging_2.tag = ActsAsTaggableOn::Tag.create(name: "Technology")
+      @tagging_2.tagger = @tagger_2
+      @tagging_2.context = 'Science'
+      @tagging_2.save
+
+      @tagging_3.taggable = TaggableModel.create(name: "Satellites")
+      @tagging_3.tag = ActsAsTaggableOn::Tag.create(name: "Engineering")
+      @tagging_3.tagger = @tagger_2
+      @tagging_3.context = 'Astronomy'
+      @tagging_3.save
+
+    end
+
+    describe '.owned_by' do
+      it "should belong to a specific user" do
+        expect(ActsAsTaggableOn::Tagging.owned_by(@tagger).first).to eq(@tagging)
+      end
+    end
+
+    describe '.by_context' do
+      it "should be found by context" do
+        expect(ActsAsTaggableOn::Tagging.by_context('Science').length).to eq(2);
+      end
+    end
+
+    describe '.by_contexts' do
+      it "should find taggings by contexts" do
+        expect(ActsAsTaggableOn::Tagging.by_contexts(['Science', 'Astronomy']).first).to eq(@tagging);
+        expect(ActsAsTaggableOn::Tagging.by_contexts(['Science', 'Astronomy']).second).to eq(@tagging_2);
+        expect(ActsAsTaggableOn::Tagging.by_contexts(['Science', 'Astronomy']).third).to eq(@tagging_3);
+        expect(ActsAsTaggableOn::Tagging.by_contexts(['Science', 'Astronomy']).length).to eq(3);
+      end
+    end
+
+    describe '.not_owned' do
+      before do
+        @tagging_4 = ActsAsTaggableOn::Tagging.new
+        @tagging_4.taggable = TaggableModel.create(name: "Gravity")
+        @tagging_4.tag = ActsAsTaggableOn::Tag.create(name: "Space")
+        @tagging_4.context = "Science"
+        @tagging_4.save
+      end
+
+      it "should found the taggings that do not have owner" do
+        expect(ActsAsTaggableOn::Tagging.all.length).to eq(4)
+        expect(ActsAsTaggableOn::Tagging.not_owned.length).to eq(1)
+        expect(ActsAsTaggableOn::Tagging.not_owned.first).to eq(@tagging_4)
+      end
+    end
   end
-
 end

data/spec/internal/db/schema.rb

@@ -7,12 +7,15 @@ ActiveRecord::Schema.define version: 0 do
   add_index 'tags', ['name'], name: 'index_tags_on_name', unique: true
 
   create_table :taggings, force: true do |t|
-    t.references :tag
+    t.integer :tag_id
 
     # You should make sure that the column created is
     # long enough to store the required class names.
-    t.references :taggable, polymorphic: true
-    t.references :tagger, polymorphic: true
+    t.string :taggable_type
+    t.integer :taggable_id
+
+    t.string :tagger_type
+    t.integer :tagger_id
 
     # Limit is created to prevent MySQL error on index
     # length for MyISAM table type: http://bit.ly/vgW2Ql
@@ -23,6 +26,7 @@ ActiveRecord::Schema.define version: 0 do
   add_index 'taggings',
             ['tag_id', 'taggable_id', 'taggable_type', 'context', 'tagger_id', 'tagger_type'],
             unique: true, name: 'taggings_idx'
+  add_index 'taggings', :tag_id , name: 'index_taggings_on_tag_id'
 
   # above copied from
   # generators/acts_as_taggable_on/migration/migration_generator

data/spec/support/database.rb

@@ -13,13 +13,7 @@ if File.exist?(database_yml)
   config = ActiveRecord::Base.configurations[db_name]
 
   begin
-    #activerecord 4 uses symbol
-    #TODO, remove when activerecord 3 support is dropped
-    if ActsAsTaggableOn::Utils.active_record4?
-      ActiveRecord::Base.establish_connection(db_name.to_sym)
-    else
-      ActiveRecord::Base.establish_connection(db_name)
-    end
+    ActiveRecord::Base.establish_connection(db_name.to_sym)
     ActiveRecord::Base.connection
   rescue
     case db_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 4.0.0.pre
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,20 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -51,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -170,19 +164,18 @@ files:
 - db/migrate/3_add_taggings_counter_cache_to_tags.rb
 - db/migrate/4_add_missing_taggable_index.rb
 - db/migrate/5_change_collation_for_tag_names.rb
-- gemfiles/activerecord_3.2.gemfile
+- db/migrate/6_add_missing_indexes.rb
 - gemfiles/activerecord_4.0.gemfile
 - gemfiles/activerecord_4.1.gemfile
 - gemfiles/activerecord_4.2.gemfile
+- gemfiles/activerecord_5.0.gemfile
 - lib/acts-as-taggable-on.rb
 - lib/acts_as_taggable_on.rb
-- lib/acts_as_taggable_on/compatibility.rb
 - lib/acts_as_taggable_on/default_parser.rb
 - lib/acts_as_taggable_on/engine.rb
 - lib/acts_as_taggable_on/generic_parser.rb
 - lib/acts_as_taggable_on/tag.rb
 - lib/acts_as_taggable_on/tag_list.rb
-- lib/acts_as_taggable_on/tag_list_parser.rb
 - lib/acts_as_taggable_on/taggable.rb
 - lib/acts_as_taggable_on/taggable/cache.rb
 - lib/acts_as_taggable_on/taggable/collection.rb
@@ -203,7 +196,6 @@ files:
 - spec/acts_as_taggable_on/generic_parser_spec.rb
 - spec/acts_as_taggable_on/related_spec.rb
 - spec/acts_as_taggable_on/single_table_inheritance_spec.rb
-- spec/acts_as_taggable_on/tag_list_parser_spec.rb
 - spec/acts_as_taggable_on/tag_list_spec.rb
 - spec/acts_as_taggable_on/tag_spec.rb
 - spec/acts_as_taggable_on/taggable/dirty_spec.rb
@@ -254,15 +246,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Advanced tagging for Rails.
@@ -274,7 +266,6 @@ test_files:
 - spec/acts_as_taggable_on/generic_parser_spec.rb
 - spec/acts_as_taggable_on/related_spec.rb
 - spec/acts_as_taggable_on/single_table_inheritance_spec.rb
-- spec/acts_as_taggable_on/tag_list_parser_spec.rb
 - spec/acts_as_taggable_on/tag_list_spec.rb
 - spec/acts_as_taggable_on/tag_spec.rb
 - spec/acts_as_taggable_on/taggable/dirty_spec.rb

data/lib/acts_as_taggable_on/compatibility.rb

@@ -1,35 +0,0 @@
-module ActsAsTaggableOn::Compatibility
-  def has_many_with_taggable_compatibility(name, options = {}, &extention)
-    if ActsAsTaggableOn::Utils.active_record4?
-      scope, opts = build_taggable_scope_and_options(options)
-      has_many(name, scope, opts, &extention)
-    else
-      has_many(name, options, &extention)
-    end
-  end
-
-  def build_taggable_scope_and_options(opts)
-    scope_opts, opts = parse_taggable_options(opts)
-
-    unless scope_opts.empty?
-      scope = -> {
-        scope_opts.inject(self) { |result, hash| result.send(*hash) }
-      }
-      return [scope, opts]
-    end
-
-    [nil, opts]
-  end
-
-  def parse_taggable_options(opts)
-    scope_opts = {}
-    [:order, :having, :select, :group, :limit, :offset, :readonly].each do |o|
-      scope_opts[o] = opts.delete o if opts[o]
-    end
-    scope_opts[:where] = opts.delete :conditions if opts[:conditions]
-    scope_opts[:joins] = opts.delete :include if opts [:include]
-    scope_opts[:distinct] = opts.delete :uniq if opts[:uniq]
-
-    [scope_opts, opts]
-  end
-end

data/lib/acts_as_taggable_on/tag_list_parser.rb

@@ -1,21 +0,0 @@
-module ActsAsTaggableOn
-  ##
-  # Returns a new TagList using the given tag string.
-  #
-  # Example:
-  #   tag_list = ActsAsTaggableOn::TagListParser.parse("One , Two,  Three")
-  #   tag_list # ["One", "Two", "Three"]
-  module TagListParser
-    class << self
-      ## DEPRECATED
-      def parse(string)
-        ActiveRecord::Base.logger.warn <<WARNING
-ActsAsTaggableOn::TagListParser.parse is deprecated \
-and will be removed from v4.0+, use  \
-ActsAsTaggableOn::TagListParser.new instead
-WARNING
-        DefaultParser.new(string).parse
-      end
-    end
-  end
-end

data/spec/acts_as_taggable_on/tag_list_parser_spec.rb

@@ -1,46 +0,0 @@
-# -*- 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