prawn-emoji 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b7d56de903eb9de13dd85933c035fd10b80adf07e1884f59917d4531c01fc34
-  data.tar.gz: b138d0eaafdbc6133b787a0af0ec02f53a036c2843cf5a0b58ccc729cdcc697d
+  metadata.gz: e24fc7c2a1d3c44a3ecf18bfa8b5124e574c1f60b9f9b7223acb82f2e37268f6
+  data.tar.gz: '0338e7946dca1bd17ab896df82b73d7d129ee7282543f71fe0c730911ebecddd'
 SHA512:
-  metadata.gz: 2a5a68b72b5cf442101ef53fa9bbba86887286d752cbc7ecf1ebcb7e759a0b59939e25ea6a13841ddbc34e13a5bb6e9a0c9d6d3555f352c8501115456c4d3905
-  data.tar.gz: '049e887b7f8cbc66343c4c8e683eae6268c564f5502ffe4058b4d4e072e24028f24b58918d22e6c1032cca5332c010e09e7a75072d68a17358ac9c5087f6f279'
+  metadata.gz: 716f0cbc65b97d8889c50ba2a46c15bed474ca5c110640b925b427cf9e05193acc5e0b57687ae5ce87018417e4984a4d43c3c669dbb4e7045e06f335beff3799
+  data.tar.gz: 3b9a3ba4e9640ceab0b0b1251731933946d02eb2ab6f9270f5cf1c8000b1a0281237d1ea07196687cea2b7efd662d5bc8bae2d42f3bdbd96de3d93b0af5c8af4

data/.github/workflows/test.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   test:
-    name: Test on ruby ${{ matrix.ruby_version }}
+    name: Test on ruby ${{ matrix.ruby_version }} and prawn ${{ matrix.prawn_version }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -12,8 +12,13 @@ jobs:
           - 2.5.x
           - 2.6.x
           - 2.7.x
+        prawn_version:
+          - 2.2
+          - 2.3
+
     steps:
     - uses: actions/checkout@v1
+
     - name: Set up diff-pdf
       run: |
         sudo apt-get update
@@ -21,12 +26,14 @@ jobs:
         git clone https://github.com/vslavik/diff-pdf.git -b v0.4.1 --depth 1 /tmp/diff-pdf-src
         cd /tmp/diff-pdf-src
         ./bootstrap && ./configure && make && sudo make install
+
     - name: Set up Ruby ${{ matrix.ruby_version }}
       uses: actions/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby_version }}
+
     - name: Build and test with Rake
       run: |
         gem install bundler
-        bundle install --jobs 4 --retry 3
+        bundle install --gemfile test/gemfiles/prawn-${{ matrix.prawn_version }} --jobs 4 --retry 3
         bundle exec rake test

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Master (Unreleased)
 
+## 4.1.0
+
+### Minor Enhancements
+
+* Add prawn 2.3.0 support #35
+
 ## 4.0.0
 
 ### Enhancements
@@ -9,7 +15,7 @@
 ### Breaking Changes
 
 * Drop ruby 2.4 support
-* The drawing results of emoji will be chnaged slightly due to the new emoji drawing process
+* The drawing results of emoji will be changed slightly due to the new emoji drawing process
 
 ### Bug Fixes
 

data/Gemfile

@@ -1,3 +1,8 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'rake', '>= 0'
+gem 'minitest', '>= 5.12.2'
+gem 'rr', '>= 0'
+gem 'rubyzip', '>= 1.0.0'

data/README.md

@@ -90,7 +90,7 @@ Prawn::Emoji.config.regex = ::Unicode::Emoji::REGEX_INCLUDE_TEXT
 
 ### Prawn
 
-2.2+
+2.2, 2.3
 
 ## Contributing
 

data/lib/prawn/emoji.rb

@@ -11,10 +11,12 @@ module Prawn
       #
       # The following values are available (Default is `Unicode::Emoji::REGEX_VALID`):
       # https://github.com/janlelis/unicode-emoji#regex.
-      :regex
+      :regex,
+
+      keyword_init: true
     )
     def self.config
-      @config ||= Config.new(::Unicode::Emoji::REGEX_VALID)
+      @config ||= Config.new(regex: ::Unicode::Emoji::REGEX_VALID)
     end
 
     def self.regex

data/lib/prawn/emoji/drawer.rb

@@ -44,26 +44,23 @@ module Prawn
 
       def draw_text(text, at:, text_options:)
         draw_text!(text, at: at, text_options: text_options)
-        document.width_of(text, text_options)
+
+        width = document.width_of(text, text_options)
+
+        if Prawn::VERSION >= '2.3.0'
+          # In prawn v2.3.0, the character spacing at the end of the text is not included in the calculated text width.
+          # https://github.com/prawnpdf/prawn/pull/1117
+          width > 0 ? width + document.character_spacing : width
+        else
+          width
+        end
       end
 
       def draw_emoji(emoji_char, at:)
         emoji_image = Emoji::Image.new(emoji_char)
+        emoji_image.render(document, at: at)
 
-        x, y = at
-
-        # Prawn 2.2 does not close the image file when Pathname is passed to Document#image method.
-        #
-        # FIXME: This issue has been fixed by https://github.com/prawnpdf/prawn/pull/1090 but not released.
-        # Fix as follows after the PR released.
-        #
-        #   @document.image(image_file.path, at: [x, y], width: image.width)
-        #
-        File.open(emoji_image.path, 'rb') do |image_file|
-          @document.image(image_file, at: [x, y + emoji_char.height], width: emoji_char.width)
-        end
-
-        emoji_char.width + document.character_spacing
+        emoji_image.width + document.character_spacing
       end
     end
   end

data/lib/prawn/emoji/image.rb

@@ -1,14 +1,36 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+
 module Prawn
   module Emoji
     class Image
+      extend Forwardable
+
       STORE = Emoji.root.join 'emoji', 'images'
 
+      def_delegators :emoji_char, :width, :height
+
       def initialize(emoji_char)
         @emoji_char = emoji_char
       end
 
+      def render(document, at:)
+        x, y = at
+
+        position = [x, y + height]
+
+        if Prawn::VERSION >= '2.3.0'
+          document.image(path, at: position, width: width)
+        else
+          # Prawn 2.2 does not close the image file when Pathname is passed to Document#image method.
+          # https://github.com/prawnpdf/prawn/pull/1090
+          File.open(path, 'rb') do |image_file|
+            document.image(image_file, at: position, width: width)
+          end
+        end
+      end
+
       def path
         STORE.join("#{emoji_char.codepoint}.png").to_s
       end

data/lib/prawn/emoji/version.rb

@@ -2,6 +2,6 @@
 
 module Prawn
   module Emoji
-    VERSION = '4.0.0'
+    VERSION = '4.1.0'
   end
 end

data/prawn-emoji.gemspec

@@ -18,12 +18,6 @@ Gem::Specification.new do |spec|
   end
   spec.require_path  = 'lib'
 
-  spec.add_runtime_dependency 'prawn', '~> 2.2.0'
+  spec.add_runtime_dependency 'prawn', '~> 2.2'
   spec.add_runtime_dependency 'unicode-emoji', '~> 2.5.0'
-
-  spec.add_development_dependency 'bundler', '>= 1.0.0'
-  spec.add_development_dependency 'rake', '>= 0'
-  spec.add_development_dependency 'minitest', '>= 5.12.2'
-  spec.add_development_dependency 'rr', '>= 0'
-  spec.add_development_dependency 'rubyzip', '>= 1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-emoji
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Katsuya HIDAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: unicode-emoji
   requirement: !ruby/object:Gem::Requirement
@@ -38,76 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.12.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.12.2
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 description: Prawn::Emoji is an extention that adds Emoji support to Prawn
 email: hidakatsuya@gmail.com
 executables: []