jets 1.8.10 → 1.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22ddc04092ba46aff21f3995f5c250a120c997fa5c91c60afe7c7922152ea405
-  data.tar.gz: d5c2976db58b411024a26a24b4016b91290e55bec4aaf711be89a5e62e23c590
+  metadata.gz: fb3d00ff418ec347dac447658effba631e98a994dd0fcf4104776a97b5fbad58
+  data.tar.gz: 6dfc483a6a998d275689361ed94897cd7fb45d7f65b1c6e5b370697fa7e2f80f
 SHA512:
-  metadata.gz: 697201cc4e1af7c8c7449f7d020853d519293ccae20892ad98e13a99990e4c5f57d695699c2b0587ea670f9831bec365a9c52827e821ad7070e493f6fa88dd08
-  data.tar.gz: b7cc5028f62577e4a754892c427c5c0730cbdb05a0b48b3df31053addf70626c9ee1bf860f48e53e352def4e9c994baa94c0626990d9155995377b5048ec0747
+  metadata.gz: ab31c4838c3c9d435e471610099d3f9e2b9ba1cbef514ab86664ae259b71faf9ecbf60446c671e18909214a74584f6ab839be79ffea6b8fd9a3d1c2b0293c50c
+  data.tar.gz: 5cb30b77d29e3ba878e0f2acaaac0083d5376e6ff9efc3fbedf23386046ca03667198d19de34a4edb1d91fcbfd782b2607a7fd13a45ff6759325c4b99a9d0a0f

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [1.8.11]
+- #242 adjust resp when request coming from elb
+- update jets generate scaffold post casing
+
 ## [1.8.10]
 - #208 add jets degenerate as opposite of generator
 - #219 fix circleci usage, remove CIRCLECI env

data/lib/jets/commands/help/generate.md

@@ -2,7 +2,7 @@ This piggy backs off of the [rails scaffold generator](https://guides.rubyonrail
 
 ## Example
 
-    $ jets generate scaffold Post title:string body:text published:boolean
+    $ jets generate scaffold post title:string body:text published:boolean
           invoke  active_record
           create    db/migrate/20180817052529_create_posts.rb
           create    app/models/post.rb

data/lib/jets/commands/help/new.md

@@ -16,7 +16,7 @@
       jets server # localhost:8888 should have the Jets welcome page
 
     Scaffold example:
-      jets generate scaffold Post title:string body:text published:boolean
+      jets generate scaffold post title:string body:text published:boolean
 
     To deploy to AWS Lambda:
       jets deploy

data/lib/jets/commands/new.rb

@@ -133,7 +133,7 @@ JS
             jets server # localhost:8888 should have the Jets welcome page
 
           Scaffold example:
-            jets generate scaffold Post title:string body:text published:boolean
+            jets generate scaffold post title:string body:text published:boolean
             jets db:create db:migrate
 
           To deploy to AWS Lambda, edit your .env.development.remote and add a DATABASE_URL endpoint.

data/lib/jets/commands/templates/skeleton/public/index.html.tt

@@ -73,7 +73,7 @@
         To get started:
       </p>
       <div class="code"><pre><code>
-        $ jets generate scaffold Post title:string
+        $ jets generate scaffold post title:string
         $ jets db:create db:migrate
         $ jets server
         $ open http://localhost:8888/posts

data/lib/jets/controller/rack/adapter.rb

@@ -33,12 +33,37 @@ module Jets::Controller::Rack
       base64 = headers["x-jets-base64"] == 'yes'
       body = body.respond_to?(:read) ? body.read : body
       body = Base64.encode64(body) if base64
-      {
+
+      resp = {
         "statusCode" => status,
         "headers" => headers,
         "body" => body,
         "isBase64Encoded" => base64,
       }
+      adjust_for_elb(resp)
+      resp
+    end
+
+    # Note: ELB is not officially support. This is just in case users wish to manually
+    # connect ELBs to the functions created by Jets.
+    def adjust_for_elb(resp)
+      return resp unless from_elb?
+
+      # ELB requires statusCode to be an Integer whereas API Gateway requires statusCode to be a String
+      status = resp["statusCode"] = resp["statusCode"].to_i
+
+      # ELB also requires statusDescription attribute
+      status_desc = Rack::Utils::HTTP_STATUS_CODES[status]
+      status_desc = status_desc.nil? ? status.to_s : "#{status} #{status_desc}"
+      resp["statusDescription"] = status_desc
+
+      resp
+    end
+
+    def from_elb?
+      # NOTE: @event["requestContext"]["elb"] is set when the request is coming from an elb
+      # Can set JETS_ELB=1 for local testing
+      @event["requestContext"] && @event["requestContext"]["elb"] || ENV['JETS_ELB']
     end
 
     # Called from Jets::Controller::Base.process. Example:

data/lib/jets/controller/rendering/rack_renderer.rb

@@ -165,7 +165,11 @@ module Jets::Controller::Rendering
                     else
                       code
                     end
-      (status_code || 200).to_s # API Gateway requires a string but rack is okay with either
+
+      # API Gateway requires status to be String but local rack is okay with either
+      # Note, ELB though requires status to be an Integer. We'll later in rack/adapter.rb
+      # adjust status to an Integer if request is coming from an ELB.
+      (status_code || 200).to_s
     end
 
     def set_content_type!(status, headers)

data/lib/jets/processors/main_processor.rb

@@ -35,8 +35,10 @@ class Jets::Processors::MainProcessor
       Jets.increase_call_count
 
       if result.is_a?(Hash) && result["headers"]
-        result["headers"]["x-jets-call-count"] = Jets.call_count
-        result["headers"]["x-jets-prewarm-count"] = Jets.prewarm_count
+        # API Gateway is okay with the header values as Integers but
+        # ELBs are more strict about this and require the header values to be Strings
+        result["headers"]["x-jets-call-count"] = Jets.call_count.to_s
+        result["headers"]["x-jets-prewarm-count"] = Jets.prewarm_count.to_s
       end
 
       result

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.8.10"
+  VERSION = "1.8.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.8.10
+  version: 1.8.11
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer