acts-as-taggable-on 2.2.0 → 2.2.1

data/README.rdoc

@@ -20,13 +20,13 @@ was used.
 
 To use it, add it to your Gemfile:
 
-  gem 'acts-as-taggable-on', '2.1.0'
+  gem 'acts-as-taggable-on', '~>2.1.0'
 
 === Rails 3.x
 
 To use it, add it to your Gemfile:
 
-  gem 'acts-as-taggable-on'
+  gem 'acts-as-taggable-on', '~>2.2.0'
 
 ==== Post Installation
 
@@ -177,6 +177,14 @@ CSS:
   .css3 { font-size: 1.4em; }
   .css4 { font-size: 1.6em; }
 
+== Remove unused tags
+
+If you would like to remove unused tag objects after removing taggings, add 
+  
+  ActsAsTaggableOn::Tag.remove_unused = true                  
+  
+to initializer file.
+  
 == Contributors
 
 We have a long list of valued contributors. {Check them all}[https://github.com/mbleigh/acts-as-taggable-on/contributors]

data/acts-as-taggable-on.gemspec

@@ -4,7 +4,7 @@ require 'acts-as-taggable-on/version'
 Gem::Specification.new do |gem|
   gem.name = %q{acts-as-taggable-on}
   gem.authors = ["Michael Bleigh"]
-  gem.date = %q{2011-12-09}
+  gem.date = %q{2011-12-18}
   gem.description = %q{With ActsAsTaggableOn, you can tag a single model on several contexts, such as skills, interests, and awards. It also provides other advanced functionality.}
   gem.summary = "Advanced tagging for Rails."
   gem.email = %q{michael@intridea.com}

data/lib/acts-as-taggable-on.rb

@@ -2,18 +2,20 @@ require "active_record"
 require "active_record/version"
 require "action_view"
 
+require "digest/sha1"
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require "acts_as_taggable_on/utils"
 
-require "acts_as_taggable_on/acts_as_taggable_on"
+require "acts_as_taggable_on/taggable"
 require "acts_as_taggable_on/acts_as_taggable_on/core"
 require "acts_as_taggable_on/acts_as_taggable_on/collection"
 require "acts_as_taggable_on/acts_as_taggable_on/cache"
 require "acts_as_taggable_on/acts_as_taggable_on/ownership"
 require "acts_as_taggable_on/acts_as_taggable_on/related"
 
-require "acts_as_taggable_on/acts_as_tagger"
+require "acts_as_taggable_on/tagger"
 require "acts_as_taggable_on/tag"
 require "acts_as_taggable_on/tag_list"
 require "acts_as_taggable_on/tags_helper"

data/lib/acts-as-taggable-on/version.rb

@@ -1,4 +1,4 @@
 module ActsAsTaggableOn
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end
 

data/lib/acts_as_taggable_on/acts_as_taggable_on/collection.rb

@@ -53,11 +53,7 @@ module ActsAsTaggableOn::Taggable
       def all_tag_counts(options = {})
         options.assert_valid_keys :start_at, :end_at, :conditions, :at_least, :at_most, :order, :limit, :on, :id
 
-        scope = if ActiveRecord::VERSION::MAJOR >= 3
-                  {}
-                else
-                  scope(:find) || {}           
-                end
+        scope = {}
 
         ## Generate conditions:
         options[:conditions] = sanitize_sql(options[:conditions]) if options[:conditions]     
@@ -92,8 +88,6 @@ module ActsAsTaggableOn::Taggable
         tag_joins = [
         ].compact
 
-        [tagging_joins, tag_joins].each(&:reverse!) if ActiveRecord::VERSION::MAJOR < 3
-
         ## Generate scope:
         tagging_scope = ActsAsTaggableOn::Tagging.select("#{ActsAsTaggableOn::Tagging.table_name}.tag_id, COUNT(#{ActsAsTaggableOn::Tagging.table_name}.tag_id) AS tags_count")
         tag_scope = ActsAsTaggableOn::Tag.select("#{ActsAsTaggableOn::Tag.table_name}.*, #{ActsAsTaggableOn::Tagging.table_name}.tags_count AS count").order(options[:order]).limit(options[:limit])   
@@ -112,18 +106,12 @@ module ActsAsTaggableOn::Taggable
 
         group_columns = "#{ActsAsTaggableOn::Tagging.table_name}.tag_id"
 
-        if ActiveRecord::VERSION::MAJOR >= 3
-          # Append the current scope to the scope, because we can't use scope(:find) in RoR 3.0 anymore:
-          scoped_select = "#{table_name}.#{primary_key}"
-          tagging_scope = tagging_scope.where("#{ActsAsTaggableOn::Tagging.table_name}.taggable_id IN(#{select(scoped_select).to_sql})").
-                                        group(group_columns).
-                                        having(having)
-        else
-          # Having is not available in 2.3.x:
-          group_by  = "#{group_columns} HAVING COUNT(*) > 0"
-          group_by << " AND #{having}" unless having.blank?
-          tagging_scope = tagging_scope.group(group_by)
-        end
+        # Append the current scope to the scope, because we can't use scope(:find) in RoR 3.0 anymore:
+        scoped_select = "#{table_name}.#{primary_key}"
+        tagging_scope = tagging_scope.where("#{ActsAsTaggableOn::Tagging.table_name}.taggable_id IN(#{select(scoped_select).to_sql})").
+                                      group(group_columns).
+                                      having(having)
+
 
         tag_scope = tag_scope.joins("JOIN (#{tagging_scope.to_sql}) AS #{ActsAsTaggableOn::Tagging.table_name} ON #{ActsAsTaggableOn::Tagging.table_name}.tag_id = #{ActsAsTaggableOn::Tag.table_name}.id")
         tag_scope

data/lib/acts_as_taggable_on/acts_as_taggable_on/core.rb

@@ -93,8 +93,7 @@ module ActsAsTaggableOn::Taggable
           # avoid ambiguous column name
           taggings_context = context ? "_#{context}" : ''
 
-          #TODO: fix alias to be smaller
-          taggings_alias   = "#{alias_base_name}#{taggings_context}_taggings_#{tags.map(&:safe_name).join('_')}_#{rand(1024)}"
+          taggings_alias   = "#{alias_base_name[0..4]}#{taggings_context[0..6]}_taggings_#{sha_prefix(tags.map(&:safe_name).join('_'))}"
 
           tagging_join  = "JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
                           "  ON #{taggings_alias}.taggable_id = #{table_name}.#{primary_key}" +
@@ -112,9 +111,8 @@ module ActsAsTaggableOn::Taggable
           return empty_result unless tags.length == tag_list.length
 
           tags.each do |tag|
-            prefix   = "#{tag.safe_name}_#{rand(1024)}"
 
-            taggings_alias = "#{alias_base_name}_taggings_#{prefix}"
+            taggings_alias = "#{alias_base_name[0..11]}_taggings_#{sha_prefix(tag.safe_name)}"
 
             tagging_join  = "JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
                             "  ON #{taggings_alias}.taggable_id = #{table_name}.#{primary_key}" +

data/lib/acts_as_taggable_on/acts_as_taggable_on/related.rb

@@ -60,7 +60,7 @@ module ActsAsTaggableOn::Taggable
 
         exclude_self = "#{klass.table_name}.#{klass.primary_key} != #{id} AND" if [self.class.base_class, self.class].include? klass
 
-group_columns = ActsAsTaggableOn::Tag.using_postgresql? ? grouped_column_names_for(klass) : "#{klass.table_name}.#{klass.primary_key}"
+        group_columns = ActsAsTaggableOn::Tag.using_postgresql? ? grouped_column_names_for(klass) : "#{klass.table_name}.#{klass.primary_key}"
 
         klass.scoped({ :select     => "#{klass.table_name}.*, COUNT(#{ActsAsTaggableOn::Tag.table_name}.#{ActsAsTaggableOn::Tag.primary_key}) AS count",
                        :from       => "#{klass.table_name}, #{ActsAsTaggableOn::Tag.table_name}, #{ActsAsTaggableOn::Tagging.table_name}",

data/lib/acts_as_taggable_on/tag.rb

@@ -2,6 +2,9 @@ module ActsAsTaggableOn
   class Tag < ::ActiveRecord::Base
     include ActsAsTaggableOn::Utils
 
+    cattr_accessor :remove_unused
+    self.remove_unused = false
+     
     attr_accessible :name
 
     ### ASSOCIATIONS:

data/lib/acts_as_taggable_on/tagging.rb

@@ -18,5 +18,17 @@ module ActsAsTaggableOn
     validates_presence_of :tag_id
 
     validates_uniqueness_of :tag_id, :scope => [ :taggable_type, :taggable_id, :context, :tagger_id, :tagger_type ]
+
+    after_destroy :remove_unused_tags
+
+    private
+
+    def remove_unused_tags
+      if Tag.remove_unused
+        if tag.taggings.count.zero?
+          tag.destroy
+        end
+      end
+    end
   end
 end

data/lib/acts_as_taggable_on/tags_helper.rb

@@ -9,8 +9,8 @@ module ActsAsTaggableOn
       max_count = tags.sort_by(&:count).last.count.to_f
 
       tags.each do |tag|
-        index = ((tag.count / max_count) * (classes.size - 1)).round
-        yield tag, classes[index]
+        index = ((tag.count / max_count) * (classes.size - 1))
+        yield tag, classes[index.nan? ? 0 : index.round]
       end
     end
   end

data/lib/acts_as_taggable_on/utils.rb

@@ -15,6 +15,10 @@ module ActsAsTaggableOn
         ::ActiveRecord::Base.connection && ::ActiveRecord::Base.connection.adapter_name == 'SQLite'
       end
 
+      def sha_prefix(string)
+        Digest::SHA1.hexdigest(string + Time.now.to_s)[0..6]
+      end
+      
       private
       def like_operator
         using_postgresql? ? 'ILIKE' : 'LIKE'

data/lib/generators/acts_as_taggable_on/migration/templates/active_record/migration.rb

@@ -12,7 +12,9 @@ class ActsAsTaggableOnMigration < ActiveRecord::Migration
       t.references :taggable, :polymorphic => true
       t.references :tagger, :polymorphic => true
 
-      t.string :context
+      # limit is created to prevent mysql error o index lenght for myisam table type.
+      # http://bit.ly/vgW2Ql
+      t.string :context, :limit => 128
 
       t.datetime :created_at
     end

data/spec/acts_as_taggable_on/tag_spec.rb

@@ -74,20 +74,12 @@ describe ActsAsTaggableOn::Tag do
   it "should require a name" do
     @tag.valid?
 
-    if ActiveRecord::VERSION::MAJOR >= 3
-      @tag.errors[:name].should == ["can't be blank"]
-    else
-      @tag.errors[:name].should == "can't be blank"
-    end
+    @tag.errors[:name].should == ["can't be blank"]
 
     @tag.name = "something"
     @tag.valid?
 
-    if ActiveRecord::VERSION::MAJOR >= 3
-      @tag.errors[:name].should == []
-    else
-      @tag.errors[:name].should be_nil
-    end
+    @tag.errors[:name].should == []
   end
 
   it "should equal a tag with the same name" do
@@ -128,4 +120,35 @@ describe ActsAsTaggableOn::Tag do
     end
 
   end
+  
+  describe ".remove_unused" do
+    before do
+      @taggable = TaggableModel.create(:name => "Bob Jones")
+      @tag = ActsAsTaggableOn::Tag.create(:name => "awesome")
+
+      @tagging = ActsAsTaggableOn::Tagging.create(:taggable => @taggable, :tag => @tag, :context => 'tags')
+    end
+    
+    context "if set to true" do
+      before do
+        ActsAsTaggableOn::Tag.remove_unused = true                  
+      end
+      
+      it "should remove unused tags after removing taggings" do
+        @tagging.destroy
+        ActsAsTaggableOn::Tag.find_by_name("awesome").should be_nil
+      end
+    end
+    
+    context "if set to false" do
+      before do
+        ActsAsTaggableOn::Tag.remove_unused = false        
+      end
+      
+      it "should not remove unused tags after removing taggings" do
+        @tagging.destroy
+        ActsAsTaggableOn::Tag.find_by_name("awesome").should == @tag
+      end
+    end
+  end
 end

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -142,20 +142,9 @@ describe "Taggable" do
     TaggableModel.tagged_with(['rails, css'], :on => :needs, :any => true).tagged_with(['c++', 'java'], :on => :offerings, :any => true).to_a.should == [bob]
   end
 
-  if ActiveRecord::VERSION::MAJOR >= 3
-    it "should not return read-only records" do
-      TaggableModel.create(:name => "Bob", :tag_list => "ruby, rails, css")
-      TaggableModel.tagged_with("ruby").first.should_not be_readonly
-    end
-  else
-    xit "should not return read-only records" do
-      # apparantly, there is no way to set readonly to false in a scope if joins are made
-    end
-
-    it "should be possible to return writable records" do
-      TaggableModel.create(:name => "Bob", :tag_list => "ruby, rails, css")
-      TaggableModel.tagged_with("ruby").first(:readonly => false).should_not be_readonly
-    end
+  it "should not return read-only records" do
+    TaggableModel.create(:name => "Bob", :tag_list => "ruby, rails, css")
+    TaggableModel.tagged_with("ruby").first.should_not be_readonly
   end
 
   it "should be able to get scoped tag counts" do

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

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.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000 Z
+date: 2011-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153284680 !ruby/object:Gem::Requirement
+  requirement: &70149870225700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2153284680
+  version_requirements: *70149870225700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153284100 !ruby/object:Gem::Requirement
+  requirement: &70149870224800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2153284100
+  version_requirements: *70149870224800
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &2153283600 !ruby/object:Gem::Requirement
+  requirement: &70149870248200 !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: *70149870248200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153283220 !ruby/object:Gem::Requirement
+  requirement: &70149870247800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153283220
+  version_requirements: *70149870247800
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &2153282280 !ruby/object:Gem::Requirement
+  requirement: &70149870247220 !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: *70149870247220
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &2153281780 !ruby/object:Gem::Requirement
+  requirement: &70149870246740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153281780
+  version_requirements: *70149870246740
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2153281300 !ruby/object:Gem::Requirement
+  requirement: &70149870246180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153281300
+  version_requirements: *70149870246180
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2153280680 !ruby/object:Gem::Requirement
+  requirement: &70149870245500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153280680
+  version_requirements: *70149870245500
 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,15 @@ 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/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 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2237132345428656164
+      hash: -2348258432577140293
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,10 +172,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2237132345428656164
+      hash: -2348258432577140293
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Advanced tagging for Rails.