marty 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86520af8c5b4d0f802cee4528502584f94d81eac
-  data.tar.gz: 1f6d2122fe80662c839ae2abd7fab0bc4512a1f4
+  metadata.gz: 74092a6c860ba6143a686a653e304abd173f7b1e
+  data.tar.gz: 7e18178b04dacec033571c2566c653043d27116a
 SHA512:
-  metadata.gz: 88edfb46b139d22027b17a43573beb85d252415cfee6f0eea1028d166a38792bf964cab12c74a5adac38b1eee836097d85ad27ff69cf54ab8211ca3aac4e6a7c
-  data.tar.gz: 587c829255481f5c00b490ba7ff57c041289b928135951b1c7b2033a73d3c3e523a41c5d147f22a5bfefeef568dc4c9a9cc8290c46600acddc854620a50d035a
+  metadata.gz: c9666aa7555d70c078cb27745206af4ae51dfa6728d21f0cb637d1736cb106b19228c6056c51d16a3a923f1630ee732a93768ca252d7fde6ecc7229a1f091586
+  data.tar.gz: 675388c07330499a07f89705c7887eadaf0da17cef12c65c0ae914ca55d3c59062e08676c6af36aff1b6891827b94348849ccb3770fe6cbc66577b70c5775bc9

data/app/controllers/marty/rpc_controller.rb

@@ -6,6 +6,7 @@ class Marty::RpcController < ActionController::Base
                   params["attrs"] || "[]",
                   params["params"] || "{}",
                   params["api_key"] || nil,
+                  params["background"],
                   )
 
     respond_to do |format|
@@ -16,48 +17,49 @@ class Marty::RpcController < ActionController::Base
         send_data Marty::DataExporter.to_csv(res)
       }
     end
-
   end
 
   private
 
-  def do_eval(sname, tag, node, attrs, params, api_key)
+  def do_eval(sname, tag, node, attrs, params, api_key, background)
+    err = "Marty::RpcController#do_eval,"
+
     unless attrs.is_a?(String)
-      logger.info "Marty::RpcController#do_eval, Bad attrs (must be a string): <#{attrs.inspect}>"
+      logger.info "#{err} Bad attrs (must be a string): <#{attrs.inspect}>"
       return {error: "Bad attrs"}
     end
 
     begin
       attrs = ActiveSupport::JSON.decode(attrs)
     rescue JSON::ParserError => e
-      logger.info "Marty::RpcController#do_eval, Malformed attrs (json parse error): #{attrs.inspect}, #{e.message}"
+      logger.info "#{err} Malformed attrs (json): #{attrs.inspect}, #{e.message}"
       return {error: "Malformed attrs"}
     end
 
     unless attrs.is_a?(Array) && attrs.all? {|x| x.is_a? String}
-      logger.info "Marty::RpcController#do_eval, Malformed attrs (must be array of strings): <#{attrs.inspect}>"
+      logger.info "#{err} Malformed attrs (not string array): <#{attrs.inspect}>"
       return {error: "Malformed attrs"}
     end
 
     unless params.is_a?(String)
-      logger.info "Marty::RpcController#do_eval, Bad params (must be a string): <#{params.inspect}>"
+      logger.info "#{err} Bad params (must be a string): <#{params.inspect}>"
       return {error: "Bad params"}
     end
 
     begin
       params = ActiveSupport::JSON.decode(params)
     rescue JSON::ParserError => e
-      logger.info "Marty::RpcController#do_eval, Malformed params (json parse error): <#{params.inspect}>, #{e.message}"
+      logger.info "#{err} Malformed params (json): <#{params.inspect}>, #{e.message}"
       return {error: "Malformed params"}
     end
 
     unless params.is_a?(Hash)
-      logger.info "Marty::RpcController#do_eval, Malformed params (must be a hash): <#{params.inspect}>"
+      logger.info "#{err} Malformed params (not hash): <#{params.inspect}>"
       return {error: "Malformed params"}
     end
 
     unless Marty::ApiAuth.authorized?(sname, api_key)
-      logger.info "Marty::RpcController#do_eval, permission denied"
+      logger.info "#{err} permission denied"
       return {error: "Permission denied" }
     end
 
@@ -66,15 +68,20 @@ class Marty::RpcController < ActionController::Base
     rescue => e
       err_msg = "Can't get engine: #{sname || 'nil'} with tag: " +
               "#{tag || 'nil'}; message: #{e.message}"
-      logger.info "Marty::RpcController#do_eval, #{err_msg}"
+      logger.info "#{err} #{err_msg}"
       return {error: err_msg}
     end
 
     begin
-      engine.evaluate_attrs(node, attrs, params)
+      if background
+        result = engine.background_eval(node, params, attrs)
+        {"job_id" => result.__promise__.id}
+      else
+        engine.evaluate_attrs(node, attrs, params)
+      end
     rescue => exc
       err_msg = Delorean::Engine.grok_runtime_exception(exc)
-      logger.info "Marty::RpcController#do_eval, Evaluation error: #{err_msg}"
+      logger.info "#{err} Evaluation error: #{err_msg}"
       err_msg
     end
   end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end

data/spec/controllers/rpc_controller_spec.rb

@@ -91,10 +91,33 @@ describe Marty::RpcController do
            node: "B",
            attrs: ["e","f"].to_json,
            tag: t1.name,
-           params: { a: 333, d: 5}.to_json
+           params: { a: 333, d: 5}.to_json,
          }
     expect(response.body).to eq([4,20].to_json)
   end
+
+  it "should be able to post background job" do
+    Delayed::Worker.delay_jobs = false
+    post 'evaluate', {
+           format: :json,
+           script: "M1",
+           node: "B",
+           attrs: ["e","f"].to_json,
+           tag: t1.name,
+           params: { a: 333, d: 5}.to_json,
+           background: true,
+         }
+    res = ActiveSupport::JSON.decode response.body
+    expect(res).to include('job_id')
+    job_id = res['job_id']
+
+    promise = Marty::Promise.find_by_id(job_id)
+
+    expect(promise.result).to eq({"e"=>4, "f"=>20})
+
+    Delayed::Worker.delay_jobs = true
+  end
+
   it "should be able to post with complex data" do
     post 'evaluate', {
            format: :json,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Arman Bostani