obf 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef34ab3a181c76b6c107a31dce9afcc447cf739
-  data.tar.gz: 662acf486037c269ec73c1a412bab3602fb45028
+  metadata.gz: cd14606792d2167ee379b1350f895a10544f8ade
+  data.tar.gz: cf2c60064c88bcb3416522194d269a4fff9ec25b
 SHA512:
-  metadata.gz: 7cb389f8925f8ce59b0d968bcf1518870a68aa24f7ad38c28a5e53b1c0857eb2940410a9e07d0da02bcf02f082d623280ce203191031409cb1cbb4d2a0853d24
-  data.tar.gz: 1e6423f85d4668b8fa3eb49d7855ae0d7824cb7d6d519b130b52eafd16f9c15bb4e34a4c4d9b08d60ac8313de6c1c5c3d94686ca5b22c80931d35978d85359ff
+  metadata.gz: ff23f4727217c9de507be569fc47b77c5764d87cc4efd563419e1ac30dfab6be833c070d93816b30aa298e710a7d4a1ba95fb04307c13c3fbda08071c6868c10
+  data.tar.gz: 86ddfe73ba066d966263e463152c9f20d4f42d2fb8e97ccb0e13072c2b7a22f898ca948ad8207b8051834ae4e75760c6c660aa0d0872f699c4a99b5f9b44f3ef

data/lib/obf.rb

@@ -15,4 +15,5 @@ module OBF
   
   require 'obf/picto4me'
   require 'obf/avaz'
+  require 'obf/unknown_file'
 end

data/lib/obf/external.rb

@@ -1,8 +1,17 @@
 module OBF::External
   def self.to_obf(hash, dest_path, path_hash=nil)
+    if hash['boards']
+      old_hash = hash
+      hash = old_hash['boards'][0]
+      hash['images'] = content['images'] || []
+      hash['sounds'] = content['sounds'] || []
+      path_hash = nil
+    end
+    
     res = OBF::Utils.obf_shell
     res['id'] = hash['id']
     res['locale'] = hash['locale'] || 'en'
+    res['format'] = 'open-board-0.1'
     res['name'] = hash['name']
     res['default_layout'] = hash['default_layout'] || 'landscape'
     res['url'] = hash['url']
@@ -183,6 +192,15 @@ module OBF::External
   end
   
   def self.to_obz(content, dest_path, opts)
+    if content['id']
+      old_content = content
+      content = {
+        'boards' => [old_content],
+        'images' => old_content['images'] || [],
+        'sounds' => old_content['sounds'] || []
+      }
+    end
+    
     paths = {}
     boards = content['boards']
     content['images'] ||= boards.map{|b| b['images'] }.flatten.uniq
@@ -203,6 +221,7 @@ module OBF::External
         end
       end
       manifest = {
+        'format' => 'open-board-0.1',
         'root' => paths['boards'][root_board['id']]['path'],
         'paths' => {}
       }

data/lib/obf/pdf.rb

@@ -147,7 +147,8 @@ module OBF::PDF
       # footer
       pdf.fill_color "aaaaaa"
       if OBF::PDF.footer_text
-        pdf.text_box OBF::PDF.footer_text, :at => [doc_width - 300, text_height], :width => 200, :height => text_height, :align => :right, :valign => :center, :overflow => :shrink_to_fit
+        text = OBF::PDF.footer_text
+        pdf.formatted_text_box [{:text => text, :link => OBF::PDF.footer_url}], :at => [doc_width - 300, text_height], :width => 200, :height => text_height, :align => :right, :valign => :center, :overflow => :shrink_to_fit
       end
       pdf.fill_color "000000"
       if options['pages']

data/lib/obf/unknown_file.rb

@@ -0,0 +1,36 @@
+module OBF::UnknownFile
+  def self.to_external(path)
+    type = OBF::Utils.identify_file(path)
+    if type == :obf
+      OBF::OBF.to_external(path, {})
+    elsif type == :obz
+      OBF::OBZ.to_external(path, {})
+    elsif type == :avaz
+      OBF::Avaz.to_external(path)
+    elsif type == :picto4me
+      OBF::Picto4me.to_external(path)
+    else
+      raise "unrecognized file type"
+    end
+  end
+  
+  def self.to_obf(path, dest_path)
+    ext = to_external(path)
+    OBF::External.to_obf(ext, dest_path, {})
+  end
+  
+  def self.to_obz(path, dest_path)
+    ext = to_external(path)
+    OBF::External.to_obz(ext, dest_path, {})
+  end
+  
+  def self.to_pdf(path, dest_path)
+    ext = to_external(path)
+    OBF::External.to_pdf(ext, dest_path, {})
+  end
+  
+  def self.to_png(path, dest_path)
+    ext = to_external(path)
+    OBF::External.to_png(ext, dest_path, {})
+  end
+end

data/lib/obf/utils.rb

@@ -22,6 +22,47 @@ module OBF::Utils
     }
   end
   
+  def self.identify_file(file)
+    name = File.basename(file.path) rescue nil
+    if name.match(/\.obf$/)
+      return :obf
+    elsif name.match(/\.obz$/)
+      return :obz
+    elsif name.match(/\.avz$/)
+      return :avaz
+    else
+      json = JSON.parse(file.read) rescue nil
+      if json
+        if json['format'] && json['format'].match(/^open-board-/)
+          return :obf
+        end
+      else
+        begin
+          type = nil
+          load_zip(f.path) do |zipper|
+            if zipper.exists?('manifest.json')
+              json = JSON.parse(zipper.read('manifest.json')) rescue nil
+              if json['root'] && json['format'] && json['format'].match(/^open-board-/)
+                type = :obz
+              end
+            end
+            if !type && zipper.glob('*.js')
+              json = JSON.parse(zipper.read('*.js')) rescue nil
+              if json['locale'] && json['sheets']
+                type = :picto4me
+              end
+            end
+          end
+          return type if type
+#         rescue => e
+#           puts e.class.to_s
+#           puts e.message.to_s
+        end
+      end
+    end
+    return :unknown
+  end
+  
   def self.image_raw(url)
     image = get_url(url)
     return nil unless image

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -125,6 +125,7 @@ files:
 - lib/obf/pdf.rb
 - lib/obf/picto4me.rb
 - lib/obf/png.rb
+- lib/obf/unknown_file.rb
 - lib/obf/utils.rb
 - lib/tinycolor_convert.js
 homepage: https://github.com/CoughDrop/obf