Merge pull request #440 from BenZhang/master

[Fix] Comparing tag names now respects strict_case_match
mbleigh · Jan 2, 2014 · 3a04338 · 3a04338
2 parents 41c4751 + cfb72cb
commit 3a04338
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/lib/acts_as_taggable_on/tag.rb b/lib/acts_as_taggable_on/tag.rb
@@ -100,7 +100,11 @@ class << self
       private
 
       def comparable_name(str)
-        as_8bit_ascii(str).downcase
+        if ActsAsTaggableOn.strict_case_match
+          as_8bit_ascii(str)
+        else
+          as_8bit_ascii(str).downcase
+        end
       end
 
       def binary

diff --git a/spec/acts_as_taggable_on/tag_spec.rb b/spec/acts_as_taggable_on/tag_spec.rb
@@ -72,16 +72,30 @@
       ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name("AWESOME").should == [@tag]
     end
 
+    it "should find by name case sensitive" do
+      ActsAsTaggableOn.strict_case_match = true
+      expect {
+        ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name("AWESOME")
+      }.to change(ActsAsTaggableOn::Tag, :count).by(1)  
+    end
+
     it "should create by name" do
-      lambda {
+      expect {
         ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name("epic")
-      }.should change(ActsAsTaggableOn::Tag, :count).by(1)
+      }.to change(ActsAsTaggableOn::Tag, :count).by(1)
+    end
+
+    it "should find or create by name case sensitive" do
+      ActsAsTaggableOn.strict_case_match = true
+      expect {
+        ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name("AWESOME", 'awesome').map(&:name).should == ["AWESOME", "awesome"]
+      }.to change(ActsAsTaggableOn::Tag, :count).by(1)
     end
 
     it "should find or create by name" do
-      lambda {
+      expect {
         ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name("awesome", "epic").map(&:name).should == ["awesome", "epic"]
-      }.should change(ActsAsTaggableOn::Tag, :count).by(1)
+      }.to change(ActsAsTaggableOn::Tag, :count).by(1)
     end
 
     it "should return an empty array if no tags are specified" do