text2svg 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d90eb44a01e353a25dcc368cf992346e1c0a9b8
-  data.tar.gz: f058dd892c5475f56b20c5431bd13ef6615ab4ad
+  metadata.gz: 9bfacdff9cb34a8770ff99e984013f4ff9a4f837
+  data.tar.gz: 0909e9114da286c14ec1bb577c7ac2c858902ddd
 SHA512:
-  metadata.gz: c8d04e7e2dc712884c642cd46eab49f233753fc7bef1924ebdce188ad64e944b6d4a73886c169af3ecee754e1ef4f8d1f927d42088ca7e9c664234a60126b123
-  data.tar.gz: 443b8559efd03d7bf7c18d07cc11065d8f0fdc1f0ed1e3803db57b84fa3553623c98901a47bc6db349c20908d1f16e330f844fbbb90dffae596b3100af9dc4da
+  metadata.gz: aa3d335335590c1c9a76cdd12a2bdd758e14651c76eb5b42c5f8fe064789a3ad5a3daee73e76ae7ff00ee507b496be9639cf9b08ae53e5954b36fb1af02d0879
+  data.tar.gz: 137eb22ad7a9be9a9f742d3158d69f78dda6f7bf844bdb38add81e32aff7a4037be6d25ce2e3de7d52d26b696f6057398127d1031dd67d7c3429b323939bfeb2

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 before_install:
   - sudo apt-get install -qq libfreetype6-dev
 rvm:
-  - 2.1.7 # ffi is not support to 2.1.8
+  - 2.1.7 # travis-ci issue
   - 2.2.4
   - 2.3.0
 matrix:

data/Rakefile

@@ -1,5 +1,5 @@
 require 'bundler/gem_tasks'
 task :test do
-  sh 'rgot -v'
+  sh 'rgot -v --bench .'
 end
 task default: [:test]

data/lib/text2svg/cli.rb

@@ -5,14 +5,9 @@ require 'text2svg/option'
 module Text2svg
   module CLI
     def start
-      o = Option.new(
-        nil,             # font
-        :left,           # text_align
-        Encoding::UTF_8, # encoding
-        false,           # bold
-        false,           # italic
-        nil,             # attribute
-      )
+      # defaults
+      o = Option.default
+
       OptionParser.new.tap { |opt|
         opt.on('-f', '--font FONT', 'font file path (require)') do |arg|
           o.font = arg
@@ -32,6 +27,9 @@ module Text2svg
         opt.on('--attribute STRING', 'decorate options (default nil)(e.g. fill="red" stroke-width="100")') do |arg|
           o.attribute = arg
         end
+        opt.on('--char-size WCHAR,HCHAR,HDPI,VDPI', 'char size set (default "0,0,3000,3000")') do |arg|
+          o.char_size = arg
+        end
       }.parse!(ARGV)
       unless o.font
         raise ArgumentError, 'require `--font` cli option. see --help'

data/lib/text2svg/option.rb

@@ -6,16 +6,30 @@ module Text2svg
     :bold,
     :italic,
     :attribute,
+    :char_size,
   )
+    DEFAULTS = [
+      nil,             # font
+      :left,           # text_align
+      Encoding::UTF_8, # encoding
+      false,           # bold
+      false,           # italic
+      nil,             # attribute
+      "0,0,3000,3000", # char_size
+    ]
 
     class << self
       def from_hash(h)
-        o = new
+        o = new(*DEFAULTS)
         h.to_h.each do |k, v|
           o[k.to_sym] = v
         end
         o
       end
+
+      def default
+        new(*DEFAULTS)
+      end
     end
   end
 end

data/lib/text2svg/typography.rb

@@ -41,8 +41,12 @@ module Text2svg
         unless option.font
           raise OptionError, 'should set `font\' option'
         end
+        char_sizes = option.char_size.split(',').map(&:to_i)
+        unless char_sizes.length == 4
+          raise OptionError, 'char-size option should be four integer values'
+        end
         FreeType::API::Font.open(File.expand_path(option.font)) do |f|
-          f.set_char_size(0, 0, 3000, 3000)
+          f.set_char_size(*char_sizes)
 
           lines = []
           line = []

data/lib/text2svg/typography_test.rb

@@ -20,28 +20,31 @@ module Text2svgTypographyTest
           [nil, 'fill="red"'].each do |attribute|
             [false, true].each do |bold|
               [false, true].each do |italic|
-                opt = Text2svg::Option.new
-                opt.font = font
-                opt.text_align = text_align
-                opt.encoding = encoding
-                opt.attribute = attribute
-                opt.bold = bold
-                opt.italic = italic
+                ["0,0,0,0", "128,128,100,100"].each do |char_size|
+                  opt = Text2svg::Option.default
+                  opt.font = font
+                  opt.text_align = text_align
+                  opt.encoding = encoding
+                  opt.attribute = attribute
+                  opt.bold = bold
+                  opt.italic = italic
+                  opt.char_size = char_size
 
-                ['ABC', "\n", "\n\nA", "", "A\nB\n\n", "A\n\n\nC", "<", ">", "&", "=", "@", "%", "#", "("].each do |text|
-                  begin
-                    c = Text2svg::Typography.build(text, opt)
-                  rescue => e
-                    t.log("raise error #{e.class}: #{e.message} with text=\"#{text}\",opt=#{opt}")
-                    raise
-                  end
+                  ['ABC', "\n", "\n\nA", "", "A\nB\n\n", "A\n\n\nC", "<", ">", "&", "=", "@", "%", "#", "("].each do |text|
+                    begin
+                      c = Text2svg::Typography.build(text, opt)
+                    rescue => e
+                      t.log("raise error #{e.class}: #{e.message} with text=\"#{text}\",opt=#{opt}")
+                      raise
+                    end
 
-                  unless Text2svg::Content === c
-                    t.error('return value was break')
-                  end
+                    unless Text2svg::Content === c
+                      t.error('return value was break')
+                    end
 
-                  unless c.data.encoding == Encoding::UTF_8
-                    t.error('encoding was changed')
+                    unless c.data.encoding == Encoding::UTF_8
+                      t.error('encoding was changed')
+                    end
                   end
                 end
               end
@@ -61,7 +64,8 @@ module Text2svgTypographyTest
 
   def benchmark_build(b)
     str = [*'!'..'z'].join
-    opt = Text2svg::Option.new('data/sporq.ttf')
+    opt = Text2svg::Option.default
+    opt.font = 'data/sporq.ttf'
     b.reset_timer
     i = 0
     while i < b.n

data/lib/text2svg/version.rb

@@ -1,3 +1,3 @@
 module Text2svg
-  VERSION = '0.3.6'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text2svg
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: freetype
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Build svg path data from font file