obf 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab2c55d56ca5f570a188f3936a58324965cfb5f9
-  data.tar.gz: b0dc51874a5a7a7b3f010d6f243cd109909ab506
+  metadata.gz: 4c5ab9a0744ec8904c6f373ab147aadd5fa896f1
+  data.tar.gz: 939fa830adbf2f3f3c0f53f22cdb912c33de60d4
 SHA512:
-  metadata.gz: 4b90045b54cdb8f01cef1ef31e2c003a4f7ff908d8337f4cab8bb1d06553ecfed2eaeb490de01b3952874501093b1474733bc0a78f112e489d6d6ac53b66c7a4
-  data.tar.gz: 2353646c0179cebd7832a883c5f2242a22e0047119eeb4f8be4ba1aa5b258877ed111cacd466db1abb51b42f3f0fc4fab26dc36c26fd81a3c0b7e306a82e4a6d
+  metadata.gz: d6837a6e94af08d818dec313d0e819b1fd1fcabedd253bc8957b25cbf8edb58ec137dec2764636c958edc1ebe82f08a257d0c7603960e08be58339e29fb1add0
+  data.tar.gz: e5beb2f5409dd1a0921b669e21ca0ab2c1b128e65796acfcbf2f52fa0c2a934e991d12c0015fb39e507568c15cec1a2ea0b5290f21f47553782b040cb284b2a1

data/lib/obf/pdf.rb

@@ -41,7 +41,8 @@ module OBF::PDF
           :Title => obj['name']
         }
       )
-      font = opts['font'] || File.expand_path('../../TimesNewRoman.ttf', __FILE__)
+      font = opts['font'] if opts['font'] && File.exists?(opts['font'])
+      font ||= File.expand_path('../../TimesNewRoman.ttf', __FILE__)
       pdf.font(font) if File.exists?(font)
     
     
@@ -55,6 +56,7 @@ module OBF::PDF
               'zipper' => zipper, 
               'pages' => obj['pages'], 
               'headerless' => !!opts['headerless'], 
+              'font' => font,
               'text_on_top' => !!opts['text_on_top'], 
               'transparent_background' => !!opts['transparent_background'],
               'text_case' => opts['text_case']
@@ -64,6 +66,7 @@ module OBF::PDF
       else
         build_page(pdf, obj, {
           'headerless' => !!opts['headerless'], 
+          'font' => font,
           'text_on_top' => !!opts['text_on_top'], 
           'transparent_background' => !!opts['transparent_background'],
           'text_case' => opts['text_case']
@@ -80,6 +83,7 @@ module OBF::PDF
   
   def self.build_page(pdf, obj, options)
     OBF::Utils.as_progress_percent(0, 1.0) do
+      pdf.font(options['font']) if options['font'] && File.exists?(options['font'])
       doc_width = 11*72 - 72
       doc_height = 8.5*72 - 72
       default_radius = 3
@@ -159,16 +163,10 @@ module OBF::PDF
               elsif options['text_case'] == 'lower'
                 text = text.downcase
               end
-              pdf.text_box text, :at => [0, vertical], :width => button_width, :height => text_height, :align => :center, :valign => :center, :overflow => :shrink_to_fit, :direction => direction
+              
               if options['text_only']
                 # render text
                 pdf.fill_color "000000"
-                text = (button['label'] || button['vocalization']).to_s
-                if options['text_case'] == 'upper'
-                  text = text.upcase
-                elsif options['text_case'] == 'lower'
-                  text = text.downcase
-                end
                 pdf.text_box text, :at => [0, 0], :width => button_width, :height => button_height, :align => :center, :valign => :center, :overflow => :shrink_to_fit, :direction => direction
               else
                 # render image
@@ -201,13 +199,7 @@ module OBF::PDF
                 # render text
                 pdf.fill_color "000000"
                 vertical = options['text_on_top'] ? button_height : text_height
-                text = (button['label'] || button['vocalization']).to_s
-                if options['text_case'] == 'upper'
-                  text = text.upcase
-                elsif options['text_case'] == 'lower'
-                  text = text.downcase
-                end
-                pdf.text_box text, :at => [0, vertical], :width => button_width, :height => text_height, :align => :center, :valign => :center, :overflow => :shrink_to_fit
+                pdf.text_box text, :at => [0, vertical], :width => button_width, :height => text_height, :align => :center, :valign => :center, :overflow => :shrink_to_fit, :direction => direction
               end
             end
             index = col + (row * obj['grid']['columns'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json