dragonfly_harfbuzz 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8770ccbb7bfdfe8b736a4e2074118fe6229161dff997af7d72eba97ae5c2bade
-  data.tar.gz: 248e3e3d33af72f6362eb02fa733e3b97ee92c101f47d27323e0708b3ec40cb5
+  metadata.gz: d960dc318684ef2b9f4796075ee08722cd391bfee77584ef024afd79f259ff64
+  data.tar.gz: db194504f7e53563c1d97198cd07eb15dc863e9e5b416774facb6f1050df787b
 SHA512:
-  metadata.gz: 936adfbd294352ec1f41301d948fe06ea1d7045a47c68a053bef53bea718b9d7953baac758070afb066c593a035b6f6642402956cfd8a8d31a8b81a6731de6c9
-  data.tar.gz: 91a5e0d69b79347ecea40d1a8502ef4a56a2cb21a5b8ef19c90e4bc3786cbeeff8f3ffb202f3cbeedd465b621614ef3153e0288e4d2f75bedd47a458f394dd2f
+  metadata.gz: d10581a86c8f9f41e746a9ce5430b2960aa1bca6c52aad670a651cc9b665977703dedcabb0b3a01646906bd10d2787f3ecee7237336c9d55a35646b3c151b462
+  data.tar.gz: a990bb2433badf1f4a330d54c3f49a305f5feb5991a7340abf00f3c0cb2c66232acc939302a2aff76c8d74c600ebe6c1c35d42bc5892b49de3f240ecf10dbb73

data/.travis.yml

@@ -9,8 +9,8 @@ rvm:
 before_install:
   - gem update bundler
   - sudo apt-get update
-  - wget --no-check-certificate http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.7.6.tar.bz2 && tar -xjf harfbuzz-1.7.6.tar.bz2 --no-same-owner
-  - cd harfbuzz-1.7.6 && sudo ./configure && sudo make && sudo make install && rm -rf harfbuzz*
+  - wget --no-check-certificate http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.3.0.tar.bz2 && tar -xjf harfbuzz-2.3.0.tar.bz2 --no-same-owner
+  - cd harfbuzz-2.3.0 && sudo ./configure && sudo make && sudo make install && rm -rf harfbuzz*
 
 notifications:
   email:

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # CHANGELOG
 
+## 1.1.4
+
+* ADD: `translate` option that translates glyph positions by specified `x` and/or `y` offset
+
 ## 1.1.3
 
-* make sure that `str` argument to `hb_view` is properly escaped
+* FIX: make sure that `str` argument to `hb_view` is properly escaped
 
 ## 1.1.2
 
@@ -10,7 +14,7 @@
 
 ## 1.1.1
 
-* minor fixes
+* FIX: minor fixes
 
 ## 1.1.0
 
@@ -19,5 +23,5 @@
 
 ## 1.0.0
 
-* add `SUPPORTED_FORMATS` and `SUPPORTED_OUTPUT_FORMATS` and raise errors when formats are not matching
-* add more thorough tests for supported formats
+* ADD: `SUPPORTED_FORMATS` and `SUPPORTED_OUTPUT_FORMATS` and raise errors when formats are not matching
+* ADD: more thorough tests for supported formats

data/README.md

@@ -56,7 +56,15 @@ DragonflyHarfbuzz::SUPPORTED_OUTPUT_FORMATS # => ["ansi", "png", "svg", "pdf", "
 
 ## Options
 
-Additionally (for `<svg>` only) you can pass the following options: `markup_svg: Boolean`, `split_paths: Boolean` and `flatten_svg: Boolean`. `markup_svg` returns an `<svg>` that is organized into word and characters and marked up with additional data attributes. `flatten_svg` uses the result of `markup_svg` and further cleans up the `<svg>`, replacing the `<symbol>`, `<use>` elements with nested `<svg>`s. This is handy if you want to do some more precise animation/manipulation of the resulting `<svg>`. `split_paths` is a feature of the `markup_svg` and controls whether the paths of each character are split up into smaller components.
+Additionally (for `<svg>` only) you can pass the following options: `translate: Hash[x: 0, y: 0]`, `markup_svg: Boolean`, `split_paths: Boolean` and `flatten_svg: Boolean`.
+
+`translate` translates glyph positions by specified `x` and/or `y` offset.
+
+`markup_svg` returns an `<svg>` that is organized into word and characters and marked up with additional data attributes.
+
+`flatten_svg` uses the result of `markup_svg` and further cleans up the `<svg>`, replacing the `<symbol>`, `<use>` elements with nested `<svg>`s. This is handy if you want to do some more precise animation/manipulation of the resulting `<svg>`.
+
+`split_paths` is a feature of the `markup_svg` and controls whether the paths of each character are split up into smaller components.
 
 ## Contributing
 

data/dragonfly_harfbuzz.gemspec

@@ -1,4 +1,3 @@
-
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dragonfly_harfbuzz/version'
@@ -23,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'savage'
 
   spec.add_development_dependency 'bundler', '~> 1.9'
-  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-minitest'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'minitest-reporters'
+  spec.add_development_dependency 'rake', '~> 10.0'
 end

data/lib/dragonfly_harfbuzz.rb

@@ -4,6 +4,7 @@ require 'active_support/core_ext/object/blank'
 require 'dragonfly_harfbuzz/dom_attrs_service'
 require 'dragonfly_harfbuzz/flatten_svg_service'
 require 'dragonfly_harfbuzz/markup_svg_service'
+require 'dragonfly_harfbuzz/translate_service'
 
 require 'dragonfly_harfbuzz/plugin'
 require 'dragonfly_harfbuzz/version'

data/lib/dragonfly_harfbuzz/processors/hb_view.rb

@@ -14,6 +14,10 @@ module DragonflyHarfbuzz
 
         raise UnsupportedOutputFormat unless SUPPORTED_OUTPUT_FORMATS.include?(format.downcase)
 
+        translate = options.fetch('translate', nil)
+        translate_hash = (translate || {}).each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
+        translate_x = translate_hash.fetch('x', nil)
+        translate_y = translate_hash.fetch('y', nil)
         flatten_svg = options.fetch('flatten_svg', false)
         markup_svg = options.fetch('markup_svg', flatten_svg)
         split_paths = options.fetch('split_paths', false)
@@ -27,7 +31,7 @@ module DragonflyHarfbuzz
 
           args << "--text=#{Shellwords.escape(str)}" unless options.key?('unicodes')
 
-          options.reject { |k, _| %w[format markup_svg flatten_svg split_paths].include?(k.to_s) }.each do |k, v|
+          options.reject { |k, _| %w[translate format markup_svg flatten_svg split_paths].include?(k.to_s) }.each do |k, v|
             args << "--#{k.to_s.tr('_', '-')}=#{Shellwords.escape(v)}" if v.present?
           end
 
@@ -38,6 +42,7 @@ module DragonflyHarfbuzz
         content.ext = format
 
         if format =~ /svg/i
+          content.update(TranslateService.call(content.data, x: translate_x, y: translate_y), 'name' => "temp.#{format}") if translate
           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}") if markup_svg

data/lib/dragonfly_harfbuzz/translate_service.rb

@@ -0,0 +1,36 @@
+require 'ox'
+
+module DragonflyHarfbuzz
+  class TranslateService
+    attr_accessor :ox_doc
+    attr_accessor :svg
+    attr_accessor :x
+    attr_accessor :y
+
+    def self.call(*args)
+      new(*args).call
+    end
+
+    def initialize(svg, x: 0, y: 0)
+      @svg = svg
+      @x = x.to_f
+      @y = y.to_f
+      @ox_doc = Ox.parse(svg)
+    end
+
+    def call
+      use_definitions.each do |use_definition|
+        use_definition[:x] = use_definition[:x].to_f + x
+        use_definition[:y] = use_definition[:y].to_f + y
+      end
+
+      Ox.dump(ox_doc)
+    end
+
+    private
+
+    def use_definitions
+      ox_doc.locate('svg/g/g/use[@xlink:href]')
+    end
+  end
+end

data/lib/dragonfly_harfbuzz/version.rb

@@ -1,3 +1,3 @@
 module DragonflyHarfbuzz
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.4'.freeze
 end

data/test/dragonfly_harfbuzz/processors/hb_view_test.rb

@@ -33,6 +33,18 @@ describe DragonflyHarfbuzz::Processors::HbView do
     it { content.data.must_include 'fill:rgb(100%,0%,100%);' }
   end
 
+  describe 'translate_x' do
+    let(:string) { 'A' }
+    before { processor.call(content, string, translate: { x: 100 }) }
+    it { content.data.must_include 'x="116.0"' }
+  end
+
+  describe 'translate_y' do
+    let(:string) { 'A' }
+    before { processor.call(content, string, translate: { y: 100 }) }
+    it { content.data.must_include 'y="329.5"' }
+  end
+
   describe 'markup_svg' do
     before { processor.call(content, string, markup_svg: true) }
     it { content.data.must_include "word=\"#{string}\"" }

data/test/dragonfly_harfbuzz/translate_service_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+describe DragonflyHarfbuzz::TranslateService 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) { 'A' }
+  let(:svg) { processor.call(content, string).data }
+  let(:font_info) { analyser.call(content) }
+  let(:result) { DragonflyHarfbuzz::TranslateService.call(svg, x: 100, y: 100) }
+
+  it { result.must_include 'x="116.0"' }
+  it { result.must_include 'y="329.5"' }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_harfbuzz
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2019-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,19 +137,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 description: 
 email:
 - tomas.celizna@gmail.com
@@ -172,6 +172,7 @@ files:
 - lib/dragonfly_harfbuzz/markup_svg_service.rb
 - lib/dragonfly_harfbuzz/plugin.rb
 - lib/dragonfly_harfbuzz/processors/hb_view.rb
+- lib/dragonfly_harfbuzz/translate_service.rb
 - lib/dragonfly_harfbuzz/version.rb
 - samples/sample.otf
 - samples/sample.ttf
@@ -179,6 +180,7 @@ files:
 - test/dragonfly_harfbuzz/markup_svg_service_test.rb
 - test/dragonfly_harfbuzz/plugin_test.rb
 - test/dragonfly_harfbuzz/processors/hb_view_test.rb
+- test/dragonfly_harfbuzz/translate_service_test.rb
 - test/test_helper.rb
 homepage: https://github.com/tomasc/dragonfly_harfbuzz
 licenses:
@@ -199,8 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Harfbuzz renderer wrapped by Dragonfly processors.
@@ -209,4 +210,5 @@ test_files:
 - test/dragonfly_harfbuzz/markup_svg_service_test.rb
 - test/dragonfly_harfbuzz/plugin_test.rb
 - test/dragonfly_harfbuzz/processors/hb_view_test.rb
+- test/dragonfly_harfbuzz/translate_service_test.rb
 - test/test_helper.rb