obf 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7bc4108de1735c572aa335fd826174d0d10aa7d
-  data.tar.gz: ac27300e004ff579c4c98d2203584cd903a0a313
+  metadata.gz: abd25c02539cdc01e06d0621a266aff2ffcaccb9
+  data.tar.gz: fd5b2cdbe77059ff5059a04832a29b6b2ac8a56f
 SHA512:
-  metadata.gz: d13ab85d3dbbdd78d6677d1b0b530aeafb2b376c951eda2e40511e5f6e75a1d6b8553e6338410d28d3c2bf6f80867c58cca52c501d68de246195478d073c824d
-  data.tar.gz: ea87f701639ade7b7aea96915d27933f071cbafd006a06677edbf57df3474ec1dc514256e9823a29142e6b72e6f90ee42abec919610269537820057d19c22331
+  metadata.gz: 1f4f0079d4cabbebbf5c83c0c2f9d1cc37fc85080c23ff3793dcc7cf2d007fa46764604fd4d864571036028e654611881b7d8905f16cd16d3ff09162bb75f1f2
+  data.tar.gz: 72bb40d9f7930309e79c3e2628f2dd2e446b1b8a93c9f75dd065696c5a7e9ecd1dd82005466085f7720872c940ccfe76d75b06f5d3b7bc39a15401359f1c94ce

data/lib/obf/external.rb

@@ -192,11 +192,12 @@ module OBF::External
   end
   
   def self.from_obf(obf_json_or_path, opts)
+    opts ||= {}
     obj = obf_json_or_path
     if obj.is_a?(String)
-      obj = OBF::Utils.parse_obf(File.read(obf_json_or_path))
+      obj = OBF::Utils.parse_obf(File.read(obf_json_or_path), opts)
     else
-      obj = OBF::Utils.parse_obf(obf_json_or_path)
+      obj = OBF::Utils.parse_obf(obf_json_or_path, opts)
     end
     
     ['images', 'sounds'].each do |type|
@@ -272,8 +273,9 @@ module OBF::External
     OBF::Utils.load_zip(obz_path) do |zipper|
       obf_opts = {'zipper' => zipper, 'images' => {}, 'sounds' => {}, 'boards' => {}}
       manifest = JSON.parse(zipper.read('manifest.json'))
+      obf_opts['manifest'] = manifest
       root = manifest['root']
-      board = OBF::Utils.parse_obf(zipper.read(root))
+      board = OBF::Utils.parse_obf(zipper.read(root), obf_opts)
       board['path'] = root
       unvisited_boards = [board]
       visited_boards = []
@@ -286,9 +288,9 @@ module OBF::External
           if button['load_board']
             all_boards = visited_boards + unvisited_boards
             if all_boards.none?{|b| b['id'] == button['load_board']['id'] || b['path'] == button['load_board']['path'] }
-              path = button['load_board']['path'] || manifest[button['load_board']['id']]
+              path = button['load_board']['path'] || (manifest['paths'] && manifest['paths']['boards'] && manifest['paths']['boards'][button['load_board']['id']])
               if path
-                b = OBF::Utils.parse_obf(zipper.read(path))
+                b = OBF::Utils.parse_obf(zipper.read(path), obf_opts)
                 b['path'] = path
                 button['load_board']['id'] = b['id']
                 unvisited_boards << b
@@ -310,11 +312,12 @@ module OBF::External
     raise "sound ids must be present and unique" unless sounds.map{|i| i['id'] }.uniq.length == sounds.length
     # TODO: try to fix the problem where multiple images or sounds have the same id --
     # this involves reaching in and updating image and sound references on generated boards..
-    return {
+    res = {
       'boards' => boards,
       'images' => images,
       'sounds' => sounds
     }
+    res
   end
   
   def self.to_pdf(board, dest_path, opts)

data/lib/obf/pdf.rb

@@ -193,7 +193,7 @@ module OBF::PDF
             children << button['load_board']
             all_boards = visited_boards + unvisited_boards
             if all_boards.none?{|b| b['id'] == button['load_board']['id'] || b['path'] == button['load_board']['path'] }
-              path = button['load_board']['path'] || manifest[button['load_board']['id']]
+              path = button['load_board']['path'] || (manifest['paths'] && manifest['paths']['boards'] && manifest['paths']['boards'][button['load_board']['id']])
               if path
                 b = OBF::Utils.parse_obf(zipper.read(path))
                 b['path'] = path

data/lib/obf/utils.rb

@@ -215,11 +215,30 @@ module OBF::Utils
     color
   end
   
-  def self.parse_obf(obj)
+  def self.parse_obf(obj, opts=nil)
+    opts ||= {}
     json = obj
     if obj.is_a?(String)
       json = JSON.parse(obj)
     end
+    if opts['manifest']
+      (json['buttons'] || []).each do |button|
+        if button['image_id']
+          # find image in list, if it has an id but no path, use the path from the manifest
+          image = (json['images'] || []).detect{|i| i['id'] == button['image_id'] }
+          if image && !image['path'] && !image['data'] && opts['manifest'] && opts['manifest']['images'] && opts['manifest']['images'][button['image_id']]
+            image['path'] = opts['manifest']['images'][button['image_id']]
+          end
+        end
+        if button['sound_id']
+          # find sound in list, if it has an id but no path, use the path from the manifest
+          sound = (json['sounds'] || []).detect{|s| s['id'] == button['sound_id'] }
+          if sound && !sound['path'] && !sound['data'] && opts['manifest'] && opts['manifest']['sounds'] && opts['manifest']['sounds'][button['sound_id']]
+            sound['path'] = opts['manifest']['sounds'][button['sound_id']]
+          end
+        end
+      end
+    end
     ['images', 'sounds', 'buttons'].each do |key|
       json["#{key}_hash"] = json[key]
       if json[key].is_a?(Array)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json