prawn-emoji 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0946a00d0fd3bd61f4ede09d782fbf90fb9a4546'
-  data.tar.gz: fc76bbf278462517086bb81fc753633b25169b31
+  metadata.gz: 26bd2353da780fc31e8ebd11751a1156916d7cea
+  data.tar.gz: 359e3538740e6c1e14a90ad6a399bb5be5c94624
 SHA512:
-  metadata.gz: 1fe08b160bd51782ae7acbff906173489651480b38e873715d51ccd0f9cc68bfde30cb48b0a5013920b57759b4dedd1d9e17734cdc7530778eea383559dcb39d
-  data.tar.gz: 85362bde5126d3fead36c462faef012ead105ed553bda946eaa48f99bee0df616821ca557afd5d34d5ed58ee89e8cb1eeb944ac1a58f75cfc4d316ddeeb1c7da
+  metadata.gz: e408960124f71a8c5151ac0ac12a767a47a992e9b819d35a932d7201f21887556f5a17ede3551dc5823900cdff03faf67601b884987f5d1242ef6d32299be72d
+  data.tar.gz: f21a974d7dcdf8e954b64639f9c33b7320d829e1467654e3f7ac0b0190d9b79b32587c57a336a8cd37a1a984e2dbaa12c6f8da868f6d41e7ed01eaae22a7b78d

data/.gitignore

@@ -1,3 +1,2 @@
 /.bundle/
-/pkg/
 /Gemfile.lock

data/.travis.yml

@@ -4,15 +4,12 @@ sudo: false
 
 rvm:
   - 2.1.10
-  - 2.2.6
-  - 2.3.3
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 
 gemfile:
   - test/gemfiles/prawn-2.1
+  - test/gemfiles/prawn-2.2
 
 script: bundle exec rake test
-
-branches:
-  only:
-    - master
-    - /\-stable$/

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.0.1
+
+### Bug Fixes:
+
+ * Fixed: part of ASCII chars and symbols is unexpectedly replaced with emojis #17 [@juanfal]
+
 ## 2.0.0
 
  * prawn-emoji requires Prawn 2.1 or higher

data/README.md

@@ -61,11 +61,11 @@ See also https://travis-ci.org/hidakatsuya/prawn-emoji.
 
 ### Ruby
 
-2.1, 2.2, 2.3
+2.1, 2.2, 2.3, 2.4
 
 ### Prawn
 
-2.1
+2.1, 2.2
 
 INFO: Version 1.x supports Prawn 1.3 and 2.0. See [README in 1.0-stable branch](https://github.com/hidakatsuya/prawn-emoji/blob/1.0-stable/README.md).
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 

data/lib/prawn/emoji.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'prawn'
 require 'pathname'
 

data/lib/prawn/emoji/drawable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'drawer'
 
 module Prawn

data/lib/prawn/emoji/drawer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'substitution'
 require_relative 'index'
 require_relative 'image'
@@ -20,7 +22,7 @@ module Prawn
       private
 
       def draw_emoji(text, text_options)
-        left_text, emoji_unicode, remaining_text = text.partition(@emoji_index.unicodes_regexp)
+        left_text, emoji_unicode, remaining_text = text.partition(@emoji_index.to_regexp)
 
         return text if emoji_unicode.empty?
 

data/lib/prawn/emoji/image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Prawn

data/lib/prawn/emoji/index.rb

@@ -1,18 +1,33 @@
+# frozen_string_literal: true
+
 module Prawn
   module Emoji
     class Index
-      def unicodes
-        @unicodes ||= YAML.load Emoji.root.join('emoji', 'index.yml').read
+      EXCLUSION_CHARS = '1234567890#*'.freeze
+
+      attr_reader :codepoints
+
+      def initialize
+        @codepoints = load_emoji_codepoints
       end
 
-      def unicodes_regexp
-        @unicodes_regexp ||= build_unicodes_regexp
+      def to_regexp
+        @regexp ||= build_regexp
       end
 
       private
 
-      def build_unicodes_regexp
-        Regexp.compile unicodes.map { |unicode| "\\u{#{unicode.split('-').join(' ')}}" }.join('|')
+      def build_regexp
+        Regexp.new(codepoints.map { |codepoint| unicode(codepoint) }.join('|'))
+      end
+
+      def load_emoji_codepoints
+        codepoints = YAML.load_file(Emoji.root.join('emoji', 'index.yml'))
+        codepoints.reject { |codepoint| /#{unicode(codepoint)}/ =~ EXCLUSION_CHARS }
+      end
+
+      def unicode(codepoint)
+        "\\u{#{codepoint.split('-').join(' ')}}"
       end
     end
   end

data/lib/prawn/emoji/substitution.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module Prawn

data/lib/prawn/emoji/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Prawn
   module Emoji
-    VERSION = '2.0.0'.freeze
+    VERSION = '2.0.1'.freeze
   end
 end

data/prawn-emoji.gemspec

@@ -1,24 +1,23 @@
-lib = File.expand_path('../lib', __FILE__)
-$:.unshift(lib) unless $:.include?(lib)
+rootdir = File.expand_path(File.dirname(__FILE__))
 
-require 'prawn/emoji/version'
+require "#{rootdir}/lib/prawn/emoji/version"
 
 Gem::Specification.new do |spec|
   spec.name          = 'prawn-emoji'
   spec.version       = Prawn::Emoji::VERSION
-  spec.authors       = ['Katsuya HIDAKA']
-  spec.email         = ['hidakatsuya@gmail.com']
+  spec.author        = 'Katsuya HIDAKA'
+  spec.email         = 'hidakatsuya@gmail.com'
 
   spec.summary       = 'Provides support for Emoji in Prawn'
   spec.description   = 'Prawn::Emoji is an extention for Prawn, provides feature for drawing Emoji.'
   spec.homepage      = 'https://github.com/hidakatsuya/prawn-emoji'
   spec.license       = 'MIT'
-  spec.platform      = Gem::Platform::RUBY
+
   spec.required_ruby_version = '>= 2.1'
 
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {test}/*`.split("\n")
-  spec.require_paths = ['lib']
+  spec.require_path  = 'lib'
 
   spec.add_runtime_dependency 'prawn', '>= 2.1.0'
 

data/test/gemfiles/prawn-2.2

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'prawn', '~> 2.2.0'
+
+gem 'rake', '>= 0'
+gem 'minitest', '>= 0'
+gem 'rr', '>= 0'
+gem 'pdf-inspector', '>= 0'

data/test/prawn/emoji/drawable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Prawn::Emoji::Drawable do

data/test/prawn/emoji/drawer_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Prawn::Emoji::Drawer do
@@ -15,7 +17,7 @@ describe Prawn::Emoji::Drawer do
     subject { drawer.draw(text, {}) }
 
     describe 'when text encoding is not utf-8' do
-      let(:text) { "\xe8\x8a\xb1".force_encoding('ascii-8bit') }
+      let(:text) { 'a'.encode('ascii-8bit') }
 
       it 'skip' do
         mock(drawer).draw_emoji(text, {}).never

data/test/prawn/emoji/image_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Prawn::Emoji::Image do

data/test/prawn/emoji/index_test.rb

@@ -1,18 +1,25 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'yaml'
 
 describe Prawn::Emoji::Index do
   let(:index) { Prawn::Emoji::Index.new }
 
-  describe '#unicodes' do
-    subject { index.unicodes }
-    it { subject.must_equal YAML.load Prawn::Emoji.root.join('emoji', 'index.yml').read }
+  describe '#codepoints' do
+    subject { index.codepoints }
+
+    let(:all_codes) { YAML.load_file(Prawn::Emoji.root.join('emoji', 'index.yml')) }
+    # Expect to excludes ASCII characters and symbols
+    let(:exclusion_codes) { (0x21..0x7e).map { |code| '%04x' % code }.map(&:downcase) }
+
+    it { subject.must_equal all_codes - exclusion_codes }
   end
 
-  describe '#unicodes_regexp' do
-    subject { index.unicodes_regexp }
-    before  { stub(index).unicodes { %w( 00A9 00AE ) } }
+  describe '#to_regexp' do
+    subject { index.to_regexp }
+    before  { stub(index).codepoints { %w( 00a9 00ae 002a-20e3 ) } }
 
-    it { subject.must_equal(/\u{00A9}|\u{00AE}/) }
+    it { subject.must_equal(/\u{00a9}|\u{00ae}|\u{002a 20e3}/) }
   end
 end

data/test/prawn/emoji/substitution_test.rb

@@ -1,26 +1,37 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Prawn::Emoji::Substitution do
   let(:document) { Prawn::Document.new }
+  let(:font_size) { 12 }
   let(:substitution) { Prawn::Emoji::Substitution.new(document) }
 
+  before do
+    document.font(font) if font
+    document.font_size = 12
+  end
+
   subject { substitution.to_s }
 
-  describe 'full-size-space is used' do
-    before do
-      document.font_size = 12
-      stub(substitution).full_size_space_width { 12 }
-    end
+  describe 'When Japanese TTF font' do
+    let(:font) { Prawn::Emoji.root.join('test', 'fonts', 'ipag.ttf') }
 
     it { subject.must_equal '　' }
+    it { document.width_of(subject).must_equal font_size }
+  end
+
+  describe 'When ASCII TTF font' do
+    let(:font) { Prawn::Emoji.root.join('test', 'fonts', 'DejaVuSans.ttf') }
+
+    it { subject.must_match /^#{Prawn::Text::NBSP}+$/ }
+    it { document.width_of(subject).must_be :>=, font_size - 1 }
+    it { document.width_of(subject).must_be :<=, font_size + 1 }
   end
 
-  describe 'half-size-space is used' do
-    before do
-      document.font_size = 12
-      stub(substitution).full_size_space_width { 11.99 }
-    end
+  describe 'When built-in AFM font' do
+    let(:font) { nil }
 
-    it { subject.must_equal Prawn::Text::NBSP }
+    it { proc { subject }.must_raise Prawn::Errors::IncompatibleStringEncoding }
   end
 end

data/test/prawn/emoji_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe 'Prawn integration' do

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $:.unshift File.expand_path('../../lib', __FILE__)
 
 require 'prawn'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-emoji
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Katsuya HIDAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -96,8 +96,7 @@ dependencies:
         version: '0'
 description: Prawn::Emoji is an extention for Prawn, provides feature for drawing
   Emoji.
-email:
-- hidakatsuya@gmail.com
+email: hidakatsuya@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -1954,6 +1953,7 @@ files:
 - test/fonts/IPA_Font_License_Agreement_v1.0.txt
 - test/fonts/ipag.ttf
 - test/gemfiles/prawn-2.1
+- test/gemfiles/prawn-2.2
 - test/prawn/emoji/drawable_test.rb
 - test/prawn/emoji/drawer_test.rb
 - test/prawn/emoji/image_test.rb
@@ -1981,7 +1981,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Provides support for Emoji in Prawn