faastruby-rpc 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0399784305d0de9f8ee8db0f602cc2062a1c1d8d631bdfd0514c1d5b846e7c0
-  data.tar.gz: f437fe5dce46945b840117d3cfa6a0b68699046b7f0a64ba7822fd2278dcc4cc
+  metadata.gz: a7ca42876deb3b89a2ce6f08e5076e920622e7e0ff90d02f97e2c27d80000191
+  data.tar.gz: 4d3ca69fd16b80edf8d2a34d8832491b512e358a4a43f9dbaeb9d482d52c685d
 SHA512:
-  metadata.gz: ab2e9df498673377e78ba3d94103a4cc07daca5ce7bcd601aede51ded5e60a74560821e5cc51089a988fbfd45a448c14a88dcb5825ea79d5a2facf1ad2d70643
-  data.tar.gz: a946ba11384ce3d9ec7a090f9be8405b9a69e69400fe153cff602a2cc2fd35e815c7474296f9dde19c8128f4c7e5db68396cf62e490d974aaf00dedc4fe8b222
+  metadata.gz: 7cc828cf2f83f4662261948ad038ca5a547e2a88400a5dfbe0deac4e51e62d7e983e4476a05abe01576847ce6e598368c34c3dd0f75869abfeb3c3ffd5a090ab
+  data.tar.gz: 6f46911239ee2a27399cdceac025ba726ee461888dc0dab2cb704fb33abb9474048b17de1220c5b59e73ad55b86847677d428b648711894bb22681bcf330f034

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 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
+
 ## 0.2.0 - Dec 31 2018
 - Redesigned UX for calling of external functions
 

data/Gemfile.lock

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

data/README.md

@@ -59,6 +59,23 @@ You can use positional or keyword arguments when calling external functions, as
 
 This gem is already required when you run your functions in FaaStRuby, or using `faastruby server`.
 
+## Running code when the invoked function responds
+If you pass a block when you call another function, the block will execute as soon as the response arrives. For example:
+
+```ruby
+require_function 'my-workspace/echo', as: 'Echo'
+def handler(event)
+  name = Echo.call(name: 'john doe') do |response|
+    # response.body      #=> "john doe"
+    # response.code      #=> 200
+    # response.headers   #=> {"content-type"=>"text/plain",...}
+    # What you return from the block will be the value of `name` or `name.body`
+    response.body.capitalize
+  end
+  render text: "Hello, #{name}!" # Will render 'John Doe'
+end
+```
+
 ## Handling errors
 
 By default, an exception is raised if the invoked function HTTP status code is greater or equal to 400. This is important to make your functions easier to debug, and you will always know what to expect from that function call.

data/lib/faastruby-rpc/function.rb

@@ -11,6 +11,9 @@ module FaaStRuby
         @headers = headers
         @klass = klass
       end
+      def body=(value)
+        @body = value
+      end
     end
     class Function
       def initialize(path, raise_errors: true)
@@ -25,46 +28,44 @@ module FaaStRuby
         }
         @raise_errors = raise_errors
       end
-      def call_with(*args)
-        execute(req_body: Oj.dump(args), headers: {'Content-Type' => 'application/json', 'Faastruby-Rpc' => 'true'})
-      end
 
       def call(*args)
-        return call_with(*args) if args.any?
-        execute(method: 'get')
+        @thread = Thread.new do
+          output = args.any? ? call_with(*args) : execute(method: 'get')
+          @response.body = yield(output) if block_given?
+        end
+        self
       end
 
       def execute(req_body: nil, query_params: {}, headers: {}, method: 'post')
-        @thread = Thread.new do
-          url = "#{FAASTRUBY_HOST}/#{@path}#{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)
-          resp_headers = {}
-          response.each{|k,v| resp_headers[k] = v}
-          case resp_headers['content-type']
-          when 'application/json'
-            begin
-              resp_body = Oj.load(response.body)
-            rescue Oj::ParseError => e
-              if response.body.is_a?(String)
-                resp_body = response.body
-              else
-                raise e if @raise_errors
-                resp_body = {
-                  'error' => e.message,
-                  'location' => e.backtrace&.first
-                }
-              end
+        url = "#{FAASTRUBY_HOST}/#{@path}#{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)
+        resp_headers = {}
+        response.each{|k,v| resp_headers[k] = v}
+        case resp_headers['content-type']
+        when 'application/json'
+          begin
+            resp_body = Oj.load(response.body)
+          rescue Oj::ParseError => e
+            if response.body.is_a?(String)
+              resp_body = response.body
+            else
+              raise e if @raise_errors
+              resp_body = {
+                'error' => e.message,
+                'location' => e.backtrace&.first
+              }
             end
-          when 'application/yaml'
-            resp_body = YAML.load(response.body)
-          else
-            resp_body = response.body
           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)
+        when 'application/yaml'
+          resp_body = YAML.load(response.body)
+        else
+          resp_body = response.body
         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)
         self
       end
 
@@ -78,7 +79,7 @@ module FaaStRuby
       end
 
       def to_s
-        body || ""
+        body.to_s || ""
       end
 
       def body
@@ -103,6 +104,10 @@ module FaaStRuby
 
       private
 
+      def call_with(*args)
+        execute(req_body: Oj.dump(args), headers: {'Content-Type' => 'application/json', 'Faastruby-Rpc' => 'true'})
+      end
+
       def wait
         @thread.join
       end

data/lib/faastruby-rpc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby-rpc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-31 00:00:00.000000000 Z
+date: 2019-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj