acts-as-taggable-on 3.2.5 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a20675bbbf6a845a9af63de544fd91aa3d0456c4
-  data.tar.gz: 525532eb66d8245b5d5e5f5e0b0bcafbd71f0165
+  metadata.gz: c207ddc1c1646d4ad2e7ea2acb1b187ae59c7dfe
+  data.tar.gz: 71f15406a4e299bedca0c8e23d473d02cab5b1d8
 SHA512:
-  metadata.gz: da3437561dbcb861750489d2abcff557bd2aa488a483ea73d242a51d08fa6df6be4b8a64b1f7fbbed9e3dd44ea63e9b7b6101bd4d52d5a0ee05658272d16e5d8
-  data.tar.gz: 4f34e61243d64b0f77c842dc929c3dc6e1039b65a388d0da2e0b31484b7c63637acc76764dc18c5fde11198199dcf5756460b322e38abd5cbb9a65ed1a510c1d
+  metadata.gz: e78b1c9f8d1b3ccc32567edd4f2e5703b34ea21c4ecf13bbc723647dedcfb2674177927955ffd6b0fd10a0e249d5e7e4ff85d4a72886a7d5016290bbab146862
+  data.tar.gz: b5e3f003ac97a1e11bad401cd8c0734570d6d0e647eed0c8c64d2c17cc7e88cfcc1204d0bf3e70b52641096cf79e84b0e9b190e19e667b938abea182e10fdf96

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/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'

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,7 +3,7 @@ require 'active_record/version'
 require 'active_support/core_ext/module'
 require 'action_view'
 
-require_relative 'acts_as_taggable_on/engine'
+require_relative 'acts_as_taggable_on/engine'  if defined?(Rails)
 
 require 'digest/sha1'
 

data/lib/acts_as_taggable_on/taggable/core.rb

@@ -153,7 +153,7 @@ module ActsAsTaggableOn::Taggable
           end
 
           joins << tagging_join
-          unless any == 'distinct'    # Fix issue #544
+          unless any == 'distinct' # Fix issue #544
             group = "#{table_name}.#{primary_key}"
             select_clause << group
           end
@@ -329,8 +329,12 @@ module ActsAsTaggableOn::Taggable
         old = changed_attributes[attrib]
         changed_attributes.delete(attrib) if old.to_s == value.to_s
       else
-        old = tag_list_on(context).to_s
-        changed_attributes[attrib] = old if old.to_s != value.to_s
+        old = tag_list_on(context)
+        if self.class.preserve_tag_order
+          changed_attributes[attrib] = old if old.to_s != value.to_s
+        else
+          changed_attributes[attrib] = old.to_s if old.sort != ActsAsTaggableOn::TagListParser.parse(value).sort
+        end
       end
     end
 

data/lib/acts_as_taggable_on/version.rb

@@ -1,4 +1,4 @@
 module ActsAsTaggableOn
-  VERSION = '3.2.5'
+  VERSION = '3.2.6'
 end
 

data/spec/acts_as_taggable_on/taggable/dirty_spec.rb

@@ -0,0 +1,127 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe ActsAsTaggableOn::Taggable::Dirty do
+  context 'with un-contexted tags' do
+    before(:each) do
+      @taggable = TaggableModel.create(tag_list: 'awesome, epic')
+    end
+
+    context 'when tag_list changed' do
+      before(:each) do
+        expect(@taggable.changes).to be_empty
+        @taggable.tag_list = 'one'
+      end
+
+      it 'should show changes of dirty object' do
+        expect(@taggable.changes).to eq({'tag_list' => ['awesome, epic', ['one']]})
+      end
+
+      it 'flags tag_list as changed' do
+        expect(@taggable.tag_list_changed?).to be_truthy
+      end
+
+      it 'preserves original value' do
+        expect(@taggable.tag_list_was).to eq('awesome, epic')
+      end
+
+      it 'shows what the change was' do
+        expect(@taggable.tag_list_change).to eq(['awesome, epic', ['one']])
+      end
+
+      context 'without order' do
+        it 'should not mark attribute if order change ' do
+          taggable = TaggableModel.create(name: 'Dirty Harry', tag_list: %w(d c b a))
+          taggable.tag_list =  %w(a b c d)
+          expect(taggable.tag_list_changed?).to be_falsey
+        end
+      end
+
+      context 'with order' do
+        it 'should mark attribute if order change' do
+          taggable = OrderedTaggableModel.create(name: 'Clean Harry', tag_list: 'd,c,b,a')
+          taggable.save
+          taggable.tag_list =  %w(a b c d)
+          expect(taggable.tag_list_changed?).to be_truthy
+        end
+      end
+    end
+
+    context 'when tag_list is the same' do
+      before(:each) do
+        @taggable.tag_list = 'awesome, epic'
+      end
+
+      it 'is not flagged as changed' do
+        expect(@taggable.tag_list_changed?).to be_falsy
+      end
+
+      it 'does not show any changes to the taggable item' do
+        expect(@taggable.changes).to be_empty
+      end
+
+      context "and using a delimiter different from a ','" do
+        before do
+          @old_delimiter = ActsAsTaggableOn.delimiter
+          ActsAsTaggableOn.delimiter = ';'
+        end
+
+        after do
+          ActsAsTaggableOn.delimiter = @old_delimiter
+        end
+
+        it 'does not show any changes to the taggable item when using array assignments' do
+          @taggable.tag_list = %w(awesome epic)
+          expect(@taggable.changes).to be_empty
+        end
+      end
+    end
+  end
+
+  context 'with context tags' do
+    before(:each) do
+      @taggable = TaggableModel.create('language_list' => 'awesome, epic')
+    end
+
+    context 'when language_list changed' do
+      before(:each) do
+        expect(@taggable.changes).to be_empty
+        @taggable.language_list = 'one'
+      end
+
+      it 'should show changes of dirty object' do
+        expect(@taggable.changes).to eq({'language_list' => ['awesome, epic', ['one']]})
+      end
+
+      it 'flags language_list as changed' do
+        expect(@taggable.language_list_changed?).to be_truthy
+      end
+
+      it 'preserves original value' do
+        expect(@taggable.language_list_was).to eq('awesome, epic')
+      end
+
+      it 'shows what the change was' do
+        expect(@taggable.language_list_change).to eq(['awesome, epic', ['one']])
+      end
+
+      it 'shows what the changes were' do
+        expect(@taggable.language_list_changes).to eq(['awesome, epic', ['one']])
+      end
+    end
+
+    context 'when language_list is the same' do
+      before(:each) do
+        @taggable.language_list = 'awesome, epic'
+      end
+
+      it 'is not flagged as changed' do
+        expect(@taggable.language_list_changed?).to be_falsy
+      end
+
+      it 'does not show any changes to the taggable item' do
+        expect(@taggable.changes).to be_empty
+      end
+    end
+  end
+end

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -506,6 +506,13 @@ describe 'Taggable' do
     expect(options).to eq({:exclude => true})
   end
 
+  it 'should not delete tags if not updated' do
+    model = TaggableModel.create(name: 'foo', tag_list: 'ruby, rails, programming')
+    model.update_attributes(name: 'bar')
+    model.reload
+    expect(model.tag_list.sort).to eq(%w(ruby rails programming).sort)
+  end
+
   context 'Duplicates' do
     context 'should not create duplicate taggings' do
       let(:bob) { TaggableModel.create(name: 'Bob') }
@@ -703,114 +710,6 @@ describe 'Taggable' do
     end
   end
 
-  describe 'Dirty Objects' do
-    context 'with un-contexted tags' do
-      before(:each) do
-        @taggable = TaggableModel.create(tag_list: 'awesome, epic')
-      end
-
-      context 'when tag_list changed' do
-        before(:each) do
-          expect(@taggable.changes).to be_empty
-          @taggable.tag_list = 'one'
-        end
-
-        it 'should show changes of dirty object' do
-          expect(@taggable.changes).to eq({'tag_list' => ['awesome, epic', ['one']]})
-        end
-
-        it 'flags tag_list as changed' do
-          expect(@taggable.tag_list_changed?).to be_truthy
-        end
-
-        it 'preserves original value' do
-          expect(@taggable.tag_list_was).to eq('awesome, epic')
-        end
-
-        it 'shows what the change was' do
-          expect(@taggable.tag_list_change).to eq(['awesome, epic', ['one']])
-        end
-      end
-
-      context 'when tag_list is the same' do
-        before(:each) do
-          @taggable.tag_list = 'awesome, epic'
-        end
-
-        it 'is not flagged as changed' do
-          expect(@taggable.tag_list_changed?).to be_falsy
-        end
-
-        it 'does not show any changes to the taggable item' do
-          expect(@taggable.changes).to be_empty
-        end
-
-        context "and using a delimiter different from a ','" do
-          before do
-            @old_delimiter = ActsAsTaggableOn.delimiter
-            ActsAsTaggableOn.delimiter = ';'
-          end
-
-          after do
-            ActsAsTaggableOn.delimiter = @old_delimiter
-          end
-
-          it 'does not show any changes to the taggable item when using array assignments' do
-            @taggable.tag_list = %w(awesome epic)
-            expect(@taggable.changes).to be_empty
-          end
-        end
-      end
-    end
-
-    context 'with context tags' do
-      before(:each) do
-        @taggable = TaggableModel.create('language_list' => 'awesome, epic')
-      end
-
-      context 'when language_list changed' do
-        before(:each) do
-          expect(@taggable.changes).to be_empty
-          @taggable.language_list = 'one'
-        end
-
-        it 'should show changes of dirty object' do
-          expect(@taggable.changes).to eq({'language_list' => ['awesome, epic', ['one']]})
-        end
-
-        it 'flags language_list as changed' do
-          expect(@taggable.language_list_changed?).to be_truthy
-        end
-
-        it 'preserves original value' do
-          expect(@taggable.language_list_was).to eq('awesome, epic')
-        end
-
-        it 'shows what the change was' do
-          expect(@taggable.language_list_change).to eq(['awesome, epic', ['one']])
-        end
-
-        it 'shows what the changes were' do
-          expect(@taggable.language_list_changes).to eq(['awesome, epic', ['one']])
-        end
-      end
-
-      context 'when language_list is the same' do
-        before(:each) do
-          @taggable.language_list = 'awesome, epic'
-        end
-
-        it 'is not flagged as changed' do
-          expect(@taggable.language_list_changed?).to be_falsy
-        end
-
-        it 'does not show any changes to the taggable item' do
-          expect(@taggable.changes).to be_empty
-        end
-      end
-    end
-  end
-
   describe 'Autogenerated methods' do
     it 'should be overridable' do
       expect(TaggableModel.create(tag_list: 'woo').tag_list_submethod_called).to be_truthy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -31,26 +31,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +199,7 @@ files:
 - spec/acts_as_taggable_on/tag_list_parser_spec.rb
 - spec/acts_as_taggable_on/tag_list_spec.rb
 - spec/acts_as_taggable_on/tag_spec.rb
+- spec/acts_as_taggable_on/taggable/dirty_spec.rb
 - spec/acts_as_taggable_on/taggable_spec.rb
 - spec/acts_as_taggable_on/tagger_spec.rb
 - spec/acts_as_taggable_on/tagging_spec.rb
@@ -292,6 +273,7 @@ test_files:
 - spec/acts_as_taggable_on/tag_list_parser_spec.rb
 - spec/acts_as_taggable_on/tag_list_spec.rb
 - spec/acts_as_taggable_on/tag_spec.rb
+- spec/acts_as_taggable_on/taggable/dirty_spec.rb
 - spec/acts_as_taggable_on/taggable_spec.rb
 - spec/acts_as_taggable_on/tagger_spec.rb
 - spec/acts_as_taggable_on/tagging_spec.rb