gemojione 2.5.0 → 2.6.0

data/lib/gemojione.rb

@@ -15,6 +15,8 @@ require "gemojione/railtie" if defined?(Rails)
 module Gemojione
   @asset_host = nil
   @asset_path = nil
+  @default_size = nil
+
   @escaper = defined?(EscapeUtils) ? EscapeUtils : CGI
 
   def self.asset_host
@@ -33,6 +35,14 @@ module Gemojione
     @asset_path = path
   end
 
+  def self.default_size
+    @default_size
+  end
+
+  def self.default_size=(size)
+    @default_size = size
+  end
+
   def self.image_url_for_name(name)
     emoji = index.find_by_name(name)
     "#{asset_host}#{ File.join(asset_path, emoji['unicode']) }.png"
@@ -43,6 +53,10 @@ module Gemojione
     image_url_for_name(emoji['name'])
   end
 
+  def self.image_tag_for_moji(moji)
+    %Q{<img alt="#{moji}" class="emoji" src="#{ image_url_for_unicode_moji(moji) }"#{ default_size ? ' style="width: '+default_size+';"' : '' }>}
+  end
+
   def self.replace_unicode_moji_with_images(string)
     return string unless string
     unless string.match(index.unicode_moji_regex)
@@ -51,7 +65,7 @@ module Gemojione
 
     safe_string = safe_string(string.dup)
     safe_string.gsub!(index.unicode_moji_regex) do |moji|
-      %Q{<img alt="#{moji}" class="emoji" src="#{ image_url_for_unicode_moji(moji) }">}
+      Gemojione.image_tag_for_moji(moji)
     end
     safe_string = safe_string.html_safe if safe_string.respond_to?(:html_safe)
 
@@ -68,7 +82,7 @@ module Gemojione
     safe_string.gsub!(index.shortname_moji_regex) do |code|
       name = code.tr(':','')
       moji = index.find_by_name(name)['moji']
-      %Q{<img alt="#{moji}" class="emoji" src="#{ image_url_for_name(name) }">}
+      Gemojione.image_tag_for_moji(moji)
     end
     safe_string = safe_string.html_safe if safe_string.respond_to?(:html_safe)
 

data/lib/gemojione/index.rb

@@ -33,8 +33,8 @@ module Gemojione
         @emoji_by_moji[moji] = emoji_hash if moji
       end
 
-      @emoji_code_regex = /#{@emoji_by_code.keys.join('|')}/
-      @emoji_moji_regex = /#{@emoji_by_moji.keys.join('|')}/
+      @emoji_code_regex = /#{@emoji_by_code.keys.map{|ec| Regexp.escape(ec)}.join('|')}/
+      @emoji_moji_regex = /#{@emoji_by_moji.keys.map{|ec| Regexp.escape(ec)}.join('|')}/
     end
 
     def find_by_moji(moji)

data/lib/gemojione/version.rb

@@ -1,3 +1,3 @@
 module Gemojione
-  VERSION = "2.5.0"
+  VERSION = "2.6.0"
 end

data/test/gemojione_test.rb

@@ -43,6 +43,30 @@ describe Gemojione do
     end
   end
 
+  describe 'default size' do
+    it 'should default to nil' do
+      assert_equal nil, Gemojione.default_size
+    end
+
+    it 'should be configurable' do
+      with_emoji_config(:default_size, '32px') do
+        assert_equal '32px', Gemojione.default_size
+      end
+    end
+  end
+
+  describe 'image_tag_for_moji' do
+    it 'should generate a clean img tag if default_size undefined' do
+      assert_equal '<img alt="🌀" class="emoji" src="http://localhost:3000/1F300.png">', Gemojione.image_tag_for_moji('🌀')
+    end
+
+    it 'should generate a img tag with style tag if default_size is defined' do
+      Gemojione.default_size='42px'
+      assert_equal '<img alt="🌀" class="emoji" src="http://localhost:3000/1F300.png" style="width: 42px;">', Gemojione.image_tag_for_moji('🌀')
+      Gemojione.default_size=nil
+    end
+  end
+
   describe "replace_unicode_moji_with_images" do
     it 'should return original string without emoji' do
       assert_equal "foo", Gemojione.replace_unicode_moji_with_images('foo')
@@ -59,6 +83,10 @@ describe Gemojione do
       assert_equal "I <img alt=\"❤\" class=\"emoji\" src=\"http://localhost:3000/2764.png\"> Emoji", replaced_string
     end
 
+    it 'should escape regex breaker mojis' do
+      assert_equal "<img alt=\"*⃣\" class=\"emoji\" src=\"http://localhost:3000/002A-20E3.png\">", Gemojione.replace_unicode_moji_with_images('*⃣')
+    end
+
     it 'should handle nil string' do
       assert_equal nil, Gemojione.replace_unicode_moji_with_images(nil)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemojione
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Steve Klabnik
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json