prawn-emoji 4.0.0.beta.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df6049f973c509b992f095c4e0ba9350d60c3c4aa9a400e2d2ad8ed0e3a5770c
-  data.tar.gz: e8dc6fad7e6dfa7c77160462d46f93d5544d6de0b483507fc904cd1ab5cb0d1a
+  metadata.gz: 2b7d56de903eb9de13dd85933c035fd10b80adf07e1884f59917d4531c01fc34
+  data.tar.gz: b138d0eaafdbc6133b787a0af0ec02f53a036c2843cf5a0b58ccc729cdcc697d
 SHA512:
-  metadata.gz: dcc0640b6ee339682aec4a53dd65d620f370c93f7c19e011754b8493f66a710af911f8441fdf61e389695321aa661de20897bac39e78e6fa3236eef6fdf61168
-  data.tar.gz: '087003d57a544f7f6538d555f2cdb392c6b17eef2edf83e3fd94d73e11c0e50db369787334738fb22c4b805d23e9a2531454a33e935abf0b197f4834dde27a4c'
+  metadata.gz: 2a5a68b72b5cf442101ef53fa9bbba86887286d752cbc7ecf1ebcb7e759a0b59939e25ea6a13841ddbc34e13a5bb6e9a0c9d6d3555f352c8501115456c4d3905
+  data.tar.gz: '049e887b7f8cbc66343c4c8e683eae6268c564f5502ffe4058b4d4e072e24028f24b58918d22e6c1032cca5332c010e09e7a75072d68a17358ac9c5087f6f279'

data/CHANGELOG.md

@@ -1,13 +1,19 @@
 ## Master (Unreleased)
 
-## 4.0.0.beta.1
+## 4.0.0
+
+### Enhancements
+
+* prawn-emoji is no longer dependent on a particular font due to the new emoji drawing process
 
 ### Breaking Changes
 
-* Changes how to draw text including emoji:
-  * The result of drawing emoji will changes slightly
-  * prawn-emoji no longer requires Japanese fonts because it stopped replacing an emoji with the substitution char such as full-width space
 * Drop ruby 2.4 support
+* The drawing results of emoji will be chnaged slightly due to the new emoji drawing process
+
+### Bug Fixes
+
+* Some emojis are not displayed #34
 
 ## 3.3.0
 

data/README.md

@@ -138,6 +138,12 @@ You can run test:
 > src# bundle exec rake test
 ```
 
+Or, you can run test instantly like this:
+
+```
+$ docker run --rm -v $PWD:/src:cached -it prawn-emoji bash -c "bundle install && bundle exec rake test:pdf"
+```
+
 ### Updating the bundled emojis
 
 ```

data/lib/prawn/emoji/drawable.rb

@@ -8,12 +8,12 @@ module Prawn
       # == Additional Options
       # <tt>:emoji</tt>:: <tt>boolean</tt>. Whether or not to draw an emoji [true]
       def draw_text!(text, options)
-        draw_emoji = options.fetch(:emoji, true)
+        draw_emoji = options.delete(:emoji) { true }
 
-        if draw_emoji && text.encoding == ::Encoding::UTF_8 && Emoji.regex.match?(text)
+        if draw_emoji && Emoji::Drawer.drawable?(text)
           emoji_drawer.draw(text.to_s, options)
         else
-          super(text, options)
+          super
         end
       end
 

data/lib/prawn/emoji/drawer.rb

@@ -7,6 +7,10 @@ require_relative 'text'
 module Prawn
   module Emoji
     class Drawer
+      def self.drawable?(text)
+        text.encoding == ::Encoding::UTF_8 && Emoji.regex.match?(text)
+      end
+
       def initialize(document)
         @document = document
         @emoji_index = Emoji::Index.new
@@ -18,9 +22,9 @@ module Prawn
         emoji_text = Emoji::Text.new(text, document.font_size)
 
         while emoji_text.contains_emoji? do
-          if emoji_index.include?(emoji_text.emoji.codepoint)
+          if emoji_index.include?(emoji_text.emoji_char.codepoint)
             cursor_x += draw_text(emoji_text.left, at: [cursor_x, cursor_y], text_options: text_options)
-            cursor_x += draw_emoji(emoji_text.emoji, at: [cursor_x, cursor_y])
+            cursor_x += draw_emoji(emoji_text.emoji_char, at: [cursor_x, cursor_y])
           else
             cursor_x += draw_text(emoji_text.left_with_emoji, at: [cursor_x, cursor_y], text_options: text_options)
           end

data/lib/prawn/emoji/text.rb

@@ -5,20 +5,20 @@ require_relative 'char'
 module Prawn
   module Emoji
     class Text
-      attr_reader :left, :emoji, :remaining
+      attr_reader :left, :emoji_char, :remaining
 
       def initialize(text, font_size)
         @text = text
-        @left, emoji_char, @remaining = partition_by_emoji(text)
-        @emoji = Emoji::Char.new(emoji_char, font_size) unless emoji_char.empty?
+        @left, emoji, @remaining = partition_by_emoji(text)
+        @emoji_char = Emoji::Char.new(emoji, font_size) unless emoji.empty?
       end
 
       def contains_emoji?
-        !emoji.nil?
+        !emoji_char.nil?
       end
 
       def left_with_emoji
-        left + emoji.to_s
+        left + emoji_char.to_s
       end
 
       def to_s

data/lib/prawn/emoji/version.rb

@@ -2,6 +2,6 @@
 
 module Prawn
   module Emoji
-    VERSION = '4.0.0.beta.1'
+    VERSION = '4.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-emoji
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Katsuya HIDAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -3509,9 +3509,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: