faastruby 0.5.16 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c2140df8e1c0f5ab07372b83c80d26e7395b64a02d8e722b50e7acdfaa4a8a8
-  data.tar.gz: 73e3b0a89b4dea4393a09fc33ffec3fcadbdbfce2069ccc3cdb60d7e96ab064e
+  metadata.gz: be62481891e7988206be9866782916c9bbd5213c8870645d86e4d598bc1246e6
+  data.tar.gz: 27229e25d96cfd1710c5056babb467613972a18ade05e20ce697c2e265f5b098
 SHA512:
-  metadata.gz: b5d46a540b29c8d43f15e939a455a7046caf501756eb3187e85116296b7dcc8ca96c3d8a6acb7f12fad506ad120d530845b5090651fa1896d822bc58fa2543c8
-  data.tar.gz: aca215d48d18df5ba9609205a90a849ce0dd6ebb247f4210f6885831691b3271dca813baa9e2a67be0e4cef18b5ede29909c5361ba97de3b904313985e9b4f17
+  metadata.gz: 78e5ce7c09846351734aed179cc7aa3c387f95c7fdc6a653be1af8d1c4edb0322539e2d0be969bd784901bf914ce438296943510b8113ccf148cd1cfd48470c9
+  data.tar.gz: 0a43bb0ede6a7dfe9071e9dfac1d47ca8753f972acc524c6e3184c9d3cd065d6f8b66a7c80702bf8d966aa93e8ff4cdcd2f651e43e9fd4a0049c86f4a08eca17

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## 0.5.16 - unreleased
+## 0.5.17 - Mar 19 2019
+- Refactored headers parsing
+- Change Oj load behaviour to use hash with symbol keys when loading rpc_args
+- Bump `faastruby-rpc` version
+- Added `favicon.ico` to the public template to stop annoying catch-all invocations on log
+
+## 0.5.16 - Mar 18 2019
 - Remove unused arguments from update workspace `run` method.
 - Update Help
 - Change the argument that measures the execution time on `run` to `--measure`

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    faastruby (0.5.16)
+    faastruby (0.5.17)
       colorize (~> 0.8)
-      faastruby-rpc (~> 0.2.5)
+      faastruby-rpc (~> 0.2.6)
       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.5)
+    faastruby-rpc (0.2.6)
       oj (~> 3.6)
     ffi (1.10.0)
     hashdiff (0.3.7)

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.2.5'
+  spec.add_runtime_dependency 'faastruby-rpc', '~> 0.2.6'
   spec.add_runtime_dependency 'tmuxinator', '~> 0.15'
   spec.add_runtime_dependency 'rouge', '~> 3.3'
   spec.add_runtime_dependency 'listen', '~> 3.1'

data/lib/faastruby/server/app.rb

@@ -6,6 +6,7 @@ require 'sinatra/multi_route'
 require 'securerandom'
 require 'rouge'
 require 'colorize'
+
 module FaaStRuby
   class Server < Sinatra::Base
     include FaaStRuby::Logger::Requests
@@ -23,21 +24,22 @@ module FaaStRuby
       request_uuid = SecureRandom.uuid
       splat = params['splat'][0]
       function_name = resolve_function_name(splat)
-      headers = parse_headers(env)
-      if headers.has_key?("Faastruby-Rpc")
+      request_headers = parse_headers(env)
+      if request_headers.has_key?('Faastruby-Rpc')
         body = nil
-        rpc_args = parse_body(request.body.read, headers['Content-Type'], request.request_method) || []
+        rpc_args = parse_body(request.body.read, request_headers['Content-Type'], request.request_method, true) || []
+
       else
-        body = parse_body(request.body.read, headers['Content-Type'], request.request_method)
+        body = parse_body(request.body.read, request_headers['Content-Type'], request.request_method)
         rpc_args = []
       end
-      headers['X-Request-Id'] = request_uuid
-      headers['Request-Method'] = request.request_method
-      original_request_id = headers['X-Original-Request-Id']
+      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: headers, context: context)
-      log_request_message(function_name, request, request_uuid, query_params, body, context)
+      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)
       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)
@@ -46,8 +48,8 @@ module FaaStRuby
       body response_body
     end
 
-    def log_request_message(function_name, request, request_uuid, query_params, body, context)
-      puts "[#{function_name}] <- [REQUEST: #{request.request_method} \"#{request.fullpath}\"] request_id=\"#{request_uuid}\" body=\"#{body}\" query_params=#{query_params} headers=#{headers}"
+    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}"
     end
 
     def log_response_message(function_name, time, request_uuid, response, print_body)
@@ -80,10 +82,14 @@ module FaaStRuby
       File.file?("#{FaaStRuby::ProjectConfig.functions_dir}/#{name}/faastruby.yml")
     end
 
-    def parse_body(body, content_type, method)
+    def parse_body(body, content_type, method, rpc=false)
       return nil if method == 'GET'
       return {} if body.nil? && method != 'GET'
-      return Oj.load(body) if content_type == 'application/json'
+      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 body
     end
 
@@ -97,11 +103,16 @@ module FaaStRuby
     end
 
     def parse_headers(env)
-      Hash[*env.select {|k,v| k.start_with? 'HTTP_'}
-        .collect {|k,v| [k.sub(/^HTTP_/, ''), v]}
-        .collect {|k,v| [k.split('_').collect{|a|k == 'DNT' ? k : k.capitalize}.join('-'), v]}
-        .sort
-        .flatten]
+      result = {}
+      env.select{|e| e.match(/^HTTP_/)}.each do |k, v|
+        newkey = k.sub(/^HTTP_/, '').split('_').map{|x| x.capitalize}.join('-')
+        result[newkey] = v
+      end
+      result['Content-Type'] = env['CONTENT_TYPE']
+      result['Request-Method'] = env['REQUEST_METHOD']
+      result['Content-Length'] = env['CONTENT_LENGTH']
+      result['Remote-Addr'] = env['REMOTE_ADDR']
+      result
     end
   end
 end

data/lib/faastruby/server/logger.rb

@@ -4,6 +4,7 @@ module FaaStRuby
     module Requests
 
       def puts(msg)
+        msg = msg.inspect unless msg.is_a?(String)
         msg = Rouge.highlight(msg, 'ruby', Rouge::Formatters::Terminal256.new(Rouge::Themes::Monokai.new))
         STDOUT_MUTEX.synchronize do
           STDOUT.puts "#{Time.now} | #{msg}"

data/lib/faastruby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: tmuxinator
   requirement: !ruby/object:Gem::Requirement
@@ -355,6 +355,7 @@ files:
 - templates/public-web/assets/images/logo-positive.png
 - templates/public-web/assets/javascripts/main.js
 - templates/public-web/assets/stylesheets/main.css
+- templates/public-web/favicon.ico
 - templates/ruby/api-404/handler.rb
 - templates/ruby/api-root/handler.rb
 - templates/ruby/example-blank/handler.rb