acts-as-taggable-on 3.4.2 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee9d316a00b3742d99175e8535a48fc94bf32f7c
-  data.tar.gz: 0a2890ba670d7df947c9e3a271d81284abc9ef42
+  metadata.gz: b39b0f1b57946931d609aa449f30102beb5a137a
+  data.tar.gz: 75404df8d0fc7bd5cda6f58cb72cebbda4d18b9c
 SHA512:
-  metadata.gz: 3da825d4c0393da92b3eef9b8f94a140c7335ed6d810476bf3ba6ef7ccfa75409b9445713bebf8b13d4890be1b1c4aa3312197eaa57b9aedae713329c6203877
-  data.tar.gz: 0fb39c27169059d20607f33bc649655474a73003e5a210f4f5706ff73416f558cbb7ca4c94b9268c72a89501e3a6003ea9f9593a3678e09efecf953da3c0a4e6
+  metadata.gz: 2379d076af6a782a0a6add5be79b8341991e607bcfbd96c45f5fe12bfc2fbf6cca5104d82494636b01ebb8776f3932a8231c199a7b1fc830b8e48bd7321af8aa
+  data.tar.gz: 82c387ff3f37edd3567e7c40f612251939c18702eabd606a711c3aad439d80e2ac4e42464317f5bd24e6bc05f53f3f414c9920064f3eb7982bece02cde56804d

data/.travis.yml

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

data/Appraisals

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

data/CHANGELOG.md

@@ -4,7 +4,7 @@ Each change should fall into categories that would affect whether the release is
 
 As such, a _Feature_ would map to either major or minor. A _bug fix_ to a patch.  And _misc_ is either minor or patch, the difference being kind of fuzzy for the purposes of history.  Adding tests would be patch level.
 
-### Master [changes](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.4.2...master)
+### Master [changes](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.4.3...master)
 
   * Breaking Changes
   * Features
@@ -12,20 +12,22 @@ As such, a _Feature_ would map to either major or minor. A _bug fix_ to a patch.
   * Performance
   * Misc
 
+
+### [3.4.3 / 2014-09-26](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.4.2...v3.4.3)
+
+  * Fixes
+   * [@warp  clears column cache on reset_column_information resolves](https://github.com/mbleigh/acts-as-taggable-on/pull/621)
+
 ### [3.4.2 / 2014-09-26](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.4.1...v3.4.2)
 
-  * Breaking Changes
-  * Features
   * Fixes
    	* [@stiff    fixed tagged_with :any in postgresql](https://github.com/mbleigh/acts-as-taggable-on/pull/570)
    	* [@jerefrer fixed encoding in mysql](https://github.com/mbleigh/acts-as-taggable-on/pull/588)
    	* [@markedmondson 	Ensure taggings context aliases are maintained when joining multiple taggables](https://github.com/mbleigh/acts-as-taggable-on/pull/589)
-  * Performance
-  * Misc
 
 ### [3.4.1 / 2014-09-01](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.4.0...v3.4.1)
   * Fixes
-    * [@konukhov fix owned ordered taggable bug]((https://github.com/mbleigh/acts-as-taggable-on/pull/585)
+    * [@konukhov fix owned ordered taggable bug](https://github.com/mbleigh/acts-as-taggable-on/pull/585)
 
 ### [3.4.0 / 2014-08-29](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.3.0...v3.4.0)
 

data/README.md

@@ -25,7 +25,7 @@ Versions 2.4.1 and up are compatible with Rails 4 too (thanks to arabonradar and
 
 Versions >= 3.x are compatible with Ruby 1.9.3+ and Rails 3 and 4.
 
-For an up-to-date roadmap, see https://github.com/mbleigh/acts-as-taggable-on/issues/milestones
+For an up-to-date roadmap, see https://github.com/mbleigh/acts-as-taggable-on/milestones
 
 ## Installation
 
@@ -180,7 +180,7 @@ ActsAsTaggableOn::Tag.most_used
 ActsAsTaggableOn::Tag.least_used
 ```
 
-You can also filter the results by passing the method a limit, however the default limit is 50.
+You can also filter the results by passing the method a limit, however the default limit is 20.
 
 ```ruby
 ActsAsTaggableOn::Tag.most_used(10)

data/UPGRADING.md

@@ -4,10 +4,4 @@ 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
+It will create any new migrations and skip existing ones

data/gemfiles/activerecord_3.2.gemfile

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

data/gemfiles/activerecord_4.0.gemfile

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

data/gemfiles/activerecord_4.1.gemfile

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

data/gemfiles/activerecord_4.2.gemfile

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

data/lib/acts_as_taggable_on/taggable/cache.rb

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

data/lib/acts_as_taggable_on/taggable/collection.rb

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

data/lib/acts_as_taggable_on/utils.rb

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

data/lib/acts_as_taggable_on/version.rb

@@ -1,4 +1,4 @@
 module ActsAsTaggableOn
-  VERSION = '3.4.2'
+  VERSION = '3.4.3'
 end
 

data/spec/acts_as_taggable_on/caching_spec.rb

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

data/spec/acts_as_taggable_on/utils_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -173,7 +173,6 @@ files:
 - gemfiles/activerecord_4.0.gemfile
 - gemfiles/activerecord_4.1.gemfile
 - gemfiles/activerecord_4.2.gemfile
-- gemfiles/activerecord_edge.gemfile
 - lib/acts-as-taggable-on.rb
 - lib/acts_as_taggable_on.rb
 - lib/acts_as_taggable_on/compatibility.rb
@@ -245,12 +244,6 @@ post_install_message: |-
       rake acts_as_taggable_on_engine:install:migrations
 
   It will create any new migrations and skip existing ones
-
-
-  ##Breaking changes:
-
-    - ActsAsTaggableOn::Tag is not extend with ActsAsTaggableOn::Utils anymore.
-      Please use ActsAsTaggableOn::Utils instead
 rdoc_options: []
 require_paths:
 - lib
@@ -309,4 +302,3 @@ test_files:
 - spec/support/array.rb
 - spec/support/database.rb
 - spec/support/database_cleaner.rb
-has_rdoc: 

data/gemfiles/activerecord_edge.gemfile

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