acts-as-taggable-on 2.1.0 → 2.3.0

data/.gitignore

@@ -5,3 +5,6 @@
 .rvmrc
 Gemfile.lock
 spec/database.yml
+tmp*.sw?
+*.sw?
+tmp

data/.travis.yml

@@ -1,9 +1,8 @@
 script: "cp spec/database.yml.sample spec/database.yml && bundle install && bundle exec rake"
 rvm:
   - 1.8.7
-  - ree
   - 1.9.2
-  - rbx
+  - 1.9.3
 env:
   - DB=sqlite3
   - DB=mysql

data/CHANGELOG

@@ -1,3 +1,13 @@
+== 2011-08-21
+* escape _ and % for mysql and postgres (@tilsammans)
+* Now depends on mysql2 gem
+* tagged_with :any is chainable now (@jeffreyiacono)
+* tagged_with(nil) returns scoped object
+* Case-insensitivity for TaggedModel.tagged_with for PostgreSQL database
+* tagged_with(' ') returns scoped object
+* remove warning for rails 3.1 about class_inheritable_attribute
+* use ActiveRecord migration_number to avoid clashs (@atd)
+
 == 2010-02-17
 * Converted the plugin to be compatible with Rails3
 

data/README.rdoc

@@ -1,4 +1,5 @@
 = ActsAsTaggableOn
+{<img src="https://secure.travis-ci.org/mbleigh/acts-as-taggable-on.png" />}[http://travis-ci.org/mbleigh/acts-as-taggable-on]
 
 This plugin was originally based on Acts as Taggable on Steroids by Jonathan Viney.
 It has evolved substantially since that point, but all credit goes to him for the
@@ -15,37 +16,15 @@ was used.
 
 == Installation
 
-=== Rails 2.3.x
+=== Rails 2.x
 
-Acts As Taggable On is tested to work in Rails 2.3.5. 
+Not supported any more! It is time for update guys.
 
-==== Plugin
-
-Acts As Taggable On is available both as a gem and as a traditional plugin. For the
-traditional plugin you can install like so:
-
-  script/plugin install git://github.com/mbleigh/acts-as-taggable-on.git
-
-Acts As Taggable On is also available as a gem plugin using Rails 2.1's gem dependencies.
-To install the gem, add this to your config/environment.rb:
-  
-  config.gem "acts-as-taggable-on", :source => "http://gemcutter.org", :version => '2.0.0.rc1'
-  
-After that, you can run "rake gems:install" to install the gem if you don't already have it.
-
-==== Post Installation
-
-1. script/generate acts_as_taggable_on_migration
-2. rake db:migrate
-
-=== Rails 3.0
-
-Acts As Taggable On is now useable in Rails 3.0, thanks to the excellent work of Szymon Nowak
-and Jelle Vandebeeck.
+=== Rails 3.x
 
 To use it, add it to your Gemfile:
-  
-  gem 'acts-as-taggable-on'
+
+  gem 'acts-as-taggable-on', '~> 2.2.2'
 
 ==== Post Installation
 
@@ -54,20 +33,11 @@ To use it, add it to your Gemfile:
 
 == Testing
 
-Acts As Taggable On uses RSpec for its test coverage. Inside the plugin
-directory, you can run the specs for RoR 3.0.0 with:
+Acts As Taggable On uses RSpec for its test coverage. Inside the gem
+directory, you can run the specs for RoR 3.x with:
 
   rake spec
 
-If you want to test the plugin for Rails 2.3.x, use:
-
-  rake rails2.3:spec
-
-If you already have RSpec on your application, the specs will run while using:
-
-rake spec:plugins
-
-
 == Usage
 
     class User < ActiveRecord::Base
@@ -89,6 +59,25 @@ rake spec:plugins
     User.skill_counts # => [<Tag name="joking" count=2>,<Tag name="clowning" count=1>...]
     @frankie.skill_counts
 
+To preserve the order in which tags are created use acts_as_ordered_taggable:
+
+    class User < ActiveRecord::Base
+      # Alias for <tt>acts_as_ordered_taggable_on :tags</tt>:
+      acts_as_ordered_taggable
+      acts_as_ordered_taggable_on :skills, :interests
+    end
+
+    @user = User.new(:name => "Bobby")
+    @user.tag_list = "east, south"
+    @user.save
+
+    @user.tag_list = "north, east, south, west"
+    @user.save
+
+    @user.reload
+    @user.tag_list # => ["north", "east", "south", "west"] 
+
+
 === Finding Tagged Objects
 
 Acts As Taggable On utilizes named_scopes to create an association for tags.
@@ -97,25 +86,32 @@ compatibility with the will_paginate gem:
 
     class User < ActiveRecord::Base
       acts_as_taggable_on :tags, :skills
-      named_scope :by_join_date, :order => "created_at DESC"
+      scope :by_join_date, order("created_at DESC")
     end
 
     User.tagged_with("awesome").by_date
     User.tagged_with("awesome").by_date.paginate(:page => params[:page], :per_page => 20)
 
     # Find a user with matching all tags, not just one
-    User.tagged_with(["awesome", "cool"], :match_all => :true)
-    
+    User.tagged_with(["awesome", "cool"], :match_all => true)
+
     # Find a user with any of the tags:
     User.tagged_with(["awesome", "cool"], :any => true)
-    
+
+    # Find a user that not tags with awesome or cool:
+    User.tagged_with(["awesome", "cool"], :exclude => true)
+
     # Find a user with any of tags based on context:
     User.tagged_with(['awesome, cool'], :on => :tags, :any => true).tagged_with(['smart', 'shy'], :on => :skills, :any => true)
-    
+
+  You can also use :wild => true option along with :any or :exclude option. It will looking for %awesome% and %cool% in sql.
+
+  Tip: User.tagged_with([]) or '' will return [], but not all records.
+
 === Relationships
 
 You can find objects of the same type based on similar tags on certain contexts.
-Also, objects will be returned in descending order based on the total number of 
+Also, objects will be returned in descending order based on the total number of
 matched tags.
 
     @bobby = User.find_by_name("Bobby")
@@ -128,8 +124,8 @@ matched tags.
     @tom.skill_list # => ["hacking", "jogging", "diving"]
 
     @tom.find_related_skills # => [<User name="Bobby">,<User name="Frankie">]
-    @bobby.find_related_skills # => [<User name="Tom">] 
-    @frankie.find_related_skills # => [<User name="Tom">] 
+    @bobby.find_related_skills # => [<User name="Tom">]
+    @frankie.find_related_skills # => [<User name="Tom">]
 
 === Dynamic Tag Contexts
 
@@ -159,8 +155,25 @@ Tags can have owners:
     @some_user.tag(@some_photo, :with => "paris, normandy", :on => :locations)
     @some_user.owned_taggings
     @some_user.owned_tags
-    @some_photo.locations_from(@some_user)
-    
+    @some_photo.locations_from(@some_user) # => ["paris", "normandy"]
+    @some_photo.owner_tags_on(@some_user, :locations) # => [#<ActsAsTaggableOn::Tag id: 1, name: "paris">...]
+    @some_photo.owner_tags_on(nil, :locations) # => Ownerships equivalent to saying @some_photo.locations
+    @some_user.tag(@some_photo, :with => "paris, normandy", :on => :locations, :skip_save => true) #won't save @some_photo object
+
+=== Dirty objects
+
+    @bobby = User.find_by_name("Bobby")
+    @bobby.skill_list # => ["jogging", "diving"]
+
+    @boddy.skill_list_changed? #=> false
+    @boddy.changes #=> {}
+
+    @bobby.skill_list = "swimming"
+    @bobby.changes.should == {"skill_list"=>["jogging, diving", ["swimming"]]}
+    @boddy.skill_list_changed? #=> true
+
+    @bobby.skill_list_change.should == ["jogging, diving", ["swimming"]]
+
 === Tag cloud calculations
 
 To construct tag clouds, the frequency of each tag needs to be calculated.
@@ -201,24 +214,31 @@ CSS:
   .css3 { font-size: 1.4em; }
   .css4 { font-size: 1.6em; }
 
+== Configuration
+
+If you would like to remove unused tag objects after removing taggings, add
+
+  ActsAsTaggableOn.remove_unused_tags = true
+
+If you want force tags to be saved downcased:
+
+  ActsAsTaggableOn.force_lowercase = true
+
+If you want tags to be saved parametrized (you can redefine to_param as well):
+
+  ActsAsTaggableOn.force_parameterize = true
+
+
 == Contributors
 
-* TomEric (i76) - Maintainer
-* Michael Bleigh - Original Author
-* Szymon Nowak - Rails 3.0 compatibility
-* Jelle Vandebeeck - Rails 3.0 compatibility
-* Brendan Lim - Related Objects
-* Pradeep Elankumaran - Taggers
-* Sinclair Bain - Patch King
-
-=== Patch Contributors
-
-* tristanzdunn - Related objects of other classes
-* azabaj - Fixed migrate down
-* Peter Cooper - named_scope fix
-* slainer68 - STI fix
-* harrylove - migration instructions and fix-ups
-* lawrencepit - cached tag work
-* sobrinho - fixed tag_cloud helper
-
-Copyright (c) 2007-2010 Michael Bleigh (http://mbleigh.com/) and Intridea Inc. (http://intridea.com/), released under the MIT license
+We have a long list of valued contributors. {Check them all}[https://github.com/mbleigh/acts-as-taggable-on/contributors]
+
+== Maintainers
+
+* Artem Kramarenko (artemk)
+
+== Author
+
+* Michael Bleigh
+
+Copyright (c) 2007-2011 Michael Bleigh (http://mbleigh.com/) and Intridea Inc. (http://intridea.com/), released under the MIT license

data/acts-as-taggable-on.gemspec

@@ -4,16 +4,17 @@ 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{2010-05-19}
+  gem.date = %q{2012-01-06}
   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}
   gem.homepage      = ''
 
-  gem.add_runtime_dependency 'rails'
-  gem.add_development_dependency 'rspec', '~> 2.5'
+  gem.add_runtime_dependency 'rails', '~> 3.0'
+  gem.add_development_dependency 'rspec', '~> 2.6'
+  gem.add_development_dependency 'ammeter', '~> 0.1.3'
   gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency 'mysql2', '< 0.3'
+  gem.add_development_dependency 'mysql2', '~> 0.3.7'
   gem.add_development_dependency 'pg'
   gem.add_development_dependency 'guard'
   gem.add_development_dependency 'guard-rspec'

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

@@ -1,4 +1,4 @@
 module ActsAsTaggableOn
-  VERSION = '2.1.0'
+  VERSION = '2.3.0'
 end
 

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

@@ -1,23 +1,45 @@
 require "active_record"
 require "active_record/version"
 require "action_view"
-RAILS_3 = ::ActiveRecord::VERSION::MAJOR >= 3
+
+require "digest/sha1"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require "acts_as_taggable_on/compatibility/active_record_backports" unless RAILS_3
+module ActsAsTaggableOn
+  mattr_accessor :delimiter
+  @@delimiter = ','
+
+  mattr_accessor :force_lowercase
+  @@force_lowercase = false
+
+  mattr_accessor :force_parameterize
+  @@force_parameterize = false
+
+  mattr_accessor :remove_unused_tags
+  self.remove_unused_tags = false
+
+  def self.glue
+    @@delimiter.ends_with?(" ") ? @@delimiter : "#{@@delimiter} "
+  end
+
+  def self.setup
+    yield self
+  end
+end
+
 
 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_taggable_on/dirty"
 
-#require "acts_as_taggable_on/utils"
-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"
@@ -33,4 +55,5 @@ end
 
 if defined?(ActionView::Base)
   ActionView::Base.send :include, ActsAsTaggableOn::TagsHelper
-end
+end
+

data/lib/acts_as_taggable_on/acts_as_taggable_on/cache.rb

@@ -40,7 +40,7 @@ module ActsAsTaggableOn::Taggable
         tag_types.map(&:to_s).each do |tag_type|
           if self.class.send("caching_#{tag_type.singularize}_list?")
             if tag_list_cache_set_on(tag_type)
-              list = tag_list_cache_on(tag_type.singularize).to_a.flatten.compact.join(', ')
+              list = tag_list_cache_on(tag_type).to_a.flatten.compact.join(', ')
               self["cached_#{tag_type.singularize}_list"] = list
             end
           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,20 +106,14 @@ 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
-
-        tag_scope = tag_scope.joins("JOIN (#{tagging_scope.to_sql}) AS taggings ON taggings.tag_id = tags.id")
+        # 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
       end
     end