obf 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8a99d902b0dc9ed0a272dc723729cb754cf94ca
-  data.tar.gz: 0b5daf60c141328401c47b0fc57e940ee4da743b
+  metadata.gz: 773dcd3bad2bae05af92f6a172d41bebea6bdb81
+  data.tar.gz: a0ccff48eb6478df5123caa27d187dd61ad00296
 SHA512:
-  metadata.gz: a87fc4b8e6632f2ed4921c9824a8feae1d59f40c749080293d122e09941edd7a53c007e185f0205bd149cdf21a0c00a01c71e30602af55b3c94d956a4ba48d80
-  data.tar.gz: 70f62b9f1c68d0377c445bdb875ec45309b5cb3e2136e5d75de1553969f002591805503ba4b47ce5f515097b94246a86650f5ebd04c1e0fd036cecf26b43f12f
+  metadata.gz: 1d998d66615468c0f56b5f6f4f7e40c539023d9e5c27cf8fd018a8e304557a874a8e2d605d74141811031de9fd0e0c8333a4755545c6ea2fa337df48189fb4ea
+  data.tar.gz: 0ca7cd8428debc173961460a10979e5f252e1c4dd173e2c6db4168ab612710d4d723fa33726042c6c6b76a6ac8c161664c323d3f2480c81a4a70eba9fe539f4a

data/lib/obf/external.rb

@@ -280,6 +280,8 @@ module OBF::External
   def self.to_obz(content, dest_path, opts)
     paths = {}
     boards = content['boards']
+    content['images'] ||= boards.map{|b| b['images'] }.flatten.uniq
+    content['sounds'] ||= boards.map{|b| b['sounds'] }.flatten.uniq
     root_board = boards[0]
     OBF::Utils.build_zip(dest_path) do |zipper|
       paths['zip'] = zipper
@@ -315,8 +317,8 @@ module OBF::External
     boards = []
     images = []
     sounds = []
-    obf_opts = {'zipper' => zipper, 'images' => {}, 'sounds' => {}, 'boards' => {}}
     OBF::Utils.load_zip(obz_path) do |zipper|
+      obf_opts = {'zipper' => zipper, 'images' => {}, 'sounds' => {}, 'boards' => {}}
       manifest = JSON.parse(zipper.read('manifest.json'))
       root = manifest['root']
       board = OBF::Utils.parse_obf(zipper.read(root))
@@ -354,7 +356,7 @@ module OBF::External
     # 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 {
-      'boards' => result,
+      'boards' => boards,
       'images' => images,
       'sounds' => sounds
     }

data/lib/obf/obz.rb

@@ -3,8 +3,8 @@ module OBF::OBZ
     OBF::External.from_obz(obz, opts)
   end
   
-  def self.from_external(board, dest_path, opts)
-    OBF::External.to_obz(board, dest_path, opts)
+  def self.from_external(content, dest_path, opts)
+    OBF::External.to_obz(content, dest_path, opts)
   end
   
   def self.to_pdf(obz, dest_path)

data/lib/obf/pdf.rb

@@ -183,9 +183,13 @@ module OBF::PDF
     return dest_path
   end
   
-  def self.from_external(board, dest_path, full_set=false)
+  def self.from_external(content, dest_path)
     tmp_path = OBF::Utils.temp_path("stash")
-    from_obz(OBF::OBZ.from_external(board, full_set, tmp_path), dest_path)
+    if content['boards']
+      from_obz(OBF::OBZ.from_external(content, tmp_path), dest_path)
+    else
+      from_obf(OBF::OBF.from_external(content, tmp_path), dest_path)
+    end
     File.unlink(tmp_path) if File.exist?(tmp_path)
     dest_path
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Brian Whitmer