rumoji 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8b7c62e0e1733933104c59ab3ac4d0312baafac
-  data.tar.gz: 19ae2ccc6e4703995a5e12e2a5fc0579e0e399f7
+  metadata.gz: 937596f7150b11e8edda58fb25ce551aa5a09c34
+  data.tar.gz: f030bc4df7e3f826c3a16bfab65fd1fc16d8cb9d
 SHA512:
-  metadata.gz: 29dfadb2c22ea87ba8a4d5f1d4cc7dc126168fcd5d3c72bacbbedfdbfa898fab0af4abd39c8559feb9707ea6dc26cb9e2ed79ebbc74e41ef536c35e6cd1c4209
-  data.tar.gz: 3d56797e19ad1558e4a44198bfb2f6e2f11b35734ef7ecd2e8244232e87a6ad10d82395e0dba5ffdb5185804e98a7dd233161dbd2e617d7044fc71441f0a7f27
+  metadata.gz: 69dd6d823624ed3b57903db1568aeb357c40f78d1c97ca44600d8afb16a15093233c6da5afdfbd702fe358d130a939ce0c2750b4ff4443cb136f662856cc49d3
+  data.tar.gz: 1eed7329f0e7a5b2a8e69bda5a4b65fc0870d0b1059ea826a8800ff74a66cdcbea3228f82dbba4f8c16ab82d4dd73d686ba3eb50ebe110518bfec44f7197dff8

data/.travis.yml

@@ -2,4 +2,8 @@ language: ruby
 rvm:
  - 1.9.3
  - 2.0.0
- - rbx-19mode
+ - 2.1.0
+ - rbx
+matrix:
+  allow_failures:
+    - rvm: rbx

data/Gemfile

@@ -4,3 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'minitest'
+end

data/lib/rumoji.rb

@@ -14,41 +14,42 @@ module Rumoji
 
   # Transform a cheat-sheet code into an Emoji
   def decode(str)
-    str.gsub(/:(\S?\w+):/) {|sym| Emoji.find($1.intern).to_s }
+    str.gsub(/:([^s:]?[\w-]+):/) {|sym| Emoji.find($1.intern).to_s }
   end
 
   def encode_io(readable, writeable=StringIO.new(""))
-    codepoints = readable.each_codepoint
-    previous_emoji = []
+    previous_codepoints = []
 
-    codepoints.each_with_object(writeable) do |codepoint, writer|
+    readable.each_codepoint do |codepoint|
       possible_emoji = Emoji.select_by_codepoint(codepoint)
-      last_emoji = previous_emoji.pop
 
-      sequence =  if last_emoji.nil? || !last_emoji.codepoints.include?(codepoint)
-                    if possible_emoji.empty? || last_emoji
-                      last_codepoint = last_emoji && last_emoji.codepoints.first
-                      sequence_from_codepoints(last_codepoint, codepoint)
+      sequence =  if possible_emoji.empty?
+                    # If this codepoint is not part of an emoji
+                    # just write it back out, along with any previously stored codepoints.
+                    dump_codepoints_to_string(previous_codepoints << codepoint)
+                  elsif !possible_emoji.any?(&:multiple?)
+                    # If this codepoint is part of an emoji, but not one
+                    # that contains multiple codepoints, write out the
+                    # first possiblity's cheat code and the previously stored codepoints
+                    dump_codepoints_to_string(previous_codepoints) << possible_emoji.first.code
+                  else
+                    # This codepoint is a part of an emoji with multiple
+                    # codepoints, so push it onto the stack.
+                    previous_codepoints.push(codepoint)
+                    # Check and see if this completes the emoji, otherwise,
+                    # write out an empty string.
+                    if found = possible_emoji.find {|e| e.codepoints.eql?(previous_codepoints) }
+                      previous_codepoints.clear and found.code
                     else
-                      multiple_codepoint_emoji = possible_emoji.select(&:multiple?)
-                      if multiple_codepoint_emoji.empty?
-                        possible_emoji.first.code
-                      else
-                        previous_emoji.concat(multiple_codepoint_emoji) ; ""
-                      end
+                      ""
                     end
-                  else
-                    last_emoji.code
                   end
 
-      writer.write sequence
+      writeable.write sequence
     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
+    # Write any remaining codepoints.
+    writeable.write dump_codepoints_to_string(previous_codepoints) if previous_codepoints.any?
 
     writeable
   end
@@ -62,9 +63,10 @@ module Rumoji
 
 private
 
-  def sequence_from_codepoints(*codepoints)
-    compacted = codepoints.flatten.compact
-    compacted.pack("U" * compacted.size)
+  def dump_codepoints_to_string(codepoints)
+    codepoints.pack("U*").tap do
+      codepoints.clear
+    end
   end
 
 end

data/lib/rumoji/emoji.rb

@@ -59,11 +59,12 @@ module Rumoji
     end
 
     def self.select_by_codepoint(codepoint)
-      ALL.select {|emoji| emoji.codepoints.first.eql? codepoint }
+      ALL.select {|emoji| emoji.codepoints.include? codepoint }
     end
 
     def self.find_by_codepoint(codepoint)
       ALL.find {|emoji| emoji.hex == codepoint.to_s(16).upcase }
     end
+
   end
 end

data/lib/rumoji/emoji/people.rb

@@ -94,7 +94,7 @@ module Rumoji
       self.new("\u{1F3B5}", [:musical_note]), # "music, being in good mood"
       self.new("\u{1F525}", [:fire], "FIRE"),
       # Poop
-      self.new("\u{1F4A9}", [:hankey, :poop, :shit], "PILE OF POO"), # "dog dirt"
+      self.new("\u{1F4A9}", [:poop, :hankey, :shit], "PILE OF POO"), # "dog dirt"
       self.new("\u{1F44D}", [:thumbsup, :"+1"], "THUMBS UP SIGN"),
       self.new("\u{1F44E}", [:thumbsdown, :"-1"], "THUMBS DOWN SIGN"),
       self.new("\u{1F44C}", [:ok_hand], "OK HAND SIGN"),

data/lib/rumoji/emoji/symbols.rb

@@ -81,16 +81,16 @@ module Rumoji
       self.new("\u{1f6c3}", [:customs]),
       self.new("\u{1f4a0}", [:diamond_shape_with_a_dot_inside]),
       self.new("\u{1f6af}", [:do_not_litter]),
-      self.new("\u{0038 20e3}" , [:eight]),
+      self.new("\u{0038 fe0f 20e3}" , [:eight]),
       self.new("\u{2734}" , [:eight_pointed_black_star]),
       self.new("\u{2733}" , [:eight_spoked_asterisk]),
       self.new("\u{1f51a}", [:end]),
       self.new("\u{23e9}" , [:fast_forward]),
-      self.new("\u{0035 20e3}" , [:five]),
-      self.new("\u{0034 20e3}" , [:four]),
+      self.new("\u{0035 fe0f 20e3}" , [:five]),
+      self.new("\u{0034 fe0f 20e3}" , [:four]),
       self.new("\u{1f193}", [:free]),
       self.new("\u{264a}" , [:gemini]),
-      self.new("\u{0023 20e3}" , [:hash]),
+      self.new("\u{0023 fe0f 20e3}" , [:hash]),
       self.new("\u{1f49f}", [:heart_decoration]),
       self.new("\u{2714}" , [:heavy_check_mark]),
       self.new("\u{2797}" , [:heavy_division_sign]),
@@ -120,7 +120,7 @@ module Rumoji
       self.new("\u{274e}" , [:negative_squared_cross_mark]),
       self.new("\u{1f195}", [:new]),
       self.new("\u{1f196}", [:ng]),
-      self.new("\u{0039 20e3}" , [:nine]),
+      self.new("\u{0039 fe0f 20e3}" , [:nine]),
       self.new("\u{1f6b3}", [:no_bicycles]),
       self.new("\u{26d4}" , [:no_entry]),
       self.new("\u{1f6ab}", [:no_entry_sign]),
@@ -132,7 +132,7 @@ module Rumoji
       self.new("\u{1f17e}", [:o2]),
       self.new("\u{1f197}", [:ok]),
       self.new("\u{1f51b}", [:on]),
-      self.new("\u{0031 20e3}" , [:one]),
+      self.new("\u{0031 fe0f 20e3}" , [:one]),
       self.new("\u{26ce}" , [:ophiuchus]),
       self.new("\u{1f17f}", [:parking]),
       self.new("\u{303d}" , [:part_alternation_mark]),
@@ -152,9 +152,9 @@ module Rumoji
       self.new("\u{2650}" , [:sagittarius]),
       self.new("\u{264f}" , [:scorpius]),
       self.new("\u{3299}" , [:secret]),
-      self.new("\u{0037 20e3}" , [:seven]),
+      self.new("\u{0037 fe0f 20e3}" , [:seven]),
       self.new("\u{1f4f6}", [:signal_strength]),
-      self.new("\u{0036 20e3}" , [:six]),
+      self.new("\u{0036 fe0f 20e3}" , [:six]),
       self.new("\u{1f52f}", [:six_pointed_star]),
       self.new("\u{1f539}", [:small_blue_diamond]),
       self.new("\u{1f538}", [:small_orange_diamond]),
@@ -164,12 +164,12 @@ module Rumoji
       self.new("\u{1f198}", [:sos]),
       self.new("\u{1f523}", [:symbols]),
       self.new("\u{2649}" , [:taurus]),
-      self.new("\u{0033 20e3}" , [:three]),
+      self.new("\u{0033 fe0f 20e3}" , [:three]),
       self.new("\u{2122}" , [:tm]),
       self.new("\u{1f51d}", [:top]),
       self.new("\u{1f531}", [:trident]),
       self.new("\u{1f500}", [:twisted_rightwards_arrows]),
-      self.new("\u{0032 20e3}" , [:two]),
+      self.new("\u{0032 fe0f 20e3}" , [:two]),
       self.new("\u{1f239}", [:u5272]),
       self.new("\u{1f234}", [:u5408]),
       self.new("\u{1f23a}", [:u55b6]),
@@ -195,7 +195,7 @@ module Rumoji
       self.new("\u{1f533}", [:white_square_button]),
       self.new("\u{1f6ba}", [:womens]),
       self.new("\u{274c}" , [:x]),
-      self.new("\u{0030 20e3}" , [:zero])
+      self.new("\u{0030 fe0f 20e3}" , [:zero])
     ]
   end
 end

data/lib/rumoji/version.rb

@@ -1,3 +1,3 @@
 module Rumoji
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/rumoji_spec.rb

@@ -7,14 +7,16 @@ describe Rumoji do
   before do
     @poop = "💩"
     @smile = "😄"
-    @zero = "0⃣"
+    @zero = "0️⃣"
     @us = "🇺🇸"
+    @non_potable_water = "🚱"
   end
 
   describe "#encode" do
     it "transforms emoji into cheat-sheet form" do
       key = :smile
       Rumoji.encode(@smile).must_equal ":smile:"
+      Rumoji.encode("#{@smile}").must_equal ":smile:"
     end
   end
 
@@ -22,6 +24,14 @@ describe Rumoji do
     it "transforms a cheat-sheet code into an emoji" do
       Rumoji.decode(":poop:").must_equal @poop
     end
+
+    it "transforms a cheat-sheet code into an emoji with colon" do
+      Rumoji.decode("::poop:").must_equal ':' + @poop
+    end
+
+    it "transforms a cheat-sheet code with a dash into an emoji" do
+      Rumoji.decode(":non-potable_water:").must_equal @non_potable_water
+    end
   end
 
   describe "#encode_io" do
@@ -33,7 +43,6 @@ describe Rumoji do
     it "keeps codepoints that match the beginnings of multi-codepoint emoji" do
       text = "i like #hashtags and 1direction they are the #1 band. end with 9"
       io   = StringIO.new(text)
-
       Rumoji.encode_io(io).string.must_equal text
     end
 
@@ -46,17 +55,30 @@ describe Rumoji do
       end
 
       it "transforms a stream of many emoji" do
-        num = ":one::two::three::four::five::six::seven::eight::nine::hash:"
-        emoji = StringIO.new("1⃣2⃣3⃣4⃣5⃣6⃣7⃣8⃣9⃣#⃣")
+        num = ":one: :two: :three: :four: :five: :six: :seven: :eight: :nine: :zero: :hash:"
+        emoji = StringIO.new"1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣ 6️⃣ 7️⃣ 8️⃣ 9️⃣ 0️⃣ #️⃣"
         Rumoji.encode_io(emoji).string.must_equal num
       end
 
+      it "does not encode double digits" do
+        num = ":zero: :one: :two: :three: :four: :five: :six: :seven: :eight: :nine: :hash:"
+        double_digits = StringIO.new("00 11 22 33 44 55 66 77 88 99 ##")
+        Rumoji.encode_io(double_digits).string.wont_equal num
+      end
+
       describe "with leading and trailing characters" do
         it "is able to pull multipoint emoji out of a sequence" do
           io = StringIO.new("An example of a multipoint emoji is the #{@us} flag.")
           Rumoji.encode_io(io).string.must_equal "An example of a multipoint emoji is the :us: flag."
         end
       end
+
+      describe "with trailing emoji" do
+        it "writes characters that are in a multipoint emoji followed by an emoji" do
+          io = StringIO.new "I would like 0#{@poop}"
+          Rumoji.encode_io(io).string.must_equal "I would like 0:poop:"
+        end
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rumoji
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Wunsch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies: []
 description: Transcode emoji utf-8 characters into emoji-cheat-sheet form
 email:
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Transcode emoji utf-8 characters into emoji-cheat-sheet form