dragonfly_harfbuzz 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 938040a9d11a528c6791eacac7035203cc7712e3
-  data.tar.gz: ab57cbc3008940618ff9ff1141ffbce2b6b60d87
+  metadata.gz: 12a1a1d9e43896d972f04db0af8fba629ff01c9a
+  data.tar.gz: 57713f254cdf739f93cd407d6662aaef451df471
 SHA512:
-  metadata.gz: f5e469b360cdf3fb2cb6b7ae4af1cb61f7625703d4c35a2da08b6349f538df34df29bb1fcd647e1ca40ce339e8a09edeee21619674262f844ad470f1a96b5486
-  data.tar.gz: cf8ba966b396fc2033ad690f84d26e26ae21bbef39cb9a77ed3f9b7912b1d52ec0fed357d3205016a7a4e10376c44de485ae5880df3203671d12a6543427487c
+  metadata.gz: 24c63ab26bbced5fb03be3071c8f0be576573852e2c95780e30068087dfead89dd74c57a1afa4b453cc3f3ddb44b2c2b4cd9e841fd1ebf1ae4aeef3131af668a
+  data.tar.gz: e37a54bb7666077687d6f2bb2e0b9e9ead42f6af984a5c62f4c57c453f3f809711d1af2d4869705786460e9e2799a6950727d608e665e562c8440fc2e18080a4

data/README.md

@@ -16,7 +16,7 @@ Or install it yourself as:
 
     $ gem install dragonfly_harfbuzz
 
-You will also need Harfbuzz installed. 
+You will also need Harfbuzz installed.
 
 Using [Homebrew](http://brew.sh):
 
@@ -45,7 +45,7 @@ See tests and `hb-view --help-all` for more details on options.
 
 ## Options
 
-Additionally (for `<svg>` only) you can pass two options: `markup_svg: 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>`.
+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.
 
 ## Contributing
 

data/lib/dragonfly_harfbuzz/flatten_svg_service.rb

@@ -1,14 +1,12 @@
 require 'ox'
-require 'savage'
 
 module DragonflyHarfbuzz
   class FlattenSvgService
-
-    def self.call *args
-      self.new(*args).call
+    def self.call(*args)
+      new(*args).call
     end
 
-    def initialize svg
+    def initialize(svg)
       @svg = svg
       @ox_doc = Ox.parse(@svg)
     end
@@ -24,10 +22,10 @@ module DragonflyHarfbuzz
 
         word.nodes.clear
 
-        characters_to_add.each{ |char| word << char }
+        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)
 
@@ -36,44 +34,43 @@ module DragonflyHarfbuzz
 
     private # =============================================================
 
-    def add_lines_to_doc lines
+    def add_lines_to_doc(lines)
       @ox_doc.nodes.clear
-
-      lines.each{ |line| @ox_doc << line }
+      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
-      word.locate("use")
+    def get_characters_from_word(word)
+      word.locate('use')
     end
 
-    def get_symbol_for_character character
-      symbols = @ox_doc.locate("defs/g/symbol")
-      symbol_href = character.attributes[:"xlink:href"].gsub(/\#/, '')
-
-      symbols.select{ |s| s.attributes[:id] == symbol_href }.first
+    def get_symbol_for_character(character)
+      symbols = @ox_doc.locate('defs/g/symbol')
+      symbol_href = character.attributes[:"xlink:href"].delete('#')
+      symbols.select { |s| s.attributes[:id] == symbol_href }.first
     end
 
-    def build_character_svg character, symbol
+    def build_character_svg(character, symbol)
       character_svg = Ox::Element.new('svg').tap do |prop|
         prop[:character] = character[:character]
-        prop[:class] = "character"
-        prop[:overflow] = "visible"
+        prop[:class] = 'character'
+        prop[:overflow] = 'visible'
         prop[:x] = character[:x]
         prop[:y] = character[:y]
       end
 
-      symbol.nodes.each{ |path| character_svg << path }
+      symbol.nodes.each do |path|
+        character_svg << path
+      end
 
       character_svg
     end
-
   end
 end

data/lib/dragonfly_harfbuzz/markup_svg_service.rb

@@ -3,31 +3,31 @@ require 'savage'
 
 module DragonflyHarfbuzz
   class MarkupSvgService
-
     attr_accessor :ox_doc
     attr_accessor :text
 
     # =====================================================================
 
-    def self.call *args
-      self.new(*args).call
+    def self.call(*args)
+      new(*args).call
     end
 
     # =====================================================================
 
-    def initialize text, svg
+    def initialize(text, svg, options = {})
       @text = text
       @svg = svg
       @ox_doc = Ox.parse(@svg)
+      @options = options
     end
 
     def call
-      split_paths
+      split_paths if split_paths?
 
       lines.each_with_index do |line, index|
         line_group = ox_doc.locate("svg/g/g[#{index}]").first
         line_group[:line] = line
-        line_group[:class] = "line"
+        line_group[:class] = 'line'
 
         word_groups = []
         words_in_line(line).each_with_index do |word, word_index|
@@ -46,18 +46,22 @@ module DragonflyHarfbuzz
     private # =============================================================
 
     def lines
-      text.split /\n+/
+      text.split(/\n+/)
+    end
+
+    def words_in_line(line)
+      line.split(/(\s+)/)
     end
 
-    def words_in_line line
-      line.split /(\s+)/
+    def split_paths?
+      @options.fetch(:split_paths, true)
     end
 
     # ---------------------------------------------------------------------
 
     # FIXME: fix issues with negative paths ('O', 'd', etc.)
     def split_paths
-      symbols = ox_doc.locate("svg/defs/g/symbol")
+      symbols = ox_doc.locate('svg/defs/g/symbol')
       symbols.each do |symbol|
         path = symbol.nodes.first
         parsed_path = Savage::Parser.parse(path[:d])
@@ -69,16 +73,16 @@ module DragonflyHarfbuzz
         end
 
         symbol.nodes.clear
-        subpath_elements.each { |path| symbol << path }
+        subpath_elements.each { |pth| symbol << pth }
       end
     end
 
     # ---------------------------------------------------------------------
 
-    def marked_up_word word, word_index, line, line_group
+    def marked_up_word(word, word_index, line, line_group)
       word_group = Ox::Element.new('g').tap do |prop|
         prop[:word] = word
-        prop[:class] = "word"
+        prop[:class] = 'word'
       end
 
       previous_words = words_in_line(line)[0...word_index]
@@ -87,7 +91,7 @@ module DragonflyHarfbuzz
       index_of_first_character = index_offset + 0
       index_of_last_character = index_offset + word.length - 1
 
-      characters = line_group.locate("use")[index_of_first_character..index_of_last_character]
+      characters = line_group.locate('use')[index_of_first_character..index_of_last_character]
 
       marked_up_characters(characters, word).each do |char|
         word_group << char
@@ -96,13 +100,12 @@ module DragonflyHarfbuzz
       word_group
     end
 
-    def marked_up_characters characters, word
+    def marked_up_characters(characters, word)
       characters.each do |character|
         index = characters.index(character)
         character[:character] = word[index]
-        character[:class] = "character"
+        character[:class] = 'character'
       end
     end
-
   end
 end

data/lib/dragonfly_harfbuzz/processors/hb_view.rb

@@ -3,11 +3,11 @@ require 'shellwords'
 module DragonflyHarfbuzz
   module Processors
     class HbView
-
-      def call content, str, opts={}
+      def call(content, str, opts = {})
         format = opts.fetch(:format, :svg)
         flatten_svg = opts.fetch(:flatten_svg, false)
         markup_svg = opts.fetch(:markup_svg, flatten_svg)
+        split_paths = opts.fetch(:split_paths, true)
 
         content.shell_update(ext: format) do |old_path, new_path|
           args = %W(
@@ -16,8 +16,8 @@ module DragonflyHarfbuzz
             --output-format=#{format}
           )
 
-          opts.reject{ |k,v| %w(format markup_svg flatten_svg).include?(k.to_s) }.each do |k, v|
-            args << "--#{k.to_s.gsub('_', '-')}=#{Shellwords.escape(v)}"
+          opts.reject { |k, _v| %w(format markup_svg flatten_svg split_paths).include?(k.to_s) }.each do |k, v|
+            args << "--#{k.to_s.tr('_', '-')}=#{Shellwords.escape(v)}"
           end
 
           "hb-view #{Shellwords.escape(str)} #{args.join(' ')}"
@@ -29,9 +29,9 @@ module DragonflyHarfbuzz
         end
 
         if format.to_s =~ /svg/i
-          content.update( DragonflyHarfbuzz::MarkupSvgService.call(str, content.data) ) if markup_svg
-          content.update( DragonflyHarfbuzz::FlattenSvgService.call(content.data) ) if flatten_svg
-          content.update( DragonflyHarfbuzz::DomAttrsService.call(content.data, opts[:font_size], opts[:margin]) )
+          content.update(DragonflyHarfbuzz::MarkupSvgService.call(str, content.data, split_paths: split_paths)) if markup_svg
+          content.update(DragonflyHarfbuzz::FlattenSvgService.call(content.data)) if flatten_svg
+          content.update(DragonflyHarfbuzz::DomAttrsService.call(content.data, opts[:font_size], opts[:margin]))
         end
 
         content
@@ -39,11 +39,10 @@ module DragonflyHarfbuzz
 
       # ---------------------------------------------------------------------
 
-      def update_url(attrs, args='', opts={})
+      def update_url(attrs, _args = '', opts = {})
         format = opts['format']
         attrs.ext = format if format
       end
-
     end
   end
 end

data/lib/dragonfly_harfbuzz/version.rb

@@ -1,3 +1,3 @@
 module DragonflyHarfbuzz
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/dragonfly_harfbuzz/flatten_svg_service_test.rb

@@ -2,7 +2,6 @@ require 'minitest_helper'
 
 module DragonflyHarfbuzz
   describe FlattenSvgService do
-
     let(:app) { test_app.configure_with(:harfbuzz) }
     let(:processor) { DragonflyHarfbuzz::Processors::HbView.new }
     let(:font) { Dragonfly::Content.new(app, SAMPLES_DIR.join('Inconsolata.otf')) }
@@ -10,12 +9,11 @@ module DragonflyHarfbuzz
     let(:svg) { processor.call(font, string) }
     let(:call) { DragonflyHarfbuzz::FlattenSvgService.call(string, svg) }
 
-    let(:f_markup) { "<svg character=\"f\" class=\"character\" overflow=\"visible\" x=\"1552\" y=\"229.504\">" }
+    let(:f_markup) { '<svg character="f" class="character" overflow="visible" x="1552" y="229.504">' }
 
     it 'supports :flatten_svg' do
-      processor.call(font, string, { flatten_svg: true })
+      processor.call(font, string, flatten_svg: true)
       font.data.sub(f_markup, '').wont_include f_markup
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_harfbuzz
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Harfbuzz renderer wrapped by Dragonfly processors.