zygote 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb685c710d11948c01a676b3a5e2fe7df5e78e98
-  data.tar.gz: 54915838f5aa83edb7088efa978d2aca242a4c7f
+  metadata.gz: 3bd75d436fea9a8f78488c577965a3582cb9a08a
+  data.tar.gz: bd6f75e7c83ed3691f0dc8940209b34e1ad0c227
 SHA512:
-  metadata.gz: 2976cb02ebe35a13e52b144c17873de7329be5e71ed1ec17ccde57dd52a9e7284250e7af07a72542ee1265ab4de3b3bf94377ec2540c8c3e67a174fe95052af9
-  data.tar.gz: 9f254761b01073a42268dbe7d84646fe9dffe1d17a3152569f441e56e7c509b1363d03af7e03ee2e1a919ddc34d985596176bbe6cee611b32eec6f497c3560a5
+  metadata.gz: 69818393b6a753bf0a4e179332242aa81c6c49576ea5ff5a58e65f775170c6ef0b0b54860335d0f01e2a5c1c01c101a06dde0eceb2143337d74c6213acaa1608
+  data.tar.gz: 4523d4cc2876570e98f1adf3dbb2af410c790bedf885ee515fb32829e85ac9f68bbc0a2d43e3d019de665f39531245061bbfc3cfe0ecc28b08a76cbfa275c018

data/lib/zygote/http.rb

@@ -73,18 +73,6 @@ class ZygoteWeb < Sinatra::Base
     body { JSON.pretty_generate(CellQueue.show(params['sku'])) }
   end
 
-  apost %r{/queue/bulk$} do
-    bulk_queue = JSON.parse(request.body.read)
-    bulk_queue.each do |asset, queue|
-      queue = [queue] unless queue.is_a?(Array)
-      queue.each do |action|
-        CellQueue.push(asset, action)
-      end
-    end
-
-    200
-  end
-
   # Enable push cells (with optional data) to the cell queue for a SKU
   apost %r{/queue/(?<sku>\S*)/(?<selected_cell>\S*)$} do
     # Clean params into a simple hash

data/lib/zygote/test.rb

@@ -70,7 +70,7 @@ module Zygote
 
   # Returns EventMachine::HttpClient
   def post(uri, params = {})
-    EM::Synchrony.sync(EventMachine::HttpRequest.new("http://127.0.0.1:#{TestConfig.port}/#{uri}").apost(body: params))
+    EM::Synchrony.sync(EventMachine::HttpRequest.new("http://127.0.0.1:#{TestConfig.port}/#{uri}").apost(body: JSON.dump(params), head: {'Content-Type' => 'application/json'}))
   end
 
   def parameterize(params)

data/lib/zygote/util.rb

@@ -1,4 +1,6 @@
 require 'socket'
+require 'base64'
+require 'json'
 
 def compute_sku(vendor, serial, board_serial)
   # Sanitize params
@@ -24,9 +26,14 @@ end
 
 def clean_params(params)
   params.delete_if { |x, _| x == 'splat' || x == 'captures' }
+  params = params.map { |k,v| [k, v.is_a?(Hash) ? encode64(v) : v] }.to_h
   params
 end
 
+def encode64(content)
+  Base64.encode64(JSON.pretty_generate(content)).gsub(/\n|=/, '')
+end
+
 def my_ip
   Socket.ip_address_list.find { |x| x.ipv4? && !x.ipv4_loopback? }.ip_address
 end

data/lib/zygote/version.rb

@@ -1,4 +1,4 @@
 # Namespace for our gem
 module Zygote
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.5'.freeze
 end

data/views/menu.erb

@@ -75,7 +75,7 @@ goto ${selected}
 # Generate chains for each submenu entry
   <% data['menu']['submenu'].each do |entry, data| %>
     <% local_params = (data['params'] || {}).merge(params) %>
-    <% parmstr = {entry: entry}.merge(local_params).map{ |k,v| "#{k}=#{v.is_a?(String) ? v : Base64.encode64(JSON.dump(v)).gsub(/\n|=/, '')}"}.join('&').gsub('?','').gsub(' ','') %>
+    <% parmstr = {entry: entry}.merge(local_params).to_query %>
 :<%= cell %>-<%= entry %>
 chain --replace --autofree  http://${dhcp-server}/cell/<%= cell %>/<%= data['action'] || 'boot' %><%= parmstr.empty? ? "" : "?#{parmstr}" %>
   <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zygote
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Dale Hamel