dragonfly_harfbuzz 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bf9f016957a6112b6780a98641577c56fb5332ed5fb8a4928c17219f57fe8b2
-  data.tar.gz: 4afcd3a4330851dc40b09d52d4e6cf5e77679fde8b56a8cda3c664d62ae5f283
+  metadata.gz: 1980ad4ccc7ad9114e7c1bf7dcedac662c745ca8e6c2b572f224accbd34f26e2
+  data.tar.gz: ce232fa77f208f0a94caed4e019aa5a3d1f5dadc0801b2d26c8d07b38140f447
 SHA512:
-  metadata.gz: 337964e96d448279649158b151b72002bd7a27466bd7e31bab4db88a981d49478fd91be5454a3e8378fc1fade11329be2a62c937dfdaae965937925d8bf75fc7
-  data.tar.gz: bda1125020e0e7d74427b0ee09a954e0606ba1640f9c4dcbd6b79368107ca3e69cd36298647c0caa4bc0a409c2c2da4808ce51630917b20fa91faed104390db5
+  metadata.gz: f7a80f5f1fed5e05abdeb0902ec1e922cf31981ef3b440b68c53e8e46c3d7a7d5ba506d378ae79eb59d26bfbb1d327a4585eebf90b1ae02fbf351f89dd1b68a7
+  data.tar.gz: 3e57c32feba7772d6478e9ea2f6a3e8036f04cc8fb51822169b7762080779f7658e297c7c391c9a942d825fade17b2bad8ac3cd1443d8241b9fe6561aa9eecb3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.1
+
+* minor fixes
+
 ## 1.1.0
 
 * support `unicodes` option for `markup_svg: true`

data/lib/dragonfly_harfbuzz/flatten_svg_service.rb

@@ -2,13 +2,16 @@ require 'ox'
 
 module DragonflyHarfbuzz
   class FlattenSvgService
+    attr_accessor :ox_doc
+    attr_accessor :svg
+
     def self.call(*args)
       new(*args).call
     end
 
     def initialize(svg)
       @svg = svg
-      @ox_doc = Ox.parse(@svg)
+      @ox_doc = Ox.parse(svg)
     end
 
     def call
@@ -25,26 +28,26 @@ module DragonflyHarfbuzz
         characters_to_add.each { |char| word << char }
       end
 
-      lines = @ox_doc.locate('g/g').select { |g| g[:class] == 'line' }
+      lines = ox_doc.locate('g/g').select { |g| g[:class] == 'line' }
 
       add_lines_to_doc(lines)
 
-      Ox.dump(@ox_doc)
+      Ox.dump(ox_doc)
     end
 
     private
 
     def add_lines_to_doc(lines)
-      @ox_doc.nodes.clear
-      lines.each { |line| @ox_doc << line }
+      ox_doc.nodes.clear
+      lines.each { |line| ox_doc << line }
     end
 
     def get_symbols
-      @ox_doc.locate('defs/g/symbol')
+      ox_doc.locate('defs/g/symbol')
     end
 
     def get_words
-      @ox_doc.locate('g/g/g')
+      ox_doc.locate('g/g/g')
     end
 
     def get_characters_from_word(word)
@@ -52,7 +55,7 @@ module DragonflyHarfbuzz
     end
 
     def get_symbol_for_character(character)
-      symbols = @ox_doc.locate('defs/g/symbol')
+      symbols = ox_doc.locate('defs/g/symbol')
       symbol_href = character.attributes[:"xlink:href"].delete('#')
       symbols.select { |s| s.attributes[:id] == symbol_href }.first
     end

data/lib/dragonfly_harfbuzz/markup_svg_service.rb

@@ -5,6 +5,9 @@ module DragonflyHarfbuzz
   class MarkupSvgService
     attr_accessor :ox_doc
     attr_accessor :text
+    attr_accessor :unicodes
+    attr_accessor :options
+    attr_accessor :svg
 
     def self.call(*args)
       new(*args).call
@@ -13,7 +16,7 @@ module DragonflyHarfbuzz
     def initialize(text, svg, options = {})
       @text = text
       @svg = svg
-      @ox_doc = Ox.parse(@svg)
+      @ox_doc = Ox.parse(svg)
       @options = options
     end
 
@@ -50,7 +53,7 @@ module DragonflyHarfbuzz
     end
 
     def split_paths?
-      @options.fetch(:split_paths, true)
+      options.fetch(:split_paths, true)
     end
 
     # FIXME: fix issues with negative paths ('O', 'd', etc.)

data/lib/dragonfly_harfbuzz/processors/hb_view.rb

@@ -39,8 +39,10 @@ module DragonflyHarfbuzz
         if format =~ /svg/i
           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}")
+          content.update(DomAttrsService.call(content.data, options[:font_size], options[:margin]), 'name' => "temp.#{format}") if markup_svg
         end
+
+        content
       end
 
       def update_url(attrs, str = '', options = {})
@@ -52,7 +54,11 @@ module DragonflyHarfbuzz
 
       def str_from_unicodes(unicodes)
         unicodes.split(",").map do |hexstring|
-          Array(hexstring).pack("H*").force_encoding('utf-16be').encode('utf-8')
+          begin
+            Array(hexstring).pack("H*").force_encoding('utf-16be').encode('utf-8')
+          rescue
+            " "
+          end
         end.join
       end
 

data/lib/dragonfly_harfbuzz/version.rb

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

data/test/dragonfly_harfbuzz/flatten_svg_service_test.rb

@@ -1,32 +1,28 @@
 require 'test_helper'
 
-module DragonflyHarfbuzz
-  describe FlattenSvgService do
-    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) { 'ABC     def' }
-    let(:svg) { processor.call(content, string) }
-    let(:call) { DragonflyHarfbuzz::FlattenSvgService.call(string, svg) }
+describe DragonflyHarfbuzz::FlattenSvgService do
+  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) { 'ABC     def' }
+  let(:svg) { processor.call(content, string, markup_svg: true, flatten_svg: false).data }
+  let(:result) { DragonflyHarfbuzz::FlattenSvgService.call(svg) }
 
-    before { processor.call(content, string, flatten_svg: true) }
-
-    describe 'lines' do
-      it { content.data.must_include "line=\"#{string}\" class=\"line\"" }
-    end
+  describe 'lines' do
+    it { result.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 'words' do
+    it { result.must_include '<g word="ABC" class="word">' }
+    it { result.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
+  describe 'characters' do
+    it { result.must_include '<svg character="A" class="character"' }
+    it { result.must_include '<svg character="B" class="character"' }
+    it { result.must_include '<svg character="C" class="character"' }
+    it { result.must_include '<svg character="d" class="character"' }
+    it { result.must_include '<svg character="e" class="character"' }
+    it { result.must_include '<svg character="f" class="character"' }
   end
 end

data/test/dragonfly_harfbuzz/markup_svg_service_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+describe DragonflyHarfbuzz::MarkupSvgService do
+  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) { 'ABC     def' }
+  let(:svg) { processor.call(content, string).data }
+  let(:result) { DragonflyHarfbuzz::MarkupSvgService.call(string, svg) }
+
+  describe 'lines' do
+    it { result.must_include "line=\"#{string}\" class=\"line\"" }
+  end
+
+  describe 'words' do
+    it { result.must_include "word=\"ABC\" class=\"word\"" }
+    it { result.must_include "word=\"def\" class=\"word\"" }
+  end
+
+  describe 'characters' do
+    it { result.must_include "character=\"A\" class=\"character\"" }
+    it { result.must_include "character=\"B\" class=\"character\"" }
+    it { result.must_include "character=\"C\" class=\"character\"" }
+    it { result.must_include "character=\"d\" class=\"character\"" }
+    it { result.must_include "character=\"e\" class=\"character\"" }
+    it { result.must_include "character=\"f\" class=\"character\"" }
+  end
+end

data/test/dragonfly_harfbuzz/processors/hb_view_test.rb

@@ -47,4 +47,10 @@ describe DragonflyHarfbuzz::Processors::HbView do
     before { processor.call(content, string, flatten_svg: true) }
     it { content.data.wont_include '#glyph0-1' }
   end
+
+  describe 'str as unicodes' do
+    before { processor.call(content, nil, unicodes: "0042,0043", flatten_svg: true) }
+    it { content.data.must_include "<svg character=\"B\" class=\"character\"" }
+    it { content.data.must_include "<svg character=\"C\" class=\"character\"" }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_harfbuzz
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -176,6 +176,7 @@ files:
 - samples/sample.otf
 - samples/sample.ttf
 - test/dragonfly_harfbuzz/flatten_svg_service_test.rb
+- test/dragonfly_harfbuzz/markup_svg_service_test.rb
 - test/dragonfly_harfbuzz/plugin_test.rb
 - test/dragonfly_harfbuzz/processors/hb_view_test.rb
 - test/test_helper.rb
@@ -205,6 +206,7 @@ specification_version: 4
 summary: Harfbuzz renderer wrapped by Dragonfly processors.
 test_files:
 - test/dragonfly_harfbuzz/flatten_svg_service_test.rb
+- test/dragonfly_harfbuzz/markup_svg_service_test.rb
 - test/dragonfly_harfbuzz/plugin_test.rb
 - test/dragonfly_harfbuzz/processors/hb_view_test.rb
 - test/test_helper.rb