acts-as-taggable-on 2.2.1 → 2.2.2

data/README.rdoc

@@ -81,10 +81,15 @@ compatibility with the will_paginate gem:
     # 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)
 
-  Note: User.tagged_with([]) or '' will return [], but not all records.
+  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
 

data/acts-as-taggable-on.gemspec

@@ -4,13 +4,13 @@ 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-18}
+  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', '~> 3.1'
+  gem.add_runtime_dependency 'rails', '~> 3.0'
   gem.add_development_dependency 'rspec', '~> 2.5'
   gem.add_development_dependency 'ammeter', '~> 0.1.3'
   gem.add_development_dependency 'sqlite3'

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

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

data/lib/acts_as_taggable_on/acts_as_taggable_on/core.rb

@@ -81,12 +81,22 @@ module ActsAsTaggableOn::Taggable
         alias_base_name = undecorated_table_name.gsub('.','_')
 
         if options.delete(:exclude)
-          tags_conditions = tag_list.map { |t| sanitize_sql(["#{ActsAsTaggableOn::Tag.table_name}.name #{like_operator} ?", t]) }.join(" OR ")
+          if options.delete(:wild)
+            tags_conditions = tag_list.map { |t| sanitize_sql(["#{ActsAsTaggableOn::Tag.table_name}.name #{like_operator} ? ESCAPE '!'", "%#{escape_like(t)}%"]) }.join(" OR ")
+          else
+            tags_conditions = tag_list.map { |t| sanitize_sql(["#{ActsAsTaggableOn::Tag.table_name}.name #{like_operator} ?", t]) }.join(" OR ")
+          end 
+          
           conditions << "#{table_name}.#{primary_key} NOT IN (SELECT #{ActsAsTaggableOn::Tagging.table_name}.taggable_id FROM #{ActsAsTaggableOn::Tagging.table_name} JOIN #{ActsAsTaggableOn::Tag.table_name} ON #{ActsAsTaggableOn::Tagging.table_name}.tag_id = #{ActsAsTaggableOn::Tag.table_name}.#{ActsAsTaggableOn::Tag.primary_key} AND (#{tags_conditions}) WHERE #{ActsAsTaggableOn::Tagging.table_name}.taggable_type = #{quote_value(base_class.name)})"
 
         elsif options.delete(:any)
           # get tags, drop out if nothing returned (we need at least one)
-          tags = ActsAsTaggableOn::Tag.named_any(tag_list)
+          if options.delete(:wild)
+            tags = ActsAsTaggableOn::Tag.named_like_any(tag_list)
+          else
+            tags = ActsAsTaggableOn::Tag.named_any(tag_list)            
+          end
+          
           return scoped(:conditions => "1 = 0") unless tags.length > 0
 
           # setup taggings alias so we can chain, ex: items_locations_taggings_awesome_cool_123
@@ -107,8 +117,8 @@ module ActsAsTaggableOn::Taggable
           joins << tagging_join
 
         else
-          tags = ActsAsTaggableOn::Tag.named_any(tag_list)
-          return empty_result unless tags.length == tag_list.length
+          tags = ActsAsTaggableOn::Tag.named_any(tag_list)   
+          return empty_result unless tags.length == tag_list.length                     
 
           tags.each do |tag|
 

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -218,12 +218,25 @@ describe "Taggable" do
     TaggableModel.tagged_with(["depressed", "css"], :order => 'taggable_models.name', :any => true).to_a.should == [bob, frank]
   end
 
+  context "wild: true" do
+    it "should use params as wildcards" do
+      bob = TaggableModel.create(:name => "Bob", :tag_list => "bob, tricia")
+      frank = TaggableModel.create(:name => "Frank", :tag_list => "bobby, jim")
+      steve = TaggableModel.create(:name => "Steve", :tag_list => "john, patricia")
+      jim = TaggableModel.create(:name => "Jim", :tag_list => "jim, steve")
+      
+      
+      TaggableModel.tagged_with(["bob", "tricia"], :wild => true, :any => true).to_a.should == [bob, frank, steve]      
+      TaggableModel.tagged_with(["bob", "tricia"], :wild => true, :exclude => true).to_a.should == [jim]            
+    end
+  end
+  
   it "should be able to find tagged on a custom tag context" do
     bob = TaggableModel.create(:name => "Bob")
     bob.set_tag_list_on(:rotors, "spinning, jumping")
     bob.tag_list_on(:rotors).should == ["spinning","jumping"]
     bob.save
-
+    
     TaggableModel.tagged_with("spinning", :on => :rotors).to_a.should == [bob]
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-18 00:00:00.000000000 Z
+date: 2012-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70149870225700 !ruby/object:Gem::Requirement
+  requirement: &70356686875400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149870225700
+  version_requirements: *70356686875400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70149870224800 !ruby/object:Gem::Requirement
+  requirement: &70356686901300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70149870224800
+  version_requirements: *70356686901300
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70149870248200 !ruby/object:Gem::Requirement
+  requirement: &70356686900800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *70149870248200
+  version_requirements: *70356686900800
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70149870247800 !ruby/object:Gem::Requirement
+  requirement: &70356686900420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149870247800
+  version_requirements: *70356686900420
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70149870247220 !ruby/object:Gem::Requirement
+  requirement: &70356686899780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.3.7
   type: :development
   prerelease: false
-  version_requirements: *70149870247220
+  version_requirements: *70356686899780
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70149870246740 !ruby/object:Gem::Requirement
+  requirement: &70356686899280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149870246740
+  version_requirements: *70356686899280
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70149870246180 !ruby/object:Gem::Requirement
+  requirement: &70356686898580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149870246180
+  version_requirements: *70356686898580
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70149870245500 !ruby/object:Gem::Requirement
+  requirement: &70356686897920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149870245500
+  version_requirements: *70356686897920
 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
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2348258432577140293
+      hash: -1793358145648125
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2348258432577140293
+      hash: -1793358145648125
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10