jets 3.0.13 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e4fbbeb4ae84a9c2f7d3c6fac9fdbb6cdcda684ae9387ba8c09b4f7c07cb7e
-  data.tar.gz: 0ca4432001005d29d4104cf48c2e92d68abb6d3018e2fdc15f3cc5f50769a703
+  metadata.gz: 571efa758f33bf44042d6e8be73c933011680217cd4e87b0324f85b5fc7c37dc
+  data.tar.gz: fac7b4ceae0b9d7e0fe8f494f57cf409d71a08d26dbd259424800d3a9feb268b
 SHA512:
-  metadata.gz: 79ac35eaf167a60a3bd6ab384fd5cd2cee55adaf3726d72d2c2648103af4153c7906560ac6977b270f55d69e4ce641582bd8f8e8e9a102af9ecbaffa071b50bd
-  data.tar.gz: 0df8301c1d590dc62119baf244eedd93d152b5d23d2149304d4223d28f7fd4b733eb05f9fcd69c8faba5df873e0023c4d88de694717d0493d30b627091110d2a
+  metadata.gz: 3ee364750aaa8c1f74a92ec9da2363e77cd7af84db97977b54a40cb087a32bbbec4e413b5cac5117018468c84b23ed18646f5416b9aaf3d425e668dabfb21b6c
+  data.tar.gz: 446e82b01a2d07679d1f51f8dd7e461d7ddfd67a46759fc22fa59c740fe8f6011a711a7acdc80ea1d4e62786f8e79eec7596c283f3758fd9734546d2bb555953

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/).
 
+## [3.0.14] - 2021-09-01
+- [#583](https://github.com/boltops-tools/jets/pull/583) Don't overwrite content_type  when rendering json or xml with content_type specified
+- [#584](https://github.com/boltops-tools/jets/pull/584) Adds an override flag to change behaviour when Jets is behind an ELB running Jets Server
+- [#585](https://github.com/boltops-tools/jets/pull/585) add_stage controller method
+- [#586](https://github.com/boltops-tools/jets/pull/586) JETS_ELB env var flag
+
 ## [3.0.13] - 2021-08-17
 - [#582](https://github.com/boltops-tools/jets/pull/582) use Shotgun::Static middleware always
 

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

@@ -70,6 +70,7 @@ module Jets::Controller::Middleware
 
     def on_aws?(env)
       return false if Jets.env.test? # usually with test we're passing in full API Gateway fixtures with the HTTP_X_AMZN_TRACE_ID
+      return false if ENV['JETS_ELB'] # If we're using an ELB and Jets is inside a container running jets server, we don't want to pretend we're on AWS.
       on_cloud9 = !!(env['HTTP_HOST'] =~ /cloud9\..*\.amazonaws\.com/)
       !!env['HTTP_X_AMZN_TRACE_ID'] && !on_cloud9
     end

data/lib/jets/controller/redirection.rb

@@ -7,16 +7,7 @@ class Jets::Controller
         raise "redirect_to url parameter must be a String. Please pass in a string"
       end
 
-      uri = URI.parse(url)
-      # if no location.host, we been provided a relative host
-      if !uri.host && actual_host
-        url = "/#{url}" unless url.starts_with?('/')
-        url = add_stage_name(url)
-        redirect_url = actual_host + url
-      else
-        redirect_url = url
-      end
-
+      redirect_url = add_stage(url)
       redirect_url = ensure_protocol(redirect_url)
 
       aws_proxy = Rendering::RackRenderer.new(self,

data/lib/jets/controller/rendering.rb

@@ -33,6 +33,8 @@ class Jets::Controller
     end
 
     def adjust_content_type!(options)
+      return if options.key?(:content_type)
+
       if options.key?(:json)
         options[:content_type] = "application/json"
       elsif options.key?(:xml)
@@ -60,15 +62,26 @@ class Jets::Controller
       rest.merge(template: template)
     end
 
-    # Add API Gateway Stage Name
-    def add_stage_name(url)
+    # Example usage:
+    #
+    #   render json: {success: true, location: add_stage(posts_path)}
+    #
+    def add_stage(url)
       return url unless actual_host
 
-      Jets::Controller::Stage.add(actual_host, url)
+      uri = URI.parse(url)
+      # if no location.host, we been provided a relative host
+      if !uri.host && actual_host
+        url = "/#{url}" unless url.starts_with?('/')
+        url = Jets::Controller::Stage.add(actual_host, url)
+        actual_host + url
+      else
+        url
+      end
     end
 
     def url_for(url)
-      add_stage_name(url)
+      add_stage(url)
     end
 
     # Actual host can be headers["origin"] when cloudfront is in front.

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "3.0.13"
+  VERSION = "3.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.13
+  version: 3.0.14
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer