acts-as-taggable-on 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbd5e8b1bc5588e5fa1f7c52d650d51284426c46
-  data.tar.gz: 8310137e6ed880ac050af6a67e0afb648720c0a8
+  metadata.gz: bc40e6d7c5c8b741bfc71aee7ae2406c6f824108
+  data.tar.gz: 3c89e20ed3b39ef33d52724d4bb8b9aa3e5738f9
 SHA512:
-  metadata.gz: 1ba873f7c016fac3ddbbad4f8ff7b946bb7ffca89074b4db76f63d58c241e01726d18fcd502a7e60fe31b635f6f1fae5d5c26dce911211db07a9c8506e07d13b
-  data.tar.gz: 098fd2268afe38cd7278a8908e6c11b1aeba8370754224730510d71a336130b89831051640fac2af432171c09f51e346b18c141e2d97553a68efc680a6afa680
+  metadata.gz: e4142af492646d113a10fa0ae4815d91a281f2a55d60fb70b653a96d4ac58e24c56e1e10bcbf9907bbcc06cee2b476b6ec4a568cc25e5247578a140cbf388d85
+  data.tar.gz: eceb8e025f83cdbc9e237405eac982aa3b7c7ef0f54d803fcd80d1ed837b833d4f07fe549f0eb0eaa443edb5cdc84bcad79555a67a886e7fc706b46aa5d37b35

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

@@ -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

@@ -26,13 +26,13 @@ Gem::Specification.new do |gem|
   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'  , '~> 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'
+  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/lib/acts_as_taggable_on/acts_as_taggable_on/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/core.rb

@@ -24,16 +24,16 @@ module ActsAsTaggableOn::Taggable
             # when preserving tag order, include order option so that for a 'tags' context
             # the associations tag_taggings & tags are always returned in created order
             has_many_with_taggable_compatibility context_taggings, as: :taggable,
-                                                                   dependent: :destroy,
-                                                                   class_name: 'ActsAsTaggableOn::Tagging',
-                                                                   order: taggings_order,
-                                                                   conditions: ["#{ActsAsTaggableOn::Tagging.table_name}.context = (?)", tags_type],
-                                                                   include: :tag
+                                                 dependent: :destroy,
+                                                 class_name: 'ActsAsTaggableOn::Tagging',
+                                                 order: taggings_order,
+                                                 conditions: ["#{ActsAsTaggableOn::Tagging.table_name}.context = (?)", tags_type],
+                                                 include: :tag
 
             has_many_with_taggable_compatibility context_tags, through: context_taggings,
-                                                               source: :tag,
-                                                               class_name: 'ActsAsTaggableOn::Tag',
-                                                               order: taggings_order
+                                                 source: :tag,
+                                                 class_name: 'ActsAsTaggableOn::Tag',
+                                                 order: taggings_order
 
           end
 
@@ -130,7 +130,7 @@ module ActsAsTaggableOn::Taggable
           taggings_context = context ? "_#{context}" : ''
 
           taggings_alias = adjust_taggings_alias(
-              "#{alias_base_name[0..4]}#{taggings_context[0..6]}_taggings_#{sha_prefix(tags.map(&:name).join('_'))}"
+              "#{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}" \
@@ -145,9 +145,9 @@ module ActsAsTaggableOn::Taggable
           if owned_by
             tagging_join << ' AND ' +
                 sanitize_sql([
-                  "#{taggings_alias}.tagger_id = ? AND #{taggings_alias}.tagger_type = ?",
-                  owned_by.id,
-                  owned_by.class.base_class.to_s
+                                 "#{taggings_alias}.tagger_id = ? AND #{taggings_alias}.tagger_type = ?",
+                                 owned_by.id,
+                                 owned_by.class.base_class.to_s
                              ])
           end
 
@@ -159,7 +159,7 @@ module ActsAsTaggableOn::Taggable
           return empty_result unless tags.length == tag_list.length
 
           tags.each do |tag|
-            taggings_alias = adjust_taggings_alias("#{alias_base_name[0..11]}_taggings_#{sha_prefix(tag.name)}")
+            taggings_alias = adjust_taggings_alias("#{alias_base_name[0..11]}_taggings_#{ActsAsTaggableOn::Utils.sha_prefix(tag.name)}")
             tagging_join = "JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" \
                 "  ON #{taggings_alias}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" +
                 " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name, nil)}" +
@@ -170,9 +170,9 @@ module ActsAsTaggableOn::Taggable
             if owned_by
               tagging_join << ' AND ' +
                   sanitize_sql([
-                    "#{taggings_alias}.tagger_id = ? AND #{taggings_alias}.tagger_type = ?",
-                    owned_by.id,
-                    owned_by.class.base_class.to_s
+                                   "#{taggings_alias}.tagger_id = ? AND #{taggings_alias}.tagger_type = ?",
+                                   owned_by.id,
+                                   owned_by.class.base_class.to_s
                                ])
             end
 
@@ -202,13 +202,13 @@ module ActsAsTaggableOn::Taggable
 
         order_by << options[:order] if options[:order].present?
 
-        request = select(select_clause).
-            joins(joins.join(' ')).
-            where(conditions.join(' AND ')).
-            group(group).
-            having(having).
-            order(order_by.join(', ')).
-            readonly(false)
+        select(select_clause)
+        .joins(joins.join(' '))
+        .where(conditions.join(' AND '))
+        .group(group)
+        .having(having)
+        .order(order_by.join(', '))
+        .readonly(false)
       end
 
       def is_taggable?

data/lib/acts_as_taggable_on/acts_as_taggable_on/related.rb

@@ -61,11 +61,11 @@ module ActsAsTaggableOn::Taggable
     end
 
     def related_where(klass, conditions)
-      klass.select("#{klass.table_name}.*, COUNT(#{ActsAsTaggableOn::Tag.table_name}.#{ActsAsTaggableOn::Tag.primary_key}) AS count").
-          from("#{klass.table_name}, #{ActsAsTaggableOn::Tag.table_name}, #{ActsAsTaggableOn::Tagging.table_name}").
-          group(group_columns(klass)).
-          order('count DESC').
-          where(conditions)
+      klass.select("#{klass.table_name}.*, COUNT(#{ActsAsTaggableOn::Tag.table_name}.#{ActsAsTaggableOn::Tag.primary_key}) AS count")
+      .from("#{klass.table_name}, #{ActsAsTaggableOn::Tag.table_name}, #{ActsAsTaggableOn::Tagging.table_name}")
+      .group(group_columns(klass))
+      .order('count DESC')
+      .where(conditions)
     end
   end
 end

data/lib/acts_as_taggable_on/tag_list.rb

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

data/lib/acts_as_taggable_on/taggable.rb

@@ -85,8 +85,6 @@ module ActsAsTaggableOn
           def self.taggable?
             true
           end
-
-          extend ActsAsTaggableOn::Utils
         end
       end
 

data/lib/acts_as_taggable_on/utils.rb

@@ -1,62 +1,62 @@
 module ActsAsTaggableOn
   module Utils
-    extend self
-
-    # Use ActsAsTaggableOn::Tag connection
-    def connection
-      ActsAsTaggableOn::Tag.connection
-    end
+    class << self
+      # Use ActsAsTaggableOn::Tag connection
+      def connection
+        ActsAsTaggableOn::Tag.connection
+      end
 
-    def using_postgresql?
-      connection && connection.adapter_name == 'PostgreSQL'
-    end
+      def using_postgresql?
+        connection && connection.adapter_name == 'PostgreSQL'
+      end
 
-    def postgresql_version
-      if using_postgresql?
-        connection.execute("SHOW SERVER_VERSION").first["server_version"].to_f
+      def postgresql_version
+        if using_postgresql?
+          connection.execute('SHOW SERVER_VERSION').first['server_version'].to_f
+        end
       end
-    end
 
-    def postgresql_support_json?
-      postgresql_version >= 9.2
-    end
+      def postgresql_support_json?
+        postgresql_version >= 9.2
+      end
 
-    def using_sqlite?
-      connection && connection.adapter_name == 'SQLite'
-    end
+      def using_sqlite?
+        connection && connection.adapter_name == 'SQLite'
+      end
 
-    def using_mysql?
-      #We should probably use regex for mysql to support prehistoric adapters
-      connection && connection.adapter_name == 'Mysql2'
-    end
+      def using_mysql?
+        #We should probably use regex for mysql to support prehistoric adapters
+        connection && connection.adapter_name == 'Mysql2'
+      end
 
-    def using_case_insensitive_collation?
-      using_mysql? && connection.collation =~ /_ci\Z/
-    end
+      def using_case_insensitive_collation?
+        using_mysql? && connection.collation =~ /_ci\Z/
+      end
 
-    def supports_concurrency?
-      !using_sqlite?
-    end
+      def supports_concurrency?
+        !using_sqlite?
+      end
 
-    def sha_prefix(string)
-      Digest::SHA1.hexdigest("#{string}#{rand}")[0..6]
-    end
+      def sha_prefix(string)
+        Digest::SHA1.hexdigest("#{string}#{rand}")[0..6]
+      end
 
-    def active_record4?
-      ::ActiveRecord::VERSION::MAJOR == 4
-    end
+      def active_record4?
+        ::ActiveRecord::VERSION::MAJOR == 4
+      end
 
-    def active_record42?
-      active_record4? && ::ActiveRecord::VERSION::MINOR >= 2
-    end
+      def active_record42?
+        active_record4? && ::ActiveRecord::VERSION::MINOR >= 2
+      end
 
-    def like_operator
-      using_postgresql? ? 'ILIKE' : 'LIKE'
-    end
+      def like_operator
+        using_postgresql? ? 'ILIKE' : 'LIKE'
+      end
 
-    # escape _ and % characters in strings, since these are wildcards in SQL.
-    def escape_like(str)
-      str.gsub(/[!%_]/) { |x| '!' + x }
+      # escape _ and % characters in strings, since these are wildcards in SQL.
+      def escape_like(str)
+        str.gsub(/[!%_]/) { |x| '!' + x }
+      end
     end
   end
 end

data/lib/acts_as_taggable_on/version.rb

@@ -1,4 +1,4 @@
 module ActsAsTaggableOn
-  VERSION = '3.2.1'
+  VERSION = '3.2.2'
 end
 

data/spec/acts_as_taggable_on/tag_spec.rb

@@ -3,8 +3,11 @@ require 'spec_helper'
 require 'db/migrate/2_add_missing_unique_indices.rb'
 
 shared_examples_for 'without unique index' do
-  before { AddMissingUniqueIndices.down }
-  after { ActsAsTaggableOn::Tag.delete_all; AddMissingUniqueIndices.up }
+  prepend_before(:all) { AddMissingUniqueIndices.down }
+  append_after(:all) do
+    ActsAsTaggableOn::Tag.delete_all
+    AddMissingUniqueIndices.up
+  end
 end
 
 describe ActsAsTaggableOn::Tag do
@@ -14,10 +17,9 @@ describe ActsAsTaggableOn::Tag do
   end
 
 
-
   describe 'named like any' do
-    context 'case insensitive collation and unique index on tag name' do
-      if ActsAsTaggableOn::Utils.using_case_insensitive_collation?
+    if ActsAsTaggableOn::Utils.using_case_insensitive_collation?
+      context 'case insensitive collation and unique index on tag name' do
         before(:each) do
           ActsAsTaggableOn::Tag.create(name: 'Awesome')
           ActsAsTaggableOn::Tag.create(name: 'epic')

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -621,8 +621,8 @@ describe 'Taggable' do
     it 'should return all column names joined for Tag GROUP clause' do
       # NOTE: type column supports an STI Tag subclass in the test suite, though
       # isn't included by default in the migration generator
-      expect(@taggable.grouped_column_names_for(ActsAsTaggableOn::Tag)).
-          to eq('tags.id, tags.name, tags.taggings_count, tags.type')
+      expect(@taggable.grouped_column_names_for(ActsAsTaggableOn::Tag))
+      .to eq('tags.id, tags.name, tags.taggings_count, tags.type')
     end
 
     it 'should return all column names joined for TaggableModel GROUP clause' do
@@ -847,33 +847,34 @@ describe 'Taggable' do
   end
 end
 
-
 if ActsAsTaggableOn::Utils.using_postgresql?
-  describe 'Taggable model with json columns' do
-    before(:each) do
-      @taggable = TaggableModelWithJson.new(:name => 'Bob Jones')
-      @taggables = [@taggable, TaggableModelWithJson.new(:name => 'John Doe')]
-    end
+  if ActsAsTaggableOn::Utils.postgresql_support_json?
+    describe 'Taggable model with json columns' do
+      before(:each) do
+        @taggable = TaggableModelWithJson.new(:name => 'Bob Jones')
+        @taggables = [@taggable, TaggableModelWithJson.new(:name => 'John Doe')]
+      end
 
-    it 'should be able to find by tag with context' do
-      @taggable.skill_list = 'ruby, rails, css'
-      @taggable.tag_list = 'bob, charlie'
-      @taggable.save
+      it 'should be able to find by tag with context' do
+        @taggable.skill_list = 'ruby, rails, css'
+        @taggable.tag_list = 'bob, charlie'
+        @taggable.save
 
-      expect(TaggableModelWithJson.tagged_with('ruby').first).to eq(@taggable)
-      expect(TaggableModelWithJson.tagged_with('ruby, css').first).to eq(@taggable)
-      expect(TaggableModelWithJson.tagged_with('bob', :on => :skills).first).to_not eq(@taggable)
-      expect(TaggableModelWithJson.tagged_with('bob', :on => :tags).first).to eq(@taggable)
-    end
+        expect(TaggableModelWithJson.tagged_with('ruby').first).to eq(@taggable)
+        expect(TaggableModelWithJson.tagged_with('ruby, css').first).to eq(@taggable)
+        expect(TaggableModelWithJson.tagged_with('bob', :on => :skills).first).to_not eq(@taggable)
+        expect(TaggableModelWithJson.tagged_with('bob', :on => :tags).first).to eq(@taggable)
+      end
 
-    it 'should be able to find tagged with any tag' do
-      bob = TaggableModelWithJson.create(:name => 'Bob', :tag_list => 'fitter, happier, more productive', :skill_list => 'ruby, rails, css')
-      frank = TaggableModelWithJson.create(:name => 'Frank', :tag_list => 'weaker, depressed, inefficient', :skill_list => 'ruby, rails, css')
-      steve = TaggableModelWithJson.create(:name => 'Steve', :tag_list => 'fitter, happier, more productive', :skill_list => 'c++, java, ruby')
+      it 'should be able to find tagged with any tag' do
+        bob = TaggableModelWithJson.create(:name => 'Bob', :tag_list => 'fitter, happier, more productive', :skill_list => 'ruby, rails, css')
+        frank = TaggableModelWithJson.create(:name => 'Frank', :tag_list => 'weaker, depressed, inefficient', :skill_list => 'ruby, rails, css')
+        steve = TaggableModelWithJson.create(:name => 'Steve', :tag_list => 'fitter, happier, more productive', :skill_list => 'c++, java, ruby')
 
-      expect(TaggableModelWithJson.tagged_with(%w(ruby java), :order => 'taggable_model_with_jsons.name', :any => true).to_a).to eq([bob, frank, steve])
-      expect(TaggableModelWithJson.tagged_with(%w(c++ fitter), :order => 'taggable_model_with_jsons.name', :any => true).to_a).to eq([bob, steve])
-      expect(TaggableModelWithJson.tagged_with(%w(depressed css), :order => 'taggable_model_with_jsons.name', :any => true).to_a).to eq([bob, frank])
+        expect(TaggableModelWithJson.tagged_with(%w(ruby java), :order => 'taggable_model_with_jsons.name', :any => true).to_a).to eq([bob, frank, steve])
+        expect(TaggableModelWithJson.tagged_with(%w(c++ fitter), :order => 'taggable_model_with_jsons.name', :any => true).to_a).to eq([bob, steve])
+        expect(TaggableModelWithJson.tagged_with(%w(depressed css), :order => 'taggable_model_with_jsons.name', :any => true).to_a).to eq([bob, frank])
+      end
     end
   end
 end

data/spec/acts_as_taggable_on/utils_spec.rb

@@ -1,21 +1,15 @@
 require 'spec_helper'
 
 describe ActsAsTaggableOn::Utils do
-  describe 'like_operator' do
-    before(:each) do
-      TaggableModel.acts_as_taggable_on(:tags, :languages, :skills, :needs, :offerings)
-      @taggable = TaggableModel.new(name: 'Bob Jones')
-    end
-
-
+  describe '#like_operator' do
     it 'should return \'ILIKE\' when the adapter is PostgreSQL' do
-      allow(TaggableModel.connection).to receive(:adapter_name) { 'PostgreSQL' }
-      expect(TaggableModel.send(:like_operator)).to eq('ILIKE')
+      allow(ActsAsTaggableOn::Utils.connection).to receive(:adapter_name) { 'PostgreSQL' }
+      expect(ActsAsTaggableOn::Utils.like_operator).to eq('ILIKE')
     end
 
     it 'should return \'LIKE\' when the adapter is not PostgreSQL' do
-      allow(TaggableModel.connection).to receive(:adapter_name) { 'MySQL' }
-      expect(TaggableModel.send(:like_operator)).to eq('LIKE')
+      allow(ActsAsTaggableOn::Utils.connection).to receive(:adapter_name) { 'MySQL' }
+      expect(ActsAsTaggableOn::Utils.like_operator).to eq('LIKE')
     end
   end
 end

data/spec/internal/db/schema.rb

@@ -86,7 +86,7 @@ ActiveRecord::Schema.define version: 0 do
       t.column :cached_glass_list, :string, array: true
     end
 
-    if self.
+    if ActsAsTaggableOn::Utils.postgresql_support_json?
       create_table :taggable_model_with_jsons, :force => true do |t|
         t.column :name, :string
         t.column :type, :string

data/spec/support/database_cleaner.rb

@@ -6,6 +6,10 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
+  config.after(:suite) do
+    DatabaseCleaner.clean
+  end
+
   config.before(:each) do
     DatabaseCleaner.start
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -69,16 +69,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -99,84 +99,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta
+        version: 3.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: barrier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 description: With ActsAsTaggableOn, you can tag a single model on several contexts,
   such as skills, interests, and awards. It also provides other advanced functionality.
 email:
@@ -236,7 +236,6 @@ files:
 - spec/acts_as_taggable_on/tagging_spec.rb
 - spec/acts_as_taggable_on/tags_helper_spec.rb
 - spec/acts_as_taggable_on/utils_spec.rb
-- spec/bm.rb
 - spec/internal/app/models/altered_inheriting_taggable_model.rb
 - spec/internal/app/models/cached_model.rb
 - spec/internal/app/models/cached_model_with_array.rb
@@ -309,7 +308,6 @@ test_files:
 - spec/acts_as_taggable_on/tagging_spec.rb
 - spec/acts_as_taggable_on/tags_helper_spec.rb
 - spec/acts_as_taggable_on/utils_spec.rb
-- spec/bm.rb
 - spec/internal/app/models/altered_inheriting_taggable_model.rb
 - spec/internal/app/models/cached_model.rb
 - spec/internal/app/models/cached_model_with_array.rb

data/spec/bm.rb

@@ -1,52 +0,0 @@
-require 'active_record'
-require 'action_view'
-require File.expand_path('../../lib/acts-as-taggable-on', __FILE__)
-
-if defined?(ActiveRecord::Acts::TaggableOn)
-  ActiveRecord::Base.send :include, ActiveRecord::Acts::TaggableOn
-  ActiveRecord::Base.send :include, ActiveRecord::Acts::Tagger
-  ActionView::Base.send :include, TagsHelper if defined?(ActionView::Base)
-end
-
-TEST_DATABASE_FILE = File.join(File.dirname(__FILE__), '..', 'test.sqlite3')
-File.unlink(TEST_DATABASE_FILE) if File.exist?(TEST_DATABASE_FILE)
-ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => TEST_DATABASE_FILE
-
-ActiveRecord::Base.silence do
-  ActiveRecord::Migration.verbose = false
-  ActiveRecord::Schema.define :version => 0 do
-    create_table "taggings", :force => true do |t|
-      t.integer  "tag_id",        :limit => 11
-      t.integer  "taggable_id",   :limit => 11
-      t.string   "taggable_type"
-      t.string   "context"
-      t.datetime "created_at"
-      t.integer  "tagger_id",     :limit => 11
-      t.string   "tagger_type"
-    end
-
-    add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
-    add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
-
-    create_table "tags", :force => true do |t|
-      t.string "name"
-    end
-
-    create_table :taggable_models, :force => true do |t|
-      t.column :name, :string
-      t.column :type, :string
-      t.column :cached_tag_list, :string
-    end
-  end
-
-  class TaggableModel < ActiveRecord::Base
-    acts_as_taggable
-    acts_as_taggable_on :languages
-    acts_as_taggable_on :skills
-    acts_as_taggable_on :needs, :offerings
-  end
-end
-
-puts Benchmark.measure {
-  1000.times { TaggableModel.create :tag_list => "awesome, epic, neat" }
-}