obf 0.9.8.36 → 0.9.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 643f357ab48bdd49d04a5769707fec92e9b6c924ba551cbbcf65ba136b945e40
-  data.tar.gz: d98c4a91aa881bdeee22e1563b3aafb7c036050b2b4a83379ff47fdea5b56687
+  metadata.gz: 2516fbb23f12e3378fa47cc3c61cae145104a2c2595022db3026c26e944f4a12
+  data.tar.gz: b5087e0ee7223306ba60ce4503b3293f3e0dfe8e3de2f206e3f31d833ed349be
 SHA512:
-  metadata.gz: 9f86ae672f6c60077c5927271dfc2eb1fc020bd39eac7b0f2dc2f638f47608df541ead763c8e8a68d34cf7de5e130190f767f4a0e900edd90051a0f45d8d2364
-  data.tar.gz: 735e978e4a00b66f0f032d570936d86eed0741ed44dc04b7a0716e86070ab728f6b811f8abf6726d850caba9d21cb919b1ff16cc618a6f5f7d3d90472d216b13
+  metadata.gz: 274d446b05caab4279d2a9acb563e7322b8e57521a9c2da386daa0da50057ee4f96b5d07cb1f832b012a60add50c08db803c894fbd6a6770bcf5831b3fbf08fb
+  data.tar.gz: 67bfaba475aaa1c882e3a0b705790f26b9fe90bd94cfeb77468f329404b20e7d1f0a78593c5181449dc6b4ccd82a06fcaec05b9767d7e5cc810bfaa8f713b45f

data/lib/obf/external.rb

@@ -149,6 +149,8 @@ module OBF::External
           'width' => original_image['width'],
           'height' => original_image['height'],
           'license' => OBF::Utils.parse_license(original_image['license']),
+          'protected' => original_image['protected'],
+          'protected_source' => original_image['protected_source'],
           'url' => original_image['url'],
           'data' => original_image['data'],
           'data_url' => original_image['data_url'],
@@ -172,7 +174,7 @@ module OBF::External
             image['height'] ||= path_hash['images'][image['id']]['height']
           else
             image_fetch = OBF::Utils.image_raw(image['data'] || image['url'])
-            if image_fetch
+            if image_fetch && image_fetch['data']
               if !image['content_type'] || !image['width'] || !image['height']
                 attrs = OBF::Utils.image_attrs(image_fetch['data'])
                 image['content_type'] ||= image_fetch['content_type'] || attrs['content_type']
@@ -202,6 +204,8 @@ module OBF::External
           'width' => original_image['width'],
           'height' => original_image['height'],
           'license' => OBF::Utils.parse_license(original_image['license']),
+          'protected' => original_image['protected'],
+          'protected_source' => original_image['protected_source'],
           'url' => original_image['url'],
           'data_url' => original_image['data_url'],
           'content_type' => original_image['content_type']
@@ -217,6 +221,8 @@ module OBF::External
           'id' => original_sound['id'],
           'duration' => original_sound['duration'],
           'license' => OBF::Utils.parse_license(original_sound['license']),
+          'protected' => original_sound['protected'],
+          'protected_source' => original_sound['protected_source'],
           'url' => original_sound['url'],
           'data' => original_sound['data'],
           'data_url' => original_sound['data_url'],
@@ -250,6 +256,8 @@ module OBF::External
           'id' => original_sound['id'],
           'duration' => original_sound['duration'],
           'license' => OBF::Utils.parse_license(original_sound['license']),
+          'protected' => original_sound['protected'],
+          'protected_source' => original_sound['protected_source'],
           'url' => original_sound['url'],
           'data_url' => original_sound['data_url'],
           'content_type' => original_sound['content_type']

data/lib/obf/pdf.rb

@@ -46,6 +46,10 @@ module OBF::PDF
     pdf.font_families.update('TimesNewRoman' => {
       normal: File.expand_path('../../TimesNewRoman.ttf', __FILE__)
     })
+    # TODO: option to add more fonts
+    pdf.font_families.update('Sazanami-Hanazono-Mincho' => {
+      normal: File.expand_path('../../Sazanami-Hanazono-Mincho.ttf', __FILE__)
+    })
     default_font = 'TimesNewRoman'
     if opts['font'] && !opts['font'].match(/TimesNewRoman/) && File.exists?(opts['font'])
       pdf.font_families.update('DocDefault' => {
@@ -53,7 +57,7 @@ module OBF::PDF
       })
       default_font = 'DocDefault'
     end
-    pdf.fallback_fonts = ['TimesNewRoman', 'THFahKwangBold', 'MiedingerBook', 'Helvetica']
+    pdf.fallback_fonts = ['TimesNewRoman', 'THFahKwangBold', 'MiedingerBook', 'Helvetica', 'Sazanami-Hanazono-Mincho']
     pdf.font(default_font)
     default_font
   end

data/lib/obf/utils.rb

@@ -153,7 +153,7 @@ module OBF::Utils
         image['content_type'] ||= attrs['content_type']
       end
     end
-    return nil unless image
+    return nil unless image && image['data']
     str = "data:" + image['content_type']
     str += ";base64," + Base64.strict_encode64(image['data'])
     str
@@ -377,7 +377,7 @@ module OBF::Utils
   
   def self.image_attrs(path, extension='')
     res = {}
-    if path.match(/^data:/)
+    if path && path.match(/^data:/)
       res['content_type'] = path.split(/;/)[0].split(/:/)[1]
       raw = Base64.strict_decode64(path.split(/\,/, 2)[1])
       file = Tempfile.new(['file', extension])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.9.8.36
+  version: 0.9.9.1
 platform: ruby
 authors:
 - Brian Whitmer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -147,6 +147,7 @@ files:
 - README.md
 - lib/Arial.ttf
 - lib/MiedingerBook.ttf
+- lib/Sazanami-Hanazono-Mincho.ttf
 - lib/THFahKwangBold.ttf
 - lib/TimesNewRoman.ttf
 - lib/obf.rb
@@ -168,7 +169,7 @@ homepage: https://github.com/CoughDrop/obf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,9 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Open Board Format
 test_files: []