acts-as-taggable-on 3.2.1 → 4.0.0

data/gemfiles/activerecord_4.0.gemfile

@@ -2,14 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.0"
-gem "actionpack", "~> 4.0"
+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", :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", "~> 4.1"
-gem "actionpack", "~> 4.1"
+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", :platforms => [:mri_21, :mri_22, :mri_23]
 end
 
 gemspec :path => "../"

data/gemfiles/{activerecord_3.2.gemfile → activerecord_4.2.gemfile}

@@ -2,14 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 3.2"
-gem "actionpack", "~> 3.2"
+gem "activerecord", "~> 4.2.0"
 
 group :local_development do
   gem "guard"
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
+  gem "byebug", :platforms => [:mri_21, :mri_22, :mri_23]
 end
 
 gemspec :path => "../"

data/gemfiles/{activerecord_edge.gemfile → activerecord_5.0.gemfile}

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

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

@@ -1,11 +1,42 @@
 require 'active_record'
 require 'active_record/version'
 require 'active_support/core_ext/module'
-require 'action_view'
+
+begin
+  require 'rails/engine'
+  require 'acts_as_taggable_on/engine'
+  rescue LoadError
+
+end
 
 require 'digest/sha1'
 
 module ActsAsTaggableOn
+  extend ActiveSupport::Autoload
+
+  autoload :Tag
+  autoload :TagList
+  autoload :GenericParser
+  autoload :DefaultParser
+  autoload :Taggable
+  autoload :Tagger
+  autoload :Tagging
+  autoload :TagsHelper
+  autoload :VERSION
+
+  autoload_under 'taggable' do
+    autoload :Cache
+    autoload :Collection
+    autoload :Core
+    autoload :Dirty
+    autoload :Ownership
+    autoload :Related
+  end
+
+  autoload :Utils
+  autoload :Compatibility
+
+
   class DuplicateTagError < StandardError
   end
 
@@ -16,7 +47,7 @@ module ActsAsTaggableOn
 
   def self.method_missing(method_name, *args, &block)
     @configuration.respond_to?(method_name) ?
-      @configuration.send(method_name, *args, &block) : super
+        @configuration.send(method_name, *args, &block) : super
   end
 
   def self.respond_to?(method_name, include_private=false)
@@ -30,8 +61,10 @@ module ActsAsTaggableOn
   end
 
   class Configuration
-    attr_accessor :delimiter, :force_lowercase, :force_parameterize,
-      :strict_case_match, :remove_unused_tags
+    attr_accessor :force_lowercase, :force_parameterize,
+                  :remove_unused_tags, :default_parser,
+                  :tags_counter
+    attr_reader :delimiter, :strict_case_match
 
     def initialize
       @delimiter = ','
@@ -39,32 +72,55 @@ module ActsAsTaggableOn
       @force_parameterize = false
       @strict_case_match = false
       @remove_unused_tags = false
+      @tags_counter = true
+      @default_parser = DefaultParser
+      @force_binary_collation = false
     end
-  end
 
-  setup
-end
+    def strict_case_match=(force_cs)
+      @strict_case_match = force_cs unless @force_binary_collation
+    end
+
+    def delimiter=(string)
+      ActiveRecord::Base.logger.warn <<WARNING
+ActsAsTaggableOn.delimiter is deprecated \
+and will be removed from v4.0+, use  \
+a ActsAsTaggableOn.default_parser instead
+WARNING
+      @delimiter = string
+    end
+
+    def force_binary_collation=(force_bin)
+      if Utils.using_mysql?
+        if force_bin
+          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
 
-require 'acts_as_taggable_on/utils'
+    def self.apply_binary_collation(bincoll)
+      if Utils.using_mysql?
+        coll = 'utf8_general_ci'
+        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
+      end
+    end
 
-require 'acts_as_taggable_on/taggable'
-require 'acts_as_taggable_on/acts_as_taggable_on/compatibility'
-require 'acts_as_taggable_on/acts_as_taggable_on/core'
-require 'acts_as_taggable_on/acts_as_taggable_on/collection'
-require 'acts_as_taggable_on/acts_as_taggable_on/cache'
-require 'acts_as_taggable_on/acts_as_taggable_on/ownership'
-require 'acts_as_taggable_on/acts_as_taggable_on/related'
-require 'acts_as_taggable_on/acts_as_taggable_on/dirty'
+  end
 
-require 'acts_as_taggable_on/tagger'
-require 'acts_as_taggable_on/tag'
-require 'acts_as_taggable_on/tag_list'
-require 'acts_as_taggable_on/tags_helper'
-require 'acts_as_taggable_on/tagging'
-require 'acts_as_taggable_on/engine'
+  setup
+end
 
 ActiveSupport.on_load(:active_record) do
-  extend ActsAsTaggableOn::Compatibility
   extend ActsAsTaggableOn::Taggable
   include ActsAsTaggableOn::Tagger
 end

data/lib/acts_as_taggable_on/default_parser.rb

@@ -0,0 +1,79 @@
+module ActsAsTaggableOn
+  ##
+  # Returns a new TagList using the given tag string.
+  #
+  # Example:
+  #   tag_list = ActsAsTaggableOn::DefaultParser.parse("One , Two,  Three")
+  #   tag_list # ["One", "Two", "Three"]
+  class DefaultParser < GenericParser
+
+    def parse
+      string = @tag_list
+
+      string = string.join(ActsAsTaggableOn.glue) if string.respond_to?(:join)
+      TagList.new.tap do |tag_list|
+        string = string.to_s.dup
+
+        string.gsub!(double_quote_pattern) {
+          # Append the matched tag to the tag list
+          tag_list << Regexp.last_match[2]
+          # Return the matched delimiter ($3) to replace the matched items
+          ''
+        }
+
+        string.gsub!(single_quote_pattern) {
+          # Append the matched tag ($2) to the tag list
+          tag_list << Regexp.last_match[2]
+          # Return an empty string to replace the matched items
+          ''
+        }
+
+        # split the string by the delimiter
+        # and add to the tag_list
+        tag_list.add(string.split(Regexp.new delimiter))
+      end
+    end
+
+
+    # private
+    def delimiter
+      # Parse the quoted tags
+      d = ActsAsTaggableOn.delimiter
+      # Separate multiple delimiters by bitwise operator
+      d = d.join('|') if d.kind_of?(Array)
+      d
+    end
+
+    # (             # Tag start delimiter ($1)
+    # \A       |  # Either string start or
+    # #{delimiter}        # a delimiter
+    # )
+    # \s*"          # quote (") optionally preceded by whitespace
+    # (.*?)         # Tag ($2)
+    # "\s*          # quote (") optionally followed by whitespace
+    # (?=           # Tag end delimiter (not consumed; is zero-length lookahead)
+    # #{delimiter}\s*  |  # Either a delimiter optionally followed by whitespace or
+    # \z          # string end
+    # )
+    def double_quote_pattern
+      /(\A|#{delimiter})\s*"(.*?)"\s*(?=#{delimiter}\s*|\z)/
+    end
+
+    # (             # Tag start delimiter ($1)
+    # \A       |  # Either string start or
+    # #{delimiter}        # a delimiter
+    # )
+    # \s*'          # quote (') optionally preceded by whitespace
+    # (.*?)         # Tag ($2)
+    # '\s*          # quote (') optionally followed by whitespace
+    # (?=           # Tag end delimiter (not consumed; is zero-length lookahead)
+    # #{delimiter}\s*  | d # Either a delimiter optionally followed by whitespace or
+    # \z          # string end
+    # )
+    def single_quote_pattern
+      /(\A|#{delimiter})\s*'(.*?)'\s*(?=#{delimiter}\s*|\z)/
+    end
+
+  end
+
+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/generic_parser.rb

@@ -0,0 +1,19 @@
+module ActsAsTaggableOn
+  ##
+  # Returns a new TagList using the given tag string.
+  #
+  # Example:
+  # tag_list = ActsAsTaggableOn::GenericParser.new.parse("One , Two, Three")
+  # tag_list # ["One", "Two", "Three"]
+  class GenericParser
+    def initialize(tag_list)
+      @tag_list = tag_list
+    end
+
+    def parse
+      TagList.new.tap do |tag_list|
+        tag_list.add @tag_list.split(',').map(&:strip).reject(&:empty?)
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on/tag.rb

@@ -1,12 +1,10 @@
-# coding: utf-8
+# encoding: utf-8
 module ActsAsTaggableOn
   class Tag < ::ActiveRecord::Base
 
-    attr_accessible :name if defined?(ActiveModel::MassAssignmentSecurity)
-
     ### ASSOCIATIONS:
 
-    has_many :taggings, dependent: :destroy, class_name: 'ActsAsTaggableOn::Tagging'
+    has_many :taggings, dependent: :destroy, class_name: '::ActsAsTaggableOn::Tagging'
 
     ### VALIDATIONS:
 
@@ -20,6 +18,8 @@ module ActsAsTaggableOn
     end
 
     ### SCOPES:
+    scope :most_used, ->(limit = 20) { order('taggings_count desc').limit(limit) }
+    scope :least_used, ->(limit = 20) { order('taggings_count asc').limit(limit) }
 
     def self.named(name)
       if ActsAsTaggableOn.strict_case_match
@@ -30,17 +30,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)
@@ -55,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)
@@ -101,6 +100,9 @@ module ActsAsTaggableOn
     end
 
     class << self
+
+
+
       private
 
       def comparable_name(str)
@@ -130,6 +132,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/tag_list.rb

@@ -1,89 +1,16 @@
+
 require 'active_support/core_ext/module/delegation'
 
 module ActsAsTaggableOn
   class TagList < Array
     attr_accessor :owner
+    attr_accessor :parser
 
     def initialize(*args)
+      @parser = ActsAsTaggableOn.default_parser
       add(*args)
     end
 
-    class << self
-      ##
-      # Returns a new TagList using the given tag string.
-      #
-      # Example:
-      #   tag_list = ActsAsTaggableOn::TagList.from("One , Two,  Three")
-      #   tag_list # ["One", "Two", "Three"]
-      def from(string)
-        string = string.join(ActsAsTaggableOn.glue) if string.respond_to?(:join)
-
-        new.tap do |tag_list|
-          string = string.to_s.dup
-
-
-          string.gsub!(double_quote_pattern) {
-            # Append the matched tag to the tag list
-            tag_list << Regexp.last_match[2]
-            # Return the matched delimiter ($3) to replace the matched items
-            ''
-          }
-
-          string.gsub!(single_quote_pattern) {
-            # Append the matched tag ($2) to the tag list
-            tag_list << Regexp.last_match[2]
-            # Return an empty string to replace the matched items
-            ''
-          }
-
-          # split the string by the delimiter
-          # and add to the tag_list
-          tag_list.add(string.split(Regexp.new delimiter))
-        end
-      end
-
-      def delimiter
-        # Parse the quoted tags
-        d = ActsAsTaggableOn.delimiter
-        # Separate multiple delimiters by bitwise operator
-        d = d.join('|') if d.kind_of?(Array)
-
-        d
-      end
-
-      def single_quote_pattern
-        %r{
-          (             # Tag start delimiter ($1)
-            \A       |  # Either string start or
-            #{delimiter}        # a delimiter
-          )
-          \s*'          # quote (') optionally preceded by whitespace
-          (.*?)         # Tag ($2)
-          '\s*          # quote (') optionally followed by whitespace
-          (?=           # Tag end delimiter (not consumed; is zero-length lookahead)
-            #{delimiter}\s*  |  # Either a delimiter optionally followed by whitespace or
-            \z          # string end
-          )
-      }x
-      end
-
-      def double_quote_pattern
-        %r{
-          (             # Tag start delimiter ($1)
-            \A       |  # Either string start or
-            #{delimiter}        # a delimiter
-          )
-          \s*"          # quote (") optionally preceded by whitespace
-          (.*?)         # Tag ($2)
-          "\s*          # quote (") optionally followed by whitespace
-          (?=           # Tag end delimiter (not consumed; is zero-length lookahead)
-            #{delimiter}\s*  |  # Either a delimiter optionally followed by whitespace or
-            \z          # string end
-          )
-      }x
-      end
-
-    end
     ##
     # Add tags to the tag_list. Duplicate or blank tags will be ignored.
     # Use the <tt>:parse</tt> option to add an unparsed tag string.
@@ -149,27 +76,30 @@ module ActsAsTaggableOn
 
     private
 
-    # Remove whitespace, duplicates, and blanks.
+    # Convert everything to string, remove whitespace, duplicates, and blanks.
     def clean!
       reject!(&:blank?)
+      map!(&:to_s)
       map!(&:strip)
       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
 
 
     def extract_and_apply_options!(args)
       options = args.last.is_a?(Hash) ? args.pop : {}
-      options.assert_valid_keys :parse
+      options.assert_valid_keys :parse, :parser
+
+      parser = options[:parser] ? options[:parser] : @parser
 
-      args.map! { |a| self.class.from(a) } if options[:parse]
+      args.map! { |a| parser.new(a).parse } if options[:parse] || options[:parser]
 
       args.flatten!
     end
 
-
   end
 end
 

data/lib/acts_as_taggable_on/{acts_as_taggable_on → taggable}/cache.rb

@@ -31,6 +31,7 @@ module ActsAsTaggableOn::Taggable
         #   to mimic the underlying behavior.  While processing this first
         #   call to columns, we do the caching column check and dynamically add
         #   the class and instance methods
+        #   FIXME: this method cannot compile in rubinius
         def columns
           @acts_as_taggable_on_cache_columns ||= begin
             db_columns = super
@@ -39,6 +40,10 @@ module ActsAsTaggableOn::Taggable
           end
         end
 
+        def reset_column_information
+          super
+          @acts_as_taggable_on_cache_columns = nil
+        end
       end
     end
 
@@ -68,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/{acts_as_taggable_on → taggable}/collection.rb

@@ -53,6 +53,7 @@ module ActsAsTaggableOn::Taggable
       #                       * :order      - A piece of SQL to order by. Eg 'tags.count desc' or 'taggings.created_at desc'
       #                       * :on         - Scope the find to only include a certain context
       def all_tags(options = {})
+        options = options.dup
         options.assert_valid_keys :start_at, :end_at, :conditions, :order, :limit, :on
 
         ## Generate conditions:
@@ -87,6 +88,7 @@ module ActsAsTaggableOn::Taggable
       #                       * :at_most    - Exclude tags with a frequency greater than the given value
       #                       * :on         - Scope the find to only include a certain context
       def all_tag_counts(options = {})
+        options = options.dup
         options.assert_valid_keys :start_at, :end_at, :conditions, :at_least, :at_most, :order, :limit, :on, :id
 
         ## Generate conditions:
@@ -133,10 +135,10 @@ module ActsAsTaggableOn::Taggable
         table_name_pkey = "#{table_name}.#{primary_key}"
         if ActsAsTaggableOn::Utils.using_mysql?
           # See https://github.com/mbleigh/acts-as-taggable-on/pull/457 for details
-          scoped_ids = select(table_name_pkey).map(&:id)
+          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
@@ -167,9 +169,12 @@ module ActsAsTaggableOn::Taggable
     end
 
     module CalculationMethods
-      def count(column_name=:all)
+      # 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