acts-as-taggable-on 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbd5e8b1bc5588e5fa1f7c52d650d51284426c46
-  data.tar.gz: 8310137e6ed880ac050af6a67e0afb648720c0a8
+  metadata.gz: 5c20928991764b079db87d3d1ba32846d0a3e01f
+  data.tar.gz: 94cae20632e6d61d21cd55921cb7ee284cb6f766
 SHA512:
-  metadata.gz: 1ba873f7c016fac3ddbbad4f8ff7b946bb7ffca89074b4db76f63d58c241e01726d18fcd502a7e60fe31b635f6f1fae5d5c26dce911211db07a9c8506e07d13b
-  data.tar.gz: 098fd2268afe38cd7278a8908e6c11b1aeba8370754224730510d71a336130b89831051640fac2af432171c09f51e346b18c141e2d97553a68efc680a6afa680
+  metadata.gz: 29cfdac7542aed8bb4f8f55a0c7d33f592739ae1f887a5399e0bd34fd686a5824b3e5335f5037a0ada5928001b4a8b3ca124d21771d5af648fc6f55735bf31da
+  data.tar.gz: 535aa2433b00889491d6aaf7f488b372ebc1ac2e60f8d9cd2337ae07a19ce2ce1bce3438a1f2db48c77b52a3a57c56648c8c31ddf1b4f0c2447bebae27d67fe0

data/.travis.yml

@@ -3,15 +3,19 @@ rvm:
   - 2.0.0
   - 2.1.1
   - rbx-2
+  - ruby-head
+
 env:
   - DB=sqlite3
   - DB=mysql
   - DB=postgresql
+
 gemfile:
   - gemfiles/activerecord_3.2.gemfile
   - gemfiles/activerecord_4.0.gemfile
   - gemfiles/activerecord_4.1.gemfile
   - gemfiles/activerecord_edge.gemfile
+
 cache: bundler
 script: bundle exec rake
 before_install: gem install bundler
@@ -20,4 +24,20 @@ matrix:
   fast_finish: true
   allow_failures:
       - gemfile: gemfiles/activerecord_edge.gemfile
-      - rvm: rbx-2
+      - rvm: rbx-2
+      - rvm: ruby-head
+  exclude:
+      - 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,20 +1,16 @@
 appraise "activerecord-3.2" do
   gem "activerecord", "~> 3.2"
-  gem "actionpack", "~> 3.2"
 end
 
 appraise "activerecord-4.0" do
   gem "activerecord", "~> 4.0"
-  gem "actionpack", "~> 4.0"
 end
 
 appraise "activerecord-4.1" do
   gem "activerecord", "~> 4.1"
-  gem "actionpack", "~> 4.1"
 end
 
 appraise "activerecord-edge" do
   gem "activerecord", github: "rails/rails"
-  gem "actionpack", github: "rails/rails"
   gem 'arel', github: 'rails/arel'
 end

data/CHANGELOG.md

@@ -4,21 +4,33 @@ 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.1.0...master)
-
-* Breaking Changes
-* Features
-  * [@chess #413 Hook to support STI subclasses of Tag in save_tags](https://github.com/mbleigh/acts-as-taggable-on/pull/413)
-* Fixes
-  * [@jdelStrother #515 Rename Compatibility methods to reduce chance of conflicts ](https://github.com/mbleigh/acts-as-taggable-on/pull/515)
-  * [@seuros #512 fix for << method](https://github.com/mbleigh/acts-as-taggable-on/pull/512)
-  * [@sonots #510 fix IN subquery error for mysql](https://github.com/mbleigh/acts-as-taggable-on/pull/510)
-  * [@jonseaberg #499 fix for race condition when multiple processes try to add the same tag](https://github.com/mbleigh/acts-as-taggable-on/pull/499)
-  * [@leklund #496 Fix for distinct and postgresql json columns errors](https://github.com/mbleigh/acts-as-taggable-on/pull/496)
-  * [@thatbettina & @plexus #394 Multiple quoted tags](https://github.com/mbleigh/acts-as-taggable-on/pull/496)
-* Performance
-* Misc
-  * [@seuros #511 Rspec 3](https://github.com/mbleigh/acts-as-taggable-on/pull/511)
+### Master [changes](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.2.0...master)
+
+  * Breaking Changes
+    * Taggable models are not extend with ActsAsTaggableOn::Utils anymore
+  * Features
+  * Fixes
+  * Performance
+  * Misc
+    * Deleted outdated benchmark script
+
+
+### [3.2.0 / 2014-05-1](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.1.1...v3.2.0)
+
+ * Breaking Changes
+   * ActsAsTaggableOn::Tag is not extend with ActsAsTaggableOn::Utils anymore
+ * Features
+   * [@chess #413 Hook to support STI subclasses of Tag in save_tags](https://github.com/mbleigh/acts-as-taggable-on/pull/413)
+ * Fixes
+   * [@jdelStrother #515 Rename Compatibility methods to reduce chance of conflicts ](https://github.com/mbleigh/acts-as-taggable-on/pull/515)
+   * [@seuros #512 fix for << method](https://github.com/mbleigh/acts-as-taggable-on/pull/512)
+   * [@sonots #510 fix IN subquery error for mysql](https://github.com/mbleigh/acts-as-taggable-on/pull/510)
+   * [@jonseaberg #499 fix for race condition when multiple processes try to add the same tag](https://github.com/mbleigh/acts-as-taggable-on/pull/499)
+   * [@leklund #496 Fix for distinct and postgresql json columns errors](https://github.com/mbleigh/acts-as-taggable-on/pull/496)
+   * [@thatbettina & @plexus #394 Multiple quoted tags](https://github.com/mbleigh/acts-as-taggable-on/pull/496)
+ * Performance
+ * Misc
+   * [@seuros #511 Rspec 3](https://github.com/mbleigh/acts-as-taggable-on/pull/511)
 
 ### [3.1.0 / 2014-03-31](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.0.1...v3.1.0)
 

data/README.md

@@ -1,7 +1,7 @@
 # ActsAsTaggableOn
 [![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-pages.github.io/github/mbleigh/acts-as-taggable-on.png)](http://inch-pages.github.io/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)
 
 This plugin was originally based on Acts as Taggable on Steroids by Jonathan Viney.
 It has evolved substantially since that point, but all credit goes to him for the
@@ -135,11 +135,13 @@ these methods are added to the model: `skill_list`(and `skill_list.add`, `skill_
 # => ["joking", "clowning", "boxing", "coding"]
 
 @another_user = User.new(:name => "Alice")
-@another_story.skill_list.add("joking")
-@another_story.save
+@another_user.skill_list.add("clowning")
+@another_user.save
 
 User.skill_counts
-=> [#<ActsAsTaggableOn::Tag id: 1, name: "joking", taggings_count: 2>, #<ActsAsTaggableOn::Tag id: 2, name: "clowning", taggings_count: 1>, ...]
+=> [#<ActsAsTaggableOn::Tag id: 1, name: "joking", taggings_count: 1>,
+ #<ActsAsTaggableOn::Tag id: 2, name: "clowning", taggings_count: 2>,
+ #<ActsAsTaggableOn::Tag id: 3, name: "boxing", taggings_count: 1>]
 ```
 
 To preserve the order in which tags are created use `acts_as_ordered_taggable`:
@@ -176,22 +178,22 @@ end
 User.tagged_with("awesome").by_join_date
 User.tagged_with("awesome").by_join_date.paginate(:page => params[:page], :per_page => 20)
 
-# Find a user with matching all tags, not just one:
+# Find users that matches all given tags:
 User.tagged_with(["awesome", "cool"], :match_all => true)
 
-# Find a user with any of the tags:
+# Find users with any of the specified tags:
 User.tagged_with(["awesome", "cool"], :any => true)
 
-# Find a user that not tags with awesome or cool:
+# Find users that has not been tagged with awesome or cool:
 User.tagged_with(["awesome", "cool"], :exclude => true)
 
-# Find a user with any of tags based on context:
+# Find users with any of the tags based on context:
 User.tagged_with(['awesome', 'cool'], :on => :tags, :any => true).tagged_with(['smart', 'shy'], :on => :skills, :any => true)
 ```
 
-You can also use `:wild => true` option along with `:any` or `:exclude` option. It will looking for `%awesome%` and `%cool%` in sql.
+You can also use `:wild => true` option along with `:any` or `:exclude` option. It will be looking for `%awesome%` and `%cool%` in SQL.
 
-__Tip:__ `User.tagged_with([])` or `User.tagged_with('')` will return `[]`, but not all records.
+__Tip:__ `User.tagged_with([])` or `User.tagged_with('')` will return `[]`, an empty set of records.
 
 ### Relationships
 
@@ -273,7 +275,7 @@ Photo.tagged_with("paris", :on => :locations, :owned_by => @some_user)
 To construct tag clouds, the frequency of each tag needs to be calculated.
 Because we specified `acts_as_taggable_on` on the `User` class, we can
 get a calculation of all the tag counts by using `User.tag_counts_on(:customs)`. But what if we wanted a tag count for
-an single user's posts? To achieve this we call tag_counts on the association:
+a single user's posts? To achieve this we call tag_counts on the association:
 
 ```ruby
 User.find(:first).posts.tag_counts_on(:tags)
@@ -360,6 +362,11 @@ We have a long list of valued contributors. [Check them all](https://github.com/
 
 * [Joost Baaij](https://github.com/tilsammans)
 
+## TODO
+
+- Write benchmark script
+- Resolve concurrency issues
+
 ## Testing
 
 Acts As Taggable On uses RSpec for its test coverage. Inside the gem

data/acts-as-taggable-on.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |gem|
   end
 
   gem.add_runtime_dependency 'activerecord',  ['>= 3', '< 5']
-  gem.add_runtime_dependency 'actionpack',    ['>= 3', '< 5']
 
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'mysql2', '~> 0.3.7'
@@ -32,7 +31,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-rails'  , '~> 3.0.0.beta'
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'ammeter'
   gem.add_development_dependency 'barrier'
   gem.add_development_dependency 'database_cleaner'
 end

data/db/migrate/4_add_missing_taggable_index.rb

@@ -0,0 +1,9 @@
+class AddMissingTaggableIndex < ActiveRecord::Migration
+  def self.up
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    remove_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+end

data/gemfiles/activerecord_3.2.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 3.2"
-gem "actionpack", "~> 3.2"
 
 group :local_development do
   gem "guard"

data/gemfiles/activerecord_4.0.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.0"
-gem "actionpack", "~> 4.0"
 
 group :local_development do
   gem "guard"

data/gemfiles/activerecord_4.1.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.1"
-gem "actionpack", "~> 4.1"
 
 group :local_development do
   gem "guard"

data/gemfiles/activerecord_edge.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", :github => "rails/rails"
-gem "actionpack", :github => "rails/rails"
 gem "arel", :github => "rails/arel"
 
 group :local_development do

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

@@ -3,9 +3,35 @@ require 'active_record/version'
 require 'active_support/core_ext/module'
 require 'action_view'
 
+require_relative 'acts_as_taggable_on/engine'  if defined?(Rails)
+
 require 'digest/sha1'
 
 module ActsAsTaggableOn
+  extend ActiveSupport::Autoload
+
+  autoload :Tag
+  autoload :TagList
+  autoload :TagListParser
+  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 +42,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)
@@ -31,7 +57,7 @@ module ActsAsTaggableOn
 
   class Configuration
     attr_accessor :delimiter, :force_lowercase, :force_parameterize,
-      :strict_case_match, :remove_unused_tags
+                  :strict_case_match, :remove_unused_tags
 
     def initialize
       @delimiter = ','
@@ -45,24 +71,6 @@ module ActsAsTaggableOn
   setup
 end
 
-require 'acts_as_taggable_on/utils'
-
-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'
-
-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'
-
 ActiveSupport.on_load(:active_record) do
   extend ActsAsTaggableOn::Compatibility
   extend ActsAsTaggableOn::Taggable

data/lib/acts_as_taggable_on/tag.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 module ActsAsTaggableOn
   class Tag < ::ActiveRecord::Base
 

data/lib/acts_as_taggable_on/tag_list.rb

@@ -1,3 +1,4 @@
+
 require 'active_support/core_ext/module/delegation'
 
 module ActsAsTaggableOn
@@ -8,82 +9,6 @@ module ActsAsTaggableOn
       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,9 +74,10 @@ 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
@@ -164,12 +90,23 @@ module ActsAsTaggableOn
       options = args.last.is_a?(Hash) ? args.pop : {}
       options.assert_valid_keys :parse
 
-      args.map! { |a| self.class.from(a) } if options[:parse]
+      args.map! { |a| TagListParser.parse(a) } if options[:parse]
 
       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::TagListParser.parse instead
+WARNING
+      TagListParser.parse(string)
+    end
+
+
   end
 end
 

data/lib/acts_as_taggable_on/tag_list_parser.rb

@@ -0,0 +1,78 @@
+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
+      def parse(string)
+        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
+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

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: