obf 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f63706c374446dc89b390e990f6fece72dca9d2
-  data.tar.gz: 4c09d0f858322855b2093e0cfc5d48ba94dba4be
+  metadata.gz: a8a99d902b0dc9ed0a272dc723729cb754cf94ca
+  data.tar.gz: 0b5daf60c141328401c47b0fc57e940ee4da743b
 SHA512:
-  metadata.gz: 17a5e56e9eb06b34ac9c5c57d5343a80afac3863e2f2bf064b0725ca80ec0abc9dfbf3fd974a2fa089c6f6ea258f77ee3ce5fdd73217d187a817320f8fdb4c62
-  data.tar.gz: 551537ce747367b3b8f4ec516cff4b5fc7287bb0742ee9be490450f5a61221c827c46672b6816a90bb4f5266a663bd5be0e69508d785059ce11ab1685f041247
+  metadata.gz: a87fc4b8e6632f2ed4921c9824a8feae1d59f40c749080293d122e09941edd7a53c007e185f0205bd149cdf21a0c00a01c71e30602af55b3c94d956a4ba48d80
+  data.tar.gz: 70f62b9f1c68d0377c445bdb875ec45309b5cb3e2136e5d75de1553969f002591805503ba4b47ce5f515097b94246a86650f5ebd04c1e0fd036cecf26b43f12f

data/lib/obf/external.rb

@@ -13,8 +13,63 @@ module OBF::External
     }
     grid = []
     
-    res['images'] = []
-    (hash['images'] || []).each do |original_image|
+    images = []
+    sounds = []
+    
+    res['buttons'] = []
+    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'],
+        'left' => original_button['left'],
+        'top' => original_button['top'],
+        'width' => original_button['width'],
+        'height' => original_button['height'],
+        'border_color' => original_button['border_color'] || "#aaa",
+        'background_color' => original_button['background_color'] || "#fff"
+      }
+      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'][original_button['load_board']['id']]
+          button['load_board']['path'] = "board_#{original_button['load_board']['id']}.obf"
+        end
+      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
+
+      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
+      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'] << button
+      OBF::Utils.update_current_progress(idx.to_f / button_count.to_f)
+    end
+
+    images.each do |original_image|
       image = {
         'id' => original_image['id'],
         'width' => original_image['width'],
@@ -45,8 +100,7 @@ module OBF::External
       res['images'] << image
     end
     
-    res['sounds'] = []
-    (hash['sounds'] || []).each do |original_sound|
+    sounds.each do |original_sound|
       sound = {
         'id' => original_sound['id'],
         'duration' => original_sound['duration'],
@@ -77,62 +131,7 @@ module OBF::External
       
       res['sounds'] << sound
     end
-    
-    res['buttons'] = []
-    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'],
-        'left' => original_button['left'],
-        'top' => original_button['top'],
-        'width' => original_button['width'],
-        'height' => original_button['height'],
-        'border_color' => original_button['border_color'] || "#aaa",
-        'background_color' => original_button['background_color'] || "#fff"
-      }
-      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'][original_button['load_board']['id']]
-          button['load_board']['path'] = "board_#{original_button['load_board']['id']}.obf"
-        end
-      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
-#       if original_button['apps']
-#         button['ext_coughdrop_apps'] = original_button['apps']
-#         if original_button['apps']['web'] && original_button['apps']['web']['launch_url']
-#           button['url'] = original_button['apps']['web']['launch_url']
-#         end
-#       end
-      if original_button['image_id'] && hash['images']
-        image = res['images'].detect{|i| i['id'] == original_button['image_id']}
-        if image
-          button['image_id'] = image['id']
-        end
-      end
-      if original_button['sound_id']
-        sound = res['sounds'].detect{|s| s['id'] == original_button['sound_id']}
-        if sound
-          button['sound_id'] = sound['id']
-        end
-      end
-      res['buttons'] << button
-      OBF::Utils.update_current_progress(idx.to_f / button_count.to_f)
-    end
+
     res['grid'] = OBF::Utils.parse_grid(hash['grid']) # TODO: more robust parsing here
     if path_hash
       zip_path = "board_#{res['id']}.obf"
@@ -167,6 +166,10 @@ module OBF::External
           item['data_or_url'] = str
         end
         item['data_or_url'] ||= item['url']
+        if item['path']
+          opts[list] ||= {} 
+          opts[list][item['path']] ||= item
+        end
       end
     end
     
@@ -274,31 +277,24 @@ module OBF::External
 
   end
   
-  def self.to_obz(boards, dest_path, opts)
+  def self.to_obz(content, dest_path, opts)
     paths = {}
+    boards = content['boards']
     root_board = boards[0]
     OBF::Utils.build_zip(dest_path) do |zipper|
       paths['zip'] = zipper
-#       board.track_downstream_boards!
       paths['included_boards'] = {}
       boards.each do |b|
         paths['included_boards'][b['id']] = b
       end
       boards.each do |b|
         b = paths['included_boards'][b['id']]
-        to_obf(b, nil, paths) if b
+        if b
+          b['images'] = content['images'] || []
+          b['sounds'] = content['sounds'] || []
+          to_obf(b, nil, paths) 
+        end
       end
-#       board.settings['downstream_board_ids'].each do |id|
-#         b = Board.find_by_path(id)
-#         if b.allows?(opts['user'], 'view')
-#           paths['included_boards'][id] = b
-#         end
-#       end
-#       to_obf(board, nil, paths)
-#       board.settings['downstream_board_ids'].each do |id|
-#         b = paths['included_boards'][id]
-#         to_obf(b, nil, paths) if b
-#       end
       manifest = {
         'root' => paths['boards'][root_board['id']]['path'],
         'paths' => {}
@@ -316,7 +312,10 @@ module OBF::External
   end
   
   def self.from_obz(obz_path, opts)
-    result = []
+    boards = []
+    images = []
+    sounds = []
+    obf_opts = {'zipper' => zipper, 'images' => {}, 'sounds' => {}, 'boards' => {}}
     OBF::Utils.load_zip(obz_path) do |zipper|
       manifest = JSON.parse(zipper.read('manifest.json'))
       root = manifest['root']
@@ -324,8 +323,6 @@ module OBF::External
       board['path'] = root
       unvisited_boards = [board]
       visited_boards = []
-      obf_opts = {'zipper' => zipper, 'images' => {}, 'sounds' => {}, 'boards' => {}}
-#      obf_opts = {'user' => opts['user'], 'zipper' => 'zipper', 'images' => {}, 'sounds' => {}, 'boards' => {}}
       while unvisited_boards.length > 0
         board_object = unvisited_boards.shift
         board_object['id'] ||= rand(9999).to_s + Time.now.to_i.to_s
@@ -344,10 +341,23 @@ module OBF::External
         end
       end
       visited_boards.each do |board_object|
-        result << from_obf(board_object, obf_opts)
+        res = from_obf(board_object, obf_opts)
+        images += res['images'] || []
+        sounds += res['sounds'] || []
+        boards << res
       end
     end
-    return result
+    images.uniq!
+    sounds.uniq!
+    raise "image ids must be present and unique" unless images.map{|i| i['id'] }.uniq.length == images.length
+    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 {
+      'boards' => result,
+      'images' => images,
+      'sounds' => sounds
+    }
   end
   
   def self.to_pdf(board, dest_path, opts)

metadata

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