acts-as-taggable-on 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc40e6d7c5c8b741bfc71aee7ae2406c6f824108
-  data.tar.gz: 3c89e20ed3b39ef33d52724d4bb8b9aa3e5738f9
+  metadata.gz: 755e4d829ddc31ccd6ffb8385594ed8c5c64971f
+  data.tar.gz: 1ce12972b7d9d436484d619843a7bdf316a5c3b7
 SHA512:
-  metadata.gz: e4142af492646d113a10fa0ae4815d91a281f2a55d60fb70b653a96d4ac58e24c56e1e10bcbf9907bbcc06cee2b476b6ec4a568cc25e5247578a140cbf388d85
-  data.tar.gz: eceb8e025f83cdbc9e237405eac982aa3b7c7ef0f54d803fcd80d1ed837b833d4f07fe549f0eb0eaa443edb5cdc84bcad79555a67a886e7fc706b46aa5d37b35
+  metadata.gz: c8f129a07903598bcb765b260bd14db168b4a6fbf6989cef816157ae6350cadd733f75ca6cc0169e00fa8c19b59710198b868f52044f07efca451c44aa9a046c
+  data.tar.gz: 578b3d36b654b9343a36df3a7086b40b3ef32f6b43973d92c0f31251ea095405b692d2ef131ba74086366d117eef0fcd2334b51ce8f7ce3c0266481819a0a2a1

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,19 @@ matrix:
   fast_finish: true
   allow_failures:
       - gemfile: gemfiles/activerecord_edge.gemfile
-      - rvm: rbx-2
+      - rvm: rbx-2
+  exclude:
+      - rvm: 1.9.3
+        gemfile: ci/Gemfile.activerecord-4.0.x
+      - rvm: 1.9.3
+        gemfile: ci/Gemfile.activerecord-4.1.x
+      - rvm: 1.9.3
+        gemfile: ci/Gemfile.activerecord-edge
+      - rvm: rbx-2
+        gemfile: ci/Gemfile.activerecord-3.2.x
+      - rvm: ruby-head
+        gemfile: ci/Gemfile.activerecord-3.2.x
+      - rvm: ruby-head
+        gemfile: ci/Gemfile.activerecord-4.0.x
+      - rvm: ruby-head
+        gemfile: ci/Gemfile.activerecord-4.1.x

data/Gemfile

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

data/acts-as-taggable-on.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'mysql2'
   gem.add_development_dependency 'pg'
 
-  gem.add_development_dependency 'rspec-rails'  , '~> 3.0.0.beta2'
+  gem.add_development_dependency 'rspec-rails'  , '~> 3.0.0.beta1'
   gem.add_development_dependency 'rspec-its', '~> 1.0'
   gem.add_development_dependency 'rspec', '3.0.0.beta2'
   gem.add_development_dependency 'ammeter', '~> 1.0'

data/gemfiles/activerecord_3.2.gemfile

@@ -10,6 +10,7 @@ group :local_development do
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
+  gem "byebug"
 end
 
 gemspec :path => "../"

data/gemfiles/activerecord_4.0.gemfile

@@ -10,6 +10,7 @@ group :local_development do
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
+  gem "byebug"
 end
 
 gemspec :path => "../"

data/gemfiles/activerecord_4.1.gemfile

@@ -10,6 +10,7 @@ group :local_development do
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
+  gem "byebug"
 end
 
 gemspec :path => "../"

data/gemfiles/activerecord_edge.gemfile

@@ -11,6 +11,7 @@ group :local_development do
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
+  gem "byebug"
 end
 
 gemspec :path => "../"

data/lib/acts_as_taggable_on/acts_as_taggable_on/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:

data/lib/acts_as_taggable_on/acts_as_taggable_on/core.rb

@@ -83,6 +83,7 @@ module ActsAsTaggableOn::Taggable
       #   User.tagged_with("awesome", "cool", :owned_by => foo ) # Users that are tagged with just awesome and cool by 'foo'
       def tagged_with(tags, options = {})
         tag_list = ActsAsTaggableOn::TagList.from(tags)
+        options = options.dup
         empty_result = where('1 = 0')
 
         return empty_result if tag_list.empty?
@@ -382,7 +383,7 @@ module ActsAsTaggableOn::Taggable
 
         # Destroy old taggings:
         if old_tags.present?
-          ActsAsTaggableOn::Tagging.destroy_all(tagger_type: nil, tagger_id: nil, context: context.to_s, tag_id: old_tags)
+          self.taggings.not_owned.by_context(context).destroy_all(tag_id: old_tags)
         end
 
         # Create new taggings:

data/lib/acts_as_taggable_on/acts_as_taggable_on/related.rb

@@ -41,7 +41,7 @@ module ActsAsTaggableOn::Taggable
     end
 
     def related_tags_for(context, klass, options = {})
-      tags_to_ignore = Array.wrap(options.delete(:ignore)).map(&:to_s) || []
+      tags_to_ignore = Array.wrap(options[:ignore]).map(&:to_s) || []
       tags_to_find = tags_on(context).map { |t| t.name }.reject { |t| tags_to_ignore.include? t }
       related_where(klass, ["#{exclude_self(klass, id)} #{klass.table_name}.#{klass.primary_key} = #{ActsAsTaggableOn::Tagging.table_name}.taggable_id AND #{ActsAsTaggableOn::Tagging.table_name}.taggable_type = '#{klass.base_class}' AND #{ActsAsTaggableOn::Tagging.table_name}.tag_id = #{ActsAsTaggableOn::Tag.table_name}.#{ActsAsTaggableOn::Tag.primary_key} AND #{ActsAsTaggableOn::Tag.table_name}.name IN (?)", tags_to_find])
     end

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/tagging.rb

@@ -15,6 +15,12 @@ module ActsAsTaggableOn
     belongs_to :taggable, polymorphic: true
     belongs_to :tagger,   polymorphic: true
 
+    scope :owned_by, ->(owner) { where(tagger: owner) }
+    scope :not_owned, -> { where(tagger_id: nil, tagger_type: nil) }
+
+    scope :by_contexts, ->(contexts = ['tags']) { where(context: contexts) }
+    scope :by_context, ->(context= 'tags') { by_contexts(context.to_s) }
+
     validates_presence_of :context
     validates_presence_of :tag_id
 

data/lib/acts_as_taggable_on/version.rb

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

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -494,6 +494,12 @@ describe 'Taggable' do
     end
   end
 
+  it 'should options key not be deleted' do
+    options = {:exclude => true}
+    TaggableModel.tagged_with("foo", options)
+    expect(options).to eq({:exclude => true})
+  end
+
   context 'Duplicates' do
     context 'should not create duplicate taggings' do
       let(:bob) { TaggableModel.create(name: 'Bob') }

data/spec/acts_as_taggable_on/tagging_spec.rb

@@ -23,5 +23,29 @@ describe ActsAsTaggableOn::Tagging do
       2.times { ActsAsTaggableOn::Tagging.create(taggable: @taggable, tag: @tag, context: 'tags') }
     }).to change(ActsAsTaggableOn::Tagging, :count).by(1)
   end
-  
-end
+
+  it 'should not delete tags of other records' do
+    6.times { TaggableModel.create(name: 'Bob Jones', tag_list: 'very, serious, bug') }
+    expect(ActsAsTaggableOn::Tag.count).to eq(3)
+    taggable = TaggableModel.first
+    taggable.tag_list = 'bug'
+    taggable.save
+
+    expect(taggable.tag_list).to eq(['bug'])
+
+    another_taggable = TaggableModel.where('id != ?', taggable.id).sample
+    expect(another_taggable.tag_list.sort).to eq(%w(very serious bug).sort)
+  end
+
+  pending 'context scopes' do
+    describe '.by_context'
+
+    describe '.by_contexts'
+
+    describe '.owned_by'
+
+    describe '.not_owned'
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Michael Bleigh
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0.beta1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement