Merge pull request #6 from jakeboxer/possible-emoji-edge-cases

Handle some edge cases with "possible emoji"

lib/rumoji.rb

@@ -26,10 +26,9 @@ module Rumoji
       last_emoji = previous_emoji.pop
       last_emoji = previous_emoji.pop
 
 
       sequence =  if last_emoji.nil? || !last_emoji.codepoints.include?(codepoint)
       sequence =  if last_emoji.nil? || !last_emoji.codepoints.include?(codepoint)
-                    if possible_emoji.empty?
+                    if possible_emoji.empty? || last_emoji
                       last_codepoint = last_emoji && last_emoji.codepoints.first
                       last_codepoint = last_emoji && last_emoji.codepoints.first
-                      sequence_codepoints = [last_codepoint, codepoint].compact
-                      sequence_codepoints.pack("U" * sequence_codepoints.size)
+                      sequence_from_codepoints(last_codepoint, codepoint)
                     else
                     else
                       multiple_codepoint_emoji = possible_emoji.select(&:multiple?)
                       multiple_codepoint_emoji = possible_emoji.select(&:multiple?)
                       if multiple_codepoint_emoji.empty?
                       if multiple_codepoint_emoji.empty?
@@ -44,6 +43,14 @@ module Rumoji
 
 
       writer.write sequence
       writer.write sequence
     end
     end
+
+    # If the last character was the beginning of a possible emoji, tack the
+    # first codepoint onto the end.
+    if last_emoji = previous_emoji.pop
+      writeable.write sequence_from_codepoints(last_emoji.codepoints.first)
+    end
+
+    writeable
   end
   end
 
 
   def decode_io(readable, writeable=StringIO.new(""))
   def decode_io(readable, writeable=StringIO.new(""))
@@ -55,5 +62,9 @@ module Rumoji
 
 
 private
 private
 
 
+  def sequence_from_codepoints(*codepoints)
+    compacted = codepoints.flatten.compact
+    compacted.pack("U" * compacted.size)
+  end
 
 
 end
 end

spec/rumoji_spec.rb

@@ -31,7 +31,7 @@ describe Rumoji do
     end
     end
 
 
     it "keeps codepoints that match the beginnings of multi-codepoint emoji" do
     it "keeps codepoints that match the beginnings of multi-codepoint emoji" do
-      text = "i like #hashtags and 1direction"
+      text = "i like #hashtags and 1direction they are the #1 band. end with 9"
       io   = StringIO.new(text)
       io   = StringIO.new(text)
 
 
       Rumoji.encode_io(io).string.must_equal text
       Rumoji.encode_io(io).string.must_equal text