obf 0.9.8.12 → 0.9.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a0723ebf0f254247db69f66d48448c89fa5e632aec48e5eb32bfde2a2093eb0
-  data.tar.gz: 7f7123c84a8b8b4479cff7ffb2c3cd394bc412497047866f411880212ffad297
+  metadata.gz: a00f932e746089fd18edbc5106531875c6b5f0343ec5879f947b98b7825c76cb
+  data.tar.gz: 9f2e7277eb0080490255753c5ca510554f9c7cb4be85152861d8a4e811de06f3
 SHA512:
-  metadata.gz: f3b4b8b8272b7411ba3a8a10880c4d8ee37836f4910b6a7564d288468bbd85e7677886310e75fa16f957dec86d5c2ce24a0f3bc0c90ddec598a26123e75e65d6
-  data.tar.gz: c83e702ac2d1da505984dd7b0551eea8f1fdf78b808a37869194b664cc32f1cb32e5f5d2f0474beaba797734e2458e33786eb1d4feed105371d0da0fbd298fed
+  metadata.gz: 56218fc388124d302fb2dddbc10dc61d60f0c278f5a9c798516c9148c24715d8d83a358b61d37bcc06996bd066ad70e960aaab8354de7f089616397c4b701880
+  data.tar.gz: 6e2e310a447cf2b1eb83bdbab259317ff12a6078c584122508c129f2101015ad9d995866bc162af384260a6de08ebdfcc571c9b820d4131dd490d38d6abb577e

data/lib/obf/external.rb

@@ -131,10 +131,12 @@ module OBF::External
       end
       hydra.run
       grabs.each do |grab|
+        if grab[:res] && grab[:res]['data']
           str = "data:" + grab[:res]['content_type']
-        str += ";base64," + Base64.strict_encode64(grab[:res]['data'])
-        grab[:img]['data'] = str
-        grab[:img]['content_type'] ||= grab[:res]['content_type']
+          str += ";base64," + Base64.strict_encode64(grab[:res]['data'])
+          grab[:img]['data'] = str
+          grab[:img]['content_type'] ||= grab[:res]['content_type']
+        end
       end
 
       images.each do |original_image|

data/lib/obf/pdf.rb

@@ -195,7 +195,7 @@ module OBF::PDF
             res = OBF::Utils.get_url(url, true)
             if res['request']
               hydra.queue(res['request'])
-              grabs << {url: url, req: res['request'], image: image, fill: btn['background_color'] ? OBF::Utils.fix_color(btn['background_color'], 'hex') : "ffffff"}
+              grabs << {url: url, res: res, req: res['request'], image: image, fill: btn['background_color'] ? OBF::Utils.fix_color(btn['background_color'], 'hex') : "ffffff"}
             end
           elsif image && image['data'] && !(image['path'] && options['zipper'])
             grabs << {image: image, fill: btn['background_color'] ? OBF::Utils.fix_color(btn['background_color'], 'hex') : "ffffff"}
@@ -204,9 +204,10 @@ module OBF::PDF
         hydra.run
         threads = []
         grabs.each do |grab|
-          if grab[:req]
-            grab[:image]['raw_data'] = grab[:req].response.body
-            grab[:image]['content_type'] ||= grab[:req].response.headers['Content-Type'] if grab[:req].response.headers['Content-Type']
+          if grab[:res]
+            grab[:image]['raw_data'] = grab[:res]['data']
+            grab[:image]['content_type'] ||= grab[:res]['content_type']
+            grab[:image]['extension'] ||= grab[:res]['extension']
           end
           grab[:image]['threadable'] = true
           bg = 'white'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.9.8.12
+  version: 0.9.8.13
 platform: ruby
 authors:
 - Brian Whitmer