jets 3.0.19 → 3.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 628d962d35e5e497e1e5362ea11d5844c94e28f9e71877295edd046d291e6b81
-  data.tar.gz: 0a353487be640729460d85debb14d71064415847311ec952b5612e8a483e6a63
+  metadata.gz: 549f5889b18b5a6dc74ec29259f874a80a6064291b1598ef92c4fd0cdcdc499b
+  data.tar.gz: 1b6a1b5534296e24729763c26b9c9aeba359412aa13da1fad9912d186c1cbef5
 SHA512:
-  metadata.gz: b36f4d843a60052f42935df53e4d801e74dba09237b03b2cee11835894d0a4574493b1b26793f2fdbc8e26b040bd911378752000201b0bcfaeda56727936f04f
-  data.tar.gz: ce8b72b84930ccd20727504c1955f4d1f4acf9c36e750207eb85ab2ccee6fd8a9d85e5f1ee6e449bf8a7e7925de3e55a08c3c294dd9eb0c8cb84cf98757412b2
+  metadata.gz: bc852f9754df45b1b8098a44de6d8b238554ad6ac8baacc005d7b2ce7a6d0a352ae12e19c6f232e8eef1d51fd1fc3fca2326025eeb4b3794d6b5c769b9748fa5
+  data.tar.gz: 818e6be78492e348119d083bc50ac91a34cf63f1e4a1785e4e1f96250418ba391388b876055b1f4916ef9a5c53dab59a1d10732b1d27d2f14ea7d64989ba7b96

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.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
 

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] = 301
+        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/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.19"
+  VERSION = "3.0.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.19
+  version: 3.0.20
 platform: ruby
 authors:
 - Tung Nguyen