obf 0.9.9.1 → 0.9.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2516fbb23f12e3378fa47cc3c61cae145104a2c2595022db3026c26e944f4a12
-  data.tar.gz: b5087e0ee7223306ba60ce4503b3293f3e0dfe8e3de2f206e3f31d833ed349be
+  metadata.gz: f0e84d8f70a1087b0875c7515fdb3eef30caae91e862bade5a2e6f6044cf43af
+  data.tar.gz: 8ea281959203867d563704341cf178a7c166a0a51efbc28ec42385f71ed81fb7
 SHA512:
-  metadata.gz: 274d446b05caab4279d2a9acb563e7322b8e57521a9c2da386daa0da50057ee4f96b5d07cb1f832b012a60add50c08db803c894fbd6a6770bcf5831b3fbf08fb
-  data.tar.gz: 67bfaba475aaa1c882e3a0b705790f26b9fe90bd94cfeb77468f329404b20e7d1f0a78593c5181449dc6b4ccd82a06fcaec05b9767d7e5cc810bfaa8f713b45f
+  metadata.gz: f76d3cb77c81d210261b2295a7d2aa2358bb324250d3093600bc0765971b6f67c0f04ca31de9023ceda7087d853516449eeb1716bbb4f456d05633babfefa969
+  data.tar.gz: 4b2389d3600ec697d8cd74aacae99ef4936bcedd0aa85a8f57d1c3215146fe82cb7138af6c7d338ae5d29db44231b8755b6a066f34a000e8f7f84ef5f68954fd

data/lib/obf/external.rb

@@ -41,81 +41,85 @@ module OBF::External
     buttons = hash['buttons'] #board.settings['buttons']
     button_count = buttons.length
     
-    buttons.each_with_index do |original_button, idx|
-      button = {
-        'id' => original_button['id'],
-        'label' => original_button['label'],
-        'vocalization' => original_button['vocalization'],
-        'action' => original_button['action'],
-        'actions' => original_button['actions'],
-        'left' => original_button['left'],
-        'top' => original_button['top'],
-        'width' => original_button['width'],
-        'height' => original_button['height'],
-        'border_color' => OBF::Utils.fix_color(original_button['border_color'] || "#aaa", 'rgb'),
-        'background_color' => OBF::Utils.fix_color(original_button['background_color'] || "#fff", 'rgb')
-      }
-      if original_button['load_board']
-        button['load_board'] = {
-          'id' => original_button['load_board']['id'],
-          'url' => original_button['load_board']['url'],
-          'data_url' => original_button['load_board']['data_url']
+    OBF::Utils.as_progress_percent(0.0, 0.3) do
+      buttons.each_with_index do |original_button, idx|
+        button = {
+          'id' => original_button['id'],
+          'label' => original_button['label'],
+          'vocalization' => original_button['vocalization'],
+          'action' => original_button['action'],
+          'actions' => original_button['actions'],
+          'left' => original_button['left'],
+          'top' => original_button['top'],
+          'width' => original_button['width'],
+          'height' => original_button['height'],
+          'border_color' => OBF::Utils.fix_color(original_button['border_color'] || "#aaa", 'rgb'),
+          'background_color' => OBF::Utils.fix_color(original_button['background_color'] || "#fff", 'rgb')
         }
-        if path_hash && path_hash['included_boards'] && path_hash['included_boards'][original_button['load_board']['id']]
-          button['load_board']['path'] = "board_#{original_button['load_board']['id']}.obf"
+        if original_button['load_board']
+          button['load_board'] = {
+            'id' => original_button['load_board']['id'],
+            'url' => original_button['load_board']['url'],
+            'data_url' => original_button['load_board']['data_url']
+          }
+          if path_hash && path_hash['included_boards'] && path_hash['included_boards'][original_button['load_board']['id']]
+            button['load_board']['path'] = "board_#{original_button['load_board']['id']}.obf"
+          end
         end
-      end
-      if original_button['translations']
-        original_button['translations'].each do |loc, hash|
-          next unless hash.is_a?(Hash)
-          button['translations'] ||= {}
-          button['translations'][loc] ||= {}
-          button['translations'][loc]['label'] = hash['label'].to_s if hash['label']
-          button['translations'][loc]['vocalization'] = hash['vocalization'].to_s if hash['vocalization']
-          (hash['inflections'] || {}).each do |key, val|
-            if key.match(/^ext_/)
-              button['translations'][loc]['inflections'] ||= {}
-              button['translations'][loc]['inflections'][key] = val
-            else
-              button['translations'][loc]['inflections'] ||= {}
-              button['translations'][loc]['inflections'][key] = val.to_s
+        if original_button['translations']
+          original_button['translations'].each do |loc, hash|
+            next unless hash.is_a?(Hash)
+            button['translations'] ||= {}
+            button['translations'][loc] ||= {}
+            button['translations'][loc]['label'] = hash['label'].to_s if hash['label']
+            button['translations'][loc]['vocalization'] = hash['vocalization'].to_s if hash['vocalization']
+            (hash['inflections'] || {}).each do |key, val|
+              if key.match(/^ext_/)
+                button['translations'][loc]['inflections'] ||= {}
+                button['translations'][loc]['inflections'][key] = val
+              else
+                button['translations'][loc]['inflections'] ||= {}
+                button['translations'][loc]['inflections'][key] = val.to_s
+              end
+            end
+            hash.keys.each do |key|
+              button['translations'][loc][key] = hash[key] if key.to_s.match(/^ext_/)
             end
-          end
-          hash.keys.each do |key|
-            button['translations'][loc][key] = hash[key] if key.to_s.match(/^ext_/)
           end
         end
-      end
-      if original_button['hidden']
-        button['hidden'] = original_button['hidden']
-      end
-      if original_button['url']
-        button['url'] = original_button['url']
-      end
-      original_button.each do|key, val|
-        if key.match(/^ext_/)
-          button[key] = val
+        if original_button['hidden']
+          button['hidden'] = original_button['hidden']
+        end
+        if original_button['url']
+          button['url'] = original_button['url']
+        end
+        original_button.each do|key, val|
+          if key.match(/^ext_/)
+            button[key] = val
+          end
         end
-      end
 
-      if original_button['image_id'] && hash['images']
-        image = hash['images'].detect{|i| i['id'] == original_button['image_id']}
-        if image
-          images << image
-          button['image_id'] = image['id']
+        if original_button['image_id'] && hash['images']
+          image = hash['images'].detect{|i| i['id'] == original_button['image_id']}
+          if image
+            images << image
+            button['image_id'] = image['id']
+          end
         end
-      end
-      if original_button['sound_id']
-        sound = hash['sounds'].detect{|s| s['id'] == original_button['sound_id']}
-        if sound
-          sounds << sound
-          button['sound_id'] = sound['id']
+        if original_button['sound_id']
+          sound = hash['sounds'].detect{|s| s['id'] == original_button['sound_id']}
+          if sound
+            sounds << sound
+            button['sound_id'] = sound['id']
+          end
         end
+        res['buttons'] << trim_empties(button)
+        OBF::Utils.update_current_progress(idx.to_f / button_count.to_f, "generated button #{button['id']} for #{res['id']}")
       end
-      res['buttons'] << trim_empties(button)
-      OBF::Utils.update_current_progress(idx.to_f / button_count.to_f)
     end
 
+    OBF::Utils.update_current_progress(0.35, "images for board #{res['id']}")
+
     # 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]
@@ -215,6 +219,7 @@ module OBF::External
 
     end
     
+    OBF::Utils.update_current_progress(0.75, "sounds for board #{res['id']}")
     if to_include[:sounds]
       sounds.each do |original_sound|
         sound = {
@@ -266,6 +271,8 @@ module OBF::External
       end
     end
 
+    OBF::Utils.update_current_progress(0.85, "grid for board #{res['id']}")
+
     res['grid'] = OBF::Utils.parse_grid(hash['grid']) # TODO: more robust parsing here
     if path_hash && path_hash['zip']
       zip_path = "board_#{res['id']}.obf"
@@ -278,6 +285,7 @@ module OBF::External
       File.open(dest_path, 'w') {|f| f.write(JSON.pretty_generate(res)) }
     end
     OBF::Utils.log("  done compressing board #{res['name'] || res['id']}")
+    OBF::Utils.update_current_progress(1.0, "done for board #{res['id']}")
     return dest_path
   end
   
@@ -333,6 +341,8 @@ module OBF::External
     content['images'] ||= boards.map{|b| b['images'] }.flatten.uniq
     content['sounds'] ||= boards.map{|b| b['sounds'] }.flatten.uniq
     root_board = boards[0]
+    incr = 1.0 / boards.length.to_f
+    tally = 0.0
     OBF::Utils.build_zip(dest_path) do |zipper|
       paths['zip'] = zipper
       paths['included_boards'] = {}
@@ -340,12 +350,15 @@ module OBF::External
         paths['included_boards'][b['id']] = b
       end
       boards.each do |b|
-        b = paths['included_boards'][b['id']]
-        if b
-          b['images'] = content['images'] || []
-          b['sounds'] = content['sounds'] || []
-          to_obf(b, nil, paths, opts[:to_include])
+        OBF::Utils.as_progress_percent(tally, tally + incr) do
+          b = paths['included_boards'][b['id']]
+          if b
+            b['images'] = content['images'] || []
+            b['sounds'] = content['sounds'] || []
+            to_obf(b, nil, paths, opts[:to_include])
+          end
         end
+        tally += incr
       end
       manifest = {
         'format' => OBF::OBF::FORMAT,
@@ -424,7 +437,7 @@ module OBF::External
     end
     tmp_path = OBF::Utils.temp_path("stash")
     if opts['packet']
-      OBF::Utils.as_progress_percent(0, 0.3) do
+      OBF::Utils.as_progress_percent(0.1, 0.3) do
         opts[:to_include] = {images: true}
         OBF::External.to_obz(board, tmp_path, opts)  
       end

data/lib/obf/pdf.rb

@@ -50,6 +50,9 @@ module OBF::PDF
     pdf.font_families.update('Sazanami-Hanazono-Mincho' => {
       normal: File.expand_path('../../Sazanami-Hanazono-Mincho.ttf', __FILE__)
     })
+    pdf.font_families.update('Khmer' => {
+      normal: File.expand_path('../../Khmer.ttf', __FILE__)
+    })
     default_font = 'TimesNewRoman'
     if opts['font'] && !opts['font'].match(/TimesNewRoman/) && File.exists?(opts['font'])
       pdf.font_families.update('DocDefault' => {
@@ -57,90 +60,90 @@ module OBF::PDF
       })
       default_font = 'DocDefault'
     end
-    pdf.fallback_fonts = ['TimesNewRoman', 'THFahKwangBold', 'MiedingerBook', 'Helvetica', 'Sazanami-Hanazono-Mincho']
+    pdf.fallback_fonts = ['TimesNewRoman', 'THFahKwangBold', 'MiedingerBook', 'Helvetica', 'Sazanami-Hanazono-Mincho', 'Khmer']
     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
-      # parse obf, draw as pdf
-      doc_opts = {
-        :page_layout => :landscape, 
-        :page_size => [8.5*72, 11*72],
-        :info => {
-          :Title => obj['name']
-        }
+    # parse obf, draw as pdf
+    doc_opts = {
+      :page_layout => :landscape, 
+      :page_size => [8.5*72, 11*72],
+      :info => {
+        :Title => obj['name']
       }
-      pdf = Prawn::Document.new(doc_opts)
-      default_font = load_fonts(pdf, opts)
-    
-      multi_render_paths = []
-      if obj['boards']
-        multi_render = obj['boards'].length > 20 && `which gs`.length > 0
-        obj['backlinks'] = {}
-        if obj['pages']
-          obj['boards'].each do |board|
-            board['buttons'].each do |button|
-              if button['load_board'] && button['load_board']['id']
-                obj['backlinks'][button['load_board']['id']] ||= []
-                obj['backlinks'][button['load_board']['id']] << obj['pages'][board['id']] if obj['pages'][board['id']]
-              end
+    }
+    pdf = Prawn::Document.new(doc_opts)
+    default_font = load_fonts(pdf, opts)
+  
+    multi_render_paths = []
+    if obj['boards']
+      multi_render = obj['boards'].length > 20 && `which gs`.length > 0
+      obj['backlinks'] = {}
+      if obj['pages']
+        obj['boards'].each do |board|
+          board['buttons'].each do |button|
+            if button['load_board'] && button['load_board']['id']
+              obj['backlinks'][button['load_board']['id']] ||= []
+              obj['backlinks'][button['load_board']['id']] << obj['pages'][board['id']] if obj['pages'][board['id']]
             end
           end
-          OBF::Utils.log "backlinks #{obj['backlinks'].to_json}"
         end
-        obj['boards'].each_with_index do |board, idx|
-          started = Time.now.to_i
-          OBF::Utils.log "starting pdf of board #{idx} #{board['name'] || board['id']} at #{started}"
-          pre = idx.to_f / obj['boards'].length.to_f
-          post = (idx + 1).to_f / obj['boards'].length.to_f
-          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
-            build_page(pdf, board, {
-              'zipper' => zipper, 
-              'pages' => obj['pages'],
-              'backlinks' => obj['backlinks'][board['id']] || [], 
-              'headerless' => !!opts['headerless'], 
-              'font' => default_font,
-              'links' => false,
-              'text_on_top' => !!opts['text_on_top'], 
-              'transparent_background' => !!opts['transparent_background'],
-              'symbol_background' => opts['symbol_background'],
-              'text_case' => opts['text_case']
-            })
-            if multi_render
-              pdf.render_file(path)
-              multi_render_paths << path
-            end
+        OBF::Utils.log "backlinks #{obj['backlinks'].to_json}"
+      end
+      incr = 1.0 / obj['boards'].length.to_f
+      tally = 0
+      obj['boards'].each_with_index do |board, idx|
+        started = Time.now.to_i
+        OBF::Utils.log "starting pdf of board #{idx} #{board['name'] || board['id']} at #{started}"
+        pre = idx.to_f / obj['boards'].length.to_f
+        post = (idx + 1).to_f / obj['boards'].length.to_f
+        OBF::Utils.as_progress_percent(tally, tally + incr) 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
+          build_page(pdf, board, {
+            'zipper' => zipper, 
+            'pages' => obj['pages'],
+            'backlinks' => obj['backlinks'][board['id']] || [], 
+            'headerless' => !!opts['headerless'], 
+            'font' => default_font,
+            'links' => false,
+            'text_on_top' => !!opts['text_on_top'], 
+            'transparent_background' => !!opts['transparent_background'],
+            'symbol_background' => opts['symbol_background'],
+            'text_case' => opts['text_case']
+          })
+          if multi_render
+            pdf.render_file(path)
+            multi_render_paths << path
           end
-          OBF::Utils.log "  finished pdf of board #{idx}/#{obj['boards'].length} #{Time.now.to_i - started}s"
         end
-      else
-        build_page(pdf, obj, {
-          'headerless' => !!opts['headerless'], 
-          'font' => default_font,
-          'text_on_top' => !!opts['text_on_top'], 
-          'transparent_background' => !!opts['transparent_background'],
-          'symbol_background' => opts['symbol_background'],
-          'text_case' => opts['text_case']
-        })
-      end
-      if multi_render_paths.length > 0
-        # `cp #{multi_render_paths[0]} #{dest_path}`
-        `gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -dPDFSETTINGS=/prepress -sOutputFile=#{dest_path} #{multi_render_paths.join(' ')}`
-      else
-        pdf.render_file(dest_path)
+        tally += incr
+        OBF::Utils.log "  finished pdf of board #{idx}/#{obj['boards'].length} #{Time.now.to_i - started}s"
       end
-    
+    else
+      build_page(pdf, obj, {
+        'headerless' => !!opts['headerless'], 
+        'font' => default_font,
+        'text_on_top' => !!opts['text_on_top'], 
+        'transparent_background' => !!opts['transparent_background'],
+        'symbol_background' => opts['symbol_background'],
+        'text_case' => opts['text_case']
+      })
+    end
+    if multi_render_paths.length > 0
+      # `cp #{multi_render_paths[0]} #{dest_path}`
+      `gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -dPDFSETTINGS=/prepress -sOutputFile=#{dest_path} #{multi_render_paths.join(' ')}`
+    else
+      pdf.render_file(dest_path)
     end
   end
   
@@ -433,7 +436,7 @@ module OBF::PDF
               end
             end
             index = col + (row * obj['grid']['columns'])
-            OBF::Utils.update_current_progress(index.to_f / (obj['grid']['rows'] * obj['grid']['columns']).to_f)
+            OBF::Utils.update_current_progress(index.to_f / (obj['grid']['rows'] * obj['grid']['columns']).to_f, "updated button #{button_id}")
           end
         end
       end
@@ -448,6 +451,7 @@ module OBF::PDF
       board['path'] = root
       unvisited_boards = [board]
       visited_boards = []
+      OBF::Utils.update_current_progress(0.2, "prepping for pdf")
       while unvisited_boards.length > 0
         board = unvisited_boards.shift
         visited_boards << board
@@ -474,11 +478,13 @@ module OBF::PDF
         pages[board['id']] = (idx + 1).to_s
       end
       
-      build_pdf({
-        'name' => 'Communication Board Set',
-        'boards' => visited_boards,
-        'pages' => pages
-      }, dest_path, zipper, opts)
+      OBF::Utils.as_progress_percent(0.2, 1.0) do
+          build_pdf({
+          'name' => 'Communication Board Set',
+          'boards' => visited_boards,
+          'pages' => pages
+        }, dest_path, zipper, opts)
+      end
     end
     # parse obz, draw as pdf
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.9.9.1
+  version: 0.9.9.3
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -146,6 +146,7 @@ files:
 - LICENSE
 - README.md
 - lib/Arial.ttf
+- lib/Khmer.ttf
 - lib/MiedingerBook.ttf
 - lib/Sazanami-Hanazono-Mincho.ttf
 - lib/THFahKwangBold.ttf