faastruby 0.5.17 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be62481891e7988206be9866782916c9bbd5213c8870645d86e4d598bc1246e6
-  data.tar.gz: 27229e25d96cfd1710c5056babb467613972a18ade05e20ce697c2e265f5b098
+  metadata.gz: 5c5a4bcb83a358f5100f329a36f5cbe052a6a9e3eb085aed3fe04bdbcd5f62da
+  data.tar.gz: ac614dec04fb647cecee6abf8b5846c1097323d35ad5ba98b424149dabec1e5a
 SHA512:
-  metadata.gz: 78e5ce7c09846351734aed179cc7aa3c387f95c7fdc6a653be1af8d1c4edb0322539e2d0be969bd784901bf914ce438296943510b8113ccf148cd1cfd48470c9
-  data.tar.gz: 0a43bb0ede6a7dfe9071e9dfac1d47ca8753f972acc524c6e3184c9d3cd065d6f8b66a7c80702bf8d966aa93e8ff4cdcd2f651e43e9fd4a0049c86f4a08eca17
+  metadata.gz: 734eb6a83509dc4b2ddcdee49846d360d39ea36499424b98a4ba538130de7528153e4c680cba7754ddd9a3527b2440f93fb085710b301a4402e01678fc921229
+  data.tar.gz: 89435a82075fd0806b2f2434177e598ce1910f5fe0a57ff3a873868cc3157f669ec9b082cfa7260c6fd8c2d75e58dd1acce49da0301b12fffa70e44c2649bb5d

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.5.18 - Mar 19 2019
+- Reverted changes from 0.5.17
+- Refactored headers parsing
+- Bump `faastruby-rpc` version
+- Force RPC calls to use event.body instead of extra arguments
+- Added `favicon.ico` to the public template to stop annoying catch-all invocations on log
+- Match platform behaviour when render text is used on an object
+
 ## 0.5.17 - Mar 19 2019
 - Refactored headers parsing
 - Change Oj load behaviour to use hash with symbol keys when loading rpc_args

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    faastruby (0.5.17)
+    faastruby (0.5.16)
       colorize (~> 0.8)
-      faastruby-rpc (~> 0.2.6)
+      faastruby-rpc (~> 0.2.5)
       listen (~> 3.1)
       oj (~> 3.6)
       puma (~> 3.12)
@@ -30,7 +30,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     equatable (0.5.0)
     erubis (2.7.0)
-    faastruby-rpc (0.2.6)
+    faastruby-rpc (0.2.5)
       oj (~> 3.6)
     ffi (1.10.0)
     hashdiff (0.3.7)

data/lib/faastruby/server/app.rb

@@ -6,7 +6,6 @@ require 'sinatra/multi_route'
 require 'securerandom'
 require 'rouge'
 require 'colorize'
-
 module FaaStRuby
   class Server < Sinatra::Base
     include FaaStRuby::Logger::Requests
@@ -25,21 +24,24 @@ module FaaStRuby
       splat = params['splat'][0]
       function_name = resolve_function_name(splat)
       request_headers = parse_headers(env)
-      if request_headers.has_key?('Faastruby-Rpc')
-        body = nil
-        rpc_args = parse_body(request.body.read, request_headers['Content-Type'], request.request_method, true) || []
 
-      else
-        body = parse_body(request.body.read, request_headers['Content-Type'], request.request_method)
-        rpc_args = []
-      end
+      # if headers.has_key?("Faastruby-Rpc")
+      #   body = nil
+      #   rpc_args = parse_body(request.body.read, headers['Content-Type'], request.request_method) || []
+      # else
+      #   body = parse_body(request.body.read, headers['Content-Type'], request.request_method)
+      #   rpc_args = []
+      # end
+
+      body = parse_body(request.body.read, request_headers['Content-Type'], request.request_method)
+      rpc_args = []
       request_headers['X-Request-Id'] = request_uuid
       request_headers['Request-Method'] = request.request_method
       original_request_id = request_headers['X-Original-Request-Id']
       query_params = parse_query(request.query_string)
       context = Oj.dump(FaaStRuby::ProjectConfig.secrets_for_function(function_name))
       event = FaaStRuby::Event.new(body: body, query_params: query_params, headers: request_headers, context: context)
-      log_request_message(function_name, request, request_uuid, query_params, body || rpc_args, context, request_headers)
+      log_request_message(function_name, request, request_uuid, query_params, body, context, request_headers)
       time, response = FaaStRuby::Runner.new(function_name).call(event, rpc_args)
       status response.status
       headers set_response_headers(response, request_uuid, original_request_id, time)
@@ -49,7 +51,7 @@ module FaaStRuby
     end
 
     def log_request_message(function_name, request, request_uuid, query_params, body, context, request_headers)
-      puts "[#{function_name}] <- [REQUEST: #{request.request_method} \"#{request.fullpath}\"] request_id=\"#{request_uuid}\" body=\"#{body}\" query_params=#{query_params} headers=#{request_headers}"
+      puts "[#{function_name}] <- [REQUEST: #{request.request_method} \"#{request.fullpath}\"] request_id=\"#{request_uuid}\" body=#{body.inspect} query_params=#{query_params} headers=#{request_headers}"
     end
 
     def log_response_message(function_name, time, request_uuid, response, print_body)
@@ -65,7 +67,7 @@ module FaaStRuby
 
     def parse_response(response)
       return [Base64.urlsafe_decode64(response.body), "Base64(#{response.body})"] if response.binary?
-      return [response.body, "#{response.body}"]
+      return [response.body, response.body]
     end
 
     def resolve_function_name(splat)
@@ -82,14 +84,10 @@ module FaaStRuby
       File.file?("#{FaaStRuby::ProjectConfig.functions_dir}/#{name}/faastruby.yml")
     end
 
-    def parse_body(body, content_type, method, rpc=false)
+    def parse_body(body, content_type, method)
       return nil if method == 'GET'
       return {} if body.nil? && method != 'GET'
-      if rpc
-        return Oj.load(body, symbol_keys: true) if content_type == 'application/json'
-      else
-        return Oj.load(body) if content_type == 'application/json'
-      end
+      # return Oj.load(body) if content_type == 'application/json'
       return body
     end
 

data/lib/faastruby/server/response.rb

@@ -48,7 +48,11 @@ module FaaStRuby
     end
     attr_accessor :body, :status, :headers, :binary
     def initialize(body:, status: 200, headers: {}, binary: false)
-      @body = body
+      if body.is_a?(String) || body.nil?
+        @body = body
+      else
+        @body = body.inspect
+      end
       @status = status
       @headers = headers
       @binary = binary

data/lib/faastruby/server/runner_methods.rb

@@ -40,7 +40,7 @@ module FaaStRuby
         resp_body = json.is_a?(String) ? json : Oj.dump(json)
       when html, inline
         headers["Content-Type"] ||= "text/html"
-        resp_body = html
+        resp_body = html || inline
       when text
         headers["Content-Type"] ||= "text/plain"
         resp_body = text

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.5.17'
+  VERSION = '0.5.18'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.5.17
+  version: 0.5.18
 platform: ruby
 authors:
 - Paulo Arruda