prawn-emoji 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 30464f704625995fdd24c34529781eb09f5cc988
-  data.tar.gz: 730b6f231a9db3d31f560372bbffcc1e45da50cf
+SHA256:
+  metadata.gz: 7c7814b9fcdf6df957493097c0a5a82b8759e4102058afda188a3323f7a48ea2
+  data.tar.gz: 5759ef6fbdfdc30bb48dbf9a8c8e87c7ddf9aa65c7f7ea5ddf52aa643d4d3469
 SHA512:
-  metadata.gz: 00c4a04c30c7c42b529a16a0368e2f9d689dcfece6adb14c2b8d2eb339de921175e8ed469f0415fe0a21f77624ff35de9401293c9e64959002d1726c7263e02f
-  data.tar.gz: 871b4cdf8e5af80ac414160bd2603884900438746f08b9a43da551e90c04d25b465c54f1a5dba4f6f939219e0e96b14680e181e6354959decfce767cf30d6c21
+  metadata.gz: 6ca4f75d9382b7a9df0be903b07761b7d924edbdb493516d48784664885e9fe775024273c0c049298b627d69770c74d6bed3c11415a0e4c5a4c42418576ec30d
+  data.tar.gz: d6040f8f133f46b844523836e10e4ec0f0bf3ab326e31a42349894a8f828e4ba66769538756384a0d58f0be581456760b420787443e2219e798c9acbf1fc5319

data/.travis.yml

@@ -4,12 +4,16 @@ sudo: false
 
 rvm:
   - 2.1.10
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
 
 gemfile:
   - test/gemfiles/prawn-2.1
   - test/gemfiles/prawn-2.2
 
+before_install:
+  - travis_retry gem update --system
+
 script: bundle exec rake test

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.1.1
+
+### Bug Fixes:
+
+ * Fixed: A text including multiple emojis are broken #19
+
 ## 2.1.0
 
 ### Breaking Changes

data/README.md

@@ -61,7 +61,7 @@ See also https://travis-ci.org/hidakatsuya/prawn-emoji.
 
 ### Ruby
 
-2.1, 2.2, 2.3, 2.4
+2.1, 2.2, 2.3, 2.4, 2.5
 
 ### Prawn
 

data/lib/prawn/emoji/drawer.rb

@@ -25,35 +25,38 @@ module Prawn
       def draw_emoji(text, text_options)
         return text unless @emoji_index.to_regexp =~ text
 
-        result = []
-        target = text
+        result_texts = []
+        target_text = text
 
-        while target do
-          left_text, emoji_unicode, remaining_text = partition_emoji(target)
+        while target_text do
+          left_text, emoji_unicode, remaining_text = partition_emoji(target_text)
 
           if emoji_unicode.nil?
-            result << target
+            result_texts << target_text
             break
           end
 
-          result << left_text
-          result << if emoji_unicode.text?
-            emoji_unicode.to_s
-          else
-            emoji_image = Emoji::Image.new(emoji_unicode)
+          current_result_texts = [left_text]
+          current_result_texts <<
+            if emoji_unicode.text?
+              emoji_unicode.to_s
+            else
+              emoji_image = Emoji::Image.new(emoji_unicode)
 
-            emoji_x, emoji_y = text_options[:at]
-            emoji_x += @document.width_of(left_text, text_options)
-            emoji_y += @document.font_size
+              emoji_x, emoji_y = text_options[:at]
+              emoji_x += @document.width_of(result_texts.join + left_text, text_options)
+              emoji_y += @document.font_size
 
-            draw_emoji_image emoji_image, at: [emoji_x, emoji_y], width: @document.font_size
+              draw_emoji_image emoji_image, at: [emoji_x, emoji_y], width: @document.font_size
 
-            Emoji::Substitution.new(@document).to_s
-          end
-          target = remaining_text
+              Emoji::Substitution.new(@document).to_s
+            end
+
+          result_texts += current_result_texts
+          target_text = remaining_text
         end
 
-        result.join
+        result_texts.join
       end
 
       def draw_emoji_image(emoji_image, at:, width:)

data/lib/prawn/emoji/version.rb

@@ -2,6 +2,6 @@
 
 module Prawn
   module Emoji
-    VERSION = '2.1.0'.freeze
+    VERSION = '2.1.1'.freeze
   end
 end

data/test/prawn/emoji/drawer_test.rb

@@ -38,7 +38,9 @@ describe Prawn::Emoji::Drawer do
 
   describe '#draw_emoji' do
     subject { drawer.send :draw_emoji, text, text_options }
-    let(:text_options) { { at: [100, 100], font_size: 12 } }
+
+    let(:text_options) { { at: [100, 200], font_size: 12 } }
+    let(:sub_char) { Prawn::Emoji::Substitution.new(document) }
 
     describe 'when not includes emoji' do
       let(:text) { 'abc' }
@@ -49,18 +51,23 @@ describe Prawn::Emoji::Drawer do
     end
 
     describe 'when includes emoji' do
-      let(:text) { "aaa#{sushi}bbb" }
-
-      it 'draws image for included emoji' do
-        image_width = 12
-        image_at    = [100 + document.width_of('aaa', text_options), 100 + 12]
-
-        mock(drawer).draw_emoji_image(sushi_image, at: image_at, width: image_width).once
+      let(:text) { "aaa#{sushi}bbb#{sushi}#{sushi}ccc" }
+
+      it 'draws alternative images for each emoji included in the text' do
+        image_x_positions = [
+          100 + document.width_of('aaa', text_options),
+          100 + document.width_of("aaa#{sub_char}bbb", text_options),
+          100 + document.width_of("aaa#{sub_char}bbb#{sub_char}", text_options)
+        ]
+
+        image_x_positions.each { |x|
+          mock(drawer).draw_emoji_image(sushi_image, at: [x, 200 + 12], width: 12).once
+        }
         subject
       end
 
       it 'returns text that all emoji has substituted' do
-        subject.must_equal "aaa#{Prawn::Emoji::Substitution.new(document)}bbb"
+        subject.must_equal "aaa#{sub_char}bbb#{sub_char}#{sub_char}ccc"
       end
     end
   end

data/test/prawn/emoji/unicode_test.rb

@@ -3,34 +3,36 @@
 require 'test_helper'
 
 describe Prawn::Emoji::Unicode do
-  let(:klass) { Prawn::Emoji::Unicode }
+  def unicode(emoji)
+    Prawn::Emoji::Unicode.new(emoji)
+  end
 
   describe '#==' do
-    it { klass.new('🐟').must_be :==, klass.new('🐟') }
-    it { klass.new('🐟').wont_be :==, klass.new('🍣') }
+    it { unicode('🐟').must_be :==, unicode('🐟') }
+    it { unicode('🐟').wont_be :==, unicode('🍣') }
   end
 
   describe '#codepoint' do
-    it { klass.new('🍣').codepoint.must_equal '1f363' }
-    it { klass.new('🇯🇵').codepoint.must_equal '1f1ef-1f1f5' }
+    it { unicode('🍣').codepoint.must_equal '1f363' }
+    it { unicode('🇯🇵').codepoint.must_equal '1f1ef-1f1f5' }
   end
 
   describe '#to_s' do
-    it { klass.new('🍣').to_s.must_equal '🍣' }
-    it { klass.new('❤️').to_s.wont_match /[\ufe0e\ufe0f]/ }
+    it { unicode('🍣').to_s.must_equal '🍣' }
+    it { unicode('❤️').to_s.wont_match /[\ufe0e\ufe0f]/ }
   end
 
   describe '#text?' do
     describe 'no selector' do
-      it { klass.new('☀').wont_be :text? }
+      it { unicode('☀').wont_be :text? }
     end
 
     describe 'with text presentation selector' do
-      it { klass.new('☀︎').must_be :text? }
+      it { unicode('☀︎').must_be :text? }
     end
 
     describe 'with emoji presentation selector' do
-      it { klass.new('☀️').wont_be :text? }
+      it { unicode('☀️').wont_be :text? }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-emoji
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Katsuya HIDAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -1983,7 +1983,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Provides support for Emoji in Prawn