acts-as-taggable-on 3.1.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85958d35c84d713f07c8002b6d13076d545c66ef
-  data.tar.gz: 0886b4ccc2336cb4231c95a3ebfad17428bc2039
+  metadata.gz: bc40e6d7c5c8b741bfc71aee7ae2406c6f824108
+  data.tar.gz: 3c89e20ed3b39ef33d52724d4bb8b9aa3e5738f9
 SHA512:
-  metadata.gz: 7aab69718b2ecca16126a6ccf094845c492bccbb56414721e39bd0a026639648df76d57bd0a89c70c320f16bbf382f2fb717aae885251d2e996113cf3fc6e466
-  data.tar.gz: e4d6bd119431386cb2329a496984b7d401494cc150796b6e7155b5533ab60cd1e82480c831034595377eba9d2226a4aebe7523628bbc69ff2954b64f2596285b
+  metadata.gz: e4142af492646d113a10fa0ae4815d91a281f2a55d60fb70b653a96d4ac58e24c56e1e10bcbf9907bbcc06cee2b476b6ec4a568cc25e5247578a140cbf388d85
+  data.tar.gz: eceb8e025f83cdbc9e237405eac982aa3b7c7ef0f54d803fcd80d1ed837b833d4f07fe549f0eb0eaa443edb5cdc84bcad79555a67a886e7fc706b46aa5d37b35

data/.gitignore

@@ -3,7 +3,7 @@
 /pkg/*
 .bundle
 .ruby-version
-spec/database.yml
+spec/internal/config/database.yml
 tmp*.sw?
 *.sw?
 tmp

data/.travis.yml

@@ -1,21 +1,23 @@
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
   - 2.1.1
+  - rbx-2
 env:
   - DB=sqlite3
   - DB=mysql
   - DB=postgresql
 gemfile:
-  - gemfiles/rails_3.2.gemfile
-  - gemfiles/rails_4.0.gemfile
-  - gemfiles/rails_4.1.gemfile
-  - gemfiles/rails_edge.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
+before_install: gem install bundler
 bundler_args: '--without local_development'
 matrix:
   fast_finish: true
+  allow_failures:
+      - gemfile: gemfiles/activerecord_edge.gemfile
+      - rvm: rbx-2

data/Appraisals

@@ -1,15 +1,20 @@
-appraise "rails-3.2" do
-  gem "rails", "~> 3.2"
+appraise "activerecord-3.2" do
+  gem "activerecord", "~> 3.2"
+  gem "actionpack", "~> 3.2"
 end
 
-appraise "rails-4.0" do
-  gem "rails", "~> 4.0"
+appraise "activerecord-4.0" do
+  gem "activerecord", "~> 4.0"
+  gem "actionpack", "~> 4.0"
 end
 
-appraise "rails-4.1" do
-  gem "rails", "~> 4.1.0.beta1"
+appraise "activerecord-4.1" do
+  gem "activerecord", "~> 4.1"
+  gem "actionpack", "~> 4.1"
 end
 
-appraise "rails-edge" do
-  gem "rails", github: "rails/rails"
+appraise "activerecord-edge" do
+  gem "activerecord", github: "rails/rails"
+  gem "actionpack", github: "rails/rails"
+  gem 'arel', github: 'rails/arel'
 end

data/CHANGELOG.md

@@ -4,13 +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
-* Fixes
-* Performance
-* Misc
+### 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/Gemfile

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

data/README.md

@@ -76,14 +76,14 @@ end
 Add and remove a single tag
 
 ```ruby
-@user.tag_list.add("awesomer")   # add a single tag. alias for <<
+@user.tag_list.add("awesome")   # add a single tag. alias for <<
 @user.tag_list.remove("awesome") # remove a single tag
 ```
 
 Add and remove multiple tags in an array
 
 ```ruby
-@user.tag_list.add("awesomer", "slicker")
+@user.tag_list.add("awesome", "slick")
 @user.tag_list.remove("awesome", "slick")
 ```
 
@@ -98,7 +98,7 @@ a change on delimiter setting, make sure the string will match. See
 [configuration](#configuration) for more about delimiter.
 
 ```ruby
-@user.tag_list.add("awesomer, slicker", parse: true)
+@user.tag_list.add("awesome, slick", parse: true)
 @user.tag_list.remove("awesome, slick", parse: true)
 ```
 
@@ -107,29 +107,41 @@ remove existing tags so use it with attention.
 
 ```ruby
 @user.tag_list = "awesome, slick, hefty"
+@user.save
+@user.reload
 @user.tags
-# => [<Tag name:"awesome">,<Tag name:"slick">,<Tag name:"hefty">]
+=> [#<ActsAsTaggableOn::Tag id: 1, name: "awesome", taggings_count: 1>,
+ #<ActsAsTaggableOn::Tag id: 2, name: "slick", taggings_count: 1>,
+ #<ActsAsTaggableOn::Tag id: 3, name: "hefty", taggings_count: 1>]
 ```
 
 With the defined context in model, you have multiple new methods at disposal
 to manage and view the tags in the context. For example, with `:skill` context
 these methods are added to the model: `skill_list`(and `skill_list.add`, `skill_list.remove`
-`skill_list=`), `skills`(plural), skill_counts
-
+`skill_list=`), `skills`(plural), `skill_counts`.
 
 ```ruby
 @user.skill_list = "joking, clowning, boxing"
-
+@user.save
+@user.reload
 @user.skills
-# => [<Tag name:"joking">,<Tag name:"clowning">,<Tag name:"boxing">]
+=> [#<ActsAsTaggableOn::Tag id: 1, name: "joking", taggings_count: 1>,
+ #<ActsAsTaggableOn::Tag id: 2, name: "clowning", taggings_count: 1>,
+ #<ActsAsTaggableOn::Tag id: 3, name: "boxing", taggings_count: 1>]
 
 @user.skill_list.add("coding")
 
 @user.skill_list
-# => ["joking","clowning","boxing", "coding"]
+# => ["joking", "clowning", "boxing", "coding"]
+
+@another_user = User.new(:name => "Alice")
+@another_user.skill_list.add("clowning")
+@another_user.save
 
 User.skill_counts
-# => [<Tag name="joking" count=2>,<Tag name="clowning" 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`:
@@ -166,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
 
@@ -199,7 +211,7 @@ matched tags.
 @tom = User.find_by_name("Tom")
 @tom.skill_list # => ["hacking", "jogging", "diving"]
 
-@tom.find_related_skills # => [<User name="Bobby">,<User name="Frankie">]
+@tom.find_related_skills # => [<User name="Bobby">, <User name="Frankie">]
 @bobby.find_related_skills # => [<User name="Tom">]
 @frankie.find_related_skills # => [<User name="Tom">]
 ```
@@ -212,7 +224,7 @@ to allow for dynamic tag contexts (this could be user generated tag contexts!)
 ```ruby
 @user = User.new(:name => "Bobby")
 @user.set_tag_list_on(:customs, "same, as, tag, list")
-@user.tag_list_on(:customs) # => ["same","as","tag","list"]
+@user.tag_list_on(:customs) # => ["same", "as", "tag", "list"]
 @user.save
 @user.tags_on(:customs) # => [<Tag name='same'>,...]
 @user.tag_counts_on(:customs)
@@ -263,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)
@@ -350,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/Rakefile

@@ -1,31 +1,19 @@
 require 'rubygems'
-begin
-  require 'bundler/setup'
-rescue LoadError
-  STDERR.puts "Bundler not loaded"
-end
+require 'bundler/setup'
 
 desc 'Default: run specs'
-task :default => :spec
+task default: :spec
 
 desc 'Copy sample spec database.yml over if not exists'
 task :copy_db_config do
-  cp 'spec/database.yml.sample', 'spec/database.yml'
+  cp 'spec/internal/config/database.yml.sample', 'spec/internal/config/database.yml'
 end
 
-task :spec => [:copy_db_config]
-
-begin
-  require 'appraisal'
-  desc 'Run tests across gemfiles specified in Appraisals'
-  task :appraise => ['appraisal:cleanup', 'appraisal:install', 'appraisal']
-rescue LoadError
-  puts "appraisal tasks not available"
-end
+task spec: [:copy_db_config]
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new do |t|
-  t.pattern = "spec/**/*_spec.rb"
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
 Bundler::GemHelper.install_tasks

data/UPGRADING.md

@@ -5,3 +5,9 @@ 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

data/acts-as-taggable-on.gemspec

@@ -4,35 +4,35 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'acts_as_taggable_on/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "acts-as-taggable-on"
+  gem.name          = 'acts-as-taggable-on'
   gem.version       = ActsAsTaggableOn::VERSION
-  gem.authors       = ["Michael Bleigh", "Joost Baaij"]
-  gem.email         = ["michael@intridea.com", "joost@spacebabies.nl"]
+  gem.authors       = ['Michael Bleigh', 'Joost Baaij']
+  gem.email         = %w(michael@intridea.com joost@spacebabies.nl)
   gem.description   = %q{With ActsAsTaggableOn, you can tag a single model on several contexts, such as skills, interests, and awards. It also provides other advanced functionality.}
-  gem.summary       = "Advanced tagging for Rails."
+  gem.summary       = 'Advanced tagging for Rails.'
   gem.homepage      = 'https://github.com/mbleigh/acts-as-taggable-on'
-  gem.license       = "MIT"
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.test_files    = gem.files.grep(%r{^spec/})
+  gem.require_paths = ['lib']
   gem.required_ruby_version     = '>= 1.9.3'
 
-  if File.exists?('UPGRADING.md')
+  if File.exist?('UPGRADING.md')
     gem.post_install_message = File.read('UPGRADING.md')
   end
 
   gem.add_runtime_dependency 'activerecord',  ['>= 3', '< 5']
-  gem.add_runtime_dependency 'activesupport', ['>= 3', '< 5']
   gem.add_runtime_dependency 'actionpack',    ['>= 3', '< 5']
 
   gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency 'mysql2', '~> 0.3.7'
+  gem.add_development_dependency 'mysql2'
   gem.add_development_dependency 'pg'
 
-  gem.add_development_dependency 'rspec-rails', '2.13.0' # 2.13.1 is broken
-  gem.add_development_dependency 'rspec', '~> 2.6'
-  gem.add_development_dependency 'ammeter'
-
+  gem.add_development_dependency 'rspec-rails'  , '~> 3.0.0.beta2'
+  gem.add_development_dependency 'rspec-its', '~> 1.0'
+  gem.add_development_dependency 'rspec', '3.0.0.beta2'
+  gem.add_development_dependency 'ammeter', '~> 1.0'
+  gem.add_development_dependency 'barrier', '~> 1.0'
+  gem.add_development_dependency 'database_cleaner', '~> 1.2'
 end

data/db/migrate/1_acts_as_taggable_on_migration.rb

@@ -9,12 +9,12 @@ class ActsAsTaggableOnMigration < ActiveRecord::Migration
 
       # 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.references :taggable, polymorphic: true
+      t.references :tagger, polymorphic: true
 
       # Limit is created to prevent MySQL error on index
       # length for MyISAM table type: http://bit.ly/vgW2Ql
-      t.string :context, :limit => 128
+      t.string :context, limit: 128
 
       t.datetime :created_at
     end

data/db/migrate/2_add_missing_unique_indices.rb

@@ -1,14 +1,13 @@
 class AddMissingUniqueIndices < ActiveRecord::Migration
-
   def self.up
     add_index :tags, :name, unique: true
 
     remove_index :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],
-      unique: true, name: 'taggings_idx'
-   end
+              [:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type],
+              unique: true, name: 'taggings_idx'
+  end
 
   def self.down
     remove_index :tags, :name
@@ -17,5 +16,4 @@ class AddMissingUniqueIndices < ActiveRecord::Migration
     add_index :taggings, :tag_id
     add_index :taggings, [:taggable_id, :taggable_type, :context]
   end
-
 end

data/db/migrate/3_add_taggings_counter_cache_to_tags.rb

@@ -1,6 +1,6 @@
 class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
   def self.up
-    add_column :tags, :taggings_count, :integer, :default => 0
+    add_column :tags, :taggings_count, :integer, default: 0
 
     ActsAsTaggableOn::Tag.reset_column_information
     ActsAsTaggableOn::Tag.find_each do |tag|

data/gemfiles/activerecord_3.2.gemfile

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

data/gemfiles/activerecord_4.0.gemfile

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

data/gemfiles/activerecord_4.1.gemfile

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

data/gemfiles/activerecord_edge.gemfile

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

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

@@ -1,11 +1,14 @@
-require "active_record"
-require "active_record/version"
-require "active_support/core_ext/module"
-require "action_view"
+require 'active_record'
+require 'active_record/version'
+require 'active_support/core_ext/module'
+require 'action_view'
 
-require "digest/sha1"
+require 'digest/sha1'
 
 module ActsAsTaggableOn
+  class DuplicateTagError < StandardError
+  end
+
   def self.setup
     @configuration ||= Configuration.new
     yield @configuration if block_given?
@@ -23,7 +26,7 @@ module ActsAsTaggableOn
   def self.glue
     setting = @configuration.delimiter
     delimiter = setting.kind_of?(Array) ? setting[0] : setting
-    delimiter.ends_with?(" ") ? delimiter : "#{delimiter} "
+    delimiter.ends_with?(' ') ? delimiter : "#{delimiter} "
   end
 
   class Configuration
@@ -42,23 +45,22 @@ module ActsAsTaggableOn
   setup
 end
 
+require 'acts_as_taggable_on/utils'
 
-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/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/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

data/lib/acts_as_taggable_on/acts_as_taggable_on/cache.rb

@@ -31,12 +31,11 @@ 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
-            if _has_tags_cache_columns?(db_columns)
-              _add_tags_caching_methods
-            end
+            _add_tags_caching_methods if _has_tags_cache_columns?(db_columns)
             db_columns
           end
         end
@@ -79,6 +78,5 @@ module ActsAsTaggableOn::Taggable
         true
       end
     end
-
   end
 end