Merge pull request #47 from redtail-technology/master

Updating rumoji library

lib/rumoji.rb

@@ -6,9 +6,9 @@ require 'stringio'
 module Rumoji
   extend self
 
-  # Transform emoji into its cheat-sheet code
+  # Transform emoji into its cheat-sheet code (convert each entry to string first to handle hash values)
   def encode(str)
-    str.gsub(Emoji::ALL_REGEXP) do |match|
+    str.to_s.gsub(Emoji::ALL_REGEXP) do |match|
       if emoji = Emoji.find_by_string(match)
         if block_given?
           yield emoji
@@ -21,9 +21,9 @@ module Rumoji
     end
   end
 
-  # Transform a cheat-sheet code into an Emoji
+  # Transform a cheat-sheet code into an Emoji (convert each entry to string first to handle hash values)
   def decode(str)
-    str.gsub(/:([^\s:]?[\w-]+):/) { |match| (Emoji.find($1) || match).to_s }
+    str.to_s.gsub(/:([^\s:]?[\w-]+):/) { |match| (Emoji.find($1) || match).to_s }
   end
 
   def encode_io(readable, writeable=StringIO.new(""), &block)

lib/rumoji/emoji.rb

@@ -55,13 +55,15 @@ module Rumoji
       other.symbol <=> symbol
     end
 
+    autoload :FOOD, 'rumoji/emoji/food'
     autoload :PEOPLE, 'rumoji/emoji/people'
     autoload :NATURE, 'rumoji/emoji/nature'
     autoload :OBJECTS, 'rumoji/emoji/objects'
     autoload :PLACES, 'rumoji/emoji/places'
     autoload :SYMBOLS, 'rumoji/emoji/symbols'
+    autoload :NEWMOJI, 'rumoji/emoji/newmoji'
 
-    ALL = PEOPLE | NATURE | OBJECTS | PLACES | SYMBOLS
+    ALL = PEOPLE | NATURE | OBJECTS | PLACES | SYMBOLS | FOOD | NEWMOJI
 
     ALL_REGEXP = Regexp.new(ALL.map(&:string).join('|'))
 

lib/rumoji/emoji/food.rb

+require 'rumoji/emoji'
+require 'set'
+
+module Rumoji
+  class Emoji
+    FOOD = SortedSet[
+      self.new("\u{1F34E}", [:apple]),
+      self.new("\u{1f34c}", [:banana]),
+      self.new("\u{1f37a}", [:beer]),
+      self.new("\u{1f37b}", [:beers]),
+      self.new("\u{1f35e}", [:bread]),
+      self.new("\u{1f370}", [:cake]),
+      self.new("\u{1f36c}", [:candy]),
+      self.new("\u{1f352}", [:cherries]),
+      self.new("\u{1f36b}", [:chocolate_bar]),
+      self.new("\u{2615}" , [:coffee]),
+      self.new("\u{1f36a}", [:cookie]),
+      self.new("\u{1f33d}", [:corn]),
+      self.new("\u{1f35b}", [:curry]),
+      self.new("\u{1f36e}", [:custard]),
+      self.new("\u{1f369}", [:doughnut]),
+      self.new("\u{1f373}", [:egg]),
+      self.new("\u{1f346}", [:eggplant]),
+      self.new("\u{1f365}", [:fish_cake]),
+      self.new("\u{1f364}", [:fried_shrimp]),
+      self.new("\u{1f35f}", [:fries]),
+      self.new("\u{1f347}", [:grapes]),
+      self.new("\u{1f34f}", [:green_apple]),
+      self.new("\u{1f354}", [:hamburger]),
+      self.new("\u{1f36f}", [:honey_pot]),
+      self.new("\u{1f368}", [:ice_cream]),
+      self.new("\u{1f366}", [:icecream]),
+      self.new("\u{1f34b}", [:lemon]),
+      self.new("\u{1f36d}", [:lollipop]),
+      self.new("\u{1f348}", [:melon]),
+      self.new("\u{1f34d}", [:pineapple]),
+      self.new("\u{1f355}", [:pizza]),
+      self.new("\u{1f35c}", [:ramen]),
+      self.new("\u{1f35a}", [:rice]),
+      self.new("\u{1f359}", [:rice_ball]),
+      self.new("\u{1f358}", [:rice_cracker]),
+      self.new("\u{1f376}", [:sake]),
+      self.new("\u{1f367}", [:shaved_ice]),
+      self.new("\u{1f35d}", [:spaghetti]),
+      self.new("\u{1f372}", [:stew]),
+      self.new("\u{1f353}", [:strawberry]),
+      self.new("\u{1f363}", [:sushi]),
+      self.new("\u{1f360}", [:sweet_potato]),
+      self.new("\u{1f34a}", [:tangerine]),
+      self.new("\u{1f375}", [:tea]),
+      self.new("\u{1f345}", [:tomato]),
+      self.new("\u{1f379}", [:tropical_drink]),
+      self.new("\u{1f349}", [:watermelon]),
+      self.new("\u{1f377}", [:wine_glass]),
+      self.new("\u{1f336}", [:hot_pepper]),
+      self.new("\u{1f9c0}", [:cheese_wedge]),
+      self.new("\u{1f32d}", [:hot_dog, :hotdog]),
+      self.new("\u{1f32e}", [:taco]),
+      self.new("\u{1f32f}", [:burrito]),
+      self.new("\u{1f37f}", [:popcorn]),
+      self.new("\u{1F95D}", [:kiwifruit]),
+      self.new("\u{1F951}", [:avocado]),
+      self.new("\u{1F952}", [:cucumber]),
+      self.new("\u{1F955}", [:carrot] ),
+      self.new("\u{1F956}", [:baguette_bread]),
+      self.new("\u{1F954}", [:potato]),
+      self.new("\u{1F95A}", [:egg]),
+      self.new("\u{1F95C}", [:peanuts]),
+      self.new("\u{1F953}", [:bacon], "BACON"),
+      self.new("\u{1F950}", [:croissant]),
+      self.new("\u{1F95E}", [:pancakes]),
+      self.new("\u{1F957}", [:green_salad]),
+      self.new("\u{1F959}", [:stuffed_flatbread]),
+      self.new("\u{1F943}", [:tumbler_glass]),
+      self.new("\u{1F942}", [:clinking_glasses]),
+      self.new("\u{1F95B}", [:glass_of_milk]),
+    ]
+  end
+end
\ No newline at end of file

lib/rumoji/emoji/newmoji.rb

+# New Emojis. Up to date with emoji-js.json as of 2/16/2018
+# TODO: Recategorize emojis to the appropriate files.
+
+require 'rumoji/emoji'
+require 'set'
+
+module Rumoji
+  class Emoji
+    NEWMOJI = SortedSet[
+      self.new(Regexp.escape("\u{002A FE0F 20E3}"), [:keycap_star]),
+      self.new("\u{1F1FA 1F1F3}", [:"flag-un"]),
+      self.new("\u{1F324 FE0F}", [:sun_small_cloud]),
+      self.new("\u{1F325 FE0F}", [:sun_behind_cloud]),
+      self.new("\u{1F326 FE0F}", [:sun_behind_rain_cloud]),
+      self.new("\u{1F329 FE0F}", [:lightning_cloud]),
+      self.new("\u{1F32A FE0F}", [:tornado_cloud]),
+      self.new("\u{1F373}", [:cooking]),
+      self.new("\u{1F373}", [:fried_egg]),
+      self.new("\u{1F3C3 200D 2640 FE0F}", [:"woman-running"]),
+      self.new("\u{1F3C3 200D 2642 FE0F}", [:"man-running"]),
+      self.new("\u{1F3C4 200D 2640 FE0F}", [:"woman-surfing"]),
+      self.new("\u{1F3C4 200D 2642 FE0F}", [:"man-surfing"]),
+      self.new("\u{1F3CA 200D 2640 FE0F}", [:"woman-swimming"]),
+      self.new("\u{1F3CA 200D 2642 FE0F}", [:"man-swimming"]),
+      self.new("\u{1F3CB FE0F 200D 2640 FE0F}", [:"woman-lifting-weights"]),
+      self.new("\u{1F3CB FE0F 200D 2642 FE0F}", [:"man-lifting-weights"]),
+      self.new("\u{1F3CC FE0F 200D 2640 FE0F}", [:"woman-golfing"]),
+      self.new("\u{1F3CC FE0F 200D 2642 FE0F}", [:"man-golfing"]),
+      self.new("\u{1F3EE}", [:lantern]),
+      self.new("\u{1F3F3 FE0F 200D 1F308}", [:"rainbow-flag"]),
+      self.new("\u{1F3F4 E0067 E0062 E0065 E006E E0067 E007F}", [:"flag-england"]),
+      self.new("\u{1F3F4 E0067 E0062 E0073 E0063 E0074 E007F}", [:"flag-scotland"]),
+      self.new("\u{1F3F4 E0067 E0062 E0077 E006C E0073 E007F}", [:"flag-wales"]),
+      self.new("\u{1F3FB}", [:"skin-tone-2"]),
+      self.new("\u{1F3FC}", [:"skin-tone-3"]),
+      self.new("\u{1F3FD}", [:"skin-tone-4"]),
+      self.new("\u{1F3FE}", [:"skin-tone-5"]),
+      self.new("\u{1F3FF}", [:"skin-tone-6"]),
+      self.new("\u{1F401}", [:mouse2]),
+      self.new("\u{1F404}", [:cow2]),
+      self.new("\u{1F405}", [:tiger2]),
+      self.new("\u{1F407}", [:rabbit2]),
+      self.new("\u{1F408}", [:cat2]),
+      self.new("\u{1F40B}", [:whale2]),
+      self.new("\u{1F415}", [:dog2]),
+      self.new("\u{1F416}", [:pig2]),
+      self.new("\u{1F42C}", [:flipper]),
+      self.new("\u{1F441 FE0F 200D 1F5E8 FE0F}", [:"eye-in-speech-bubble"]),
+      self.new("\u{1F44D}", [:"+1"]),
+      self.new("\u{1F468 200D 1F33E}", [:"male-farmer"]),
+      self.new("\u{1F468 200D 1F373}", [:"male-cook"]),
+      self.new("\u{1F468 200D 1F393}", [:"male-student"]),
+      self.new("\u{1F468 200D 1F3A4}", [:"male-singer"]),
+      self.new("\u{1F468 200D 1F3A8}", [:"male-artist"]),
+      self.new("\u{1F468 200D 1F3EB}", [:"male-teacher"]),
+      self.new("\u{1F468 200D 1F3ED}", [:"male-factory-worker"]),
+      self.new("\u{1F468 200D 1F466 200D 1F466}", [:"man-boy-boy"]),
+      self.new("\u{1F468 200D 1F466}", [:"man-boy"]),
+      self.new("\u{1F468 200D 1F467 200D 1F466}", [:"man-girl-boy"]),
+      self.new("\u{1F468 200D 1F467 200D 1F467}", [:"man-girl-girl"]),
+      self.new("\u{1F468 200D 1F467}", [:"man-girl"]),
+      self.new("\u{1F468 200D 1F469 200D 1F466}", [:family]),
+      self.new("\u{1F468 200D 1F469 200D 1F466}", [:"man-woman-boy"]),
+      self.new("\u{1F468 200D 1F4BB}", [:"male-technologist"]),
+      self.new("\u{1F468 200D 1F4BC}", [:"male-office-worker"]),
+      self.new("\u{1F468 200D 1F527}", [:"male-mechanic"]),
+      self.new("\u{1F468 200D 1F52C}", [:"male-scientist"]),
+      self.new("\u{1F468 200D 1F680}", [:"male-astronaut"]),
+      self.new("\u{1F468 200D 1F692}", [:"male-firefighter"]),
+      self.new("\u{1F468 200D 2695 FE0F}", [:"male-doctor"]),
+      self.new("\u{1F468 200D 2696 FE0F}", [:"male-judge"]),
+      self.new("\u{1F468 200D 2708 FE0F}", [:"male-pilot"]),
+      self.new("\u{1F469 200D 1F33E}", [:"female-farmer"]),
+      self.new("\u{1F469 200D 1F373}", [:"female-cook"]),
+      self.new("\u{1F469 200D 1F393}", [:"female-student"]),
+      self.new("\u{1F469 200D 1F3A4}", [:"female-singer"]),
+      self.new("\u{1F469 200D 1F3A8}", [:"female-artist"]),
+      self.new("\u{1F469 200D 1F3EB}", [:"female-teacher"]),
+      self.new("\u{1F469 200D 1F3ED}", [:"female-factory-worker"]),
+      self.new("\u{1F469 200D 1F466 200D 1F466}", [:"woman-boy-boy"]),
+      self.new("\u{1F469 200D 1F466}", [:"woman-boy"]),
+      self.new("\u{1F469 200D 1F467 200D 1F466}", [:"woman-girl-boy"]),
+      self.new("\u{1F469 200D 1F467 200D 1F467}", [:"woman-girl-girl"]),
+      self.new("\u{1F469 200D 1F467}", [:"woman-girl"]),
+      self.new("\u{1F469 200D 1F4BB}", [:"female-technologist"]),
+      self.new("\u{1F469 200D 1F4BC}", [:"female-office-worker"]),
+      self.new("\u{1F469 200D 1F527}", [:"female-mechanic"]),
+      self.new("\u{1F469 200D 1F52C}", [:"female-scientist"]),
+      self.new("\u{1F469 200D 1F680}", [:"female-astronaut"]),
+      self.new("\u{1F469 200D 1F692}", [:"female-firefighter"]),
+      self.new("\u{1F469 200D 2695 FE0F}", [:"female-doctor"]),
+      self.new("\u{1F469 200D 2696 FE0F}", [:"female-judge"]),
+      self.new("\u{1F469 200D 2708 FE0F}", [:"female-pilot"]),
+      self.new("\u{1F46A}", [:family]),
+      self.new("\u{1F46A}", [:"man-woman-boy"]),
+      self.new("\u{1F46B}", [:man_and_woman_holding_hands]),
+      self.new("\u{1F46E 200D 2640 FE0F}", [:"female-police-officer"]),
+      self.new("\u{1F46E 200D 2642 FE0F}", [:"male-police-officer"]),
+      self.new("\u{1F46F 200D 2640 FE0F}", [:"woman-with-bunny-ears-partying"]),
+      self.new("\u{1F46F 200D 2642 FE0F}", [:"man-with-bunny-ears-partying"]),
+      self.new("\u{1F471 200D 2640 FE0F}", [:"blond-haired-woman"]),
+      self.new("\u{1F471 200D 2642 FE0F}", [:"blond-haired-man"]),
+      self.new("\u{1F473 200D 2640 FE0F}", [:"woman-wearing-turban"]),
+      self.new("\u{1F473 200D 2642 FE0F}", [:"man-wearing-turban"]),
+      self.new("\u{1F477 200D 2640 FE0F}", [:"female-construction-worker"]),
+      self.new("\u{1F477 200D 2642 FE0F}", [:"male-construction-worker"]),
+      self.new("\u{1F481 200D 2640 FE0F}", [:"woman-tipping-hand"]),
+      self.new("\u{1F481 200D 2642 FE0F}", [:"man-tipping-hand"]),
+      self.new("\u{1F482 200D 2640 FE0F}", [:"female-guard"]),
+      self.new("\u{1F482 200D 2642 FE0F}", [:"male-guard"]),
+      self.new("\u{1F486 200D 2640 FE0F}", [:"woman-getting-massage"]),
+      self.new("\u{1F486 200D 2642 FE0F}", [:"man-getting-massage"]),
+      self.new("\u{1F487 200D 2640 FE0F}", [:"woman-getting-haircut"]),
+      self.new("\u{1F487 200D 2642 FE0F}", [:"man-getting-haircut"]),
+      self.new("\u{1F4A4}", [:zzz]),
+      self.new("\u{1F4D6}", [:open_book]),
+      self.new("\u{1F4E1}", [:satellite_antenna]),
+      self.new("\u{1F4E7}", [:"e-mail"]),
+      self.new("\u{1F52A}", [:knife]),
+      self.new("\u{1F575 FE0F 200D 2640 FE0F}", [:"female-detective"]),
+      self.new("\u{1F575 FE0F 200D 2642 FE0F}", [:"male-detective"]),
+      self.new("\u{1F57A}", [:man_dancing]),
+      self.new("\u{1F595}", [:reversed_hand_with_middle_finger_extended]),
+      self.new("\u{1F5A4}", [:black_heart]),
+      self.new("\u{1F5E8 FE0F}", [:left_speech_bubble]),
+      self.new("\u{1F645 200D 2640 FE0F}", [:"woman-gesturing-no"]),
+      self.new("\u{1F645 200D 2642 FE0F}", [:"man-gesturing-no"]),
+      self.new("\u{1F646 200D 2640 FE0F}", [:"woman-gesturing-ok"]),
+      self.new("\u{1F646 200D 2642 FE0F}", [:"man-gesturing-ok"]),
+      self.new("\u{1F647 200D 2640 FE0F}", [:"woman-bowing"]),
+      self.new("\u{1F647 200D 2642 FE0F}", [:"man-bowing"]),
+      self.new("\u{1F64B 200D 2640 FE0F}", [:"woman-raising-hand"]),
+      self.new("\u{1F64B 200D 2642 FE0F}", [:"man-raising-hand"]),
+      self.new("\u{1F64D 200D 2640 FE0F}", [:"woman-frowning"]),
+      self.new("\u{1F64D 200D 2642 FE0F}", [:"man-frowning"]),
+      self.new("\u{1F64E 200D 2640 FE0F}", [:"woman-pouting"]),
+      self.new("\u{1F64E 200D 2642 FE0F}", [:"man-pouting"]),
+      self.new("\u{1F6A3 200D 2640 FE0F}", [:"woman-rowing-boat"]),
+      self.new("\u{1F6A3 200D 2642 FE0F}", [:"man-rowing-boat"]),
+      self.new("\u{1F6B4 200D 2640 FE0F}", [:"woman-biking"]),
+      self.new("\u{1F6B4 200D 2642 FE0F}", [:"man-biking"]),
+      self.new("\u{1F6B5 200D 2640 FE0F}", [:"woman-mountain-biking"]),
+      self.new("\u{1F6B5 200D 2642 FE0F}", [:"man-mountain-biking"]),
+      self.new("\u{1F6B6 200D 2640 FE0F}", [:"woman-walking"]),
+      self.new("\u{1F6B6 200D 2642 FE0F}", [:"man-walking"]),
+      self.new("\u{1F6D1}", [:octagonal_sign]),
+      self.new("\u{1F6D2}", [:shopping_trolley]),
+      self.new("\u{1F6F4}", [:scooter]),
+      self.new("\u{1F6F5}", [:motor_scooter]),
+      self.new("\u{1F6F6}", [:canoe]),
+      self.new("\u{1F6F7}", [:sled]),
+      self.new("\u{1F6F8}", [:flying_saucer]),
+      self.new("\u{1F918}", [:sign_of_the_horns]),
+      self.new("\u{1F919}", [:call_me_hand]),
+      self.new("\u{1F91A}", [:raised_back_of_hand]),
+      self.new("\u{1F91B}", [:"left-facing_fist"]),
+      self.new("\u{1F91C}", [:"right-facing_fist"]),
+      self.new("\u{1F91E}", [:hand_with_index_and_middle_fingers_crossed]),
+      self.new("\u{1F91F}", [:i_love_you_hand_sign]),
+      self.new("\u{1F922}", [:nauseated_face]),
+      self.new("\u{1F923}", [:rolling_on_the_floor_laughing]),
+      self.new("\u{1F924}", [:drooling_face]),
+      self.new("\u{1F925}", [:lying_face]),
+      self.new("\u{1F926 200D 2640 FE0F}", [:"woman-facepalming"]),
+      self.new("\u{1F926 200D 2642 FE0F}", [:"man-facepalming"]),
+      self.new("\u{1F926}", [:face_palm]),
+      self.new("\u{1F927}", [:sneezing_face]),
+      self.new("\u{1F928}", [:face_with_one_eyebrow_raised]),
+      self.new("\u{1F929}", [:grinning_face_with_star_eyes]),
+      self.new("\u{1F92A}", [:grinning_face_with_one_large_and_one_small_eye]),
+      self.new("\u{1F92B}", [:face_with_finger_covering_closed_lips]),
+      self.new("\u{1F92C}", [:serious_face_with_symbols_covering_mouth]),
+      self.new("\u{1F92D}", [:smiling_face_with_smiling_eyes_and_hand_covering_mouth]),
+      self.new("\u{1F92E}", [:face_with_open_mouth_vomiting]),
+      self.new("\u{1F92F}", [:shocked_face_with_exploding_head]),
+      self.new("\u{1F930}", [:pregnant_woman]),
+      self.new("\u{1F931}", [:"breast-feeding"]),
+      self.new("\u{1F932}", [:palms_up_together]),
+      self.new("\u{1F933}", [:selfie]),
+      self.new("\u{1F934}", [:prince]),
+      self.new("\u{1F935}", [:man_in_tuxedo]),
+      self.new("\u{1F936}", [:mother_christmas]),
+      self.new("\u{1F937 200D 2640 FE0F}", [:"woman-shrugging"]),
+      self.new("\u{1F937 200D 2642 FE0F}", [:"man-shrugging"]),
+      self.new("\u{1F937}", [:shrug]),
+      self.new("\u{1F938 200D 2640 FE0F}", [:"woman-cartwheeling"]),
+      self.new("\u{1F938 200D 2642 FE0F}", [:"man-cartwheeling"]),
+      self.new("\u{1F938}", [:person_doing_cartwheel]),
+      self.new("\u{1F939 200D 2640 FE0F}", [:"woman-juggling"]),
+      self.new("\u{1F939 200D 2642 FE0F}", [:"man-juggling"]),
+      self.new("\u{1F939}", [:juggling]),
+      self.new("\u{1F93A}", [:fencer]),
+      self.new("\u{1F93C 200D 2640 FE0F}", [:"woman-wrestling"]),
+      self.new("\u{1F93C 200D 2642 FE0F}", [:"man-wrestling"]),
+      self.new("\u{1F93C}", [:wrestlers]),
+      self.new("\u{1F93D 200D 2640 FE0F}", [:"woman-playing-water-polo"]),
+      self.new("\u{1F93D 200D 2642 FE0F}", [:"man-playing-water-polo"]),
+      self.new("\u{1F93D}", [:water_polo]),
+      self.new("\u{1F93E 200D 2640 FE0F}", [:"woman-playing-handball"]),
+      self.new("\u{1F93E 200D 2642 FE0F}", [:"man-playing-handball"]),
+      self.new("\u{1F93E}", [:handball]),
+      self.new("\u{1F940}", [:wilted_flower]),
+      self.new("\u{1F941}", [:drum_with_drumsticks]),
+      self.new("\u{1F944}", [:spoon]),
+      self.new("\u{1F945}", [:goal_net]),
+      self.new("\u{1F947}", [:first_place_medal]),
+      self.new("\u{1F948}", [:second_place_medal]),
+      self.new("\u{1F949}", [:third_place_medal]),
+      self.new("\u{1F94A}", [:boxing_glove]),
+      self.new("\u{1F94B}", [:martial_arts_uniform]),
+      self.new("\u{1F94C}", [:curling_stone]),
+      self.new("\u{1F958}", [:shallow_pan_of_food]),
+      self.new("\u{1F95F}", [:dumpling]),
+      self.new("\u{1F960}", [:fortune_cookie]),
+      self.new("\u{1F961}", [:takeout_box]),
+      self.new("\u{1F962}", [:chopsticks]),
+      self.new("\u{1F963}", [:bowl_with_spoon]),
+      self.new("\u{1F964}", [:cup_with_straw]),
+      self.new("\u{1F965}", [:coconut]),
+      self.new("\u{1F966}", [:broccoli]),
+      self.new("\u{1F967}", [:pie]),
+      self.new("\u{1F968}", [:pretzel]),
+      self.new("\u{1F969}", [:cut_of_meat]),
+      self.new("\u{1F96A}", [:sandwich]),
+      self.new("\u{1F96B}", [:canned_food]),
+      self.new("\u{1F985}", [:eagle]),
+      self.new("\u{1F986}", [:duck]),
+      self.new("\u{1F987}", [:bat]),
+      self.new("\u{1F988}", [:shark]),
+      self.new("\u{1F989}", [:owl]),
+      self.new("\u{1F98A}", [:fox_face]),
+      self.new("\u{1F98B}", [:butterfly]),
+      self.new("\u{1F98C}", [:deer]),
+      self.new("\u{1F98D}", [:gorilla]),
+      self.new("\u{1F98E}", [:lizard]),
+      self.new("\u{1F98F}", [:rhinoceros]),
+      self.new("\u{1F990}", [:shrimp]),
+      self.new("\u{1F991}", [:squid]),
+      self.new("\u{1F992}", [:giraffe_face]),
+      self.new("\u{1F993}", [:zebra_face]),
+      self.new("\u{1F994}", [:hedgehog]),
+      self.new("\u{1F995}", [:sauropod]),
+      self.new("\u{1F996}", [:"t-rex"]),
+      self.new("\u{1F997}", [:cricket]),
+      self.new("\u{1F9D0}", [:face_with_monocle]),
+      self.new("\u{1F9D1}", [:adult]),
+      self.new("\u{1F9D2}", [:child]),
+      self.new("\u{1F9D3}", [:older_adult]),
+      self.new("\u{1F9D4}", [:bearded_person]),
+      self.new("\u{1F9D5}", [:person_with_headscarf]),
+      self.new("\u{1F9D6 200D 2640 FE0F}", [:woman_in_steamy_room]),
+      self.new("\u{1F9D6 200D 2642 FE0F}", [:man_in_steamy_room]),
+      self.new("\u{1F9D6}", [:person_in_steamy_room]),
+      self.new("\u{1F9D7 200D 2640 FE0F}", [:woman_climbing]),
+      self.new("\u{1F9D7 200D 2642 FE0F}", [:man_climbing]),
+      self.new("\u{1F9D7}", [:person_climbing]),
+      self.new("\u{1F9D8 200D 2640 FE0F}", [:woman_in_lotus_position]),
+      self.new("\u{1F9D8 200D 2642 FE0F}", [:man_in_lotus_position]),
+      self.new("\u{1F9D8}", [:person_in_lotus_position]),
+      self.new("\u{1F9D9 200D 2640 FE0F}", [:female_mage]),
+      self.new("\u{1F9D9 200D 2642 FE0F}", [:male_mage]),
+      self.new("\u{1F9D9}", [:mage]),
+      self.new("\u{1F9DA 200D 2640 FE0F}", [:female_fairy]),
+      self.new("\u{1F9DA 200D 2642 FE0F}", [:male_fairy]),
+      self.new("\u{1F9DA}", [:fairy]),
+      self.new("\u{1F9DB 200D 2640 FE0F}", [:female_vampire]),
+      self.new("\u{1F9DB 200D 2642 FE0F}", [:male_vampire]),
+      self.new("\u{1F9DB}", [:vampire]),
+      self.new("\u{1F9DC 200D 2640 FE0F}", [:mermaid]),
+      self.new("\u{1F9DC 200D 2642 FE0F}", [:merman]),
+      self.new("\u{1F9DC}", [:merperson]),
+      self.new("\u{1F9DD 200D 2640 FE0F}", [:female_elf]),
+      self.new("\u{1F9DD 200D 2642 FE0F}", [:male_elf]),
+      self.new("\u{1F9DD}", [:elf]),
+      self.new("\u{1F9DE 200D 2640 FE0F}", [:female_genie]),
+      self.new("\u{1F9DE 200D 2642 FE0F}", [:male_genie]),
+      self.new("\u{1F9DE}", [:genie]),
+      self.new("\u{1F9DF 200D 2640 FE0F}", [:female_zombie]),
+      self.new("\u{1F9DF 200D 2642 FE0F}", [:male_zombie]),
+      self.new("\u{1F9DF}", [:zombie]),
+      self.new("\u{1F9E0}", [:brain]),
+      self.new("\u{1F9E1}", [:orange_heart]),
+      self.new("\u{1F9E2}", [:billed_cap]),
+      self.new("\u{1F9E3}", [:scarf]),
+      self.new("\u{1F9E4}", [:gloves]),
+      self.new("\u{1F9E5}", [:coat]),
+      self.new("\u{1F9E6}", [:socks]),
+      self.new("\u{23CF FE0F}", [:eject]),
+      self.new("\u{2614}", [:umbrella_with_rain_drops]),
+      self.new("\u{2640 FE0F}", [:female_sign]),
+      self.new("\u{2642 FE0F}", [:male_sign]),
+      self.new("\u{2695 FE0F}", [:staff_of_aesculapius]),
+      self.new("\u{26F9 FE0F 200D 2640 FE0F}", [:"woman-bouncing-ball"]),
+      self.new("\u{26F9 FE0F 200D 2642 FE0F}", [:"man-bouncing-ball"]),
+      self.new("\u{270F FE0F}", [:pencil2]),
+      self.new("\u{2757}", [:heavy_exclamation_mark])
+    ]
+  end
+end
\ No newline at end of file

lib/rumoji/emoji/objects.rb

@@ -22,19 +22,15 @@ module Rumoji
       self.new("\u{1F385}", [:santa], "FATHER CHRISTMAS"), # "Santa Claus"
       self.new("\u{1f3b1}", [:"8ball"]),
       self.new("\u{23f0}" , [:alarm_clock]),
-      self.new("\u{1f34e}", [:apple]),
       self.new("\u{1f3a8}", [:art]),
       self.new("\u{1f37c}", [:baby_bottle]),
       self.new("\u{1f388}", [:balloon]),
-      self.new("\u{1f34c}", [:banana]),
       self.new("\u{1f4ca}", [:bar_chart]),
       self.new("\u{26be}" , [:baseball]),
       self.new("\u{1f3c0}", [:basketball]),
       self.new("\u{1f6c0}", [:bath]),
       self.new("\u{1f6c1}", [:bathtub]),
       self.new("\u{1f50b}", [:battery]),
-      self.new("\u{1f37a}", [:beer]),
-      self.new("\u{1f37b}", [:beers]),
       self.new("\u{1f514}", [:bell]),
       self.new("\u{1f371}", [:bento]),
       self.new("\u{1f6b4}", [:bicyclist]),
@@ -49,20 +45,15 @@ module Rumoji
       self.new("\u{1f4da}", [:books]),
       self.new("\u{1f462}", [:boot]),
       self.new("\u{1f3b3}", [:bowling]),
-      self.new("\u{1f35e}", [:bread]),
       self.new("\u{1f4bc}", [:briefcase]),
       self.new("\u{1f4a1}", [:bulb]),
-      self.new("\u{1f370}", [:cake]),
       self.new("\u{1f4c6}", [:calendar]),
       self.new("\u{1f4f2}", [:calling]),
       self.new("\u{1f4f7}", [:camera]),
-      self.new("\u{1f36c}", [:candy]),
       self.new("\u{1f4c7}", [:card_index]),
       self.new("\u{1f4bf}", [:cd]),
       self.new("\u{1f4c9}", [:chart_with_downwards_trend]),
       self.new("\u{1f4c8}", [:chart_with_upwards_trend]),
-      self.new("\u{1f352}", [:cherries]),
-      self.new("\u{1f36b}", [:chocolate_bar]),
       self.new("\u{1f384}", [:christmas_tree]),
       self.new("\u{1f3ac}", [:clapper]),
       self.new("\u{1f4cb}", [:clipboard]),
@@ -71,53 +62,39 @@ module Rumoji
       self.new("\u{1f302}", [:closed_umbrella]),
       self.new("\u{2663}" , [:clubs]),
       self.new("\u{1f378}", [:cocktail]),
-      self.new("\u{2615}" , [:coffee]),
       self.new("\u{1f4bb}", [:computer]),
       self.new("\u{1f38a}", [:confetti_ball]),
-      self.new("\u{1f36a}", [:cookie]),
-      self.new("\u{1f33d}", [:corn]),
       self.new("\u{1f4b3}", [:credit_card]),
       self.new("\u{1f451}", [:crown]),
       self.new("\u{1f52e}", [:crystal_ball]),
-      self.new("\u{1f35b}", [:curry]),
-      self.new("\u{1f36e}", [:custard]),
       self.new("\u{1f361}", [:dango]),
       self.new("\u{1f3af}", [:dart]),
       self.new("\u{1f4c5}", [:date]),
       self.new("\u{2666}" , [:diamonds]),
       self.new("\u{1f4b5}", [:dollar]),
       self.new("\u{1f6aa}", [:door]),
-      self.new("\u{1f369}", [:doughnut]),
       self.new("\u{1f457}", [:dress]),
       self.new("\u{1f4c0}", [:dvd]),
       self.new("\u{1f4e7}", [:"e-mail"]),
-      self.new("\u{1f373}", [:egg]),
-      self.new("\u{1f346}", [:eggplant]),
       self.new("\u{1f50c}", [:electric_plug]),
       self.new("\u{2709}" , [:email, :envelope]),
       self.new("\u{1f4b6}", [:euro]),
       self.new("\u{1f453}", [:eyeglasses]),
       self.new("\u{1f4e0}", [:fax]),
       self.new("\u{1f4c1}", [:file_folder]),
-      self.new("\u{1f365}", [:fish_cake]),
       self.new("\u{1f3a3}", [:fishing_pole_and_fish]),
       self.new("\u{1f526}", [:flashlight]),
       self.new("\u{1f4be}", [:floppy_disk]),
       self.new("\u{1f3b4}", [:flower_playing_cards]),
       self.new("\u{1f3c8}", [:football]),
       self.new("\u{1f374}", [:fork_and_knife]),
-      self.new("\u{1f364}", [:fried_shrimp]),
-      self.new("\u{1f35f}", [:fries]),
       self.new("\u{1f3b2}", [:game_die]),
       self.new("\u{1f48e}", [:gem]),
       self.new("\u{1f381}", [:gift]),
       self.new("\u{26f3}" , [:golf]),
-      self.new("\u{1f347}", [:grapes]),
-      self.new("\u{1f34f}", [:green_apple]),
       self.new("\u{1f4d7}", [:green_book]),
       self.new("\u{1f3b8}", [:guitar]),
       self.new("\u{1f52b}", [:gun]),
-      self.new("\u{1f354}", [:hamburger]),
       self.new("\u{1f528}", [:hammer]),
       self.new("\u{1f45c}", [:handbag]),
       self.new("\u{1f3a7}", [:headphones]),
@@ -125,12 +102,9 @@ module Rumoji
       self.new("\u{1f506}", [:high_brightness]),
       self.new("\u{1f460}", [:high_heel]),
       self.new("\u{1f52a}", [:hocho]),
-      self.new("\u{1f36f}", [:honey_pot]),
       self.new("\u{1f3c7}", [:horse_racing]),
       self.new("\u{231b}" , [:hourglass]),
       self.new("\u{23f3}" , [:hourglass_flowing_sand]),
-      self.new("\u{1f368}", [:ice_cream]),
-      self.new("\u{1f366}", [:icecream]),
       self.new("\u{1f4e5}", [:inbox_tray]),
       self.new("\u{1f4e8}", [:incoming_envelope]),
       self.new("\u{1f4f1}", [:iphone]),
@@ -138,11 +112,9 @@ module Rumoji
       self.new("\u{1f511}", [:key]),
       self.new("\u{1f458}", [:kimono]),
       self.new("\u{1f4d2}", [:ledger]),
-      self.new("\u{1f34b}", [:lemon]),
       self.new("\u{1f484}", [:lipstick]),
       self.new("\u{1f512}", [:lock]),
       self.new("\u{1f50f}", [:lock_with_ink_pen]),
-      self.new("\u{1f36d}", [:lollipop]),
       self.new("\u{27bf}" , [:loop]),
       self.new("\u{1f4e2}", [:loudspeaker]),
       self.new("\u{1f505}", [:low_brightness]),
@@ -156,7 +128,6 @@ module Rumoji
       self.new("\u{1f45e}", [:mans_shoe, :shoe]),
       self.new("\u{1f356}", [:meat_on_bone]),
       self.new("\u{1f4e3}", [:mega]),
-      self.new("\u{1f348}", [:melon]),
       self.new("\u{1f4dd}", [:memo, :pencil]),
       self.new("\u{1f3a4}", [:microphone]),
       self.new("\u{1f52c}", [:microscope]),
@@ -188,8 +159,6 @@ module Rumoji
       self.new("\u{270f}" , [:pencil2]),
       self.new("\u{260e}" , [:phone, :telephone]),
       self.new("\u{1f48a}", [:pill]),
-      self.new("\u{1f34d}", [:pineapple]),
-      self.new("\u{1f355}", [:pizza]),
       self.new("\u{1f4ef}", [:postal_horn]),
       self.new("\u{1f4ee}", [:postbox]),
       self.new("\u{1f45d}", [:pouch]),
@@ -198,22 +167,16 @@ module Rumoji
       self.new("\u{1f45b}", [:purse]),
       self.new("\u{1f4cc}", [:pushpin]),
       self.new("\u{1f4fb}", [:radio]),
-      self.new("\u{1f35c}", [:ramen]),
       self.new("\u{1f380}", [:ribbon]),
-      self.new("\u{1f35a}", [:rice]),
-      self.new("\u{1f359}", [:rice_ball]),
-      self.new("\u{1f358}", [:rice_cracker]),
       self.new("\u{1f48d}", [:ring]),
       self.new("\u{1f3c9}", [:rugby_football]),
       self.new("\u{1f3bd}", [:running_shirt_with_sash]),
-      self.new("\u{1f376}", [:sake]),
       self.new("\u{1f461}", [:sandal]),
       self.new("\u{1f4e1}", [:satellite]),
       self.new("\u{1f3b7}", [:saxophone]),
       self.new("\u{2702}" , [:scissors]),
       self.new("\u{1f4dc}", [:scroll]),
       self.new("\u{1f4ba}", [:seat]),
-      self.new("\u{1f367}", [:shaved_ice]),
       self.new("\u{1f455}", [:shirt, :tshirt]),
       self.new("\u{1f6bf}", [:shower]),
       self.new("\u{1f3bf}", [:ski]),
@@ -223,29 +186,20 @@ module Rumoji
       self.new("\u{1f509}", [:sound, :speaker_with_one_sound_wave]),
       self.new("\u{1f47e}", [:space_invader]),
       self.new("\u{2660}" , [:spades]),
-      self.new("\u{1f35d}", [:spaghetti]),
       self.new("\u{1f50a}", [:speaker, :speaker_with_three_sound_waves]),
-      self.new("\u{1f372}", [:stew]),
       self.new("\u{1f4cf}", [:straight_ruler]),
-      self.new("\u{1f353}", [:strawberry]),
       self.new("\u{1f3c4}", [:surfer]),
-      self.new("\u{1f363}", [:sushi]),
-      self.new("\u{1f360}", [:sweet_potato]),
       self.new("\u{1f3ca}", [:swimmer]),
       self.new("\u{1f489}", [:syringe]),
       self.new("\u{1f389}", [:tada]),
       self.new("\u{1f38b}", [:tanabata_tree]),
-      self.new("\u{1f34a}", [:tangerine]),
-      self.new("\u{1f375}", [:tea]),
       self.new("\u{1f4de}", [:telephone_receiver]),
       self.new("\u{1f52d}", [:telescope]),
       self.new("\u{1f3be}", [:tennis]),
       self.new("\u{1f6bd}", [:toilet]),
-      self.new("\u{1f345}", [:tomato]),
       self.new("\u{1f3a9}", [:tophat]),
       self.new("\u{1f4d0}", [:triangular_ruler]),
       self.new("\u{1f3c6}", [:trophy]),
-      self.new("\u{1f379}", [:tropical_drink]),
       self.new("\u{1f3ba}", [:trumpet]),
       self.new("\u{1f4fa}", [:tv]),
       self.new("\u{1f513}", [:unlock]),
@@ -254,20 +208,12 @@ module Rumoji
       self.new("\u{1f3ae}", [:video_game]),
       self.new("\u{1f3bb}", [:violin]),
       self.new("\u{231a}" , [:watch]),
-      self.new("\u{1f349}", [:watermelon]),
-      self.new("\u{1f377}", [:wine_glass]),
       self.new("\u{1f45a}", [:womans_clothes]),
       self.new("\u{1f452}", [:womans_hat]),
       self.new("\u{1f527}", [:wrench]),
       self.new("\u{1f4b4}", [:yen]),
       self.new("\u{1f6CD}", [:shopping_bags], "SHOPPING BAGS"),
       self.new("\u{1f4ff}", [:prayer_beads], "PRAYER BEADS"),
-      self.new("\u{1f336}", [:hot_pepper]),
-      self.new("\u{1f9c0}", [:cheese_wedge]),
-      self.new("\u{1f32d}", [:hot_dog, :hotdog]),
-      self.new("\u{1f32e}", [:taco]),
-      self.new("\u{1f32f}", [:burrito]),
-      self.new("\u{1f37f}", [:popcorn]),
       self.new("\u{1f37e}", [:bottle_popping_cork, :champagne]),
       self.new("\u{1f3fa}", [:amphora]),
       self.new("\u{1f579}", [:joystick]),

lib/rumoji/emoji/people.rb

@@ -112,7 +112,7 @@ module Rumoji
       self.new("\u{1F574}", [:man_levitating, :man_in_business_suit_levitating], "MAN IN BUSINESS SUIT LEVITATING"),
       self.new("\u{1F641}", [:slightly_frowning, :slightly_frowning_face], "SLIGHTLY FROWNING FACE"),
       self.new("\u{1F642}", [:slightly_smiling, :slightly_smiling_face], "SLIGHTLY SMILING FACE"),
-
+      self.new("\u{1F920}", [:face_with_cowboy_hat], "COWBOY HAT FACE"),
       # Poop
       self.new("\u{1F4A9}", [:poop, :hankey, :shit], "PILE OF POO"), # "dog dirt"
       self.new("\u{1F44D}", [:thumbsup, :"+1"], "THUMBS UP SIGN"),