Match only wrapped in :_: words

veelenga · Jun 23, 2015 · cdc6b61 · cdc6b61
1 parent 06a61f0
commit cdc6b61
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/spec/emoji_spec.cr b/spec/emoji_spec.cr
@@ -15,11 +15,19 @@ describe "Emoji" do
   describe ".emojize" do
     cat  = "🐱"
 
-    it_emojizes(":cat:", "#{cat}")
     it_emojizes(":cat:s are awesome", "#{cat}s are awesome")
     it_emojizes("Sweet :cat:s", "Sweet #{cat}s")
     it_emojizes("I have a :cat:", "I have a #{cat}")
     it_emojizes("Why :cat:s? 'cause :cat:s rock", "Why #{cat}s? 'cause #{cat}s rock")
+    it_emojizes("Talk to your :cat:: say 'meow'", "Talk to your #{cat}: say 'meow'")
+    it_emojizes("Who rocks? For sure ::cat:s", "Who rocks? For sure :#{cat}s")
+
+    it_emojizes(":cat:", "#{cat}")
+    it_emojizes("::cat::", ":#{cat}:")
+    it_emojizes("-:cat:-", "-#{cat}-")
+    it_emojizes(" :cat: ", " #{cat} ")
+    it_emojizes(": :cat: ", ": #{cat} ")
+    it_emojizes(":cat: :", "#{cat} :")
 
     it_emojizes(":thumbsup:", "👍")
     it_emojizes(":+1:", "👍")

diff --git a/src/emoji.cr b/src/emoji.cr
@@ -6,7 +6,7 @@ module Emoji
   @@map = Emoji::CodepointMap.new
 
   def self.emojize(s)
-    s.scan(/:[\S]+:/).map { |data| data[0] }
+    s.scan(/:[^(: )]+?:/).map { |data| data[0] }
       .uniq!
       .each do |name|
         s = s.gsub(name, @@map[name]) if @@map.includes? name