jets 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fffc1bee1f24ec886725f284f26c2876833048efa0596536155b87fddd38bce3
-  data.tar.gz: 32493191db6f88d33d95a7927e5723ef85b949eb511f59089b39df0e8352b064
+  metadata.gz: acc1ca8f19a2a3312ebcd7d401233a81cd59a50332b12714efea1c7eb2630f70
+  data.tar.gz: 6c2dc27bca44f067688800db2bd02d0b9082996aa5fd6c4fdb59d677355f107e
 SHA512:
-  metadata.gz: 75655e94fc346815891d7c0f5825272c3f247442930ab16e3418f5fb0b3856c5ae32560469137f94138f3f2b9ea313186d3d9c09af6c09d5672ecb882d3d3c11
-  data.tar.gz: 026c25491b0762085122a7e45b649d4b36d2a3c9ff51ea791c769ba4ae64e30c083946c2f775a254405bb977055829cdbc2836366d29b9ee823494b06030b781
+  metadata.gz: 9701f2ab97be26f14ff47b657717f6c973d183eb2d5de6342fa04bb79b1f01260c982aef592c33d4c897e8cfb4de8961d5d47b1bd05b55a1ffaae3cd578e9ffc
+  data.tar.gz: 2f15bff8efd7ea3ea3908704c526ad4c9f617be934caa77b2e3bdfee6e0ad5e99dcbd1dbf98fe6c621fb3259b5f5a7342213f044902e1762303a620d966f84f0

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.5.3]
+- #142 from tongueroo/rails-api-afterburner fix jets afterburner for rails api mode apps
+
 ## [1.5.2]
 - #138 from patchkit-net/feature/before_action_chain_break Change before_action behavior: allow chain break
 - #139 from patchkit-net/bugfix/spec-gem-files-dir Fix jets.gemspec files listing method

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.5.2)
+    jets (1.5.3)
       activerecord (>= 5.2.1)
       activesupport (>= 5.2.1)
       aws-sdk-apigateway
@@ -131,7 +131,7 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     mysql2 (0.5.2)
-    nokogiri (1.10.0)
+    nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
     rack (2.0.6)
     rack-proxy (0.6.5)

data/lib/jets/builders/code_builder.rb

@@ -201,15 +201,13 @@ class Jets::Builders
     # This happens in the current app directory not the tmp code for simplicity
     # This is because the node likely been set up correctly there.
     def compile_rails_assets
-      return unless rails?
+      return unless Jets.rack? && rails? && !rails_api?
 
       if ENV['JETS_SKIP_ASSETS']
         puts "Skip compiling rack assets".colorize(:yellow) # useful for debugging
         return
       end
 
-      return unless Jets.rack?
-
       # Need to capture JETS_ROOT since can be changed by Turbo mode
       jets_root = Jets.root
       Bundler.with_clean_env do
@@ -232,12 +230,23 @@ class Jets::Builders
     end
 
     # Rudimentary rails detection
+    # Duplicated in builders/reconfigure_rails.rb
     def rails?
       config_ru = "#{Jets.root}rack/config.ru"
       return false unless File.exist?(config_ru)
       !IO.readlines(config_ru).grep(/Rails.application/).empty?
     end
 
+    # Rudimentary rails api detection
+    # Duplicated in builders/reconfigure_rails.rb
+    # Another way of checking is loading a rails console and checking Rails.application.config.api_only
+    # Using this way for simplicity.
+    def rails_api?
+      config_app = "#{Jets.root}rack/config/application.rb"
+      return false unless File.exist?(config_app)
+      !IO.readlines(config_app).grep(/config.api_only.*=.*true/).empty?
+    end
+
     # Cleans out non-cached files like code-*.zip in Jets.build_root
     # for a clean start. Also ensure that the /tmp/jets/project build root exists.
     #

data/lib/jets/builders/reconfigure_rails/config/initializers/jets.rb

@@ -4,11 +4,13 @@ JetsRails.stage = ENV['JETS_STAGE'] || 'dev' # for jets-rails StageMiddleware
 s3_base_url = IO.read("#{Rails.root}/config/s3_base_url.txt").strip rescue "s3_base_url_placeholder"
 asset_host = "#{s3_base_url}/rack/public"
 Rails.application.config.action_controller.asset_host = asset_host
+Rails.application.config.public_file_server.enabled = true
 
+<% unless @api_mode -%>
 # Rails.application.config.assets.quiet = false
 Rails.application.config.assets.debug = false
 Rails.application.config.assets.compile = false
-Rails.application.config.public_file_server.enabled = true
+<% end -%>
 
 # Looks better without colorizatiion in CloudWatch logs
 Rails.application.config.colorize_logging = false

data/lib/jets/builders/reconfigure_rails.rb

@@ -22,9 +22,13 @@ class Jets::Builders
       templates = File.expand_path("./reconfigure_rails", File.dirname(__FILE__))
       relative_path = "config/initializers/jets.rb"
       src = "#{templates}/#{relative_path}"
+      result = Jets::Erb.result(src, api_mode: rails_api?)
       dest = "#{@app_root}/#{relative_path}"
       FileUtils.mkdir_p(File.dirname(dest))
-      FileUtils.cp(src, dest)
+      IO.write(dest, result)
+    end
+
+    def api_mode?
     end
 
     def update_gemfile
@@ -90,10 +94,21 @@ class Jets::Builders
     end
 
     # Rudimentary rails detection
+    # Duplicated in builders/code_builders.rb
     def rails?
       config_ru = "#{@app_root}/config.ru"
       return false unless File.exist?(config_ru)
       !IO.readlines(config_ru).grep(/Rails.application/).empty?
     end
+
+    # Rudimentary rails api detection
+    # Duplicated in builders/code_builders.rb
+    # Another way of checking is loading a rails console and checking Rails.application.config.api_only
+    # Using this way for simplicity.
+    def rails_api?
+      config_app = "#{@app_root}/config/application.rb"
+      return false unless File.exist?(config_app)
+      !IO.readlines(config_app).grep(/config.api_only.*=.*true/).empty?
+    end
   end
 end

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

@@ -1,8 +1,6 @@
 Builds a zip file package to be uploaded to AWS Lambda. This allows you to build the project without deploying and inspect the zip file that gets deployed to AWS Lambda. The package contains:
 
 * your application code
-* generated node shims
-* bundled gems
-* bundled Ruby
+* generated shims
 
-If the application has no ruby code and only uses polymorphic functions, then gems and Ruby is not bundled up.
+If the application has no Ruby code and only uses Polymorphic functions, then gems are not bundled up.

data/lib/jets/controller/redirection.rb

@@ -19,7 +19,7 @@ class Jets::Controller
 
       redirect_url = ensure_protocol(redirect_url)
 
-      aws_proxy = Renderers::RackRenderer.new(self,
+      aws_proxy = Rendering::RackRenderer.new(self,
         status: options[:status] || 302,
         headers: { "Location" => redirect_url },
         body: "",

data/lib/jets/controller/{renderers/template_renderer.rb → rendering/rack_renderer.rb}

@@ -1,22 +1,42 @@
-module Jets::Controller::Renderers
-  class TemplateRenderer < BaseRenderer
-    def controller_instance_variables
-      instance_vars = @controller.instance_variables.inject({}) do |vars, v|
-        k = v.to_s.sub(/^@/,'') # @var => var
-        vars[k] = @controller.instance_variable_get(v)
-        vars
-      end
-      instance_vars[:event] = event
-      instance_vars
+require "rack/utils"
+
+# Special renderer.  All the other renderers lead here
+module Jets::Controller::Rendering
+  class RackRenderer
+    delegate :request, :event, :headers, to: :controller
+    attr_reader :controller
+    def initialize(controller, options={})
+      @controller = controller
+      @options = options
     end
 
+    # Example response:
+    #
+    #   [200, {"my-header" = > "value" }, "my body" ]
+    #
+    # Returns rack triplet
     def render
+      # we do some normalization here
+      status = normalize_status_code(@options[:status])
+
+      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
+
       # Rails rendering does heavy lifting
-      renderer = ActionController::Base.renderer.new(renderer_options)
-      body = renderer.render(render_options)
-      @options[:body] = body # important to set as it was originally nil
+      if drop_content_info?(status)
+        body = StringIO.new
+      else
+        renderer = ActionController::Base.renderer.new(renderer_options)
+        body = renderer.render(render_options)
+        body = StringIO.new(body)
+      end
 
-      RackRenderer.new(@controller, @options).render
+      [status, headers, body] # triplet
     end
 
     # Example: posts/index
@@ -114,6 +134,72 @@ module Jets::Controller::Renderers
       render_options
     end
 
+    def controller_instance_variables
+      instance_vars = @controller.instance_variables.inject({}) do |vars, v|
+        k = v.to_s.sub(/^@/,'') # @var => var
+        vars[k] = @controller.instance_variable_get(v)
+        vars
+      end
+      instance_vars[:event] = event
+      instance_vars
+    end
+
+  private
+    # From jets/controller/response.rb
+    def drop_content_info?(status)
+      status.to_i / 100 == 1 or drop_body?(status)
+    end
+
+    DROP_BODY_RESPONSES = [204, 304]
+    def drop_body?(status)
+      DROP_BODY_RESPONSES.include?(status.to_i)
+    end
+
+    # maps:
+    #   :continue => 100
+    #   :success => 200
+    #   etc
+    def normalize_status_code(code)
+      status_code = if code.is_a?(Symbol)
+                      Rack::Utils::SYMBOL_TO_STATUS_CODE[code]
+                    else
+                      code
+                    end
+      (status_code || 200).to_s # API Gateway requires a string but rack is okay with either
+    end
+
+    def set_content_type!(status, headers)
+      if drop_content_info?(status)
+        headers.delete "Content-Length"
+        headers.delete "Content-Type"
+      else
+        headers["Content-Type"] = @options[:content_type] ||
+                                  headers['content-type'] || # Mega Mode (Rails)
+                                  headers['Content-Type'] || # Just in case
+                                  Jets::Controller::DEFAULT_CONTENT_TYPE
+      end
+    end
+
+    def normalized_base64_option(options)
+      base64 = @options[:base64] if options.key?(:base64)
+      base64 = @options[:isBase64Encoded] if options.key?(:isBase64Encoded)
+      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 Hash
+        Jets.config.cors # contains Hash with Access-Control-Allow-* values
+      else
+        {}
+      end
+    end
+
     class << self
       def setup!
         require "action_controller"
@@ -161,8 +247,7 @@ module Jets::Controller::Renderers
         end
       end
     end
-
   end
 end
 
-Jets::Controller::Renderers::TemplateRenderer.setup!
+Jets::Controller::Rendering::RackRenderer.setup!

data/lib/jets/controller/rendering.rb

@@ -1,14 +1,13 @@
 class Jets::Controller
-  autoload :Renderers, "jets/controller/renderers"
-
   module Rendering
+    autoload :RackRenderer, "jets/controller/rendering/rack_renderer"
     include Redirection
 
     def ensure_render
       return @rendered_data if @rendered
 
       # defaults to rendering templates
-      Renderers::TemplateRenderer.new(self, managed_options).render
+      RackRenderer.new(self, managed_options).render
     end
 
     # Many different ways to render:
@@ -27,7 +26,8 @@ class Jets::Controller
 
       options.reverse_merge!(managed_options)
       adjust_content_type!(options)
-      @rendered_data = Renderers::TemplateRenderer.new(self, options).render
+
+      @rendered_data = RackRenderer.new(self, options).render
 
       @rendered = true
       @rendered_data

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -619,11 +619,8 @@ files:
 - lib/jets/controller/rack/adapter.rb
 - lib/jets/controller/rack/env.rb
 - lib/jets/controller/redirection.rb
-- lib/jets/controller/renderers.rb
-- lib/jets/controller/renderers/base_renderer.rb
-- lib/jets/controller/renderers/rack_renderer.rb
-- lib/jets/controller/renderers/template_renderer.rb
 - lib/jets/controller/rendering.rb
+- lib/jets/controller/rendering/rack_renderer.rb
 - lib/jets/controller/request.rb
 - lib/jets/controller/response.rb
 - lib/jets/core.rb

data/lib/jets/controller/renderers/base_renderer.rb

@@ -1,12 +0,0 @@
-# Interface:
-#   subclasses must implement render
-module Jets::Controller::Renderers
-  class BaseRenderer
-    delegate :request, :event, :headers, to: :controller
-    attr_reader :controller
-    def initialize(controller, options={})
-      @controller = controller
-      @options = options
-    end
-  end
-end

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

@@ -1,57 +0,0 @@
-require "rack/utils"
-
-# Special renderer.  All the other renderers lead here
-module Jets::Controller::Renderers
-  class RackRenderer < BaseRenderer
-    # Example response:
-    #
-    #   [200, {"my-header" = > "value" }, "my body" ]
-    def render
-      # we do some normalization here
-      status = map_status_code(@options[:status]) || 200
-      status = status.to_s # API Gateway requires a string but rack is okay with either
-      body = @options[:body]
-      base64 = normalized_base64_option(@options)
-
-      headers = @options[:headers] || {}
-      headers = cors_headers.merge(headers)
-      headers["Content-Type"] ||= @options[:content_type] || Jets::Controller::DEFAULT_CONTENT_TYPE
-      # 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
-      body = StringIO.new(body)
-      [status, headers, body] # triplet
-    end
-
-    # maps:
-    #   :continue => 100
-    #   :success => 200
-    #   etc
-    def map_status_code(code)
-      if code.is_a?(Symbol)
-        Rack::Utils::SYMBOL_TO_STATUS_CODE[code]
-      else
-        code
-      end
-    end
-
-    def normalized_base64_option(options)
-      base64 = @options[:base64] if options.key?(:base64)
-      base64 = @options[:isBase64Encoded] if options.key?(:isBase64Encoded)
-      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 Hash
-        Jets.config.cors # contains Hash with Access-Control-Allow-* values
-      else
-        {}
-      end
-    end
-  end
-end

data/lib/jets/controller/renderers.rb

@@ -1,5 +0,0 @@
-module Jets::Controller::Renderers
-  autoload :BaseRenderer, "jets/controller/renderers/base_renderer"
-  autoload :RackRenderer, "jets/controller/renderers/rack_renderer"
-  autoload :TemplateRenderer, "jets/controller/renderers/template_renderer"
-end