obf 0.6.13 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38e2b9153c3f65d8e3fab0216892f769e76a5a3a
-  data.tar.gz: decef2e81054b457e762409c0254c1ffac52390f
+  metadata.gz: a8c10c2dae743466f7598663539f5217ce8dcb95
+  data.tar.gz: eaaf655f14ac7f999b4f798883bbe643c3030887
 SHA512:
-  metadata.gz: 61d0060ed0bfbfadaec1e36404bee843301f8ff55e03af4558b698b46a0a946dd5f2a7e067f6759412734a496b315b7f3626c0b9153c8f7b6c1ff651715627fd
-  data.tar.gz: ea976460fc413420d3a6bcd9e1523a32c6418aebfea70064d1074fe1cf47ba57c73211bc0260db4d49a4fb17ab703235a3e323b3c291525c2d425c7db82e3623
+  metadata.gz: 2086258ef0e206331916219f38cd5dca25a7b70683ec5fd1e41d7167481027bc680e20b09e2f5acae0ab564c12c5d2245fb60b67b3770c56967a86f9c9c80d78
+  data.tar.gz: 8d044b03e5f00e352185503da7ff20ad603143ca492e991ecd9b23b1ca40194a3499775a6f1da27b8bce5a7869273a852376077d17ab35c967cb3c00a9177422

data/lib/obf/external.rb

@@ -81,7 +81,7 @@ module OBF::External
           button['sound_id'] = sound['id']
         end
       end
-      res['buttons'] << button
+      res['buttons'] << trim_empties(button)
       OBF::Utils.update_current_progress(idx.to_f / button_count.to_f)
     end
 
@@ -97,7 +97,7 @@ module OBF::External
         'content_type' => original_image['content_type']
       }
       if !path_hash
-        image['data'] = OBF::Utils.image_base64(image['url']) if image['url']
+        image['data'] ||= OBF::Utils.image_base64(image['url']) if image['url']
       else
         if path_hash['images'] && path_hash['images'][image['id']]
           image['path'] = path_hash['images'][image['id']]['path']
@@ -114,7 +114,7 @@ module OBF::External
           end
         end
       end
-      res['images'] << image
+      res['images'] << trim_empties(image)
     end
     
     sounds.each do |original_sound|
@@ -147,7 +147,7 @@ module OBF::External
         sound['path'] = zip_path
       end
       
-      res['sounds'] << sound
+      res['sounds'] << trim_empties(sound)
     end
 
     res['grid'] = OBF::Utils.parse_grid(hash['grid']) # TODO: more robust parsing here
@@ -164,6 +164,14 @@ module OBF::External
     return dest_path
   end
   
+  def self.trim_empties(hash)
+    new_hash = {}
+    hash.each do |key, val|
+      new_hash[key] = val if val != nil
+    end
+    new_hash
+  end
+  
   def self.from_obf(obf_json_or_path, opts)
     obj = obf_json_or_path
     if obj.is_a?(String)
@@ -174,19 +182,16 @@ module OBF::External
     
     ['images', 'sounds'].each do |type|
       (obj[type] || []).each do |item|
-        item['data_or_url'] = item['data']
-        if !item['data_or_url'] && item['path'] && opts['zipper']
+        if !item['data'] && item['path'] && opts['zipper']
           content_type = item['content_type']
           data = opts['zipper'].read(item['path'])
           str = "data:" + content_type
           str += ";base64," + Base64.strict_encode64(data)
-          record = klass.create(:user => opts['user'])
-          item['data_or_url'] = str
+          item['data'] = str
         end
-        item['data_or_url'] ||= item['url']
         if item['path']
-          opts[list] ||= {} 
-          opts[list][item['path']] ||= item
+          opts[type] ||= {} 
+          opts[type][item['path']] ||= item
         end
       end
     end

metadata

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