obf 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e1b5472c682875d9a7105a13e5d8c082755b708
-  data.tar.gz: c2f86abbb91ed2b93a4a7ef249ecb20378c0a9a0
+  metadata.gz: 0c27601024bf7909871b16237383f37f1293e735
+  data.tar.gz: dd85480dd2a3c0761e0822c7f7807c69d29695d4
 SHA512:
-  metadata.gz: dc5bb78ba9ac04762f648e13d88fe6c55ab13e7ab900f56fcea0b98b96e2fe8126e81535350e9b98fa2c2d47c09e3fbbc0516b356618e3aa6c104c1b920a7b0e
-  data.tar.gz: 09780a4f5476a8993fa9dbd76ce298e80f84da98aa08660246718417d889dffe0cbb5d5637b63c10f256c901e149ef4b47dacdad950c4da12c5974e5ddf4ddf9
+  metadata.gz: c6dc3bd80f1cb84236f42d527d676c3628e72d226c1eb67d142143f015c0a4616f7449679f0fb3ede3a583ae7c8acdd27077216d469fb8b769137834a028fff5
+  data.tar.gz: 98d650f28f82ef7d93f6f97b8ec7da80a1b4e130209a39653faa0f806fd262e4f6b8f5d40465ae22eac6a0f6de80f73fc43cb14832eadb2fe04ec99f9991a5c6

data/lib/obf/external.rb

@@ -28,12 +28,13 @@ module OBF::External
         'id' => original_button['id'],
         'label' => original_button['label'],
         'vocalization' => original_button['vocalization'],
+        'action' => original_button['action'],
         '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"
+        'border_color' => OFB::Utils.fix_color(original_button['border_color'] || "#aaa", 'rgb'),
+        'background_color' => OBF::Utils.fix_color(original_button['background_color'] || "#fff", 'rgb')
       }
       if original_button['load_board']
         button['load_board'] = {

data/lib/obf/pdf.rb

@@ -48,14 +48,6 @@ module OBF::PDF
     end
   end
   
-  def self.fix_color(str)
-    @@colors ||= {}
-    return @@colors[str] if @@colors[str]
-    color = `node lib/tinycolor_convert.js "#{str}"`.strip
-    @@colors[str] = color
-    color
-  end
-  
   def self.build_page(pdf, obj, options)
     OBF::Utils.as_progress_percent(0, 1.0) do
       doc_width = 11*72 - 72
@@ -116,10 +108,10 @@ module OBF::PDF
               fill = "ffffff"
               border = "eeeeee"
               if button['background_color']
-                fill = fix_color(button['background_color'])
+                fill = OBF::Utils.fix_color(button['background_color'], 'hex')
               end   
               if button['border_color']
-                border = fix_color(button['border_color'])
+                border = OBF::Utils.fix_color(button['border_color'], 'hex')
               end         
               pdf.fill_color fill
               pdf.stroke_color border

data/lib/obf/utils.rb

@@ -118,6 +118,15 @@ module OBF::Utils
       'sounds' => []
     }
   end
+
+  def self.fix_color(str, type='hex')
+    lookup = str + "::" + type
+    @@colors ||= {}
+    return @@colors[lookup] if @@colors[lookup]
+    color = `node lib/tinycolor_convert.js "#{str}" #{type}`.strip
+    @@colors[lookup] = color
+    color
+  end
   
   def self.parse_obf(obj)
     json = obj

data/lib/tinycolor_convert.js

@@ -966,4 +966,8 @@ else {
 
 
 var color = tiny(process.argv[2]);
-console.log(color.toHex());
+if(process.argv[3] == 'rgb') {
+  console.log(color.toRgbString());
+} else {
+  console.log(color.toHexg());
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json