serverless-rack 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e2ee06d74ace889ea61ad77a3c208075d81822482bed898d298bca6da2814d6
-  data.tar.gz: f8e09735728d88f2dec09c3ae0fd934569120d51dc5c5e082223e2bce7aae32c
+  metadata.gz: 67c45bfb333ad3b27bd1d7f36e5b98ecc7ead2f27762a9ddc1c713b7d2cc5a9b
+  data.tar.gz: 9db88c7bf781a67032fb866886d443ff219140427ce1087e667d836a39f9271a
 SHA512:
-  metadata.gz: da480222e126f675db95a97930f4b74b04553c2471d262d454db69121b5ffb76ea56d0c8b5bb5822b5ceb8d7c54fc106139de7c552cede33094c28f170eb8fd0
-  data.tar.gz: 2d75c999716059e286376c8998663223d7eb4f834f195692bdf3609bd00499f15e4f24dee8b4d085efe4d33b08fffa0a4c91026c7c98addd3e2793088d57b1a7
+  metadata.gz: 1dbfe05405a816ae2a31e62a3046253f842616e72b3ca3aa0149e337f97d59e75127f3d513b657f2357e94c1c31a11701f352b2d82c75a22843f296dd388f988
+  data.tar.gz: 75b78e2e61ab8fcba27b75ac33c4cf328049b26ea97ff3480b4049e013d4b25d7a89c4e17896c57f08cd9f90ea53a6cdab196e97c1ba2d009888e32d23fc3bfd

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+# 1.0.6
+
+- Upgrade dependencies
+- Add a dockerImage config option to override the docker image to be used for compiling gems (defaults to the lambci ruby images) (#17)
+
+  _Benjamin Curtis_
+
+- Cache the bundle that is created by docker to avoid recompiling gems (#17)
+
+  _Benjamin Curtis_
+
+- Handle empty `API_GATEWAY_BASE_PATH` (#14)
+
+  _Joel Van Horn_
+
+# 1.0.5
+
+- Upgrade dependencies
+
+# 1.0.4
+
+- Support `configPath` option when invoking `sls rack serve` (#5)
+
+# 1.0.3
+
+- Upgrade dependencies
+
+# 1.0.2
+
+- Remove `BUNDLED WITH` from Gemfile to allow using different version of
+  Bundler from the one provided by AWS Lambda (#3)
+- Add `configPath` option for setting path to `config.ru` (#4)
+
+  _Yousaf Nabi_
+
 # 1.0.1
 
 - Support additional bundler arguments to be passed when using docker (#2)

data/README.md

@@ -139,13 +139,23 @@ For more information, see https://bundler.io/docs.html.
 
 If your application depends on any gems that include compiled binaries, these
 must be compiled for the lambda execution environment. Enabling the `dockerizeBundler` configuration
-option will fetch and build the gems using a [docker image](https://hub.docker.com/r/logandk/serverless-rack-bundler)
-that emulates the lambda environment:
+option will fetch and build the gems using a docker image that emulates the lambda environment:
 
 ```yaml
 custom:
   rack:
-    dockerizeBundler: false
+    dockerizeBundler: true
+```
+
+The default docker image that will be used will match the runtime you are using.
+That is, if you are using the `ruby2.7` runtime, then the docker image will be
+`logandk/serverless-rack-bundler:ruby2.7`. You can override the docker image with the
+`dockerImage` configuration option:
+
+```yaml
+custom:
+  rack:
+    dockerImage: lambci/lambda:build-ruby2.5
 ```
 
 ### Bundler configuration
@@ -181,6 +191,17 @@ custom:
     bundlerBin: /path/to/bundler
 ```
 
+### Rack configuration file
+
+If your Rack configuration file (`config.ru`) is not in `./`, set the path explicitly using the `configPath`
+configuration option:
+
+```yaml
+custom:
+  rack:
+    configPath: path/to/config.ru
+```
+
 ### Local server
 
 For convenience, a `sls rack serve` command is provided to run your Rack application
@@ -208,6 +229,8 @@ $ sls rack serve -p 8000
 When running locally, an environment variable named `IS_OFFLINE` will be set to `True`.
 So, if you want to know when the application is running locally, check `ENV["IS_OFFLINE"]`.
 
+For use with the `serverless-offline` plugin, run `sls rack install` prior to `sls offline`.
+
 ### Remote command execution
 
 The `rack exec` command lets you execute ruby code remotely:

data/lib/serverless_rack.rb

@@ -15,17 +15,19 @@ TEXT_MIME_TYPES = [
   'image/svg+xml'
 ].freeze
 
+def base_path
+  "/#{ENV['API_GATEWAY_BASE_PATH']}" unless ENV['API_GATEWAY_BASE_PATH'].to_s.empty?
+end
+
 def keepalive_event?(event)
   ['aws.events', 'serverless-plugin-warmup'].include?(event['source'])
 end
 
 def parse_script_name(event, headers)
-  if ENV['API_GATEWAY_BASE_PATH']
-    "/#{ENV['API_GATEWAY_BASE_PATH']}"
-  elsif (headers['Host'] || '').include?('amazonaws.com')
+  if base_path.nil? && (headers['Host'] || '').include?('amazonaws.com')
     "/#{event['requestContext']['stage']}"
   else
-    ''
+    base_path.to_s
   end
 end
 
@@ -33,12 +35,11 @@ def parse_path_info(event)
   # If a user is using a custom domain on API Gateway, they may have a base
   # path in their URL. This allows us to strip it out via an optional
   # environment variable.
-  if ENV['API_GATEWAY_BASE_PATH']
-    base_path = "/#{ENV['API_GATEWAY_BASE_PATH']}"
-    return event['path'][base_path.length..-1] if event['path'].start_with?(base_path)
+  if base_path && event['path'].start_with?(base_path)
+    event['path'][base_path.length..-1]
+  else
+    event['path']
   end
-
-  event['path']
 end
 
 def parse_query_string(event)
@@ -59,9 +60,11 @@ end
 
 def parse_headers(event)
   if event.include? 'multiValueHeaders'
-    Rack::Utils::HeaderHash.new((event['multiValueHeaders'] || {}).map do |key, value|
-      [key, value.join("\n")]
-    end.to_h)
+    Rack::Utils::HeaderHash.new(
+      (event['multiValueHeaders'] || {}).transform_values do |value|
+        value.join("\n")
+      end
+    )
   else
     Rack::Utils::HeaderHash.new(event['headers'] || {})
   end
@@ -166,11 +169,12 @@ end
 
 def format_split_headers(headers:)
   headers = headers.to_hash
+  keys = headers.keys
 
   # If there are headers multiple occurrences, e.g. Set-Cookie, create
   # case-mutated variations in order to pass them through APIGW.
   # This is a hack that's currently needed.
-  headers.keys.each do |key|
+  keys.each do |key|
     values = headers[key].split("\n")
 
     next if values.size < 2
@@ -187,9 +191,9 @@ def format_split_headers(headers:)
 end
 
 def format_grouped_headers(headers:)
-  { 'multiValueHeaders' => headers.map do |key, value|
-    [key, value.split("\n")]
-  end.to_h }
+  { 'multiValueHeaders' => headers.transform_values do |value|
+    value.split("\n")
+  end }
 end
 
 def format_response(event:, status:, headers:, body:, text_mime_types:)

data/serverless-rack.gemspec

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |s|
   s.name        = 'serverless-rack'
-  s.version     = '1.0.1'
+  s.version     = '1.0.6'
   s.summary     =
     'Serverless plugin to deploy Ruby Rack applications (Sinatra/Padrino/Cuba etc.) '\
     'and bundle gems'
@@ -21,6 +23,6 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/logandk/serverless-rack'
   s.license = 'MIT'
 
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.4.0'
   s.add_dependency 'rack', '~> 2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverless-rack
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Logan Raarup
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-24 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -50,15 +50,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Serverless plugin to deploy Ruby Rack applications (Sinatra/Padrino/Cuba