acts-as-taggable-on 3.4.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 281e3a40ea12a2d4bf7cd9a17548afaa79d38551
-  data.tar.gz: 87e34ac29deab9211aea132e6f2189635d6918d5
+  metadata.gz: 92222646174fc38e87d9972cea2022c78e9ba337
+  data.tar.gz: 62d819d54ea8d538ce67d1f30c4c640e63333328
 SHA512:
-  metadata.gz: 2168df4d62261fb9fbaacff107fb1311f9a9c8567f674b74e784dbd48a0e006825371cfa68de03595907974a1fc842383ca2ea90c2d48e51284a7398f492442a
-  data.tar.gz: 4478cd0771d44535549f4516f9d087b94250e2087c8c75fe559752e1f033c8336167dcaede44b1223360d1e3821da8d515e5fb03398689ea3fb207dd9f15673b
+  metadata.gz: 6a17ce74f9d91e98037faa3348449813632f2f1ba2a4ca92a297beaafa8e544b650c2e12586c03a9aab8c2c6b0b5c1c1de21571d860be49aed971b0d20b8338e
+  data.tar.gz: d50ea8e8200c3eaef6f1d80b53412637604e74de62dd3a2e6385e22d1fbf579bbb372f2bbd9b6c026f3f062e4959a288a5a890360d5f98cde6df222ebc72947f

data/.travis.yml

@@ -1,9 +1,11 @@
+language: ruby
+
 rvm:
-  - 1.9.3
+  - 2.1
+  - 2.2
   - 2.0.0
-  - 2.1.1
+  - 1.9.3
   - rbx-2
-  - ruby-head
 
 env:
   - DB=sqlite3
@@ -14,30 +16,25 @@ gemfile:
   - gemfiles/activerecord_3.2.gemfile
   - gemfiles/activerecord_4.0.gemfile
   - gemfiles/activerecord_4.1.gemfile
-  - gemfiles/activerecord_edge.gemfile
 
-cache: bundler
+sudo: false
+
+bundler_args: '--without local_development --jobs 3 --retry 3'
+
 script: bundle exec rake
-before_install: gem install bundler
-bundler_args: '--without local_development'
+
 matrix:
   fast_finish: true
   allow_failures:
       - gemfile: gemfiles/activerecord_edge.gemfile
       - rvm: rbx-2
-      - rvm: ruby-head
   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: 1.9.3
-        gemfile: gemfiles/activerecord_edge.gemfile
       - rvm: rbx-2
         gemfile: gemfiles/activerecord_3.2.gemfile
-      - rvm: ruby-head
-        gemfile: gemfiles/activerecord_3.2.gemfile
-      - rvm: ruby-head
-        gemfile: gemfiles/activerecord_4.0.gemfile
-      - rvm: ruby-head
-        gemfile: gemfiles/activerecord_4.1.gemfile
+

data/Appraisals

@@ -1,22 +1,16 @@
 appraise "activerecord-3.2" do
-  gem "activerecord", "~> 3.2"
+  gem "activerecord", github: "rails/rails" , branch: '3-2-stable'
 end
 
 appraise "activerecord-4.0" do
-  gem "activerecord", "~> 4.0.0"
+  gem "activerecord", github: "rails/rails" , branch: '4-0-stable'
 end
 
 appraise "activerecord-4.1" do
-  gem "activerecord", "~> 4.1.0"
+  gem "activerecord", github: "rails/rails" , branch: '4-1-stable'
 end
 
 appraise "activerecord-4.2" do
-  gem "railties", ">= 4.2.0.beta1"
-  gem "activerecord", ">= 4.2.0.beta1"
-  gem "rack", ">= 1.6.0.beta"
-end
-
-appraise "activerecord-edge" do
-  gem "activerecord", github: "rails/rails"
-  gem 'arel', github: 'rails/arel'
+  gem "railties", github: "rails/rails" , branch: '4-2-stable'
+  gem "activerecord", github: "rails/rails"  , branch: '4-2-stable'
 end

data/CHANGELOG.md

@@ -4,17 +4,32 @@ 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.
 
-### Master [changes](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.4.0...master)
+### [3.5.0 / 2015-02-11](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.4.4...v3.5.0)
 
-  * Breaking Changes
-  * Features
   * Fixes
-  * Performance
-  * Misc
+   * [@rikettsie Fixed collation for MySql via rake rule or config parameter](https://github.com/mbleigh/acts-as-taggable-on/pull/634)
+
+### [3.4.4 / 2015-02-11](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.4.3...v3.4.4)
+
+  * Fixes
+   * [@d4rky-pl Add context constraint to find_related_* methods](https://github.com/mbleigh/acts-as-taggable-on/pull/629)
+
+
+### [3.4.3 / 2014-09-26](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.4.2...v3.4.3)
+
+  * Fixes
+   * [@warp  clears column cache on reset_column_information resolves](https://github.com/mbleigh/acts-as-taggable-on/pull/621)
+
+### [3.4.2 / 2014-09-26](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.4.1...v3.4.2)
+
+  * Fixes
+   	* [@stiff    fixed tagged_with :any in postgresql](https://github.com/mbleigh/acts-as-taggable-on/pull/570)
+   	* [@jerefrer fixed encoding in mysql](https://github.com/mbleigh/acts-as-taggable-on/pull/588)
+   	* [@markedmondson 	Ensure taggings context aliases are maintained when joining multiple taggables](https://github.com/mbleigh/acts-as-taggable-on/pull/589)
 
 ### [3.4.1 / 2014-09-01](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.4.0...v3.4.1)
   * Fixes
-    * [@konukhov fix owned ordered taggable bug]((https://github.com/mbleigh/acts-as-taggable-on/pull/585)
+    * [@konukhov fix owned ordered taggable bug](https://github.com/mbleigh/acts-as-taggable-on/pull/585)
 
 ### [3.4.0 / 2014-08-29](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.3.0...v3.4.0)
 

data/Gemfile

@@ -7,4 +7,5 @@ group :local_development do
   gem 'guard-rspec'
   gem 'appraisal'
   gem 'rake'
-end
+  gem 'byebug' , platform: :mri_21
+end

data/README.md

@@ -1,4 +1,5 @@
 # ActsAsTaggableOn
+[![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)
 [![Inline docs](http://inch-ci.org/github/mbleigh/acts-as-taggable-on.png)](http://inch-ci.org/github/mbleigh/acts-as-taggable-on)
@@ -24,14 +25,14 @@ Versions 2.4.1 and up are compatible with Rails 4 too (thanks to arabonradar and
 
 Versions >= 3.x are compatible with Ruby 1.9.3+ and Rails 3 and 4.
 
-For an up-to-date roadmap, see https://github.com/mbleigh/acts-as-taggable-on/issues/milestones
+For an up-to-date roadmap, see https://github.com/mbleigh/acts-as-taggable-on/milestones
 
 ## Installation
 
 To use it, add it to your Gemfile:
 
 ```ruby
-gem 'acts-as-taggable-on'
+gem 'acts-as-taggable-on', '~> 3.4'
 ```
 
 and bundle:
@@ -56,6 +57,22 @@ Review the generated migrations then migrate :
 rake db:migrate
 ```
 
+#### For MySql users
+You can circumvent at any time the problem of special characters [issue 623](https://github.com/mbleigh/acts-as-taggable-on/issues/623) by setting in an initializer file:
+
+```ruby
+ActsAsTaggableOn.force_binary_collation = true
+```
+
+Or by running this rake task:
+
+```shell
+rake acts_as_taggable_on_engine:tag_names:collate_bin
+```
+
+See the Configuration section for more details, and a general note valid for older
+version of the gem.
+
 #### Upgrading
 
 see [UPGRADING](UPGRADING.md)
@@ -72,7 +89,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
 
@@ -179,7 +196,7 @@ ActsAsTaggableOn::Tag.most_used
 ActsAsTaggableOn::Tag.least_used
 ```
 
-You can also filter the results by passing the method a limit, however the default limit is 50.
+You can also filter the results by passing the method a limit, however the default limit is 20.
 
 ```ruby
 ActsAsTaggableOn::Tag.most_used(10)
@@ -261,7 +278,7 @@ If you want to change how tags are parsed, you can define a your own implementat
 ```ruby
 class MyParser < ActsAsTaggableOn::GenericParser
   def parse
-    TagList.new.tap do |tag_list|
+    ActsAsTaggableOn::TagList.new.tap do |tag_list|
       tag_list.add @tag_list.split('|')
     end
   end
@@ -406,13 +423,28 @@ If you would like tags to be case-sensitive and not use LIKE queries for creatio
 ActsAsTaggableOn.strict_case_match = true
 ```
 
+If you would like to have an exact match covering special characters with MySql:
+
+```ruby
+ActsAsTaggableOn.force_binary_collation = true
+```
+
 If you want to change the default delimiter (it defaults to ','). You can also pass in an array of delimiters such as ([',', '|']):
 
 ```ruby
 ActsAsTaggableOn.delimiter = ','
 ```
 
-*NOTE: SQLite by default can't upcase or downcase multibyte characters, resulting in unwanted behavior. Load the SQLite ICU extension for proper handle of such characters. [See docs](http://www.sqlite.org/src/artifact?ci=trunk&filename=ext/icu/README.txt)*
+*NOTE 1: SQLite by default can't upcase or downcase multibyte characters, resulting in unwanted behavior. Load the SQLite ICU extension for proper handle of such characters. [See docs](http://www.sqlite.org/src/artifact?ci=trunk&filename=ext/icu/README.txt)*
+
+*NOTE 2: the option `force_binary_collation` is strongest than `strict_case_match` and when
+set to true, the `strict_case_match` is ignored.
+To roughly apply the `force_binary_collation` behaviour with a version of the gem <= 3.4.4, execute the following commands in the MySql console:*
+
+```shell
+USE my_wonderful_app_db;
+ALTER TABLE tags MODIFY name VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin;
+```
 
 ## Contributors
 

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'bundler/setup'
 
+import "./lib/tasks/tags_collate_utf8.rake"
+
 desc 'Default: run specs'
 task default: :spec
 

data/UPGRADING.md

@@ -4,10 +4,5 @@ Re-run the migrations generator
 
     rake acts_as_taggable_on_engine:install:migrations
 
-It will create any new migrations and skip existing ones
-
-
-##Breaking changes:
-
-  - ActsAsTaggableOn::Tag is not extend with ActsAsTaggableOn::Utils anymore.
-    Please use ActsAsTaggableOn::Utils instead
+This will create any new migrations and skip existing ones
+Version 3.5.0 has a migration for mysql adapter

data/db/migrate/5_change_collation_for_tag_names.rb

@@ -0,0 +1,9 @@
+# This migration is added to circumvent issue #623 and have special characters
+# work properly
+class ChangeCollationForTagNames < ActiveRecord::Migration
+  def up
+    if ActsAsTaggableOn::Utils.using_mysql?
+      execute("ALTER TABLE tags MODIFY name varchar(255) CHARACTER SET utf8 COLLATE utf8_bin;")
+    end
+  end
+end

data/gemfiles/activerecord_3.2.gemfile

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

data/gemfiles/activerecord_4.0.gemfile

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

data/gemfiles/activerecord_4.1.gemfile

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

data/gemfiles/activerecord_4.2.gemfile

@@ -2,15 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "railties", ">= 4.2.0.beta1"
-gem "activerecord", ">= 4.2.0.beta1"
-gem "rack", ">= 1.6.0.beta"
+gem "railties", :github => "rails/rails", :branch => "4-2-stable"
+gem "activerecord", :github => "rails/rails", :branch => "4-2-stable"
 
 group :local_development do
   gem "guard"
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
+  gem "byebug", :platform => :mri_21
 end
 
 gemspec :path => "../"

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

@@ -58,7 +58,8 @@ module ActsAsTaggableOn
 
   class Configuration
     attr_accessor :delimiter, :force_lowercase, :force_parameterize,
-                  :strict_case_match, :remove_unused_tags, :default_parser
+                  :strict_case_match, :remove_unused_tags, :default_parser,
+                  :tags_counter
 
     def initialize
       @delimiter = ','
@@ -66,7 +67,15 @@ module ActsAsTaggableOn
       @force_parameterize = false
       @strict_case_match = false
       @remove_unused_tags = false
+      @tags_counter = true
       @default_parser = DefaultParser
+      @force_binary_collation = false
+    end
+
+    def strict_case_match=(force_cs)
+      if @force_binary_collation == false
+        @strict_case_match = force_cs
+      end
     end
 
     def delimiter=(string)
@@ -77,6 +86,30 @@ a ActsAsTaggableOn.default_parser instead
 WARNING
       @delimiter = string
     end
+
+    def force_binary_collation=(force_bin)
+      if Utils.using_mysql?
+        if force_bin == true
+          Configuration.apply_binary_collation(true)
+          @force_binary_collation = true
+          @strict_case_match = true
+        else
+          Configuration.apply_binary_collation(false)
+          @force_binary_collation = false
+        end
+      end
+    end
+
+    def self.apply_binary_collation(bincoll)
+      if Utils.using_mysql?
+        coll = 'utf8_general_ci'
+        if bincoll == true
+          coll = 'utf8_bin'
+        end
+        ActiveRecord::Migration.execute("ALTER TABLE tags MODIFY name varchar(255) CHARACTER SET utf8 COLLATE #{coll};")
+      end
+    end
+
   end
 
   setup

data/lib/acts_as_taggable_on/tag.rb

@@ -6,7 +6,7 @@ module ActsAsTaggableOn
 
     ### ASSOCIATIONS:
 
-    has_many :taggings, dependent: :destroy, class_name: 'ActsAsTaggableOn::Tagging'
+    has_many :taggings, dependent: :destroy, class_name: '::ActsAsTaggableOn::Tagging'
 
     ### VALIDATIONS:
 
@@ -32,17 +32,10 @@ module ActsAsTaggableOn
     end
 
     def self.named_any(list)
-      if ActsAsTaggableOn.strict_case_match
-        clause = list.map { |tag|
-          sanitize_sql(["name = #{binary}?", as_8bit_ascii(tag)])
-        }.join(' OR ')
-        where(clause)
-      else
-        clause = list.map { |tag|
-          sanitize_sql(['LOWER(name) = LOWER(?)', as_8bit_ascii(unicode_downcase(tag))])
-        }.join(' OR ')
-        where(clause)
-      end
+      clause = list.map { |tag|
+        sanitize_sql_for_named_any(tag).force_encoding('BINARY')
+      }.join(' OR ')
+      where(clause)
     end
 
     def self.named_like(name)
@@ -135,6 +128,14 @@ module ActsAsTaggableOn
           string.to_s.mb_chars
         end
       end
+
+      def sanitize_sql_for_named_any(tag)
+        if ActsAsTaggableOn.strict_case_match
+          sanitize_sql(["name = #{binary}?", as_8bit_ascii(tag)])
+        else
+          sanitize_sql(['LOWER(name) = LOWER(?)', as_8bit_ascii(unicode_downcase(tag))])
+        end
+      end
     end
   end
 end

data/lib/acts_as_taggable_on/taggable/cache.rb

@@ -40,6 +40,10 @@ module ActsAsTaggableOn::Taggable
           end
         end
 
+        def reset_column_information
+          super
+          @acts_as_taggable_on_cache_columns = nil
+        end
       end
     end
 

data/lib/acts_as_taggable_on/taggable/collection.rb

@@ -169,7 +169,7 @@ module ActsAsTaggableOn::Taggable
     end
 
     module CalculationMethods
-      def count(column_name=:all)
+      def count(column_name=:all, options = {})
         # https://github.com/rails/rails/commit/da9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2
         super
       end

data/lib/acts_as_taggable_on/taggable/core.rb

@@ -27,7 +27,7 @@ module ActsAsTaggableOn::Taggable
                                                  dependent: :destroy,
                                                  class_name: 'ActsAsTaggableOn::Tagging',
                                                  order: taggings_order,
-                                                 conditions: ["#{ActsAsTaggableOn::Tagging.table_name}.context = (?)", tags_type],
+                                                 conditions: {context: tags_type},
                                                  include: :tag
 
             has_many_with_taggable_compatibility context_tags, through: context_taggings,
@@ -100,6 +100,7 @@ module ActsAsTaggableOn::Taggable
         context = options.delete(:on)
         owned_by = options.delete(:owned_by)
         alias_base_name = undecorated_table_name.gsub('.', '_')
+        # FIXME use ActiveRecord's connection quote_column_name
         quote = ActsAsTaggableOn::Utils.using_postgresql? ? '"' : ''
 
         if options.delete(:exclude)
@@ -117,7 +118,7 @@ module ActsAsTaggableOn::Taggable
                       " AND #{ActsAsTaggableOn::Tagging.table_name}.taggable_type = #{quote_value(base_class.name, nil)}" +
                       " AND #{ActsAsTaggableOn::Tagging.table_name}.tagger_id = #{quote_value(owned_by.id, nil)}" +
                       " AND #{ActsAsTaggableOn::Tagging.table_name}.tagger_type = #{quote_value(owned_by.class.base_class.to_s, nil)}"
-            
+
             joins << " AND " + sanitize_sql(["#{ActsAsTaggableOn::Tagging.table_name}.created_at >= ?", options.delete(:start_at)]) if options[:start_at]
             joins << " AND " + sanitize_sql(["#{ActsAsTaggableOn::Tagging.table_name}.created_at <= ?", options.delete(:end_at)])   if options[:end_at]
           end
@@ -130,7 +131,7 @@ module ActsAsTaggableOn::Taggable
                    ActsAsTaggableOn::Tag.named_any(tag_list)
                  end
 
-          return empty_result unless tags.length > 0
+          return empty_result if tags.length == 0
 
           # setup taggings alias so we can chain, ex: items_locations_taggings_awesome_cool_123
           # avoid ambiguous column name
@@ -140,21 +141,22 @@ module ActsAsTaggableOn::Taggable
               "#{alias_base_name[0..4]}#{taggings_context[0..6]}_taggings_#{ActsAsTaggableOn::Utils.sha_prefix(tags.map(&:name).join('_'))}"
           )
 
-          tagging_join = "JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
-                          "  ON #{taggings_alias}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" +
+          tagging_cond = "#{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
+                          " WHERE #{taggings_alias}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" +
                           " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name, nil)}"
 
-          tagging_join << " AND " + sanitize_sql(["#{taggings_alias}.created_at >= ?", options.delete(:start_at)]) if options[:start_at]
-          tagging_join << " AND " + sanitize_sql(["#{taggings_alias}.created_at <= ?", options.delete(:end_at)])   if options[:end_at]
+          tagging_cond << " AND " + sanitize_sql(["#{taggings_alias}.created_at >= ?", options.delete(:start_at)]) if options[:start_at]
+          tagging_cond << " AND " + sanitize_sql(["#{taggings_alias}.created_at <= ?", options.delete(:end_at)])   if options[:end_at]
 
-          tagging_join << " AND " + sanitize_sql(["#{taggings_alias}.context = ?", context.to_s]) if context
+          tagging_cond << " AND " + sanitize_sql(["#{taggings_alias}.context = ?", context.to_s]) if context
 
           # don't need to sanitize sql, map all ids and join with OR logic
-          conditions << tags.map { |t| "#{taggings_alias}.tag_id = #{quote_value(t.id, nil)}" }.join(' OR ')
+          tag_ids = tags.map { |t| quote_value(t.id, nil) }.join(', ')
+          tagging_cond << " AND #{taggings_alias}.tag_id in (#{tag_ids})"
           select_clause << " #{table_name}.*" unless context and tag_types.one?
 
           if owned_by
-            tagging_join << ' AND ' +
+            tagging_cond << ' AND ' +
                 sanitize_sql([
                                  "#{taggings_alias}.tagger_id = ? AND #{taggings_alias}.tagger_type = ?",
                                  owned_by.id,
@@ -162,10 +164,9 @@ module ActsAsTaggableOn::Taggable
                              ])
           end
 
-          joins << tagging_join
-          unless any == 'distinct' # Fix issue #544
-            group = "#{table_name}.#{primary_key}"
-            select_clause << group
+          conditions << "EXISTS (SELECT 1 FROM #{tagging_cond})"
+          if options.delete(:order_by_matching_tag_count)
+            order_by << "(SELECT count(*) FROM #{tagging_cond}) desc"
           end
         else
           tags = ActsAsTaggableOn::Tag.named_any(tag_list)
@@ -224,11 +225,11 @@ module ActsAsTaggableOn::Taggable
         query = self
         query = self.select(select_clause.join(',')) unless select_clause.empty?
         query.joins(joins.join(' '))
-        .where(conditions.join(' AND '))
-        .group(group)
-        .having(having)
-        .order(order_by.join(', '))
-        .readonly(false)
+          .where(conditions.join(' AND '))
+          .group(group)
+          .having(having)
+          .order(order_by.join(', '))
+          .readonly(false)
       end
 
       def is_taggable?

data/lib/acts_as_taggable_on/taggable/related.rb

@@ -43,7 +43,7 @@ module ActsAsTaggableOn::Taggable
     def related_tags_for(context, klass, options = {})
       tags_to_ignore = Array.wrap(options[:ignore]).map(&:to_s) || []
       tags_to_find = tags_on(context).map { |t| t.name }.reject { |t| tags_to_ignore.include? t }
-      related_where(klass, ["#{exclude_self(klass, id)} #{klass.table_name}.#{klass.primary_key} = #{ActsAsTaggableOn::Tagging.table_name}.taggable_id AND #{ActsAsTaggableOn::Tagging.table_name}.taggable_type = '#{klass.base_class}' AND #{ActsAsTaggableOn::Tagging.table_name}.tag_id = #{ActsAsTaggableOn::Tag.table_name}.#{ActsAsTaggableOn::Tag.primary_key} AND #{ActsAsTaggableOn::Tag.table_name}.name IN (?)", tags_to_find])
+      related_where(klass, ["#{exclude_self(klass, id)} #{klass.table_name}.#{klass.primary_key} = #{ActsAsTaggableOn::Tagging.table_name}.taggable_id AND #{ActsAsTaggableOn::Tagging.table_name}.taggable_type = '#{klass.base_class}' AND #{ActsAsTaggableOn::Tagging.table_name}.tag_id = #{ActsAsTaggableOn::Tag.table_name}.#{ActsAsTaggableOn::Tag.primary_key} AND #{ActsAsTaggableOn::Tag.table_name}.name IN (?) AND #{ActsAsTaggableOn::Tagging.table_name}.context = ?", tags_to_find, context])
     end
 
     private

data/lib/acts_as_taggable_on/taggable.rb

@@ -80,8 +80,8 @@ module ActsAsTaggableOn
         self.preserve_tag_order = preserve_tag_order
 
         class_eval do
-          has_many :taggings, as: :taggable, dependent: :destroy, class_name: 'ActsAsTaggableOn::Tagging'
-          has_many :base_tags, through: :taggings, source: :tag, class_name: 'ActsAsTaggableOn::Tag'
+          has_many :taggings, as: :taggable, dependent: :destroy, class_name: '::ActsAsTaggableOn::Tagging'
+          has_many :base_tags, through: :taggings, source: :tag, class_name: '::ActsAsTaggableOn::Tag'
 
           def self.taggable?
             true

data/lib/acts_as_taggable_on/tagger.rb

@@ -19,13 +19,13 @@ module ActsAsTaggableOn
                                                opts.merge(
                                                    as: :tagger,
                                                    dependent: :destroy,
-                                                   class_name: 'ActsAsTaggableOn::Tagging'
+                                                   class_name: '::ActsAsTaggableOn::Tagging'
                                                )
 
           has_many_with_taggable_compatibility :owned_tags,
                                                through: :owned_taggings,
                                                source: :tag,
-                                               class_name: 'ActsAsTaggableOn::Tag',
+                                               class_name: '::ActsAsTaggableOn::Tag',
                                                uniq: true
         end
 

data/lib/acts_as_taggable_on/tagging.rb

@@ -11,7 +11,7 @@ module ActsAsTaggableOn
                     :tagger_type,
                     :tagger_id if defined?(ActiveModel::MassAssignmentSecurity)
 
-    belongs_to :tag, class_name: 'ActsAsTaggableOn::Tag' , counter_cache: true
+    belongs_to :tag, class_name: '::ActsAsTaggableOn::Tag', counter_cache: ActsAsTaggableOn.tags_counter
     belongs_to :taggable, polymorphic: true
     belongs_to :tagger,   polymorphic: true
 
@@ -32,7 +32,11 @@ module ActsAsTaggableOn
 
     def remove_unused_tags
       if ActsAsTaggableOn.remove_unused_tags
-        tag.destroy if tag.reload.taggings_count.zero?
+        if ActsAsTaggableOn.tags_counter
+          tag.destroy if tag.reload.taggings_count.zero?
+        else
+          tag.destroy if tag.reload.taggings.count.zero?
+        end
       end
     end
   end

data/lib/acts_as_taggable_on/utils.rb

@@ -18,7 +18,7 @@ module ActsAsTaggableOn
       end
 
       def sha_prefix(string)
-        Digest::SHA1.hexdigest("#{string}#{rand}")[0..6]
+        Digest::SHA1.hexdigest(string)[0..6]
       end
 
       def active_record4?

data/lib/acts_as_taggable_on/version.rb

@@ -1,4 +1,4 @@
 module ActsAsTaggableOn
-  VERSION = '3.4.1'
+  VERSION = '3.5.0'
 end
 

data/lib/tasks/tags_collate_utf8.rake

@@ -0,0 +1,21 @@
+# These rake tasks are to be run by MySql users only, they fix the management of
+# binary-encoded strings for tag 'names'. Issues:
+# https://github.com/mbleigh/acts-as-taggable-on/issues/623
+
+namespace :acts_as_taggable_on_engine do
+
+  namespace :tag_names do
+
+    desc "Forcing collate of tag names to utf8_bin"
+    task :collate_bin => [:environment] do |t, args|
+      ActsAsTaggableOn::Configuration.apply_binary_collation(true)
+    end
+
+    desc "Forcing collate of tag names to utf8_general_ci"
+    task :collate_ci => [:environment] do |t, args|
+      ActsAsTaggableOn::Configuration.apply_binary_collation(false)
+    end
+
+  end
+
+end

data/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -133,6 +133,22 @@ describe 'Acts As Taggable On' do
       expect(taggable1.find_matching_contexts_for(TaggableModel, :offerings, :needs)).to_not include(taggable1)
     end
 
+    it 'should ensure joins to multiple taggings maintain their contexts when aliasing' do
+      taggable1 = TaggableModel.create!(name: 'Taggable 1')
+
+      taggable1.offering_list = 'one'
+      taggable1.need_list = 'two'
+
+      taggable1.save
+
+      column = TaggableModel.connection.quote_column_name("context")
+      offer_alias = TaggableModel.connection.quote_table_name("taggings")
+      need_alias = TaggableModel.connection.quote_table_name("need_taggings_taggable_models_join")
+
+      expect(TaggableModel.joins(:offerings, :needs).to_sql).to include "#{offer_alias}.#{column}"
+      expect(TaggableModel.joins(:offerings, :needs).to_sql).to include "#{need_alias}.#{column}"
+    end
+
   end
 
   describe 'Tagging Contexts' do

data/spec/acts_as_taggable_on/caching_spec.rb

@@ -69,6 +69,12 @@ describe 'Acts As Taggable On' do
       @taggable.save!
       expect(@taggable.tag_list.sort).to eq(%w(awesome epic).sort)
     end
+
+    it 'should clear the cache on reset_column_information' do
+      CachedModel.column_names
+      CachedModel.reset_column_information
+      expect(CachedModel.instance_variable_get(:@acts_as_taggable_on_cache_columns)).to eql(nil)
+    end
   end
 
   describe 'CachingWithArray' do

data/spec/acts_as_taggable_on/related_spec.rb

@@ -42,6 +42,15 @@ describe 'Acts As Taggable On' do
       expect(taggable1.find_related_tags_for(OtherTaggableModel)).to_not include(taggable2)
     end
 
+    it 'should find other related objects based on tags only from particular context' do
+      taggable1 = TaggableModel.create!(name: 'Taggable 1',tag_list: 'one, two')
+      taggable2 = TaggableModel.create!(name: 'Taggable 2',tag_list: 'three, four', skill_list: 'one, two')
+      taggable3 = TaggableModel.create!(name: 'Taggable 3',tag_list: 'one, four')
+
+      expect(taggable1.find_related_tags).to include(taggable3)
+      expect(taggable1.find_related_tags).to_not include(taggable2)
+    end
+
 
     shared_examples "a collection" do
       it do

data/spec/acts_as_taggable_on/tag_spec.rb

@@ -2,6 +2,7 @@
 require 'spec_helper'
 require 'db/migrate/2_add_missing_unique_indices.rb'
 
+
 shared_examples_for 'without unique index' do
   prepend_before(:all) { AddMissingUniqueIndices.down }
   append_after(:all) do
@@ -46,6 +47,14 @@ describe ActsAsTaggableOn::Tag do
     end
   end
 
+  describe 'named any' do
+    context 'with some special characters combinations', if: using_mysql? do
+      it 'should not raise an invalid encoding exception' do
+        expect{ActsAsTaggableOn::Tag.named_any(["holä", "hol'ä"])}.not_to raise_error
+      end
+    end
+  end
+
   describe 'find or create by name' do
     before(:each) do
       @tag.name = 'awesome'
@@ -250,13 +259,19 @@ describe ActsAsTaggableOn::Tag do
       end
     end
 
-    it 'should not change enconding' do
+    it 'should not change encoding' do
       name = "\u3042"
       original_encoding = name.encoding
       record = ActsAsTaggableOn::Tag.find_or_create_with_like_by_name(name)
       record.reload
       expect(record.name.encoding).to eq(original_encoding)
     end
+
+    context 'named any with some special characters combinations', if: using_mysql? do
+      it 'should not raise an invalid encoding exception' do
+        expect{ActsAsTaggableOn::Tag.named_any(["holä", "hol'ä"])}.not_to raise_error
+      end
+    end
   end
 
   describe 'name uniqeness validation' do
@@ -295,7 +310,7 @@ describe ActsAsTaggableOn::Tag do
         tag.save!
       end
     end
-    
+
     it 'should find the most popular tags' do
       expect(ActsAsTaggableOn::Tag.most_used(3).first.name).to eq("golden_syrup")
       expect(ActsAsTaggableOn::Tag.most_used(3).length).to eq(3)
@@ -306,4 +321,5 @@ describe ActsAsTaggableOn::Tag do
       expect(ActsAsTaggableOn::Tag.least_used(3).length).to eq(3)
     end
   end
+
 end

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -261,7 +261,7 @@ describe 'Taggable' do
     @taggable.tag_list = 'bob, charlie'
     @taggable.save
 
-    expect(TaggableModel.group(:created_at).tagged_with(['bob', 'css'], :any => true).first).to eq(@taggable)
+    expect(TaggableModel.tagged_with(['bob', 'css'], :any => true).to_a).to eq([@taggable])
 
     bob = TaggableModel.create(:name => 'Bob', :tag_list => 'ruby, rails, css')
     frank = TaggableModel.create(:name => 'Frank', :tag_list => 'ruby, rails')
@@ -459,6 +459,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])
     end
   end
 

data/spec/acts_as_taggable_on/utils_spec.rb

@@ -13,4 +13,11 @@ describe ActsAsTaggableOn::Utils do
       expect(ActsAsTaggableOn::Utils.like_operator).to eq('LIKE')
     end
   end
+
+  describe '#sha_prefix' do
+    it 'should return a consistent prefix for a given word' do
+      expect(ActsAsTaggableOn::Utils.sha_prefix('kittens')).to eq(ActsAsTaggableOn::Utils.sha_prefix('kittens'))
+      expect(ActsAsTaggableOn::Utils.sha_prefix('puppies')).not_to eq(ActsAsTaggableOn::Utils.sha_prefix('kittens'))
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,7 @@
+begin
+  require 'byebug'
+rescue LoadError
+end
 $LOAD_PATH << '.' unless $LOAD_PATH.include?('.')
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require 'logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -169,11 +169,11 @@ files:
 - db/migrate/2_add_missing_unique_indices.rb
 - 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
 - gemfiles/activerecord_4.0.gemfile
 - gemfiles/activerecord_4.1.gemfile
 - gemfiles/activerecord_4.2.gemfile
-- gemfiles/activerecord_edge.gemfile
 - lib/acts-as-taggable-on.rb
 - lib/acts_as_taggable_on.rb
 - lib/acts_as_taggable_on/compatibility.rb
@@ -195,6 +195,7 @@ files:
 - lib/acts_as_taggable_on/tags_helper.rb
 - lib/acts_as_taggable_on/utils.rb
 - lib/acts_as_taggable_on/version.rb
+- lib/tasks/tags_collate_utf8.rake
 - spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb
 - spec/acts_as_taggable_on/acts_as_tagger_spec.rb
 - spec/acts_as_taggable_on/caching_spec.rb
@@ -244,13 +245,8 @@ post_install_message: |-
 
       rake acts_as_taggable_on_engine:install:migrations
 
-  It will create any new migrations and skip existing ones
-
-
-  ##Breaking changes:
-
-    - ActsAsTaggableOn::Tag is not extend with ActsAsTaggableOn::Utils anymore.
-      Please use ActsAsTaggableOn::Utils instead
+  This will create any new migrations and skip existing ones
+  Version 3.5.0 has a migration for mysql adapter
 rdoc_options: []
 require_paths:
 - lib
@@ -266,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Advanced tagging for Rails.
@@ -309,4 +305,3 @@ test_files:
 - spec/support/array.rb
 - spec/support/database.rb
 - spec/support/database_cleaner.rb
-has_rdoc: 

data/gemfiles/activerecord_edge.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", :github => "rails/rails"
-gem "arel", :github => "rails/arel"
-
-group :local_development do
-  gem "guard"
-  gem "guard-rspec"
-  gem "appraisal"
-  gem "rake"
-end
-
-gemspec :path => "../"