acts-as-taggable-on 2.2.2 → 2.3.3

data/spec/acts_as_taggable_on/tagger_spec.rb

@@ -16,7 +16,7 @@ describe "Tagger" do
     @user.tag(@taggable, :with=>'ruby,scheme', :on=>:tags)
     @user.owned_tags.size == 2
   end
-  
+
   it "should scope objects returned by tagged_with by owners" do
     @taggable2 = TaggableModel.create(:name => "Jim Jones")
     @taggable3 = TaggableModel.create(:name => "Jane Doe")
@@ -30,7 +30,7 @@ describe "Tagger" do
     TaggableModel.tagged_with(%w(ruby scheme), :owned_by => @user2).count.should == 2
 
   end
-  
+
   it "should not overlap tags from different taggers" do
     @user2 = TaggableUser.new
     lambda{
@@ -42,35 +42,35 @@ describe "Tagger" do
 
     @user.owned_tags.map(&:name).sort.should == %w(ruby scheme).sort
     @user2.owned_tags.map(&:name).sort.should == %w(java python lisp ruby).sort
-    
+
     @taggable.tags_from(@user).sort.should == %w(ruby scheme).sort
     @taggable.tags_from(@user2).sort.should == %w(java lisp python ruby).sort
-    
+
     @taggable.all_tags_list.sort.should == %w(ruby scheme java python lisp).sort
     @taggable.all_tags_on(:tags).size.should == 5
   end
-  
+
   it "should not lose tags from different taggers" do
     @user2 = TaggableUser.create
     @user2.tag(@taggable, :with => 'java, python, lisp, ruby', :on => :tags)
-    @user.tag(@taggable, :with => 'ruby, scheme', :on => :tags)  
-    
+    @user.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
+
     lambda {
       @user2.tag(@taggable, :with => 'java, python, lisp', :on => :tags)
     }.should change(ActsAsTaggableOn::Tagging, :count).by(-1)
 
     [@user, @user2, @taggable].each(&:reload)
-    
+
     @taggable.tags_from(@user).sort.should == %w(ruby scheme).sort
     @taggable.tags_from(@user2).sort.should == %w(java python lisp).sort
-    
+
     @taggable.all_tags_list.sort.should == %w(ruby scheme java python lisp).sort
     @taggable.all_tags_on(:tags).length.should == 5
   end
 
   it "should not lose tags" do
     @user2 = TaggableUser.create
-    
+
     @user.tag(@taggable, :with => 'awesome', :on => :tags)
     @user2.tag(@taggable, :with => 'awesome, epic', :on => :tags)
 
@@ -78,28 +78,61 @@ describe "Tagger" do
       @user2.tag(@taggable, :with => 'epic', :on => :tags)
     }.should change(ActsAsTaggableOn::Tagging, :count).by(-1)
 
-    @taggable.reload  
+    @taggable.reload
     @taggable.all_tags_list.should include('awesome')
     @taggable.all_tags_list.should include('epic')
   end
-  
+
   it "should not lose tags" do
     @taggable.update_attributes(:tag_list => 'ruby')
     @user.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
-    
+
     [@taggable, @user].each(&:reload)
     @taggable.tag_list.should == %w(ruby)
     @taggable.all_tags_list.sort.should == %w(ruby scheme).sort
-    
+
     lambda {
       @taggable.update_attributes(:tag_list => "")
     }.should change(ActsAsTaggableOn::Tagging, :count).by(-1)
-    
+
     @taggable.tag_list.should == []
     @taggable.all_tags_list.sort.should == %w(ruby scheme).sort
   end
 
   it "is tagger" do
     @user.is_tagger?.should(be_true)
-  end  
+  end
+
+  it "should skip save if skip_save is passed as option" do
+    lambda {
+      @user.tag(@taggable, :with => 'epic', :on => :tags, :skip_save => true)
+    }.should_not change(ActsAsTaggableOn::Tagging, :count)
+  end
+
+  describe "Single Table Inheritance" do
+    before do
+      @user3 = InheritingTaggableUser.create
+    end
+
+    it "should have taggings" do
+      @user3.tag(@taggable, :with=>'ruby,scheme', :on=>:tags)
+      @user3.owned_taggings.size == 2
+    end
+
+    it "should have tags" do
+      @user3.tag(@taggable, :with=>'ruby,scheme', :on=>:tags)
+      @user3.owned_tags.size == 2
+    end
+
+    it "should return tags for the inheriting tagger" do
+      @user3.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
+      @taggable.tags_from(@user3).sort.should == %w(ruby scheme).sort
+    end
+
+    it "should scope objects returned by tagged_with by owners" do
+      @user3.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
+      TaggableModel.tagged_with(%w(ruby scheme), :owned_by => @user3).count.should == 1
+    end
+  end
+
 end

data/spec/models.rb

@@ -30,15 +30,23 @@ class TaggableUser < ActiveRecord::Base
   acts_as_tagger
 end
 
+class InheritingTaggableUser < TaggableUser
+end
+
 class UntaggableModel < ActiveRecord::Base
   belongs_to :taggable_model
 end
 
 class NonStandardIdTaggableModel < ActiveRecord::Base
-  set_primary_key "an_id"
+  primary_key = "an_id"
   acts_as_taggable
   acts_as_taggable_on :languages
   acts_as_taggable_on :skills
   acts_as_taggable_on :needs, :offerings
   has_many :untaggable_models
 end
+
+class OrderedTaggableModel < ActiveRecord::Base
+  acts_as_ordered_taggable
+  acts_as_ordered_taggable_on :colours
+end

data/spec/schema.rb

@@ -53,4 +53,9 @@ ActiveRecord::Schema.define :version => 0 do
     t.column :name, :string
     t.column :type, :string
   end
+  
+  create_table :ordered_taggable_models, :force => true do |t|
+    t.column :name, :string
+    t.column :type, :string
+  end
 end

data/spec/spec_helper.rb

@@ -31,6 +31,8 @@ unless [].respond_to?(:freq)
   end
 end
 
+# set adapter to use, default is sqlite3
+# to use an alternative adapter run => rake spec DB='postgresql'
 db_name = ENV['DB'] || 'sqlite3'
 database_yml = File.expand_path('../database.yml', __FILE__)
 
@@ -72,7 +74,7 @@ end
 
 def clean_database!
   models = [ActsAsTaggableOn::Tag, ActsAsTaggableOn::Tagging, TaggableModel, OtherTaggableModel, InheritingTaggableModel,
-            AlteredInheritingTaggableModel, TaggableUser, UntaggableModel]
+            AlteredInheritingTaggableModel, TaggableUser, UntaggableModel, OrderedTaggableModel]
   models.each do |model|
     ActiveRecord::Base.connection.execute "DELETE FROM #{model.table_name}"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000 Z
+date: 2012-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70356686875400 !ruby/object:Gem::Requirement
+  requirement: &70163811858760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70356686875400
+  version_requirements: *70163811858760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70356686901300 !ruby/object:Gem::Requirement
+  requirement: &70163811858260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70356686901300
+  version_requirements: *70163811858260
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70356686900800 !ruby/object:Gem::Requirement
+  requirement: &70163811857800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *70356686900800
+  version_requirements: *70163811857800
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70356686900420 !ruby/object:Gem::Requirement
+  requirement: &70163811875300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70356686900420
+  version_requirements: *70163811875300
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70356686899780 !ruby/object:Gem::Requirement
+  requirement: &70163811874540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.3.7
   type: :development
   prerelease: false
-  version_requirements: *70356686899780
+  version_requirements: *70163811874540
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70356686899280 !ruby/object:Gem::Requirement
+  requirement: &70163811873760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70356686899280
+  version_requirements: *70163811873760
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70356686898580 !ruby/object:Gem::Requirement
+  requirement: &70163811872980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70356686898580
+  version_requirements: *70163811872980
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70356686897920 !ruby/object:Gem::Requirement
+  requirement: &70163811872440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70356686897920
+  version_requirements: *70163811872440
 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: michael@intridea.com
@@ -121,6 +121,7 @@ files:
 - lib/acts_as_taggable_on/acts_as_taggable_on/cache.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/collection.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/core.rb
+- lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/ownership.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/related.rb
 - lib/acts_as_taggable_on/tag.rb
@@ -163,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1793358145648125
+      hash: -1816807933576177649
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1793358145648125
+      hash: -1816807933576177649
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10