dragonfly_harfbuzz 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df2c3ab44eceb11b1369967d4ba836e4e4a6b5c93a8aa1aaea2a4a76027cc74f
-  data.tar.gz: 3d3dca8871157110c99dae33bd081c1d3b137bd5d5c1f219e270849371abd62e
+  metadata.gz: 0bf9f016957a6112b6780a98641577c56fb5332ed5fb8a4928c17219f57fe8b2
+  data.tar.gz: 4afcd3a4330851dc40b09d52d4e6cf5e77679fde8b56a8cda3c664d62ae5f283
 SHA512:
-  metadata.gz: 12b1e43a879e9179f0ec66b7ff39927014fec014561eb1df12e7fc3778e411a4630f2305837e3c3d8c132885659b6c62de051b0f84fff3088d3d1d3b33c082bc
-  data.tar.gz: 72527b11a71864ca51f21f2fb30848df92e40b3fad9c0645e27cf08c541e233a5100102835f8a1866958d04a3349c2a7606c71a599e764b36041dd6d609d12d9
+  metadata.gz: 337964e96d448279649158b151b72002bd7a27466bd7e31bab4db88a981d49478fd91be5454a3e8378fc1fade11329be2a62c937dfdaae965937925d8bf75fc7
+  data.tar.gz: bda1125020e0e7d74427b0ee09a954e0606ba1640f9c4dcbd6b79368107ca3e69cd36298647c0caa4bc0a409c2c2da4808ce51630917b20fa91faed104390db5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.1.0
+
+* support `unicodes` option for `markup_svg: true`
+* `split_paths: false` by default
+
 ## 1.0.0
 
 * add `SUPPORTED_FORMATS` and `SUPPORTED_OUTPUT_FORMATS` and raise errors when formats are not matching

data/lib/dragonfly_harfbuzz/processors/hb_view.rb

@@ -5,6 +5,7 @@ module DragonflyHarfbuzz
     class HbView
       def call(content, str, options = {})
         options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
+        unicodes = options.fetch('unicodes', nil)
 
         raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
 
@@ -14,7 +15,7 @@ module DragonflyHarfbuzz
 
         flatten_svg = options.fetch('flatten_svg', false)
         markup_svg = options.fetch('markup_svg', flatten_svg)
-        split_paths = options.fetch('split_paths', true)
+        split_paths = options.fetch('split_paths', false)
 
         content.shell_update(ext: format) do |old_path, new_path|
           args = %W[
@@ -36,7 +37,7 @@ module DragonflyHarfbuzz
         content.ext = format
 
         if format =~ /svg/i
-          content.update(MarkupSvgService.call(str, content.data, split_paths: split_paths), 'name' => "temp.#{format}") if markup_svg
+          content.update(MarkupSvgService.call((str || str_from_unicodes(unicodes)), content.data, split_paths: split_paths), 'name' => "temp.#{format}") if markup_svg
           content.update(FlattenSvgService.call(content.data), 'name' => "temp.#{format}") if flatten_svg
           content.update(DomAttrsService.call(content.data, options[:font_size], options[:margin]), 'name' => "temp.#{format}")
         end
@@ -49,6 +50,12 @@ module DragonflyHarfbuzz
 
       private
 
+      def str_from_unicodes(unicodes)
+        unicodes.split(",").map do |hexstring|
+          Array(hexstring).pack("H*").force_encoding('utf-16be').encode('utf-8')
+        end.join
+      end
+
       def hb_view_command
         'hb-view'
       end

data/lib/dragonfly_harfbuzz/version.rb

@@ -1,3 +1,3 @@
 module DragonflyHarfbuzz
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/test/dragonfly_harfbuzz/flatten_svg_service_test.rb

@@ -5,15 +5,28 @@ module DragonflyHarfbuzz
     let(:app) { test_app.configure_with(:harfbuzz) }
     let(:processor) { DragonflyHarfbuzz::Processors::HbView.new }
     let(:content) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample.otf')) }
-    let(:string) { 'foo     foo' }
+    let(:string) { 'ABC     def' }
     let(:svg) { processor.call(content, string) }
     let(:call) { DragonflyHarfbuzz::FlattenSvgService.call(string, svg) }
 
-    let(:f_markup) { '<svg character="f" class="character" overflow="visible" x="1552" y="229.504">' }
+    before { processor.call(content, string, flatten_svg: true) }
 
-    describe 'flatten_svg' do
-      before { processor.call(content, string, flatten_svg: true) }
-      it { content.data.sub(f_markup, '').wont_include f_markup }
+    describe 'lines' do
+      it { content.data.must_include "line=\"#{string}\" class=\"line\"" }
+    end
+
+    describe 'words' do
+      it { content.data.must_include '<g word="ABC" class="word">' }
+      it { content.data.must_include '<g word="def" class="word">' }
+    end
+
+    describe 'characters' do
+      it { content.data.must_include '<svg character="A" class="character"' }
+      it { content.data.must_include '<svg character="B" class="character"' }
+      it { content.data.must_include '<svg character="C" class="character"' }
+      it { content.data.must_include '<svg character="d" class="character"' }
+      it { content.data.must_include '<svg character="e" class="character"' }
+      it { content.data.must_include '<svg character="f" class="character"' }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_harfbuzz
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-14 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport