faastruby-rpc 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7ca42876deb3b89a2ce6f08e5076e920622e7e0ff90d02f97e2c27d80000191
-  data.tar.gz: 4d3ca69fd16b80edf8d2a34d8832491b512e358a4a43f9dbaeb9d482d52c685d
+  metadata.gz: 3549d86d75838deeb0ee5ab553304ae42471c35b588ca0193053f8e3d96d1aea
+  data.tar.gz: cfcd04067a0eea97c821ee10d1783fd6e8f8d7738edfb88ed210c863fd97ac33
 SHA512:
-  metadata.gz: 7cc828cf2f83f4662261948ad038ca5a547e2a88400a5dfbe0deac4e51e62d7e983e4476a05abe01576847ce6e598368c34c3dd0f75869abfeb3c3ffd5a090ab
-  data.tar.gz: 6f46911239ee2a27399cdceac025ba726ee461888dc0dab2cb704fb33abb9474048b17de1220c5b59e73ad55b86847677d428b648711894bb22681bcf330f034
+  metadata.gz: c7a2897bb1c884105668b0ec7a6f9247c1e31f9e2fb230ca0b4078f80fbff5ed0124a7041906c3a50e212c1033e0043d3ad60d2368de17efa4ef3e5d5e954a0b
+  data.tar.gz: eb69a1bcc203c6eeb4733e1898e5218b8ddcd6b9f0c9e1ddc8ac938bdbaf86fffb00fe6fb16d6bd6fd8d858da56f9dd4a85120d23c56bbb7a0786d6c5b35c577

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.2 - Mar 8 2019
+- Improved response string from invoked function when there's an error.
+- Catch method missing calls and try them against the result once it arrives
+
 ## 0.2.1 - Jan 3rd 2019
 - Pass a block when calling a function and the code will be executed when the function responds, and the block's return value will replace the function's response body
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faastruby-rpc (0.2.0)
+    faastruby-rpc (0.2.1)
       oj (~> 3.6)
 
 GEM

data/lib/faastruby-rpc/function.rb

@@ -1,5 +1,5 @@
 module FaaStRuby
-  FAASTRUBY_HOST = ENV['FAASTRUBY_HOST'] || "http://localhost:3000"
+  FAASTRUBY_WORKSPACE_BASE_HOST = ENV['FAASTRUBY_WORKSPACE_BASE_HOST']
   module RPC
     class ExecutionError < StandardError
     end
@@ -37,20 +37,25 @@ module FaaStRuby
         self
       end
 
+      def get_endpoint(query_params)
+        return "https://#{FAASTRUBY_WORKSPACE_BASE_HOST}/#{@path}#{query_params}" if FAASTRUBY_WORKSPACE_BASE_HOST
+        return "http://localhost:3000/#{@path}#{query_params}"
+      end
+
       def execute(req_body: nil, query_params: {}, headers: {}, method: 'post')
-        url = "#{FAASTRUBY_HOST}/#{@path}#{convert_query_params(query_params)}"
+        url = get_endpoint(convert_query_params(query_params))
         uri = URI.parse(url)
         use_ssl = uri.scheme == 'https' ? true : false
-        response = fetch(use_ssl: use_ssl, uri: uri, headers: headers, method: @methods[method], req_body: req_body)
+        function_response = fetch(use_ssl: use_ssl, uri: uri, headers: headers, method: @methods[method], req_body: req_body)
         resp_headers = {}
-        response.each{|k,v| resp_headers[k] = v}
+        function_response.each{|k,v| resp_headers[k] = v}
         case resp_headers['content-type']
         when 'application/json'
           begin
-            resp_body = Oj.load(response.body)
+            resp_body = Oj.load(function_response.body)
           rescue Oj::ParseError => e
-            if response.body.is_a?(String)
-              resp_body = response.body
+            if function_response.body.is_a?(String)
+              resp_body = function_response.body
             else
               raise e if @raise_errors
               resp_body = {
@@ -60,12 +65,16 @@ module FaaStRuby
             end
           end
         when 'application/yaml'
-          resp_body = YAML.load(response.body)
+          resp_body = YAML.load(function_response.body)
         else
-          resp_body = response.body
+          resp_body = function_response.body
+        end
+        if function_response.code.to_i >= 400 && @raise_errors
+          location = resp_body['location'] ? " @ #{resp_body['location']}" : nil
+          error_msg = "#{resp_body['error']}#{location}"
+          raise FaaStRuby::RPC::ExecutionError.new("Function '#{@path}' returned status code #{function_response.code}: #{error_msg}")
         end
-        raise FaaStRuby::RPC::ExecutionError.new("Function #{@path} returned status code #{response.code} - #{resp_body['error']} - #{resp_body['location']}") if response.code.to_i >= 400 && @raise_errors
-        @response = FaaStRuby::RPC::Response.new(resp_body, response.code.to_i, resp_headers)
+        @response = FaaStRuby::RPC::Response.new(resp_body, function_response.code.to_i, resp_headers)
         self
       end
 
@@ -73,6 +82,11 @@ module FaaStRuby
         !@response.nil?
       end
 
+      def method_missing(m, *args, &block)
+        rsp = response.body
+        rsp.send(m.to_sym, *args, &block)
+      end
+
       def response
         wait unless returned?
         @response
@@ -82,6 +96,8 @@ module FaaStRuby
         body.to_s || ""
       end
 
+      # alias_method :read, :to_s
+
       def body
         # wait unless returned?
         response.body

data/lib/faastruby-rpc/version.rb

@@ -1,5 +1,5 @@
 module FaaStRuby
   module RPC
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby-rpc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-03 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: FaaStRuby RPC - Wrapper to make it easy to call FaaStRuby functions.