obf 0.9.8.10 → 0.9.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5887852bddf42b571fd8f7eb218c687bac537a033eced3e39b4337d1dab5649
-  data.tar.gz: 8078156b8ff756c09a5d7b4fe6c2ed631bb8ba8bdc74a208d34eb462218cdb98
+  metadata.gz: 46ac08afef61672a59703da2bc305d08bf293cbbebbe98a1a0b53db0a9344e9d
+  data.tar.gz: 6234bb16ab6c89a021d0754ad759955a0cb6709a808dd7e357475b45156d3c4b
 SHA512:
-  metadata.gz: d92677f8f0365ab972cb8ea060a0bd69b4541342022c6f5600693c3e368ca29c230ca217ba08d9ba0a73b613c029564bc07c4cbcfaf3cd9ef5071c94530ccd61
-  data.tar.gz: b4fb1d7224de77acab7d80b6a7cdf707dbcad55d2e54f3e5ff78116e9dbd114259d40a640fbd8221addba0f88c80e6eb0ae3fb633ab8505324b753912f04e7a4
+  metadata.gz: 44c9c23805b78858c0018e818bedb6feebb1aebe2acef09518497595e83a3245ff7929de15734a5910a2f6b1458b9526652e38b7680847f5db738ff04fdadd08
+  data.tar.gz: 1fa32a4e2a6b7ee0a6a86caec469415e3b3552c5233117dc894673d9c1d41f63b8a03b24fd9a8ce5a2bfe2ea02b0aa5842d78bb322aba0b7dfbe856fd1aa4093

data/lib/obf/external.rb

@@ -122,7 +122,7 @@ module OBF::External
       images.each do |img|
         if path_hash && path_hash['images'] && path_hash['images'][img['id']]
         elsif img['url'] && !img['data']
-          got_url = OBF::Utils.get_url(img['url'], true)
+          got_url = OBF::Utils.get_url(img['url'].to_s, true)
           if got_url['request']
             hydra.queue(got_url['request'])
             grabs << {req: got_url['request'], img: img, res: got_url}

data/lib/obf/pdf.rb

@@ -255,10 +255,11 @@ module OBF::PDF
               elsif options['text_case'] == 'lower'
                 text = text.downcase
               end
+              text_color = OBF::Utils.fix_color(fill, 'contrast')
               
               if options['text_only']
                 # render text
-                pdf.fill_color "000000"
+                pdf.fill_color text_color
                 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
@@ -285,7 +286,7 @@ module OBF::PDF
                     pdf.fill_color "ffffff"            
                     pdf.stroke_color "eeeeee"            
                     pdf.fill_and_stroke_rounded_rectangle [button_width - 18, page_vertical], 20, text_height, 5
-                    pdf.fill_color "000000"
+                    pdf.fill_color text_color
                     text_options = {:text => page}
                     text_options[:anchor] = "page#{page}" if options['links']
                     pdf.formatted_text_box [text_options], :at => [button_width - 18, page_vertical], :width => 20, :height => text_height, :align => :center, :valign => :center
@@ -293,7 +294,7 @@ module OBF::PDF
                 end
               
                 # render text
-                pdf.fill_color "000000"
+                pdf.fill_color text_color
                 vertical = options['text_on_top'] ? button_height : text_height
                 pdf.text_box text, :at => [0, vertical], :width => button_width, :height => text_height, :align => :center, :valign => :center, :overflow => :shrink_to_fit, :direction => direction
               end

data/lib/tinycolor_convert.js

@@ -1120,6 +1120,8 @@ else {
 var color = tiny(process.argv[2]);
 if(process.argv[3] == 'rgb') {
   console.log(color.toRgbString());
+} else if(process.argv[3] == 'contrast') {
+  console.log(tiny.mostReadable(color, ['#fff', '#000']).toHex());
 } else {
   if(color.getAlpha() < 1.0) {
     var rgb = color.toRgb();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.9.8.10
+  version: 0.9.8.11
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json