obf 0.9.8.35 → 0.9.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3274b731d612ffd8a4ce7b39c4f5c24693c15d62ef2e22126df98ce428e8d0ae
-  data.tar.gz: e7956b737623c1f5b8471c2fc3465478aebb6dd60b157bae69c7ffa9935da140
+  metadata.gz: a69fdd5e4096eb1801dcfa04abe1d091abfcca98aab6c8170bab7bb3ae93375d
+  data.tar.gz: 2d09ffd7e75aedc26c1b764fe2d442c8d527f484d44d678c7757117b46565629
 SHA512:
-  metadata.gz: fc988d4f31a72cf4e64db2256e6610dfbfbf397937f65822689cb89751a80475de8ff4e93cface38edab88821f077a79c5f9352de5c7a233f6d5e4e65a62bd59
-  data.tar.gz: d93c9e458967e25de8b6d79feeffac73cef7f4ef674f57b15432aa3f66312017aa932c921c2afeb770f352557f382ef16409b6f871d2feae021232ada4d650bd
+  metadata.gz: 5d9a0f073fa2028b6f967caed39687d67b21d82c7cd8f37e06f26a8c7e42d99d2a1a76b474a674bea4893325ad1dbf49d2ae38f07f7bdccc22cf1b4514c2c34f
+  data.tar.gz: a8015113cbb3c8e2f3fcf79283e645dd96fb2dd67a3c7623e430301f8d5338898057c4a2b6e2d6b48d1b4daad93dfeddcf646ca325bb995b30559c735d40431e

data/lib/obf/external.rb

@@ -116,6 +116,8 @@ module OBF::External
       OBF::Utils.update_current_progress(idx.to_f / button_count.to_f)
     end
 
+    # board_id 1_527892 has some svg's still, not pre-rasterized versions
+    # 1_531854 convert-im6.q16: non-conforming drawing primitive definition `Helvetica''' @ error/draw.c/DrawImage/3265.
     if to_include[:images]
       hydra = OBF::Utils.hydra
       grabs = []
@@ -129,6 +131,7 @@ module OBF::External
           end
         end
       end
+      OBF::Utils.log("  batch-retrieving #{grabs.length} images for board #{res['name'] || res['id']}")
       hydra.run
       
       grabs.each do |grab|
@@ -192,6 +195,20 @@ module OBF::External
         end
         res['images'] << trim_empties(image)
       end
+    elsif to_include[:image_urls]
+      images.each do |original_image|
+        image = {
+          'id' => original_image['id'],
+          'width' => original_image['width'],
+          'height' => original_image['height'],
+          'license' => OBF::Utils.parse_license(original_image['license']),
+          'url' => original_image['url'],
+          'data_url' => original_image['data_url'],
+          'content_type' => original_image['content_type']
+        }
+        res['images'] << trim_empties(image)
+      end
+
     end
     
     if to_include[:sounds]
@@ -225,6 +242,18 @@ module OBF::External
           sound['path'] = zip_path
         end
         
+        res['sounds'] << trim_empties(sound)
+      end
+    elsif to_include[:sound_urls]
+      sounds.each do |original_sound|
+        sound = {
+          'id' => original_sound['id'],
+          'duration' => original_sound['duration'],
+          'license' => OBF::Utils.parse_license(original_sound['license']),
+          'url' => original_sound['url'],
+          'data_url' => original_sound['data_url'],
+          'content_type' => original_sound['content_type']
+        }
         res['sounds'] << trim_empties(sound)
       end
     end

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
@@ -181,9 +185,11 @@ module OBF::PDF
                   text_options = {:text => "Go Back"}
                   text_options[:anchor] = "page1" if options['links']
                   pdf.formatted_text_box [text_options], :at => [x + 10, header_height], :width => 80, :height => 80, :align => :center, :valign => :bottom, :overflow => :shrink_to_fit
-                  backlinks = (options['backlinks'] || []).join(',')
-                  pdf.fill_color "ffffff"
-                  pdf.formatted_text_box [{:text => backlinks}], :at => [x + 20, header_height + 5 - 25], :width => 70, :height => 30, :align => :center, :valign => :center, :overflow => :shrink_to_fit
+                  if options['backlinks'].length <= 3
+                    backlinks = (options['backlinks'] || []).join(',')
+                    pdf.fill_color "ffffff"
+                    pdf.formatted_text_box [{:text => backlinks}], :at => [x + 20, header_height + 5 - 25], :width => 70, :height => 30, :align => :center, :valign => :center, :overflow => :shrink_to_fit
+                  end
                 end
               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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.9.8.35
+  version: 0.9.9.0
 platform: ruby
 authors:
 - Brian Whitmer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2022-02-22 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.2.3
+signing_key:
 specification_version: 4
 summary: Open Board Format
 test_files: []