obf 0.9.8.32 → 0.9.8.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16b1632c3cbc9a1ae6257270d4efb70929ded87aa79c1b73a5ed7c553e452df6
-  data.tar.gz: 37d0c8a2c6eed4b4ce9ba26bf97f76d12040b33def794d1524cc2ea4028ab0ad
+  metadata.gz: 9e9c05fbc1eb76aca00e0b2bda343ed7d2309ef8350d494eee7c07b1806013e4
+  data.tar.gz: 0b13491784c9dae969e7cf9344f7c5d171b63ab6251a37d57ce0261ae78106da
 SHA512:
-  metadata.gz: 236aefcd275d5d2323895a6c463b7d08028f4b6b746e41df12efd723ca3829324edfd5030c07ac2a4e9b7f54999660f2a9efc5d40b97790ee24c90b395fdb3bd
-  data.tar.gz: 2f5fe9234e980e76d4bfd23affa13a0966ab1bd6c8f394a7cb2fc7f614c0f8baac92662a0ecd3b48632e282ea0747a1c751c31441fa086bb349da05553197848
+  metadata.gz: 9459a448663ae43c120ed92d1d223efa5402895665919df8ba2d1ac2c8a52276724f6b4157a71f6c1abe7fafa26029118467a1646f1f0ea2083320dc5c8fcc45
+  data.tar.gz: 8847fd9594814bb7789178f89584811f63c4726982307a1e4ff432cb9537e9a2beff69c684d4218a04d398116128bab6efc7e87eadc07f24a0a6d09f64aedffa

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

@@ -31,6 +31,36 @@ module OBF::PDF
     build_pdf(obj, dest_path, zipper, opts)
     return dest_path
   end
+
+  def self.load_fonts(pdf, opts)
+    # remember: https://www.alphabet-type.com/tools/charset-checker/
+    pdf.font_families.update('THFahKwangBold' => {
+      normal: File.expand_path('../../THFahKwangBold.ttf', __FILE__)
+    })
+    pdf.font_families.update('MiedingerBook' => {
+      normal: File.expand_path('../../MiedingerBook.ttf', __FILE__)
+    })
+    pdf.font_families.update('Arial' => {
+      normal: File.expand_path('../../Arial.ttf', __FILE__)
+    })
+    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' => {
+        normal: opts['font']
+      })
+      default_font = 'DocDefault'
+    end
+    pdf.fallback_fonts = ['TimesNewRoman', 'THFahKwangBold', 'MiedingerBook', 'Helvetica', 'Sazanami-Hanazono-Mincho']
+    pdf.font(default_font)
+    default_font
+  end
   
   def self.build_pdf(obj, dest_path, zipper, opts={})
     OBF::Utils.as_progress_percent(0, 1.0) do
@@ -43,33 +73,11 @@ module OBF::PDF
         }
       }
       pdf = Prawn::Document.new(doc_opts)
-      # remember: https://www.alphabet-type.com/tools/charset-checker/
-      pdf.font_families.update('THFahKwangBold' => {
-        normal: {font: 'THFahKwangBold', file: File.expand_path('../../THFahKwangBold.ttf', __FILE__)}
-      })
-      pdf.font_families.update('MiedingerBook' => {
-        normal: {font: 'MiedingerBook', file: File.expand_path('../../MiedingerBook.ttf', __FILE__)}
-      })
-      pdf.font_families.update('Arial' => {
-        normal: {font: 'Arial', file: File.expand_path('../../Arial.ttf', __FILE__)}
-      })
-      pdf.font_families.update('TimesNewRoman' => {
-        normal: {font: 'TimesNewRoman', file: File.expand_path('../../TimesNewRoman.ttf', __FILE__)}
-      })
-      default_font = 'TimesNewRoman'
-      if opts['font'] && !opts['font'].match(/TimesNewRoman/) && File.exists?(opts['font'])
-        pdf.font_families.update('DocDefault' => {
-          normal: {font: 'DocDefault', file: font}
-        })
-        default_font = 'DocDefault'
-      else
-      end
-      pdf.fallback_fonts = ['TimesNewRoman', 'THFahKwangBold', 'MiedingerBook', 'Helvetica']
-      pdf.font(default_font)
+      default_font = load_fonts(pdf, opts)
     
       multi_render_paths = []
       if obj['boards']
-        multi_render = obj['boards'].length > 20
+        multi_render = obj['boards'].length > 20 && `which gs`.length > 0
         obj['backlinks'] = {}
         if obj['pages']
           obj['boards'].each do |board|
@@ -90,10 +98,10 @@ module OBF::PDF
           OBF::Utils.as_progress_percent(pre, post) do
             # if more than 20 pages, build each page individually 
             # and combine them afterwards
-
             if multi_render
               path = OBF::Utils.temp_path("stash-#{idx}.pdf")
               pdf = Prawn::Document.new(doc_opts)
+              load_fonts(pdf, opts)
             else
               pdf.start_new_page unless idx == 0
             end
@@ -119,7 +127,7 @@ module OBF::PDF
       else
         build_page(pdf, obj, {
           'headerless' => !!opts['headerless'], 
-          'font' => font,
+          'font' => default_font,
           'text_on_top' => !!opts['text_on_top'], 
           'transparent_background' => !!opts['transparent_background'],
           'symbol_background' => opts['symbol_background'],
@@ -154,98 +162,114 @@ module OBF::PDF
         page_num = options['pages'][obj['id']].to_i
         pdf.add_dest("page#{page_num}", pdf.dest_fit) if options['links']
       end
-      # header
-      if !options['headerless']
-        header_height = 80
-        pdf.bounding_box([0, doc_height], :width => doc_width, :height => header_height) do
-          pdf.font('Arial')
-          pdf.line_width = 2
-          pdf.font_size 16
-          pdf.fill_color "eeeeee"
-          pdf.stroke_color "888888"
-      
-          include_back = options['pages'] && page_num != 1 && page_num != 0
-          # Go Back
-          if include_back
-            OBF::Utils.log "  board backlinks #{obj['id']} #{options['backlinks'].to_json}"
-            options['backlinks'] ||= []
-            if options['backlinks'].length > 0
-              x = 110
-              pdf.fill_and_stroke_rounded_rectangle [x, header_height], 100, header_height, default_radius
-              pdf.fill_color "6D81D1"
-              pdf.fill_and_stroke_polygon([x + 5, 45], [x + 35, 70], [x + 35, 60], [x + 95, 60], [x + 95, 30], [x + 35, 30], [x + 35, 20])
-              pdf.fill_color "666666"
-              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
-            end
-          end
+      pdf.font('Arial') do
+        # header
+        if !options['headerless']
+          header_height = 80
+          pdf.bounding_box([0, doc_height], :width => doc_width, :height => header_height) do
+            pdf.line_width = 2
+            pdf.font_size 16
+            pdf.fill_color "eeeeee"
+            pdf.stroke_color "888888"
+              include_back = options['pages'] && page_num != 1 && page_num != 0
+              # Go Back
+              if include_back
+                OBF::Utils.log "  board backlinks #{obj['id']} #{options['backlinks'].to_json}"
+                options['backlinks'] ||= []
+                if options['backlinks'].length > 0
+                  x = 110
+                  pdf.fill_and_stroke_rounded_rectangle [x, header_height], 100, header_height, default_radius
+                  pdf.fill_color "6D81D1"
+                  pdf.fill_and_stroke_polygon([x + 5, 45], [x + 35, 70], [x + 35, 60], [x + 95, 60], [x + 95, 30], [x + 35, 30], [x + 35, 20])
+                  pdf.fill_color "666666"
+                  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
+                  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
 
-          # Say it Out Loud
-          pdf.fill_color "ffffff"
-          shift = include_back ? 0 : 55
-          offset = include_back ? 110 : 55
-          box_shift = include_back ? 110 : 0
-          
-          pdf.fill_and_stroke_rounded_rectangle [110 + box_shift, header_height], 170 + shift + shift, header_height, default_radius
-          pdf.fill_color "DDDB54"
-          pdf.fill_and_stroke do
-            pdf.move_to 160 + offset, 40
-            pdf.line_to 190 + offset, 55
-            pdf.curve_to [125 + offset, 40], :bounds => [[180 + offset, 80], [125 + offset, 80]]
-            pdf.curve_to [190 + offset, 25], :bounds => [[125 + offset, 0], [180 + offset, 0]]
-            pdf.line_to 160 + offset, 40
-          end
-          pdf.fill_color "444444"
-          pdf.text_box "Say that out loud for me", :at => [210 + offset, header_height], :width => 60, :height => 80, :align => :center, :valign => :center, :overflow => :shrink_to_fit
+              # Say it Out Loud
+              pdf.fill_color "ffffff"
+              shift = include_back ? 0 : 55
+              offset = include_back ? 110 : 55
+              box_shift = include_back ? 110 : 0
+              
+              pdf.fill_and_stroke_rounded_rectangle [110 + box_shift, header_height], 170 + shift + shift, header_height, default_radius
+              pdf.fill_color "DDDB54"
+              pdf.fill_and_stroke do
+                pdf.move_to 160 + offset, 40
+                pdf.line_to 190 + offset, 55
+                pdf.curve_to [125 + offset, 40], :bounds => [[180 + offset, 80], [125 + offset, 80]]
+                pdf.curve_to [190 + offset, 25], :bounds => [[125 + offset, 0], [180 + offset, 0]]
+                pdf.line_to 160 + offset, 40
+              end
+              pdf.fill_color "444444"
+              pdf.text_box "Say that out loud for me", :at => [210 + offset, header_height], :width => 60, :height => 80, :align => :center, :valign => :center, :overflow => :shrink_to_fit
 
-          # Start Over
-          x = doc_width
-          pdf.fill_color "eeeeee"
-          pdf.fill_and_stroke_rounded_rectangle [(doc_width - x), header_height], 100, header_height, default_radius
-          pdf.fill_color "5c9c6d"
-          pdf.stroke_color "25783b"
-          pdf.fill_and_stroke_polygon([doc_width - x + 50, 75], [doc_width - x + 80, 50], [doc_width - x + 80, 20], [doc_width - x + 20, 20], [doc_width - x + 20, 50])
-          pdf.stroke_color "888888"
-          pdf.fill_color "666666"
-          pdf.text_box "Start Over", :styles => [:bold], :at => [(doc_width - x + 10), header_height], :width => 80, :height => 80, :align => :center, :valign => :bottom, :overflow => :shrink_to_fit
+              # Start Over
+              x = doc_width
+              pdf.fill_color "eeeeee"
+              pdf.fill_and_stroke_rounded_rectangle [(doc_width - x), header_height], 100, header_height, default_radius
+              pdf.fill_color "5c9c6d"
+              pdf.stroke_color "25783b"
+              pdf.fill_and_stroke_polygon([doc_width - x + 50, 75], [doc_width - x + 80, 50], [doc_width - x + 80, 20], [doc_width - x + 20, 20], [doc_width - x + 20, 50])
+              pdf.stroke_color "888888"
+              pdf.fill_color "666666"
+              pdf.text_box "Start Over", :styles => [:bold], :at => [(doc_width - x + 10), header_height], :width => 80, :height => 80, :align => :center, :valign => :bottom, :overflow => :shrink_to_fit
 
-          # Oops
-          x = 210
-          pdf.fill_color "eeeeee"
-          pdf.fill_and_stroke_rounded_rectangle [(doc_width - x), header_height], 100, header_height, default_radius
-          pdf.fill_color "6653a6"
-          pdf.stroke_color "554a78"
-          pdf.fill_and_stroke_polygon([doc_width - x + 50 - 7, 75], [doc_width - x + 50 + 7, 75], [doc_width - x + 50 + 7, 40], [doc_width - x + 50 - 7, 40])
-          pdf.fill_and_stroke_polygon([doc_width - x + 50 - 7, 33], [doc_width - x + 50 + 7, 33], [doc_width - x + 50 + 7, 20], [doc_width - x + 50 - 7, 20])
-          pdf.stroke_color "888888"
-          pdf.fill_color "666666"
-          pdf.text_box "Oops", :at => [(doc_width - x + 10), header_height], :width => 80, :height => 80, :align => :center, :valign => :bottom, :overflow => :shrink_to_fit
+              # Oops
+              x = 210
+              pdf.fill_color "eeeeee"
+              pdf.fill_and_stroke_rounded_rectangle [(doc_width - x), header_height], 100, header_height, default_radius
+              pdf.fill_color "6653a6"
+              pdf.stroke_color "554a78"
+              pdf.fill_and_stroke_polygon([doc_width - x + 50 - 7, 75], [doc_width - x + 50 + 7, 75], [doc_width - x + 50 + 7, 40], [doc_width - x + 50 - 7, 40])
+              pdf.fill_and_stroke_polygon([doc_width - x + 50 - 7, 33], [doc_width - x + 50 + 7, 33], [doc_width - x + 50 + 7, 20], [doc_width - x + 50 - 7, 20])
+              pdf.stroke_color "888888"
+              pdf.fill_color "666666"
+              pdf.text_box "Oops", :at => [(doc_width - x + 10), header_height], :width => 80, :height => 80, :align => :center, :valign => :bottom, :overflow => :shrink_to_fit
 
-          # Stop
-          x = 320
-          pdf.fill_color "eeeeee"
-          pdf.fill_and_stroke_rounded_rectangle [(doc_width - x), header_height], 100, header_height, default_radius
-          pdf.fill_color "944747"
-          pdf.stroke_color "693636"
-          pdf.fill_and_stroke_polygon([doc_width - x + 39, 70], [doc_width - x + 61, 70], [doc_width - x + 75, 56], [doc_width - x + 75, 34], [doc_width - x + 61, 20], [doc_width - x + 39, 20], [doc_width - x + 25, 34], [doc_width - x + 25, 56])
-          pdf.stroke_color "888888"
-          pdf.fill_color "666666"
-          pdf.text_box "Stop", :at => [(doc_width - x + 10), header_height], :width => 80, :height => 80, :align => :center, :valign => :bottom, :overflow => :shrink_to_fit
-          
-          # Clear
-          x = 100
-          pdf.fill_color "eeeeee"
-          pdf.fill_and_stroke_rounded_rectangle [(doc_width - x), header_height], 100, header_height, default_radius
-          pdf.stroke_color "666666"
-          pdf.fill_color "888888"
-          pdf.fill_and_stroke_polygon([doc_width - x + 10, 45], [doc_width - x + 35, 70], [doc_width - x + 90, 70], [doc_width - x + 90, 20], [doc_width - x + 35, 20])
-          pdf.stroke_color "888888"
-          pdf.fill_color "666666"
-          pdf.text_box "Clear", :at => [(doc_width - x + 10), header_height], :width => 80, :height => 80, :align => :center, :valign => :bottom, :overflow => :shrink_to_fit
+              # Stop
+              x = 320
+              pdf.fill_color "eeeeee"
+              pdf.fill_and_stroke_rounded_rectangle [(doc_width - x), header_height], 100, header_height, default_radius
+              pdf.fill_color "944747"
+              pdf.stroke_color "693636"
+              pdf.fill_and_stroke_polygon([doc_width - x + 39, 70], [doc_width - x + 61, 70], [doc_width - x + 75, 56], [doc_width - x + 75, 34], [doc_width - x + 61, 20], [doc_width - x + 39, 20], [doc_width - x + 25, 34], [doc_width - x + 25, 56])
+              pdf.stroke_color "888888"
+              pdf.fill_color "666666"
+              pdf.text_box "Stop", :at => [(doc_width - x + 10), header_height], :width => 80, :height => 80, :align => :center, :valign => :bottom, :overflow => :shrink_to_fit
+              
+              # Clear
+              x = 100
+              pdf.fill_color "eeeeee"
+              pdf.fill_and_stroke_rounded_rectangle [(doc_width - x), header_height], 100, header_height, default_radius
+              pdf.stroke_color "666666"
+              pdf.fill_color "888888"
+              pdf.fill_and_stroke_polygon([doc_width - x + 10, 45], [doc_width - x + 35, 70], [doc_width - x + 90, 70], [doc_width - x + 90, 20], [doc_width - x + 35, 20])
+              pdf.stroke_color "888888"
+              pdf.fill_color "666666"
+              pdf.text_box "Clear", :at => [(doc_width - x + 10), header_height], :width => 80, :height => 80, :align => :center, :valign => :bottom, :overflow => :shrink_to_fit
+          end
+        end
+        # footer
+        pdf.fill_color "bbbbbb"
+        obj['name'] = nil if obj['name'] == 'Unnamed Board'
+        if OBF::PDF.footer_text || obj['name']
+          text = [obj['name'], OBF::PDF.footer_text].compact.join(', ')
+          offset = options['pages'] ? 400 : 300
+          pdf.formatted_text_box [{:text => text, :link => OBF::PDF.footer_url}], :at => [doc_width - offset, text_height], :width => 300, :height => text_height, :align => :right, :valign => :center, :overflow => :shrink_to_fit
+        end
+        pdf.fill_color "000000"
+        if options['pages'] && page_num != 0
+          text_options = {:text => page_num.to_s}
+          text_options[:anchor] = "page1" if options['links']
+          pdf.formatted_text_box [text_options], :at => [doc_width - 100, text_height], :width => 100, :height => text_height, :align => :right, :valign => :center, :overflow => :shrink_to_fit
         end
       end
     
@@ -413,22 +437,6 @@ module OBF::PDF
           end
         end
       end
-    
-      # footer
-      pdf.fill_color "bbbbbb"
-      obj['name'] = nil if obj['name'] == 'Unnamed Board'
-      pdf.font('Arial')
-      if OBF::PDF.footer_text || obj['name']
-        text = [obj['name'], OBF::PDF.footer_text].compact.join(', ')
-        offset = options['pages'] ? 400 : 300
-        pdf.formatted_text_box [{:text => text, :link => OBF::PDF.footer_url}], :at => [doc_width - offset, text_height], :width => 300, :height => text_height, :align => :right, :valign => :center, :overflow => :shrink_to_fit
-      end
-      pdf.fill_color "000000"
-      if options['pages'] && page_num != 0
-        text_options = {:text => page_num.to_s}
-        text_options[:anchor] = "page1" if options['links']
-        pdf.formatted_text_box [text_options], :at => [doc_width - 100, text_height], :width => 100, :height => text_height, :align => :right, :valign => :center, :overflow => :shrink_to_fit
-      end
     end
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.9.8.32
+  version: 0.9.8.37
 platform: ruby
 authors:
 - Brian Whitmer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2021-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,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Open Board Format
 test_files: []