jets 1.6.7 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69556eafe9fdb5824e36659f2a2b9eb55b0a597fd9f0d1322bb73292b0a4d57d
-  data.tar.gz: d33bf0cc0a22f7e6dd83cce09e6c4a1087943cacc2e859976d3f0fa43137db01
+  metadata.gz: 58be2e98e5ac05eb8b721e2dd3561561ec887eda18bdf17baeb75b7f0e1b73bb
+  data.tar.gz: ec9bad41783087450f9fac8f62f5032cefeb6be701fb1f774ed1277adccdc7e4
 SHA512:
-  metadata.gz: ffaf7153c8ad19c8d744fc9b87aff4929b4734b39a04c2d2494ec82c2615965c2b6a2a56ecaef0a1a20bc504d1a8ba9181bf1a062057ba6276cb5be7882b9511
-  data.tar.gz: 6b7655a80691cf8cbc455a303a2dfe2a633be92927dc90810d83c4cf81b4130561f4ff8f3e074085c89f26a3fd9fe20f3e7f30810048ade7bb4a5c5bb34d723e
+  metadata.gz: 874405e9a58ac61ed2688ef853b0bad7008cec7b1799581de581607ca2af4d7524ba6ede39c1805c906bb960375192b7736b177f673115a41fbe964b4ae3528f
+  data.tar.gz: 44b70405f81f129a3f4aeb928e7afb4d1702ab2d671d22344cbd87a8be183667468d345a3a536a45d2047a1721bbafc463adfe98b9001dee4fc57f7e61ce4f08

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [1.6.8]
+- #181 cors middleware
+- #182 more robust handler shim
+- fix polymorphic get_source_path path
+- only upgrade config.ru if exists
+
 ## [1.6.7]
 - update faq: JETS_AGREE no interruption flag
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.6.7)
+    jets (1.6.8)
       activerecord (~> 5.2.1)
       activesupport (~> 5.2.1)
       aws-sdk-apigateway
@@ -120,7 +120,7 @@ GEM
       loofah (~> 2.2, >= 2.2.2)
     jmespath (1.4.0)
     json (2.1.0)
-    kramdown (2.0.0)
+    kramdown (2.1.0)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

data/lib/jets/builders/handler_generator.rb

@@ -127,7 +127,7 @@ class Jets::Builders
       folder = original_path.sub(/\.rb$/,'')
       lang_folder = "#{folder}/#{task.lang}"
       root = Jets.root unless original_path.include?("lib/jets/internal")
-      "#{root}#{lang_folder}/#{task.meth}#{task.lang_ext}"
+      "#{root}/#{lang_folder}/#{task.meth}#{task.lang_ext}"
     end
 
     # Builds and copies over the native source code: python or node

data/lib/jets/builders/templates/handler.rb

@@ -2,6 +2,11 @@ require "bundler/setup"
 require "jets"
 Jets.once  # runs once in lambda execution context
 
-<% @vars.functions.each do |function_name| -%>
-Jets.handler(self, "<%= @vars.handler_for(function_name) %>")
+<% @vars.functions.each do |function_name|
+  handler = @vars.handler_for(function_name)
+  meth = handler.split('.').last
+-%>
+def <%= meth -%>(event:, context:)
+  Jets.process(event, context, "<%= handler -%>")
+end
 <% end %>

data/lib/jets/commands/upgrade.rb

@@ -78,11 +78,13 @@ module Jets::Commands
     end
 
     def update_config_ru
-      config_ru = File.read("#{Jets.root}/config.ru")
+      src = "#{Jets.root}/config.ru"
+      return unless File.exist?(src)
+      config_ru = File.read(src)
       return if config_ru.include?("Jets.boot")
 
       src = File.expand_path("templates/skeleton/config.ru", File.dirname(__FILE__))
-      dest = "#{Jets.root}/config.ru"
+      dest = src
       puts "Update: config.ru"
       FileUtils.cp(src, dest)
     end

data/lib/jets/controller/middleware.rb

@@ -1,4 +1,5 @@
 module Jets::Controller::Middleware
+  autoload :Cors, "jets/controller/middleware/cors"
   autoload :Local, "jets/controller/middleware/local"
   autoload :Main, "jets/controller/middleware/main"
 end

data/lib/jets/controller/middleware/cors.rb

@@ -0,0 +1,59 @@
+# The rack cors middleware handles all types of requests locally, this includes the OPTIONS request.
+# Remotely on lambda, the rack cors middleware handles all requests except the OPTIONS request.
+# The options request is handled by a OPTIONS API Gateway Method Mock. This is to allow it to bypass
+# API Gateway authorizers.
+module Jets::Controller::Middleware
+  class Cors
+    extend Memoist
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      if env['REQUEST_METHOD'] == 'OPTIONS'
+        return [200, cors_headers(true), StringIO.new]
+      end
+
+      status, headers, body = @app.call(env)
+      cors_headers.each do |k,v|
+        headers[k] ||= v
+      end
+      [status, headers, body]
+    end
+
+  private
+    def cors_headers(preflight=false)
+      headers = case Jets.config.cors
+      when true
+        {
+          "access-control-allow-origin" => "*", # Required for CORS support to work
+          "access-control-allow-credentials" => "true" # Required for cookies, authorization headers with HTTPS
+        }
+      when String
+        {
+          "access-control-allow-origin" => Jets.config.cors, # contains Hash with Access-Control-Allow-* values
+          "access-control-allow-credentials" => "true" # Required for cookies, authorization headers with HTTPS
+        }
+      when Hash
+        Jets.config.cors # contains Hash with Access-Control-Allow-* values
+      else
+        {}
+      end
+
+      headers.merge!(preflight_headers) if preflight
+      headers
+    end
+
+    # Preflight OPTIONS request has extra headers.
+    # This is only used locally. Remotely on AWS Lambda, OPTIONS requests are handled by an API Gateway Method.
+    def preflight_headers
+      # FYI: Jets as part of the rack processing normalizes the casing of these headers eventually.
+      # IE: Access-Control-Allow-Methods
+      {
+        "access-control-allow-methods" => "OPTIONS,GET",
+        "access-control-allow-headers" => "Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token,X-Amz-User-Agent",
+      }
+    end
+  end
+end

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

@@ -22,7 +22,6 @@ module Jets::Controller::Rendering
       base64 = normalized_base64_option(@options)
 
       headers = @options[:headers] || {}
-      headers = cors_headers.merge(headers)
       set_content_type!(status, headers)
       # x-jets-base64 to convert this Rack triplet to a API Gateway hash structure later
       headers["x-jets-base64"] = base64 ? 'yes' : 'no' # headers values must be Strings
@@ -186,25 +185,6 @@ module Jets::Controller::Rendering
       base64
     end
 
-    def cors_headers
-      case Jets.config.cors
-      when true
-        {
-          "Access-Control-Allow-Origin" => "*", # Required for CORS support to work
-          "Access-Control-Allow-Credentials" => "true" # Required for cookies, authorization headers with HTTPS
-        }
-      when String
-        {
-          "Access-Control-Allow-Origin" => Jets.config.cors, # contains Hash with Access-Control-Allow-* values
-          "Access-Control-Allow-Credentials" => "true" # Required for cookies, authorization headers with HTTPS
-        }
-      when Hash
-        Jets.config.cors # contains Hash with Access-Control-Allow-* values
-      else
-        {}
-      end
-    end
-
     class << self
       def setup!
         require "action_controller"

data/lib/jets/core.rb

@@ -183,14 +183,6 @@ module Jets::Core
     end
   end
 
-  # Example: Jets.handler(self, "handlers/controllers/posts_controller.index")
-  def handler(lambda_context, handler)
-    meth = handler.split('.').last
-    lambda_context.send(:define_method, meth) do |event:, context:|
-      Jets.process(event, context, handler)
-    end
-  end
-
   def once
     boot
     override_lambda_ruby_runtime

data/lib/jets/middleware/default_stack.rb

@@ -8,6 +8,7 @@ module Jets::Middleware
 
     def build_stack
       Stack.new do |middleware|
+        middleware.use Jets::Controller::Middleware::Cors if cors_enabled?
         middleware.use Rack::Runtime
         middleware.use Rack::MethodOverride # must come before Middleware::Local for multipart post forms to work
         middleware.use Jets::Controller::Middleware::Local # mimics AWS Lambda for local server only
@@ -20,6 +21,10 @@ module Jets::Middleware
     end
 
   private
+    def cors_enabled?
+      Jets.config.cors
+    end
+
     # Written as method to easily not include webpacker for case when either
     # webpacker not installed at all or disabled upon `jets deploy`.
     def use_webpacker(middleware)

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.6.7"
+  VERSION = "1.6.8"
 end

data/vendor/jets-gems/lib/jets/gems/check.rb

@@ -77,7 +77,6 @@ Jets is unable to build a deployment package that will work on AWS Lambda withou
 
 * Use another gem that does not require compilation.
 * Create your own custom layer with the gem: http://rubyonjets.com/docs/custom-lambda-layers/
-* Build the gem yourself and add it to your own custom lambdagems sources. Refer to the Lambda Gems Docs: http://rubyonjets.com/docs/lambdagems
 <% if agree.yes? -%>
 * No need to report this to us, as we've already been notified.
 <% elsif agree.no? -%>
@@ -85,6 +84,7 @@ Jets is unable to build a deployment package that will work on AWS Lambda withou
 <% end -%>
 
 Compiled gems usually take some time to figure out how to build as they each depend on different libraries and packages.
+More info: http://rubyonjets.com/docs/lambdagems/
 
 EOL
       erb = ERB.new(template, nil, '-') # trim mode https://stackoverflow.com/questions/4632879/erb-template-removing-the-trailing-line

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -608,6 +608,7 @@ files:
 - lib/jets/controller/cookies/jar.rb
 - lib/jets/controller/layout.rb
 - lib/jets/controller/middleware.rb
+- lib/jets/controller/middleware/cors.rb
 - lib/jets/controller/middleware/local.rb
 - lib/jets/controller/middleware/local/api_gateway.rb
 - lib/jets/controller/middleware/local/mimic_aws_call.rb