jets 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9350d2ad41ae1ab0874e259483e40f971c1d0505d21f5ffb6506595e1a79c65b
-  data.tar.gz: 138152a71d392822710657ba7998b5fc26faba03ec5039615239ca7a9bcf54b5
+  metadata.gz: f5b0ce83e75713097408782eb9e2e1bf2e1e73cf0ea43949530b9313fa6f7c95
+  data.tar.gz: 9e342074cf9ec18312ede4f7a5d67f96141c43d205e5908911889f2344c81b35
 SHA512:
-  metadata.gz: 8b81b4344b3176063e195ed18a40cb19e3c79dc3d4ac8708f6bc0a25e302628ee72024d2a707584f449f424270d3d20fdca183688374ef8c8d795c7422b07353
-  data.tar.gz: 225bad7d48c93975fd92a4adfbcf4daf2e77c56b7c96e2d7a35c0768087b5c5c1439347759bc223afcfd745dfe5edf1a36472d134121d8d93cebed744293ee74
+  metadata.gz: 625a6eb43d4043ffa1d9eccc6e945d79686c3f69c958171652405fa1ce2940e862acec327ee483dc8395e05ccb30409f3e024a9d136fa4a503db7ec1ba1df106
+  data.tar.gz: 571c6a4db6ad117ffa4aac070641b2868a52f8b983831ec1c5414ecebd28b37d167e544d95279cbf5d99bfa1200d4f20b52b9393085f3917ba9230c00e7c529d

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/).
 
+## [1.9.2]
+- #232 Rename lambda method to aws_lambda to avoid ruby keyword collision
+- #259 fix stage name in dev mode for redirect also
+- #262 Handle nil body on mega request proxy
+- #263 fix for static files now that not using shotgun
+
 ## [1.9.1]
 - #257 dont generate handlers for concerns
 - #258 from Fix custom domain base mapping

data/jets.gemspec

@@ -54,6 +54,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "railties", "~> 5.2.1" # ActiveRecord database_tasks.rb require this
   spec.add_dependency "rainbow"
   spec.add_dependency "recursive-open-struct"
+  spec.add_dependency "shotgun"
   spec.add_dependency "text-table"
   spec.add_dependency "thor"
   spec.add_dependency "zeitwerk"

data/lib/jets/aws_services.rb

@@ -32,10 +32,10 @@ module Jets::AwsServices
   end
   global_memoize :dynamodb
 
-  def lambda
+  def aws_lambda
     Aws::Lambda::Client.new
   end
-  global_memoize :lambda
+  global_memoize :aws_lambda
 
   def logs
     Aws::CloudWatchLogs::Client.new

data/lib/jets/commands/call.rb

@@ -65,7 +65,7 @@ class Jets::Commands::Call
       qualifier: @qualifier, # "1",
     }
     begin
-      resp = lambda.invoke(options)
+      resp = aws_lambda.invoke(options)
     rescue Aws::Lambda::Errors::ResourceNotFoundException
       puts "The function #{function_name} was not found.  Maybe check the spelling or the AWS_PROFILE?".color(:red)
       return

data/lib/jets/controller.rb

@@ -13,4 +13,5 @@ class Jets::Controller
   autoload :Rendering, "jets/controller/rendering"
   autoload :Request, "jets/controller/request"
   autoload :Response, "jets/controller/response"
+  autoload :Stage, "jets/controller/stage"
 end

data/lib/jets/controller/rendering.rb

@@ -65,11 +65,7 @@ class Jets::Controller
     def add_stage_name(url)
       return url unless actual_host
 
-      if actual_host.include?("amazonaws.com") && url.starts_with?('/')
-        stage_name = Jets::Resource::ApiGateway::Deployment.stage_name
-        url = "/#{stage_name}#{url}"
-      end
-      url
+      Jets::Controller::Stage.add(actual_host, url)
     end
 
     def url_for(url)

data/lib/jets/controller/stage.rb

@@ -0,0 +1,33 @@
+class Jets::Controller
+  class Stage
+    def initialize(host, url)
+      @host, @url = host, url
+    end
+
+    def add
+      return @url unless add_stage?
+
+      stage_name = Jets::Resource::ApiGateway::Deployment.stage_name
+      "/#{stage_name}#{@url}"
+    end
+
+    def add_stage?
+      return false if on_cloud9?
+      @host.include?("amazonaws.com") && @url.starts_with?('/')
+    end
+
+    def on_cloud9?
+      self.class.on_cloud9?(@host)
+    end
+
+    class << self
+      def add(host, url)
+        new(host, url).add
+      end
+
+      def on_cloud9?(host)
+        !!(host =~ /cloud9\..*\.amazonaws\.com/)
+      end
+    end
+  end
+end

data/lib/jets/mega/request.rb

@@ -51,7 +51,7 @@ module Jets::Mega
       status = response.code.to_i
       headers = response.each_header.to_h
       encoding = get_encoding(headers['content-type'])
-      body = response.body.force_encoding(encoding)
+      body = response.body&.force_encoding(encoding)
       {
         status: status,
         headers: headers,

data/lib/jets/middleware/default_stack.rb

@@ -8,6 +8,7 @@ module Jets::Middleware
 
     def build_stack
       Stack.new do |middleware|
+        middleware.use Shotgun::Static if Jets.env.development?
         middleware.use Rack::Runtime
         middleware.use Jets::Controller::Middleware::Cors if cors_enabled?
         middleware.use Rack::MethodOverride # must come before Middleware::Local for multipart post forms to work

data/lib/jets/overrides/rails/common_methods.rb

@@ -2,25 +2,12 @@ module Jets::CommonMethods
   extend Memoist
   # Add API Gateway Stage Name
   def add_stage_name(url)
-    return url unless add_stage?(url)
-
-    stage_name = Jets::Resource::ApiGateway::Deployment.stage_name
-    "/#{stage_name}#{url}"
-  end
-
-  def add_stage?(url)
-    return false if on_cloud9?
-    request.host.include?("amazonaws.com") && url.starts_with?('/')
+    Jets::Controller::Stage.add(request.host, url)
   end
-  memoize :add_stage?
 
   def on_aws?
-    !request.headers['HTTP_X_AMZN_TRACE_ID'].nil? && !on_cloud9?
+    on_cloud9 = Jets::Controller::Stage.on_cloud9?(request.headers['HTTP_HOST'])
+    !request.headers['HTTP_X_AMZN_TRACE_ID'].nil? && !on_cloud9
   end
   memoize :on_aws?
-
-  def on_cloud9?
-    !!(request.headers['HTTP_HOST'] =~ /cloud9\..*\.amazonaws\.com/)
-  end
-  memoize :on_cloud9?
 end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.9.1"
+  VERSION = "1.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -360,6 +360,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: shotgun
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: text-table
   requirement: !ruby/object:Gem::Requirement
@@ -685,6 +699,7 @@ files:
 - lib/jets/controller/rendering/rack_renderer.rb
 - lib/jets/controller/request.rb
 - lib/jets/controller/response.rb
+- lib/jets/controller/stage.rb
 - lib/jets/core.rb
 - lib/jets/core_ext/kernel.rb
 - lib/jets/db.rb