jets 3.0.17 → 3.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a03ac914d64e082dd8973795f04e9e4ebd3878b0eb04663e97ef368eecc19eb3
-  data.tar.gz: 56fe08319ec68002c7990d140dd26e90cdd7ff13b503702bf94dcddb60e12e4a
+  metadata.gz: 3528d3aae63a12bcc3b82b0d9666db4b9b621122a8665f2591b655f4283c5368
+  data.tar.gz: edfb967cf885286ec053cb933749a1a378fa7d20fbf8952d81be518c63649d64
 SHA512:
-  metadata.gz: 9bdcb8d9549179d4adf082abaa0b7353b758b4168019dc43a5208e427186462875bc2e843378461747b756f976d2b62ee175714a7081455ddacb532b4f1b6e2f
-  data.tar.gz: 5d79ca553952a1413abf1ac4a143f6b905bf1067662c4642e598932ff5ee15b135334d57fbb3530171e63f8322c9e46dc60e6349c1d2e3c06b1416ce386a2821
+  metadata.gz: d5f4a9ed780d249b48488dafa67cdd15e82f0d63cc70c42717a667b0ad6d22fd9b9f07cbd6435a3cdb7f2346d8e49b87c3d6265782b60c0233e608a080a2c363
+  data.tar.gz: a844a49e320d9b9235da7b2e48bf336801aa06f348e039cc49ee5129b173fd8bd0a5e375ca09071f262f25d8532b329cf0c45024a450b26e4b954a96827619a5

data/CHANGELOG.md

@@ -3,6 +3,22 @@
 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.21] - 2021-10-21
+- [#605](https://github.com/boltops-tools/jets/pull/605) use safer 302 redirect as default
+
+## [3.0.20] - 2021-10-20
+- [#603](https://github.com/boltops-tools/jets/pull/603) redirect_to: smarter handling of request xhr
+- [#604](https://github.com/boltops-tools/jets/pull/604) fix redirect_to 301 and keep use default
+
+## [3.0.19] - 2021-10-20
+- [#602](https://github.com/boltops-tools/jets/pull/602) pin zeitwerk to 2.4.x in gemfile
+
+## [3.0.18] - 2021-10-20
+- [#596](https://github.com/boltops-tools/jets/pull/596) Serialize job data correctly
+- [#598](https://github.com/boltops-tools/jets/pull/598) fixing issues when mounting
+- [#599](https://github.com/boltops-tools/jets/pull/599) pin to zeitwerk 2.4.x
+- [#600](https://github.com/boltops-tools/jets/pull/600) method override also on the lambda function side
+
 ## [3.0.17] - 2021-09-15
 - [#593](https://github.com/boltops-tools/jets/pull/593) Fix deploy for new projects. Added rescue block back into lib/jets/commands/deploy.rb
 

data/jets.gemspec

@@ -61,7 +61,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "shotgun"
   spec.add_dependency "text-table"
   spec.add_dependency "thor"
-  spec.add_dependency "zeitwerk"
+  spec.add_dependency "zeitwerk", "~> 2.4.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"

data/lib/jets/commands/templates/skeleton/Gemfile.tt

@@ -18,6 +18,7 @@ gem "mysql2", "~> 0.5.3"
 <% unless options[:mode] == 'job' -%>
 gem "dynomite"
 <% end -%>
+gem "zeitwerk", "~> 2.4.0"
 
 # development and test groups are not bundled as part of the deployment
 group :development, :test do

data/lib/jets/controller/base.rb

@@ -43,7 +43,7 @@ class Jets::Controller
     # Most of the time, you want process! instead of dispatch!
     #
     def process!
-      adapter = Jets::Controller::Rack::Adapter.new(event, context, meth)
+      adapter = Jets::Controller::Rack::Adapter.new(event, context)
       adapter.rack_vars(
         'jets.controller' => self,
         'lambda.context' => context,
@@ -75,6 +75,8 @@ class Jets::Controller
     # dispatch! is useful for megamode or mounted applications
     #
     def dispatch!
+      method_override!
+
       t1 = Time.now
       log_start
 
@@ -99,12 +101,30 @@ class Jets::Controller
       triplet # status, headers, body
     end
 
+    # Override @meth when POST with _method=delete
+    # By the time processing reaches dispatch which calls method_override!
+    # The Rack::MethodOverride middleware has overriden env['REQUEST_METHOD'] with DELETE
+    # and set env['rack.methodoverride.original_method']
+    def method_override!
+      env = request.env
+      if env['rack.methodoverride.original_method'] && env['REQUEST_METHOD'] == 'DELETE'
+        @original_meth = @meth
+        @meth = "delete"
+      end
+    end
+
+    def processing_log
+      processing = "Processing #{self.class.name}##{@meth}"
+      processing << " (original method #{@original_meth})" if @original_meth
+      processing
+    end
+
     # Documented interface method, careful not to rename
     def log_start
       # JSON.dump makes logging look pretty in CloudWatch logs because it keeps it on 1 line
       ip = request.ip
       Jets.logger.info "Started #{@event['httpMethod']} \"#{@event['path']}\" for #{ip} at #{Time.now}"
-      Jets.logger.info "Processing #{self.class.name}##{@meth}"
+      Jets.logger.info processing_log
       Jets.logger.info "  Event: #{event_log}"
       Jets.logger.info "  Parameters: #{JSON.dump(filtered_parameters.to_h)}"
     end

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

@@ -5,13 +5,13 @@ module Jets::Controller::Rack
     extend Memoist
 
     # Returns back API Gateway response hash structure
-    def self.process(event, context, meth)
-      adapter = new(event, context, meth)
+    def self.process(event, context)
+      adapter = new(event, context)
       adapter.process
     end
 
-    def initialize(event, context, meth)
-      @event, @context, @meth = event, context, meth
+    def initialize(event, context)
+      @event, @context = event, context
     end
 
     # 1. Convert API Gateway event event to Rack env

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

@@ -27,12 +27,12 @@ module Jets::Controller::Rack
     def path_with_base_path
       resource = @event['resource']
       pathParameters = @event['pathParameters']
-      
+
       if(!pathParameters.nil? and !resource.nil?)
         resource = pathParameters.reduce(resource) {|resource, parameter|
           key, value = parameter
-          key = key.eql?("catchall") ? "{#{key}+}" : "{#{key}}"
-          resource = resource.gsub(key, value)
+          resource = resource.gsub("{#{key}+}", value)
+          resource = resource.gsub("{#{key}}", value)
           resource
         }
       end
@@ -64,7 +64,9 @@ module Jets::Controller::Rack
     end
 
     def content_type
-      headers['Content-Type'] || Jets::Controller::DEFAULT_CONTENT_TYPE
+      # Rack (local) uses Content-Type and APIGW (remote) uses content-type
+      # Rack::MethodOverride relys on content-type to detect content type properly.
+      headers['Content-Type'] || headers['content-type'] || Jets::Controller::DEFAULT_CONTENT_TYPE
     end
 
     def content_length

data/lib/jets/controller/redirection.rb

@@ -10,12 +10,22 @@ class Jets::Controller
       redirect_url = add_stage(url)
       redirect_url = ensure_protocol(redirect_url)
 
-      aws_proxy = Rendering::RackRenderer.new(self,
-        status: options[:status] || 302,
+      default = {
         headers: { "Location" => redirect_url },
-        body: "",
         isBase64Encoded: false,
-      )
+      }
+      if request.xhr?
+        options[:content_type] ||= "application/json"
+        options[:status] ||= 200
+        options[:body] ||= JSON.dump(success: true, location: redirect_url)
+      else
+        options[:status] ||= 302
+        options[:body] ||= ""
+      end
+      Jets.logger.info("redirect_to options #{options}")
+      options = default.merge(options)
+
+      aws_proxy = Rendering::RackRenderer.new(self, options)
       resp = aws_proxy.render
       # redirect is a type of rendering
       @rendered = true

data/lib/jets/generator/templates/rails/scaffold_controller/controller.rb

@@ -29,11 +29,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
 
     if @<%= orm_instance.save %>
-      if request.xhr?
-        render json: {success: true, location: url_for(@<%= singular_table_name %>)}
-      else
-        redirect_to <%= singular_table_name %>_path(@<%= singular_table_name %>)
-      end
+      redirect_to <%= singular_table_name %>_path(@<%= singular_table_name %>)
     else
       render :new
     end
@@ -42,11 +38,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   # PUT <%= route_url %>/1
   def update
     if @<%= orm_instance.update("#{singular_table_name}_params") %>
-      if request.xhr?
-        render json: {success: true, location: url_for(@<%= singular_table_name %>)}
-      else
-        redirect_to <%= singular_table_name %>_path(@<%= singular_table_name %>)
-      end
+      redirect_to <%= singular_table_name %>_path(@<%= singular_table_name %>)
     else
       render :edit
     end
@@ -55,11 +47,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   # DELETE <%= route_url %>/1
   def delete
     @<%= orm_instance.destroy %>
-    if request.xhr?
-      render json: {success: true, location: <%= table_name %>_path}
-    else
-      redirect_to <%= table_name %>_path
-    end
+    redirect_to <%= table_name %>_path
   end
 
 private

data/lib/jets/job/base.rb

@@ -26,13 +26,13 @@ module Jets::Job
       end
 
       def perform_now(meth, event={}, context={})
-        new(event, context, meth).send(meth)
+        new(event.try(:to_unsafe_h), context, meth).send(meth)
       end
 
       def perform_later(meth, event={}, context={})
         if on_lambda?
           function_name = "#{self.to_s.underscore}-#{meth}"
-          call = Jets::Commands::Call.new(function_name, JSON.dump(event), invocation_type: "Event")
+          call = Jets::Commands::Call.new(function_name, JSON.dump(event.try(:to_unsafe_h)), invocation_type: "Event")
           call.run
         else
           puts "INFO: Not on AWS Lambda. In local mode perform_later executes the job with perform_now instead."

data/lib/jets/middleware/default_stack.rb

@@ -13,7 +13,7 @@ module Jets::Middleware
         middleware.use Shotgun::Static
         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
+        middleware.use Rack::MethodOverride unless ENV['JETS_RACK_METHOD_OVERRIDE'] == '0' # must come before Middleware::Local for multipart post forms to work
         middleware.use Jets::Controller::Middleware::Reloader if Jets.config.hot_reload
         middleware.use Jets::Controller::Middleware::Local # mimics AWS Lambda for local server only
         middleware.use session_store, session_options

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "3.0.17"
+  VERSION = "3.0.21"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.17
+  version: 3.0.21
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -490,16 +490,16 @@ dependencies:
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement