emoji 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85b117fc2248c58f4b7c1b271121cefcc58ecd7a
-  data.tar.gz: 1b78b3e8d1d096e644110f03d41fdaf64d6ddf50
+  metadata.gz: 51aa082de115428a1e87faf901e48086d154ce29
+  data.tar.gz: 8be5856bfe94ea3767e65155c61e706c463c5529
 SHA512:
-  metadata.gz: 10e36d5aab8e0a94fc2f28cf9ab8b0b59786127089dd6c86f876a10821480a9be6f0103a9ecc1cc15357097cfaed232c0a945d3194099737b5f1258a3b092a5e
-  data.tar.gz: 0ae62138344caec64c023abfd93731e31202bfbc4ff0d3df241e04c6fc21fe02715403c2d657bd7262587667dc80e3173886a05577dad024c0c795b32a623211
+  metadata.gz: 277599578461ed7f39f8904b25ac513f029368cfeeb07e761dd77f690be86b8042281cad3e0c190e637bd5d20c1d20c5b24537b197fe3e18e49af9c2f020fc43
+  data.tar.gz: ece245951377000b90ec40ea13f5cd01790219c218795a1de44a9889feb32bd45e0d7836f860f923868ef84c8bf63c68b9e8dfe5142723c458de6e344db457d4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Releases / Changes
 
+## 1.0.7
+
+* Adds `Emoji.replace_named_moji_with_unicode()` for Markdown
+* Use configured Rails asset `path_prefix` for `Emoji.asset_path` prefix
+
+
 ## 1.0.6
 
 * Adds `Emoji.replace_unicode_moji_with_name()` for Markdown

data/lib/emoji.rb

@@ -36,7 +36,7 @@ module Emoji
     return '' unless asset_host_spec.size >= 1
 
     # Special Case for 'hostname:port' style URIs, not parse properly by URI.parse
-    if asset_host_spec.match(/^[^:]+:\d+$/)
+    if asset_host_spec.match(/^[^:\/]+:\d+$/)
       components = asset_host_spec.split(':')
       scheme_string = 'http://'
       hostname = components.first
@@ -132,6 +132,24 @@ module Emoji
     safe_string
   end
 
+  def self.replace_named_moji_with_unicode(string)
+    return string unless string
+    unless string.match(index.named_moji_regex)
+      return safe_string(string)
+    end
+
+    safe_string = safe_string(string.dup)
+    safe_string.gsub!(index.named_moji_regex) do |name_exp|
+      name = name_exp[1..-2] # Convert :heart: to heart, strips first/last chars
+      emoji = index.find_by_name(name)
+
+      emoji['moji']
+    end
+    safe_string = safe_string.html_safe if safe_string.respond_to?(:html_safe)
+
+    safe_string
+  end
+
   def self.replace_unicode_moji_with_name(string)
     return string unless string
     unless string.match(index.unicode_moji_regex)
@@ -141,7 +159,7 @@ module Emoji
     safe_string = safe_string(string.dup)
     safe_string.gsub!(index.unicode_moji_regex) do |moji|
       emoji = index.find_by_moji(moji)
-      %Q{:#{emoji['name']}:}
+      ":#{emoji['name']}:"
     end
     safe_string = safe_string.html_safe if safe_string.respond_to?(:html_safe)
 

data/lib/emoji/index.rb

@@ -4,7 +4,7 @@ module Emoji
   class Index
     extend Forwardable
 
-    attr_reader :unicode_moji_regex
+    attr_reader :unicode_moji_regex, :named_moji_regex
 
     def_delegator :@emoji_by_moji, :[], :find_by_moji
     def_delegator :@emoji_by_name, :[], :find_by_name
@@ -31,7 +31,9 @@ module Emoji
         @emoji_by_unicode[unicode] = emoji_hash if unicode
       end
 
-      @unicode_moji_regex = /#{@emoji_by_moji.keys.join('|')}/
+      annotated_name_strings = @emoji_by_name.keys.map{|name| ":#{name}:" }
+      @named_moji_regex = /#{ annotated_name_strings.join('|') }/
+      @unicode_moji_regex = /#{ @emoji_by_moji.keys.join('|') }/
     end
   end
 end

data/lib/emoji/railtie.rb

@@ -1,11 +1,13 @@
 require 'emoji'
 require 'rails'
+require 'sprockets'
 
 module Emoji
   class Railtie < Rails::Railtie
     initializer "emoji.defaults" do
       Emoji.asset_host = ActionController::Base.asset_host
-      Emoji.asset_path = '/assets/emoji'
+      asset_prefix = Rails.application.config.assets.prefix rescue '/assets'
+      Emoji.asset_path =  File.join(asset_prefix, '/emoji')
       Emoji.use_plaintext_alt_tags = false
     end
 

data/lib/emoji/version.rb

@@ -1,3 +1,3 @@
 module Emoji
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/test/emoji_test.rb

@@ -50,6 +50,12 @@ describe Emoji do
       end
     end
 
+    it 'should allow protocol relative UR with port' do
+      with_emoji_config(:asset_host, '//emoji:3000') do
+        assert_equal '//emoji:3000', Emoji.asset_host
+      end
+    end
+
     it 'should respect protocol scheme' do
       with_emoji_config(:asset_host, 'https://emoji') do
         assert_equal 'https://emoji', Emoji.asset_host
@@ -114,6 +120,22 @@ describe Emoji do
     end
   end
 
+  describe 'replace_named_moji_with_unicode' do
+    it 'should return the original string without emoji' do
+      assert_equal "foo", Emoji.replace_named_moji_with_unicode('foo')
+    end
+
+    it 'should replace the markdown-esque emoji name with its unicode equivalent' do
+      base_string = "I :heart: Emoji"
+      assert_equal "I ❤ Emoji", Emoji.replace_named_moji_with_unicode(base_string)
+    end
+
+    it 'should be able to replace multiple emoji in one go' do
+      base_string = "I :heart: :invalid: Emoji"
+      assert_equal "I ❤ :invalid: Emoji", Emoji.replace_named_moji_with_unicode(base_string)
+    end
+  end
+
   describe "replace_unicode_moji_with_images" do
     it 'should return original string without emoji' do
       assert_equal "foo", Emoji.replace_unicode_moji_with_images('foo')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emoji
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Steve Klabnik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -605,7 +605,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: 'A Ruby gem. For emoji. For everyone. :heart:'