obf 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8454639e83fc8b2def96962a5ba2e31791a362e5
-  data.tar.gz: 7e1abb111236636a50c09a0304810513ab4d30f2
+  metadata.gz: b79ac939f92a647ac73653cccb8609eebc16aace
+  data.tar.gz: 0b710379e5f53177b90aebbbe93de11809ec0b21
 SHA512:
-  metadata.gz: 288c13639fdf253583cc2c826c0d52cc9e57a21937207883c70618ca4f7837d23920169806811b3f6fcfd827335336a395290393810160648f91e079fe859411
-  data.tar.gz: 14418e8801345139b24dee027718e2a4ad6a9b11ab0112a8485b17f8e206dba3f5d75913a0a551f93de38018e0967aaa654685911081390b3ee1933617d7b3be
+  metadata.gz: 7d1090c6ca796b367d744564a6acf250ee0c57f4c380d4a3f10d365d23dd6cd854b33727fb721bc5cfd5c9e415346f0d089559847aeca6d86597be1790448214
+  data.tar.gz: d6ec22573bb37ac5eee8d7320894764317eda2e9039094413a04cd3093a1a415da089c7fd0566be60cbd40c502787466bcd3928e91dfdb759c98d35529a69214

data/lib/obf.rb

@@ -17,5 +17,6 @@ module OBF
   require 'obf/picto4me'
   require 'obf/avz'
   require 'obf/sfy'
+  require 'obf/sgrid'
   require 'obf/unknown_file'
 end

data/lib/obf/external.rb

@@ -120,11 +120,12 @@ module OBF::External
         'duration' => original_sound['duration'],
         'license' => OBF::Utils.parse_license(original_sound['license']),
         'url' => original_sound['url'],
+        'data' => original_sound['data'],
         'data_url' => original_sound['data_url'],
         'content_type' => original_sound['content_type']
       }
       if !path_hash
-        sound['data'] = OBF::Utils.sound_base64(sound['url'])
+        sound['data'] = OBF::Utils.sound_base64(sound['url']) if sound['url']
       else
         if path_hash['sounds'] && path_hash['sounds'][sound['id']]
           sound['path'] = path_hash['sounds'][sound['id']]['path']

data/lib/obf/sgrid.rb

@@ -0,0 +1,148 @@
+module OBF::Sgrid
+  EXT_PREFIX = 'ext_sgrid_'
+  
+  def self.html_at(elem, css)
+    res = elem.css(css)[0]
+    if res && res.inner_html && res.inner_html.length > 0
+      res.inner_html
+    else
+      nil
+    end
+  end
+  
+  def self.to_external(path)
+    xml = Nokogiri::XML(File.open(path))
+    grid = xml.css('sensorygrid grid')[0]
+    puts grid.to_s
+    puts grid.css('rows')[0].to_s
+    rows = html_at(grid, 'rows').to_i
+    columns = html_at(grid, 'cols').to_i
+    board = {
+      'id' => 'sgrid'
+    }
+    ['selfclosing', 'titlebartext', 'customblockscan', 'predictionsource', 'oskcellratio', 'workspace_x', 'workspace_y', 'eyegazemonitor_x', 'eyegazemonitor_y'].each do |attr|
+      res = html_at(grid, attr)
+      board[EXT_PREFIX + attr] = res if res
+    end
+    if grid.css('background')[0]
+      bg = grid.css('background')[0]
+      board['ext_sgrid_background'] = {
+        'style' => bg['style'],
+        'backcolour' => html_at(bg, 'backcolour'),
+        'backcolour2' => html_at(bg, 'backcolour2'),
+        'picformat' => html_at(bg, 'picformat'),
+        'tilepicture' => html_at(bg, 'tilepicture')
+      }
+    end
+    commands = grid.children.detect{|c| c.name == 'commands'}
+    if commands
+      board['ext_sgrid_commands'] = []
+      commands.css('command').each do |command|
+        
+        id = html_at(command, 'id')
+        board[EXT_PREFIX + 'commands'] << id if id
+      end
+    end
+    
+    board['name'] = board[EXT_PREFIX + 'titlebartext'] || "board"
+    board['grid'] = {
+      'rows' => rows,
+      'columns' => columns,
+      'order' => []
+    }
+    rows.times do |i|
+      row = []
+      columns.times do |j|
+        row << nil
+      end
+      board['grid']['order'] << row
+    end
+    
+    buttons = []
+    images = []
+    button_id = 0
+    image_id = 0
+    grid.css('cells cell').each do |cell|
+      button = {
+        'id' => button_id
+      }
+      button_id += 1
+      row = cell['x'].to_i - 1
+      col = cell['y'].to_i - 1
+      ['stylepreset', 'scanblock', 'magnifyx', 'magnifyy', 'tooltip', 'directactivate'].each do |attr|
+        res = html_at(cell, attr)
+        button[EXT_PREFIX + attr] = res if res
+      end
+      preset = button[EXT_PREFIX + 'stylepreset']
+      if preset == 'Blank cell (no style)'
+        button['background_color'] = 'rgb(255, 255, 255)'
+        button['border_color'] = 'rgb(150, 150, 150)'
+      elsif preset == 'Jump cell'
+        button['background_color'] = 'rgb(200, 225, 255)'
+        button['border_color'] = 'rgb(95, 135, 185)'
+      elsif preset == 'Action cell'
+        button['background_color'] = 'rgb(255, 200, 200)'
+        button['border_color'] = 'rgb(155, 75, 75)'
+      elsif preset == 'Vocab cell'
+        button['background_color'] = 'rgb(255, 255, 155)'
+        button['border_color'] = 'rgb(150, 135, 32)'
+      end
+      
+      button['label'] = html_at(cell, 'caption')
+      button[EXT_PREFIX + 'commands'] = []
+      cell.css('commands command').each do |command|
+        type = html_at(command, 'id')
+        params = []
+        command.css('parameter').each do |param|
+          idx = param['index'].to_i - 1
+          val = param.inner_html
+          params[idx] = val
+        end
+        button[EXT_PREFIX + 'commands'] << {
+          'type' => type,
+          'parameters' => params
+        }
+        if type == 'type'
+          button['vocalization'] = params[0]
+        elsif type == 'action.clear'
+          button['action'] = ':clear'
+        else
+          button['action'] = ":" + EXT_PREFIX + type
+        end
+      end
+      button.delete(EXT_PREFIX + 'commands') if button[EXT_PREFIX + 'commands'].length == 0
+      hidden = html_at(cell, 'hidden')
+      button['hidden'] = true if hidden == 'true'
+      picture = html_at(cell, 'picture')
+      if picture
+        image = {
+          'id' => image_id
+        }
+        image_id += 1
+        puts picture.to_json
+        match = picture.match(/^(\[\w+\])?(.+)$/)
+        symbol_set = match && match[1][1..-2]
+        filename = match && match[2]
+        if symbol_set
+          image['symbol'] = {
+            'set' => symbol_set,
+            'filename' => filename
+          }
+        else
+          image[EXT_PREFIX + 'filename'] = filename
+        end
+        images << image
+        button['image_id'] = image['id']
+      end
+      
+      col = cell['x'].to_i - 1
+      row = cell['y'].to_i - 1
+      buttons << button
+      board['grid']['order'][row][col] = button['id']
+    end
+    board['buttons'] = buttons
+    board['images'] = images
+    board['sounds'] = []
+    return board
+  end
+end

data/lib/obf/unknown_file.rb

@@ -11,6 +11,8 @@ module OBF::UnknownFile
       OBF::Picto4me.to_external(path)
     elsif type == :sfy
       OBF::Sfy.to_external(path)
+    elsif type == :sgrid
+      OBF::Sgrid.to_external(path)
     else
       raise "unrecognized file type"
     end

data/lib/obf/utils.rb

@@ -56,6 +56,14 @@ module OBF::Utils
       rescue CFFormatError => e
       end
       
+      xml = Nokogiri::XML(File.open(path)) rescue nil
+      if xml && xml.children.length > 0
+        if xml.children[0].name == 'sensorygrid'
+          return :sgrid
+        end
+        return :unknown
+      end
+
       begin
         type = nil
         load_zip(path) do |zipper|
@@ -73,8 +81,7 @@ module OBF::Utils
           end
         end
         return type if type
-      rescue => e
-        return :unknown
+      rescue Zip::Error => e
       end
     end
     return :unknown

data/lib/obf/validator.rb

@@ -518,7 +518,7 @@ module OBF
               err "button.action must start with either : or + if defined"
             end
 
-            attrs = ['id', 'label', 'vocalization', 'image_id', 'hidden', 'background_color', 'border_color', 'action', 'load_board', 'top', 'left', 'width', 'height']
+            attrs = ['id', 'label', 'vocalization', 'image_id', 'sound_id', 'hidden', 'background_color', 'border_color', 'action', 'load_board', 'top', 'left', 'width', 'height']
             button.keys.each do |key|
               if !attrs.include?(key) && !key.match(/^ext_/)
                 warn "button.#{key} attribute is not defined in the spec, should be prefixed with ext_yourapp_"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +154,7 @@ files:
 - lib/obf/picto4me.rb
 - lib/obf/png.rb
 - lib/obf/sfy.rb
+- lib/obf/sgrid.rb
 - lib/obf/unknown_file.rb
 - lib/obf/utils.rb
 - lib/obf/validator.rb