obf 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 773dcd3bad2bae05af92f6a172d41bebea6bdb81
-  data.tar.gz: a0ccff48eb6478df5123caa27d187dd61ad00296
+  metadata.gz: 5afc4eec32460327902d440eb155542c74c03d66
+  data.tar.gz: f07ee3b08cbd8d54a8871d899d1c706e7d11bdc2
 SHA512:
-  metadata.gz: 1d998d66615468c0f56b5f6f4f7e40c539023d9e5c27cf8fd018a8e304557a874a8e2d605d74141811031de9fd0e0c8333a4755545c6ea2fa337df48189fb4ea
-  data.tar.gz: 0ca7cd8428debc173961460a10979e5f252e1c4dd173e2c6db4168ab612710d4d723fa33726042c6c6b76a6ac8c161664c323d3f2480c81a4a70eba9fe539f4a
+  metadata.gz: 2922588d938f988d71e032e826c89c56377d8f208edd8cbd6e082f0307d27767fed792ca10f03652cc49c6f9f6dfdf976323db91820fde343d6d9edd653edbab
+  data.tar.gz: 85c9884e240b60e9ba76de7b8b927779d20386ab640495a3e1075aefa6c412d02d5d6f150db4f3fd65ada8e7334f19ff0fc189bb2b58b01676d52fe89966e49b

data/lib/obf.rb

@@ -12,4 +12,7 @@ module OBF
   require 'obf/pdf'
   require 'obf/png'
   require 'obf/utils'
+  
+  require 'obf/picto4me'
+  require 'obf/avaz'
 end

data/lib/obf/avaz.rb

@@ -0,0 +1,5 @@
+module OBF::Avaz
+  def self.to_external(avz_path)
+    # load the contents, process them into an external hash
+  end
+end

data/lib/obf/external.rb

@@ -76,6 +76,7 @@ module OBF::External
         'height' => original_image['height'],
         'license' => OBF::Utils.parse_license(original_image['license']),
         'url' => original_image['url'],
+        'data' => original_image['data'],
         'data_url' => original_image['data_url'],
         'content_type' => original_image['content_type']
       }
@@ -85,7 +86,7 @@ module OBF::External
         if path_hash['images'] && path_hash['images'][image['id']]
           image['path'] = path_hash['images'][image['id']]['path']
         else
-          image_fetch = OBF::Utils.image_raw(image['url'])
+          image_fetch = OBF::Utils.image_raw(image['url'] || image['data'])
           if image_fetch
             zip_path = "images/image_#{image['id']}#{image_fetch['extension']}"
             path_hash['images'] ||= {}
@@ -115,7 +116,7 @@ module OBF::External
         if path_hash['sounds'] && path_hash['sounds'][sound['id']]
           sound['path'] = path_hash['sounds'][sound['id']]['path']
         else
-          sound_fetch = OBF::Utils.sound_raw(sound['url'])
+          sound_fetch = OBF::Utils.sound_raw(sound['url'] || sound['data'])
           if sound_fetch
             zip_path = "sounds/sound_#{sound['id']}#{sound_fetch['extension']}"
             path_hash['sounds'] ||= {}
@@ -175,106 +176,6 @@ module OBF::External
     
     obj['license'] = OBF::Utils.parse_license(obj['license'])
     obj
-
-#     raise "user required" unless opts['user']
-#     raise "missing id" unless obj['id']
-# 
-#     hashes = {}
-#     [['images_hash', ButtonImage], ['sounds_hash', ButtonSound]].each do |list, klass|
-#       obj[list].each do |id, item|
-#         record = nil
-#         unique_id = obj['id'] + "_" + item['id'].to_s
-#         if opts[list] && opts[list][unique_id]
-#           record = klass.find_by_global_id(opts[list][unique_id])
-#         elsif item['data']
-#           record = klass.create(:user => opts['user'])
-#           item['ref_url'] = item['data']
-#         elsif 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['ref_url'] = str
-#         elsif item['url']
-#           record = klass.create(:user => opts['user'])
-#           item['ref_url'] = item['url']
-#         end
-#         if record
-#           item.delete('data')
-#           item.delete('url')
-#           record.process(item)
-#           record.upload_to_remote(item['ref_url']) if item['ref_url']
-#           opts[list] ||= {}
-#           opts[list][unique_id] = record.global_id
-#           hashes[item['id']] = record.global_id
-#         end
-#       end
-#     end
-
-#     params = {}
-#     non_user_params = {'user' => opts['user']}
-#     params['name'] = obj['name']
-#     params['description'] = obj['description_html']
-#     params['image_url'] = obj['image_url']
-#     params['license'] = OBF::Utils.parse_license(obj['license'])
-#     params['buttons'] = obj['buttons'].map do |button|
-#       new_button = {
-#         'id' => button['id'],
-#         'label' => button['label'],
-#         'vocalization' => button['vocalization'],
-#         'left' => button['left'],
-#         'top' => button['top'],
-#         'width' => button['width'],
-#         'height' => button['height'],
-#         'border_color' => button['border_color'],
-#         'background_color' => button['background_color']
-#       }
-#       if button['image_id']
-#         new_button['image_id'] = hashes[button['image_id']]
-#       end
-#       if button['sound_id']
-#         new_button['sound_id'] = hashes[button['sound_id']]
-#       end
-#       if button['load_board'] 
-#         if opts['boards'] && opts['boards'][button['load_board']['id']]
-#           new_button['load_board'] = opts['boards'][button['load_board']['id']]
-#         else
-#           link = Board.find_by_path(button['load_board']['key'] || button['load_board']['id'])
-#           if link
-#             new_button['load_board'] = {
-#               'id' => link.global_id,
-#               'key' => link.key
-#             }
-#           end
-#         end
-#       elsif button['url']
-#         if button['ext_coughdrop_apps']
-#           new_button['apps'] = button['ext_coughdrop_apps']
-#         else
-#           new_button['url'] = button['url']
-#         end
-#       end
-#       new_button
-#     end
-#     params['grid'] = obj['grid']
-#     params['public'] = !(obj['settings'] && obj['settings']['private'])
-#     non_user_params[:key] = (obj['settings'] && obj['settings']['key'])
-#     board = nil
-#     if opts['boards'] && opts['boards'][obj['id']]
-#       board = Board.find_by_path(opts['boards'][obj['id']]['id']) || Board.find_by_path(opts['boards'][obj['id']]['key'])
-#       board.process(params, non_user_params)
-#     else
-#       board = Board.process_new(params, non_user_params)
-#       opts['boards'] ||= {}
-#       opts['boards'][obj['id']] = {
-#         'id' => board.global_id,
-#         'key' => board.key
-#       }
-#     end
-#     board
-# 
-
   end
   
   def self.to_obz(content, dest_path, opts)
@@ -294,7 +195,7 @@ module OBF::External
         if b
           b['images'] = content['images'] || []
           b['sounds'] = content['sounds'] || []
-          to_obf(b, nil, paths) 
+          to_obf(b, nil, paths)
         end
       end
       manifest = {

data/lib/obf/pdf.rb

@@ -1,4 +1,13 @@
 module OBF::PDF
+  @@footer_text ||= nil
+  def self.footer_text
+    @@footer_text
+  end
+  
+  def self.footer_text=(text)
+    @@footer_text = text
+  end
+  
   def self.from_obf(obf_json_or_path, dest_path, zipper=nil)
     obj = obf_json_or_path
     if obj.is_a?(String)
@@ -131,7 +140,9 @@ module OBF::PDF
     
       # footer
       pdf.fill_color "aaaaaa"
-      pdf.text_box "mycoughdrop.com", :at => [doc_width - 300, text_height], :width => 200, :height => text_height, :align => :right, :valign => :center, :overflow => :shrink_to_fit
+      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
+      end
       pdf.fill_color "000000"
       if options['pages']
         pdf.text_box options['pages'][obj['id']], :at => [doc_width - 100, text_height], :width => 100, :height => text_height, :align => :right, :valign => :center, :overflow => :shrink_to_fit

data/lib/obf/picto4me.rb

@@ -0,0 +1,97 @@
+module OBF::Picto4me
+  def self.to_external(zip_path)
+    boards = []
+    images = []
+    sounds = []
+    OBF::Utils.load_zip(zip_path) do |zipper|
+      json = JSON.parse(zipper.read('*.js'))
+      locale = json['locale']
+      json['sheets'].each_with_index do |sheet, idx|
+        board = OBF::Utils.obf_shell
+        board['id'] = idx.to_s
+        board['locale'] = locale
+        board['name'] = sheet['title']['text']
+        board['ext_picto4me_title'] = sheet['title']
+        board['ext_picto4me_cellsize'] = sheet['cellsize']
+        board['ext_picto4me_pictoOverrule'] = sheet['pictoOverrule']
+        board['ext_picto4me_showPictoTitles'] = sheet['showPictoTitles']
+        board['ext_picto4me_pictoBorder'] = sheet['pictoBorder']
+        grid = []
+        sheet['rows'].times do 
+          grid << [nil] * sheet['columns']
+        end
+        board['grid'] = {
+          'rows' => sheet['rows'],
+          'columns' => sheet['columns'],
+          'order' => grid
+        }
+        sheet['pictos'].each_with_index do |picto, jdx|
+          next unless picto
+          button = {}
+          button['id'] = board['id'] + ":" + picto['id']
+          button['label'] = picto['title']['text']
+          button['vocalization'] = picto['description']['text']
+          button['border_color'] = picto['borderColor'] unless picto['borderColor'] == 'transparent'
+          button['background_color'] = picto['bgColor'] unless picto['bgColor'] == 'transparent'
+          button['ext_picto4me_lang'] = picto['lang']
+          button['ext_picto4me_description'] = picto['description']
+          button['ext_picto4me_title'] = picto['title']
+          button['ext_picto4me_overlay'] = picto['overlay']
+          button['ext_picto4me_source'] = picto['source']
+          button['ext_picto4me_key'] = picto['key']
+          button['ext_picto4me_categories'] = picto['categories']
+          button['ext_picto4me_size'] = picto['size']
+          
+          if picto['imageurl']
+            image = {}
+            image['id'] = 'img:' + button['id']
+            
+            attrs = zipper.read_as_data(picto['imageurl'][1..-1])
+            raise "didn't work" unless attrs['data']
+            image['data'] = attrs['data']
+            image['width'] = attrs['width']
+            image['height'] = attrs['height']
+            image['content_type'] = attrs['content_type']
+
+            images << image
+            button['image_id'] = image['id']
+          end
+          if picto['soundurl']
+            sound = {}
+            sound['id'] = 'snd:' + button['id']
+            
+            attrs = zipper.read_as_data(picto['soundurl'][1..-1])
+            raise "didn't work" unless attrs['data']
+            sound['data'] = attrs['data']
+            sound['content_type'] = attrs['content_type']
+
+            sounds << sound
+            button['sound_id'] = sound['id']
+          end
+          if picto['link'] && json['sheets'][picto['link'].to_i]
+            button['load_board'] = {'id' => picto['link']}
+          end
+          board['buttons'] << button
+          row = (jdx / sheet['columns']).floor.to_i
+          col = jdx % sheet['columns']
+          board['grid']['order'][row][col] = button['id']
+        end
+        boards << board
+      end
+    end
+    images.uniq!
+    sounds.uniq!
+    if boards.length == 1
+      board = boards[0]
+      board['images'] = images
+      board['sounds'] = sounds
+      return board
+    else
+      return {
+        'boards' => boards,
+        'images' => images,
+        'sounds' => sounds
+      }
+    end
+  end
+end

data/lib/obf/utils.rb

@@ -1,81 +1,23 @@
 module OBF::Utils
-#   def self.board_to_remote(board, user, file_type, include)
-#     OBF::Utils.update_current_progress(0.2, :converting_file)
-#     # TODO: key off just the last change id for the board(s) when building the
-#     # filename, return existing filename if it exists and isn't about to expire
-#     path = OBF::Utils.temp_path("stash")
-# 
-#     content_type = nil
-#     if file_type == 'obf'
-#       content_type = 'application/obf'
-#     elsif file_type == 'obz'
-#       content_type = 'application/obz'
-#     elsif file_type == 'pdf'
-#       content_type = 'application/pdf'
-#     else
-#       raise "Unrecognized conversion type: #{file_type}"
-#     end
-#     key = Security.sha512(board.id.to_s, 'board_id')
-#     filename = "board_" + board.current_revision + "." + file_type.to_s
-#     remote_path = "downloads/#{key}/#{filename}"
-#     url = Uploader.check_existing_upload(remote_path)
-#     return url if url
-#     OBF::Utils.update_current_progress(0.3, :converting_file)
-#     
-#     OBF::Utils.as_progress_percent(0.3, 0.8) do
-#       if file_type == 'obz'
-#         if include == 'all'
-#           OBF::CoughDrop.to_obz(board, path, {'user' => user})
-#         else
-#           OBF::CoughDrop.to_obz(board, path, {'user' => user})
-#         end
-#       elsif file_type == 'obf'
-#         OBF::CoughDrop.to_obf(board, path)
-#       elsif file_type == 'pdf'
-#         OBF::CoughDrop.to_pdf(board, path, {'user' => user, 'packet' => (include == 'all')})
-#       end
-#     end
-#     OBF::Utils.update_current_progress(0.9, :uploading_file)
-#     url = Uploader.remote_upload(remote_path, path, content_type)
-#     raise "File not uploaded" unless url
-#     File.unlink(path) if File.exist?(path)
-#     return url
-#   end
-  
-#   def self.remote_to_boards(user, url)
-#     result = []
-#     OBF::Utils.update_current_progress(0.1, :downloading_file)
-#     response = Typhoeus.get(url)
-#     file = Tempfile.new('stash')
-#     file.binmode
-#     file.write response.body
-#     file.close
-#     OBF::Utils.update_current_progress(0.2, :processing_file)
-#     OBF::Utils.as_progress_percent(0.2, 1.0) do
-#       if url.match(/\.obz$/) || response.headers['Content-Type'] == 'application/obz'
-#         boards = OBF::CoughDrop.from_obz(file.path, {'user' => user})
-#         result = boards
-#       elsif url.match(/\.obf$/) || response.headers['Content-Type'] == 'application/obf'
-#         board = OBF::CoughDrop.from_obf(file.path, {'user' => user})
-#         result = [board]
-#       else
-#         raise "Unrecognized file type: #{response.headers['Content-Type']}"
-#       end
-#       file.unlink
-#     end
-#     return result
-#   end
-  
   def self.get_url(url)
     return nil unless url
-    res = Typhoeus.get(URI.escape(url))
-    extension = ""
-    type = MIME::Types[res.headers['Content-Type']]
+    content_type = nil
+    data = nil
+    if url.match(/^data:/)
+      content_type = url.split(/;/)[0].split(/:/)[1]
+      data = Base64.strict_decode64(url.split(/\,/, 2)[1])
+    else
+      res = Typhoeus.get(URI.escape(url))
+      content_type = res.headers['Content-Type']
+      data = res.body
+    end
+    type = MIME::Types[content_type]
     type = type && type[0]
+    extension = ""
     extension = ("." + type.preferred_extension) if type && type.extensions && type.extensions.length > 0
     {
-      'content_type' => res.headers['Content-Type'],
-      'data' => res.body,
+      'content_type' => content_type,
+      'data' => data,
       'extension' => extension
     }
   end
@@ -87,7 +29,16 @@ module OBF::Utils
   end
   
   def self.image_base64(url)
-    image = get_url(url)
+    image = nil
+    if url.match(/:\/\//)
+      image = get_url(url)
+    else
+      types = MIME::Types.type_for(url)
+      image = {
+        'data' => File.read(url),
+        'content_type' => types[0] && types[0].to_s
+      }
+    end
     return nil unless image
     str = "data:" + image['content_type']
     str += ";base64," + Base64.strict_encode64(image['data'])
@@ -137,7 +88,16 @@ module OBF::Utils
   end
   
   def self.sound_base64(url)
-    sound = get_url(url)
+    sound = nil
+    if url.match(/:\/\//)
+      sound = get_url(url)
+    else
+      types = MIME::Types.type_for(url)
+      sound = {
+        'data' => File.read(url),
+        'content_type' => types[0] && types[0].to_s
+      }
+    end
     return nil unless sound
     str = "data:" + sound['content_type']
     str += ";base64," + Base64.strict_encode64(sound['data'])
@@ -228,6 +188,37 @@ module OBF::Utils
       entry = @zipfile.glob(path).first
       entry ? entry.get_input_stream.read : nil
     end
+
+    def read_as_data(path)
+      attrs = {}
+      raw = @zipfile.read(path)
+      types = MIME::Types.type_for(path)
+      attrs['content_type'] = types[0] && types[0].to_s
+    
+      str = "data:" + attrs['content_type']
+      str += ";base64," + Base64.strict_encode64(raw)
+      attrs['data'] = str
+    
+      if attrs['content_type'].match(/^image/)
+        fn = OBF::Utils.temp_path('file')
+        file = Tempfile.new('file')
+        file.binmode
+        file.write raw
+        file.close
+        data = `identify -verbose #{file.path}`
+        data.split(/\n/).each do |line|
+          pre, post = line.sub(/^\s+/, '').split(/:\s/, 2)
+          if pre == 'Geometry'
+            match = post.match(/(\d+)x(\d+)/)
+            if match && match[1] && match[2]
+              attrs['width'] = match[1].to_i
+              attrs['height'] = match[2].to_i
+            end
+          end
+        end
+      end
+      attrs
+    end
   end
   
   def self.load_zip(path, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Brian Whitmer
@@ -118,10 +118,12 @@ files:
 - LICENSE
 - README.md
 - lib/obf.rb
+- lib/obf/avaz.rb
 - lib/obf/external.rb
 - lib/obf/obf.rb
 - lib/obf/obz.rb
 - lib/obf/pdf.rb
+- lib/obf/picto4me.rb
 - lib/obf/png.rb
 - lib/obf/utils.rb
 - lib/tinycolor_convert.js