acts-as-taggable-on 2.2.0 → 2.3.0

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,35 @@ 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
 end

data/spec/acts_as_taggable_on/tagging_spec.rb

@@ -13,11 +13,7 @@ describe ActsAsTaggableOn::Tagging do
 
     @tagging.should_not be_valid
     
-    if ActiveRecord::VERSION::MAJOR >= 3
-      @tagging.errors[:tag_id].should == ["can't be blank"]
-    else
-      @tagging.errors[:tag_id].should == "can't be blank"
-    end
+    @tagging.errors[:tag_id].should == ["can't be blank"]
   end
 
   it "should not create duplicate taggings" do
@@ -28,4 +24,5 @@ describe ActsAsTaggableOn::Tagging do
       2.times { ActsAsTaggableOn::Tagging.create(:taggable => @taggable, :tag => @tag, :context => 'tags') }
     }.should change(ActsAsTaggableOn::Tagging, :count).by(1)
   end
+  
 end

data/spec/acts_as_taggable_on/tags_helper_spec.rb

@@ -25,4 +25,20 @@ describe ActsAsTaggableOn::TagsHelper do
     tags["c++"].should == "sucky"
     tags["php"].should == "sucky"
   end
+  
+  it "should handle tags with zero counts (build for empty)" do
+    bob = ActsAsTaggableOn::Tag.create(:name => "php")
+    tom = ActsAsTaggableOn::Tag.create(:name => "java")
+    eve = ActsAsTaggableOn::Tag.create(:name => "c++")
+    
+    tags = { }
+    
+    @helper.tag_cloud(ActsAsTaggableOn::Tag.all, ["sucky", "awesome"]) do |tag, css_class|
+      tags[tag.name] = css_class
+    end
+    
+    tags["java"].should == "sucky"
+    tags["c++"].should == "sucky"
+    tags["php"].should == "sucky"
+  end
 end

data/spec/models.rb

@@ -42,3 +42,8 @@ class NonStandardIdTaggableModel < ActiveRecord::Base
   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.0
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000 Z
+date: 2012-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153284680 !ruby/object:Gem::Requirement
+  requirement: &70275758086480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153284680
+  version_requirements: *70275758086480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153284100 !ruby/object:Gem::Requirement
+  requirement: &70275758085980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2153284100
+  version_requirements: *70275758085980
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &2153283600 !ruby/object:Gem::Requirement
+  requirement: &70275758085520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2153283600
+  version_requirements: *70275758085520
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153283220 !ruby/object:Gem::Requirement
+  requirement: &70275758103040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153283220
+  version_requirements: *70275758103040
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &2153282280 !ruby/object:Gem::Requirement
+  requirement: &70275758102400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.3.7
   type: :development
   prerelease: false
-  version_requirements: *2153282280
+  version_requirements: *70275758102400
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &2153281780 !ruby/object:Gem::Requirement
+  requirement: &70275758101640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153281780
+  version_requirements: *70275758101640
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2153281300 !ruby/object:Gem::Requirement
+  requirement: &70275758100980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153281300
+  version_requirements: *70275758100980
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2153280680 !ruby/object:Gem::Requirement
+  requirement: &70275758100180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153280680
+  version_requirements: *70275758100180
 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
@@ -118,15 +118,16 @@ files:
 - acts-as-taggable-on.gemspec
 - lib/acts-as-taggable-on.rb
 - lib/acts-as-taggable-on/version.rb
-- lib/acts_as_taggable_on/acts_as_taggable_on.rb
 - 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/acts_as_tagger.rb
 - lib/acts_as_taggable_on/tag.rb
 - lib/acts_as_taggable_on/tag_list.rb
+- lib/acts_as_taggable_on/taggable.rb
+- lib/acts_as_taggable_on/tagger.rb
 - lib/acts_as_taggable_on/tagging.rb
 - lib/acts_as_taggable_on/tags_helper.rb
 - lib/acts_as_taggable_on/utils.rb
@@ -163,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2237132345428656164
+      hash: 3587969812961176900
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,10 +173,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2237132345428656164
+      hash: 3587969812961176900
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Advanced tagging for Rails.

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -1,54 +0,0 @@
-module ActsAsTaggableOn
-  module Taggable
-    def taggable?
-      false
-    end
-
-    ##
-    # This is an alias for calling <tt>acts_as_taggable_on :tags</tt>.
-    #
-    # Example:
-    #   class Book < ActiveRecord::Base
-    #     acts_as_taggable
-    #   end
-    def acts_as_taggable
-      acts_as_taggable_on :tags
-    end
-
-    ##
-    # Make a model taggable on specified contexts.
-    #
-    # @param [Array] tag_types An array of taggable contexts
-    #
-    # Example:
-    #   class User < ActiveRecord::Base
-    #     acts_as_taggable_on :languages, :skills
-    #   end
-    def acts_as_taggable_on(*tag_types)
-      tag_types = tag_types.to_a.flatten.compact.map(&:to_sym)
-
-      if taggable?
-          self.tag_types = (self.tag_types + tag_types).uniq
-      else
-          class_attribute :tag_types
-          self.tag_types = tag_types
-
-        class_eval do
-          has_many :taggings, :as => :taggable, :dependent => :destroy, :include => :tag, :class_name => "ActsAsTaggableOn::Tagging"
-          has_many :base_tags, :through => :taggings, :source => :tag, :class_name => "ActsAsTaggableOn::Tag"
-
-          def self.taggable?
-            true
-          end
-
-          include ActsAsTaggableOn::Utils
-          include ActsAsTaggableOn::Taggable::Core
-          include ActsAsTaggableOn::Taggable::Collection
-          include ActsAsTaggableOn::Taggable::Cache
-          include ActsAsTaggableOn::Taggable::Ownership
-          include ActsAsTaggableOn::Taggable::Related
-        end
-      end
-    end
-  end
-end