emoji_sub 0.2.0 → 0.2.1

data/lib/emoji_sub.rb

@@ -5,7 +5,7 @@ module EmojiSub
   EMOJI_MAPPING_YAML = "data/emoji.yaml"
   
   def emoji_sub(text, additional_mappings = {})
-    known_emoji = YAML.load(File.read(EMOJI_MAPPING_YAML)).merge(additional_mappings)
+    known_emoji = emoji_definitions.merge(additional_mappings)
 
     discovered_emoji = text.scan(/:([\w\d\-\_]+):/).flatten.map(&:to_sym).uniq
     found = discovered_emoji.each_with_object({}) do |emoji, found|
@@ -13,12 +13,18 @@ module EmojiSub
     end.compact
 
     found.each do |shortcode, unicode|
-      text.gsub!(/:#{shortcode}:/, "&#x#{unicode}")
+      text.gsub!(/:#{shortcode}:/, Array(unicode).map { |u| "&#x#{u}" }.join(''))
     end
     
     text
   end
-  module_function :emoji_sub
 
+  def emoji_definitions
+    m = YAML.load(File.read(EMOJI_MAPPING_YAML)).values
+    @emoji_definitions ||= m.inject({}) { |a,memo| memo.merge(a) }
+    
+    #@emoji_definitions ||= m.collect(&:values).flatten
+  end
+  module_function :emoji_sub, :emoji_definitions
 
 end

data/lib/emoji_sub/version.rb

@@ -1,3 +1,3 @@
 module EmojiSub
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emoji_sub
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Aaron Hill
@@ -33,7 +33,6 @@ files:
 - data/emoji.yaml
 - emoji_sub.gemspec
 - lib/emoji_sub.rb
-- lib/emoji_sub/emoji_parser.rb
 - lib/emoji_sub/version.rb
 homepage: https://github.com/armahillo/emoji_sub
 licenses:

data/lib/emoji_sub/emoji_parser.rb

@@ -1,25 +0,0 @@
-require 'YAML'
-
-def emoji_sub(text)
-  known_emoji = load_emoji
-  discovered_emoji = text.scan(/:([\w\d\-\_]+):/).flatten.map(&:to_sym).uniq
-  found = discovered_emoji.each_with_object({}) do |emoji, found|
-    found[emoji] = known_emoji.fetch(emoji,'')
-  end
-
-  found.each do |shortcode, unicode|
-    text.gsub!(/:#{shortcode}:/, "&#x#{unicode}")
-  end
-  
-  text
-end
-
-def load_emoji
-  YAML.load(File.read('emoji.yaml'))
-end
-
-
-
-TEXT = 'This is testing text :100: :100: :100: :bad_dude: It is great :slightly_smiling_face:.'
-
-p emoji_sub(TEXT)