faastruby 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c01308a98baef83f7584358342b5593f8017671243fccdb351bbca0501efb5e8
-  data.tar.gz: 02573d5f8483a4a0d797caac9f97659550bfbab776fbf879dfb7a67503bfd63c
+  metadata.gz: 89c1ce111c17f6eb8b69d8d47cffc7dea7a6a48e373d43bd30cd7303c097d21f
+  data.tar.gz: e616406ad0c57004cc55e63b3c5db761164fb4ff4d3f40cab8474fcdafe7a3bb
 SHA512:
-  metadata.gz: 34bbb6de97544ddefdb8f8c9d233da3469b22b0145631b8dec39e31d2bfb4e1a9b4f8be53bba86a019caeb2ec0e4d46af66967a6c4f91bd50fe2da59bd98bd07
-  data.tar.gz: a74de808b41605fe03d80b1cc434c958b71b2373395e00c66ef7bd56b9ffc86a99555b28d9012130d0df6ef6382aa95e66e941cc3a526ad077fd7197346a2350
+  metadata.gz: 464be81d0ccc2a374a69111e61c29a7ee7f6797d3aeb4ce1c9e30bc76578fa07d313930a5034e566b5ce46a57356c8ab6897e49dea307e22530f2c0960626786
+  data.tar.gz: c2158f4ad8209e2028519c97edac9434e170158d801dc941160a5ea12ac25569aaa7b1efe01f056d5faf89238160eb31cee021261bc7ce73be05d6c326dad378

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.3 - Dec 31 2018
+- Updated `faastruby-rpc` dependency to 0.2.0.
+- Improved FaaStRuby Server.
+
 ## 0.4.2 - Dec 30 2018
 - Simplified Crystal Hello World example.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faastruby (0.4.1)
+    faastruby (0.4.2)
       colorize (~> 0.8)
       faastruby-rpc (~> 0.1.3)
       oj (~> 3.6)

data/exe/faastruby-server

@@ -6,57 +6,84 @@ require 'yaml'
 require 'oj'
 require 'faastruby-rpc'
 
-module FaaStRubyFunction
-  def self.call(workspace_name, function_name, event, args)
-    begin
-      load "./#{workspace_name}/#{function_name}/handler.rb"
-      response = handler(event, *args)
-      return response if response.is_a?(FaaStRubyFunction::Response)
-      body = {
-        'error' => "Please use the helpers 'render' or 'respond_with' as your function return value."
-      }
-      respond_with(Oj.dump(body), status: 500, headers: {'Content-Type' => 'application/json'})
-    rescue Exception => e
-      body = {
-        'error' => e.message,
-        'location' => e.backtrace&.first,
-      }
-      respond_with(Oj.dump(body), status: 500, headers: {'Content-Type' => 'application/json'})
+module FaaStRuby
+  class DoubleRenderError < StandardError; end
+end
+
+module FaaStRuby
+  class Runner
+    def initialize
+      @rendered = false
     end
-  end
-  def self.respond_with(body, status: 200, headers: {})
-    r = FaaStRubyFunction::Response.new(:body, :status, :headers)
-    r.new(body, status, headers)
-  end
 
-  def self.render(js: nil, body: nil, inline: nil, html: nil, json: nil, yaml: nil, text: nil, status: 200, headers: {}, content_type: nil)
-    headers["Content-Type"] = content_type if content_type
-    case
-    when json
-      headers["Content-Type"] ||= "application/json"
-      resp_body = json.is_a?(String) ? json : Oj.dump(json)
-    when html, inline
-      headers["Content-Type"] ||= "text/html"
-      resp_body = html
-    when text
-      headers["Content-Type"] ||= "text/plain"
-      resp_body = text
-    when yaml
-      headers["Content-Type"] ||= "application/yaml"
-      resp_body = yaml.to_yaml
-    when body
-      headers["Content-Type"] ||= "application/octet-stream"
-      resp_body = raw
-    when js
-      headers["Content-Type"] ||= "text/javascript"
-      resp_body = js
+    def call(workspace_name, function_name, event, args)
+      begin
+        load "./#{workspace_name}/#{function_name}/handler.rb"
+        response = handler(event, *args)
+        return response if response.is_a?(FaaStRuby::Response)
+        body = {
+          'error' => "Please use the helpers 'render' or 'respond_with' as your function return value."
+        }
+        FaaStRuby::Response.new(body: Oj.dump(body), status: 500, headers: {'Content-Type' => 'application/json'})
+      rescue Exception => e
+        body = {
+          'error' => e.message,
+          'location' => e.backtrace&.first,
+        }
+        FaaStRuby::Response.new(body: Oj.dump(body), status: 500, headers: {'Content-Type' => 'application/json'})
+      end
+    end
+
+    def rendered!
+      @rendered = true
+    end
+    def rendered?
+      @rendered
+    end
+
+    def respond_with(body, status: 200, headers: {})
+      raise FaaStRuby::DoubleRenderError.new("You called 'render' or 'respond_with' twice in your handler method") if rendered?
+      response = FaaStRuby::Response.new(body: body, status: status, headers: headers)
+      rendered!
+      response
+    end
+
+    def render(js: nil, body: nil, inline: nil, html: nil, json: nil, yaml: nil, text: nil, status: 200, headers: {}, content_type: nil)
+      headers["Content-Type"] = content_type if content_type
+      case
+      when json
+        headers["Content-Type"] ||= "application/json"
+        resp_body = json.is_a?(String) ? json : Oj.dump(json)
+      when html, inline
+        headers["Content-Type"] ||= "text/html"
+        resp_body = html
+      when text
+        headers["Content-Type"] ||= "text/plain"
+        resp_body = text
+      when yaml
+        headers["Content-Type"] ||= "application/yaml"
+        resp_body = yaml.is_a?(String) ? yaml : YAML.load(yaml)
+      when body
+        headers["Content-Type"] ||= "application/octet-stream"
+        resp_body = raw
+      when js
+        headers["Content-Type"] ||= "text/javascript"
+        resp_body = js
+      end
+      respond_with(resp_body, status: status, headers: headers)
     end
-    respond_with(resp_body, status: status, headers: headers)
   end
+
   class Event < Struct
   end
 
-  class Response < Struct
+  class Response
+    attr_accessor :body, :status, :headers
+    def initialize(body:, status: 200, headers: {})
+      @body = body
+      @status = status
+      @headers = headers
+    end
   end
 end
 
@@ -71,11 +98,11 @@ class FaaStRubyServer < Sinatra::Application
   end
   set :server, %w[puma]
   set :run, false
-  set :show_exceptions, false
+  set :show_exceptions, true
 
   register Sinatra::MultiRoute
   route :get, :post, :put, :patch, :delete, '/:workspace_name/:function_name' do
-    e = FaaStRubyFunction::Event.new(:body, :query_params, :headers, :context)
+    e = FaaStRuby::Event.new(:body, :query_params, :headers, :context)
     headers = env.select { |key, value| key.include?('HTTP_') || ['CONTENT_TYPE', 'CONTENT_LENGTH', 'REMOTE_ADDR', 'REQUEST_METHOD', 'QUERY_STRING'].include?(key) }
     if headers.has_key?("HTTP_FAASTRUBY_RPC")
       body = nil
@@ -87,7 +114,7 @@ class FaaStRubyServer < Sinatra::Application
     query_params = parse_query(request.query_string)
     context = set_context(params[:workspace_name], params[:function_name])
     event = e.new(body, query_params, headers, context)
-    response = FaaStRubyFunction.call(params[:workspace_name], params[:function_name], event, rpc_args)
+    response = FaaStRuby::Runner.new.call(params[:workspace_name], params[:function_name], event, rpc_args)
     status response.status
     headers response.headers
     body response.body

data/faastruby.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'sinatra', '~> 2.0'
   spec.add_runtime_dependency 'sinatra-contrib', '~> 2.0'
   spec.add_runtime_dependency 'puma', '~> 3.12'
-  spec.add_runtime_dependency 'faastruby-rpc', '~> 0.1.3'
+  spec.add_runtime_dependency 'faastruby-rpc', '~> 0.2.0'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Paulo Arruda
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement