lamby 2.6.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 680b99fd678aef833c4bdca9cee66b2adcb171f8e0ada61fffec9443f6304c21
-  data.tar.gz: 41664f4e4e02e4ab88112ad6f5f16ec59901cbd7f58639833a322658afec9443
+  metadata.gz: 24518347cf3f2b14390d16a2fff5f0025d3911efd06252721cd49f8fedb90562
+  data.tar.gz: 3e55836604fc8b6abdf953f2b421f9efdb7689a9ea3fa27cc1528844de06418e
 SHA512:
-  metadata.gz: 7705fcb6bf84b50267a0a51008d0003b506198cbfd72c69d7b1114c97780f52f89793374f10d2a36fb0ec7932243e13ba5e8a29b69ab8d8eaa4d9cbb37f16861
-  data.tar.gz: 73f4038e54a8a5417cef4586c25497dcad49af932b3359ae3827a115b5d018c42f57a7b39ce8ef43d5da1b6be6251f945e6bf5ee72b2c66d67587d0f11f5c36f
+  metadata.gz: 79bf535b1fc336b634ee33bc5e3a847bd9aaa1c809c6f49c37d6807dc44d26468da1fcf4272599b2d11c1c2d8ed90420301963dbd2723e72060b2067c97b86e1
+  data.tar.gz: 2ea5e61fe84d7b7b5d9be7001376346dc2574feb68e9a2230e79e781c8365e465f193dc7c89d62cc954d5f37195bae81ebf69376f5d0621b79b8fbbbea76171a

data/CHANGELOG.md

@@ -4,6 +4,34 @@
 
 See this http://keepachangelog.com link for information on how we want this documented formatted.
 
+## v2.8.0
+
+#### Fixed
+
+- Perform rack body closing hooks on request #85
+
+## v2.7.1
+
+#### Removed
+
+- Bootsnap setup convenience require.
+
+## v2.7.0
+
+#### Added
+
+- Support EventBridge events in handler with default proc to log.
+
+## v2.6.3
+
+#### Added
+
+- Bootsnap setup convenience require.
+
+## v2.6.2
+
+- Fixed Rack::Deflate usage with an ALB.
+
 ## v2.6.1
 
 #### Fixed

data/Dockerfile

@@ -1,10 +1,5 @@
 FROM lambci/lambda:build-ruby2.7
 
-# Lock down AWS SAM version.
-RUN pip install awscli && \
-    pip uninstall --yes aws-sam-cli && \
-    pip install aws-sam-cli==0.45.0
-
 # Asset Pipeline
 RUN curl -sL https://rpm.nodesource.com/setup_12.x | bash - && \
     yum install -y nodejs

data/Gemfile.lock

@@ -1,155 +1,158 @@
 PATH
   remote: .
   specs:
-    lamby (2.6.0)
+    lamby (2.8.0)
       rack
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.2.2)
-      actionpack (= 6.0.2.2)
+    actioncable (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activejob (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
-      activestorage (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionmailbox (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      actionview (= 6.0.2.2)
-      activejob (= 6.0.2.2)
+    actionmailer (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      actionview (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.2.2)
-      actionview (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.3.1)
+      actionview (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
-      activestorage (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actiontext (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionview (6.1.3.1)
+      activesupport (= 6.1.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    activejob (6.1.3.1)
+      activesupport (= 6.1.3.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activerecord (6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activestorage (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activejob (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
-      marcel (~> 0.3.1)
-    activesupport (6.0.2.2)
+    activemodel (6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activerecord (6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activestorage (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+      marcel (~> 1.0.0)
+      mini_mime (~> 1.0.2)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    aws-eventstream (1.0.3)
-    aws-partitions (1.287.0)
-    aws-sdk-core (3.92.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.446.0)
+    aws-sdk-core (3.114.0)
+      aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ssm (1.73.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-ssm (1.108.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.1)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-sigv4 (1.2.3)
+      aws-eventstream (~> 1, >= 1.0.2)
     builder (3.2.4)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
     crass (1.0.6)
-    erubi (1.9.0)
+    erubi (1.10.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.8.2)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
-    loofah (2.4.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.1)
     method_source (1.0.0)
-    mimemagic (0.3.4)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    minitest-focus (1.1.2)
+    mini_mime (1.0.3)
+    mini_portile2 (2.5.0)
+    minitest (5.14.4)
+    minitest-focus (1.2.1)
       minitest (>= 4, < 6)
-    mocha (1.11.2)
-    nio4r (2.5.2)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    pry (0.13.0)
+    mocha (1.12.0)
+    nio4r (2.5.7)
+    nokogiri (1.11.3)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.2)
+    racc (1.5.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.2.2)
-      actioncable (= 6.0.2.2)
-      actionmailbox (= 6.0.2.2)
-      actionmailer (= 6.0.2.2)
-      actionpack (= 6.0.2.2)
-      actiontext (= 6.0.2.2)
-      actionview (= 6.0.2.2)
-      activejob (= 6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
-      activestorage (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-      bundler (>= 1.3.0)
-      railties (= 6.0.2.2)
+    rails (6.1.3.1)
+      actioncable (= 6.1.3.1)
+      actionmailbox (= 6.1.3.1)
+      actionmailer (= 6.1.3.1)
+      actionpack (= 6.1.3.1)
+      actiontext (= 6.1.3.1)
+      actionview (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+      bundler (>= 1.15.0)
+      railties (= 6.1.3.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    railties (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.1)
-    sprockets (4.0.0)
+      thor (~> 1.0)
+    rake (13.0.3)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.1)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    zeitwerk (2.3.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -166,4 +169,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   2.2.7
+   2.2.15

data/lib/lamby.rb

@@ -2,6 +2,7 @@ require 'lamby/logger'
 require 'rack'
 require 'base64'
 require 'lamby/version'
+require 'lamby/config'
 require 'lamby/sam_helpers'
 require 'lamby/rack'
 require 'lamby/rack_alb'
@@ -23,6 +24,10 @@ module Lamby
     Handler.call(app, event, context, options)
   end
 
+  def config
+    Lamby::Config.config
+  end
+
   autoload :SsmParameterStore, 'lamby/ssm_parameter_store'
 
 end

data/lib/lamby/config.rb

@@ -0,0 +1,47 @@
+module Lamby
+  module Config
+
+    def configure
+      yield(config)
+      config
+    end
+
+    def reconfigure
+      config.reconfigure { |c| yield(c) if block_given? }
+    end
+
+    def config
+      @config ||= Configuration.new
+    end
+
+    extend self
+
+  end
+
+  class Configuration
+
+    def initialize
+      initialize_defaults
+    end
+
+    def reconfigure
+      instance_variables.each { |var| instance_variable_set var, nil }
+      initialize_defaults
+      yield(self) if block_given?
+      self
+    end
+
+    def initialize_defaults
+      @event_bridge_handler = lambda { |event, context| puts(event) }
+    end
+
+    def event_bridge_handler
+      @event_bridge_handler
+    end
+
+    def event_bridge_handler=(func)
+      @event_bridge_handler = func
+    end
+
+  end
+end

data/lib/lamby/handler.rb

@@ -41,22 +41,23 @@ module Lamby
     def body
       @rbody ||= ''.tap do |rbody|
         @body.each { |part| rbody << part if part }
+        @body.close if @body.respond_to? :close
       end
     end
 
     def call
       return self if @called
       @status, @headers, @body = call_app
-      set_cookies
+      set_cookies if rack?
       @called = true
       self
     end
 
-    def base64_encodeable?
-      @headers && (
-        @headers['Content-Transfer-Encoding'] == 'binary' ||
-        content_encoding_compressed? ||
-        @headers['X-Lamby-Base64'] == '1'
+    def base64_encodeable?(hdrs = @headers)
+      hdrs && (
+        hdrs['Content-Transfer-Encoding'] == 'binary' ||
+        content_encoding_compressed?(hdrs) ||
+        hdrs['X-Lamby-Base64'] == '1'
       )
     end
 
@@ -78,20 +79,34 @@ module Lamby
     end
 
     def rack_response
-      rack.response(self)
+      rack? ? rack.response(self) : {}
     end
 
     def call_app
       if Debug.on?(@event)
         Debug.call @event, @context, rack.env
-      else
+      elsif rack?
         @app.call rack.env
+      elsif event_bridge?
+        Lamby.config.event_bridge_handler.call @event, @context
+        [200, {}, StringIO.new('')]
+      else
+        [404, {}, StringIO.new('')]
       end
     end
 
-    def content_encoding_compressed?
-      content_encoding_header = @headers['Content-Encoding'] || ''
+    def content_encoding_compressed?(hdrs)
+      content_encoding_header = hdrs['Content-Encoding'] || ''
       content_encoding_header.split(', ').any? { |h| ['br', 'gzip'].include?(h) }
     end
+
+    def rack?
+      @event.key?('httpMethod') || @event.dig('requestContext', 'http')
+    end
+
+    def event_bridge?
+      Lamby.config.event_bridge_handler &&
+        @event.key?('source') && @event.key?('detail') && @event.key?('detail-type')
+    end
   end
 end

data/lib/lamby/rack_alb.rb

@@ -16,7 +16,7 @@ module Lamby
         multivalue_headers['Set-Cookie'] = handler.set_cookies if handler.set_cookies
       end
       status_description = "#{handler.status} #{::Rack::Utils::HTTP_STATUS_CODES[handler.status]}"
-      base64_encode = hhdrs['Content-Transfer-Encoding'] == 'binary' || hhdrs['X-Lamby-Base64'] == '1'
+      base64_encode = handler.base64_encodeable?(hhdrs)
       body = Base64.strict_encode64(handler.body) if base64_encode
       { multiValueHeaders: multivalue_headers,
         statusDescription: status_description,

data/lib/lamby/railtie.rb

@@ -1,8 +1,6 @@
 module Lamby
   class Railtie < ::Rails::Railtie
 
-    config.lamby = ActiveSupport::OrderedOptions.new
-
     rake_tasks do
       load 'lamby/tasks.rake'
       load 'lamby/templates.rake'

data/lib/lamby/version.rb

@@ -1,3 +1,3 @@
 module Lamby
-  VERSION = '2.6.1'
+  VERSION = '2.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lamby
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -150,6 +150,7 @@ files:
 - docker-compose.yml
 - lamby.gemspec
 - lib/lamby.rb
+- lib/lamby/config.rb
 - lib/lamby/debug.rb
 - lib/lamby/handler.rb
 - lib/lamby/logger.rb