jets 3.0.11 → 3.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be3e6d33ee23f0ba16056fe99edc1327bf678762d47203ec74296280b89be993
-  data.tar.gz: a0a956dee36f4a82aa2a77d7990bcc2a342708de7b3cfd04670921e843b04e7b
+  metadata.gz: 58e203dbd0ee79c9e7287badab576597b08f0b3f5fd3f1b5309bfa910cbf2858
+  data.tar.gz: 1a29ba9a72f042b156312d47acdeebee565f6dc4a5c3d3ee109931723e59b583
 SHA512:
-  metadata.gz: ad3cc2834cea313bb75fe8f7b079e626b67962e9a52dc586895e0147c4ec5bba72015c35e9b7a85258cbc2553edfbdfe7e481395b4c5d52032868742720db19a
-  data.tar.gz: b091b135234c439e7ed5dcf405770cabf9c14590575582ef1f6329a611e6928a9e734d1f99650c6302e7cd24a69e1f3a055c555153814ed902b104ebfbbe4687
+  metadata.gz: 6c6f2d06e54b0837f30c9a064e48252330a72a770b1b0f51e1884ab4820291220565b696f505cfe5645a3de2d428a3c380bc2c7f8d8873ae8819f2f5f0c0a6ef
+  data.tar.gz: 95a8262ad30c8a593a2c23fed954528e4d0801cd8260ae81e7c974f89d1e8c05c34c3778a7422f356de30c410bae9a9313ebf677e440d7b06d379aa7580421f8

data/CHANGELOG.md

@@ -3,6 +3,25 @@
 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.15] - 2021-09-05
+- [#587](https://github.com/boltops-tools/jets/pull/587) Fix private method names
+- [#588](https://github.com/boltops-tools/jets/pull/588) custom domain: adjust rate limit for base mapping
+- [#589](https://github.com/boltops-tools/jets/pull/589) Ujs
+
+## [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
+
+## [3.0.12] - 2021-08-08
+- [#578](https://github.com/boltops-tools/jets/pull/578) Update "jets delete" documentation to be --yes instead of --skip
+- [#580](https://github.com/boltops-tools/jets/pull/580) Use active support instead of actionview
+- [#581](https://github.com/boltops-tools/jets/pull/581) Csrf csrf-param authenticity_token and use @rails/ujs for crud
+
 ## [3.0.11] - 2021-07-15
 - update serverlessgems gem
 

data/lib/jets/builders/md5_zip.rb

@@ -1,4 +1,4 @@
-require 'action_view'
+require "active_support/number_helper"
 
 # Examples:
 #
@@ -10,7 +10,7 @@ require 'action_view'
 #
 module Jets::Builders
   class Md5Zip
-    include ActionView::Helpers::NumberHelper # number_to_human_size
+    include ActiveSupport::NumberHelper # number_to_human_size
     include Util
 
     def initialize(folder)

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

@@ -17,6 +17,6 @@ This deletes the all the contents in the internal s3 bucket that jets uses and t
     Project demo-dev deleted!
     $
 
-You can bypass the are you sure prompt with the `--sure` flag.
+You can bypass the are you sure prompt with the `--yes` flag.
 
-    $ jets delete --sure
+    $ jets delete --yes

data/lib/jets/commands/new.rb

@@ -114,7 +114,14 @@ JS
       after = "const { environment } = require('@rails/webpacker')\n"
       insert_into_file("config/webpack/environment.js", jquery, after: after)
 
-      run("yarn add bootstrap jquery popper.js postcss-cssnext")
+      jets_ujs =<<-JS
+import Jets from "@rubyonjets/ujs-compat"
+Jets.start()
+JS
+      after = "Rails.start()\n"
+      insert_into_file("app/javascript/packs/application.js", jets_ujs, after: after)
+
+      run("yarn add bootstrap jquery popper.js postcss-cssnext @rails/ujs @rubyonjets/ujs-compat")
     end
 
     def git_init

data/lib/jets/commands/templates/webpacker/app/javascript/packs/application.js.tt

@@ -18,5 +18,6 @@
 <% if @bootstrap -%>
 import 'bootstrap/dist/js/bootstrap';
 <% end -%>
-import '../src/jets/crud'
-console.log('Hello World from Webpacker')
+
+import Rails from "@rails/ujs"
+Rails.start()

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

@@ -5,17 +5,17 @@ class Jets::Controller::Middleware::Local
     end
 
     def find_route
-      Jets::Router::Finder.new(method, path).run
+      Jets::Router::Finder.new(path, method).run
     end
 
   private
     attr_reader :env
 
-    def path
+    def method
       env["REQUEST_METHOD"] || "GET"
     end
 
-    def method
+    def path
       env["PATH_INFO"].sub(/^\//,'')
     end
   end

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/generator/templates/rails/scaffold_controller/controller.rb

@@ -56,7 +56,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   def delete
     @<%= orm_instance.destroy %>
     if request.xhr?
-      render json: {success: true}
+      render json: {success: true, location: <%= table_name %>_path}
     else
       redirect_to <%= table_name %>_path
     end

data/lib/jets/internal/app/functions/jets/base_path_mapping.rb

@@ -4,6 +4,25 @@ require 'aws-sdk-cloudformation'
 class BasePathMapping
   def initialize(event, stage_name)
     @event, @stage_name = event, stage_name
+    aws_config_update!
+  end
+
+  # Override the AWS retry settings. The aws-sdk-core has expondential backup with this formula:
+  #
+  #   2 ** c.retries * c.config.retry_base_delay
+  #
+  # So the max delay will be 2 ** 7 * 0.6 = 76.8s
+  #
+  # Useful links:
+  #
+  #   https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/lib/aws-sdk-core/plugins/retry_errors.rb
+  #   https://docs.aws.amazon.com/apigateway/latest/developerguide/limits.html
+  #
+  def aws_config_update!
+    Aws.config.update(
+      retry_limit: 7, # default: 3
+      retry_base_delay: 0.6, # default: 0.3
+    )
   end
 
   # Cannot use update_base_path_mapping to update the base_mapping because it doesnt

data/lib/jets/middleware/default_stack.rb

@@ -1,3 +1,5 @@
+require "shotgun"
+
 module Jets::Middleware
   class DefaultStack
     attr_reader :config, :app
@@ -8,7 +10,7 @@ module Jets::Middleware
 
     def build_stack
       Stack.new do |middleware|
-        middleware.use Shotgun::Static if Jets.env.development?
+        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

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

@@ -77,7 +77,10 @@ module Jets::UrlHelper
 
   def csrf_meta_tags
     if protect_against_forgery?
-      tag("meta", name: "csrf-token", content: masked_authenticity_token).html_safe
+      html = tag("meta", name: "csrf-token", content: masked_authenticity_token).html_safe
+      html << "\n"
+      html << tag("meta", name: "csrf-param", content: "authenticity_token").html_safe
+      html
     end
   end
 end # UrlHelper

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "3.0.11"
+  VERSION = "3.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 3.0.15
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -776,7 +776,6 @@ files:
 - lib/jets/commands/templates/skeleton/spec/spec_helper.rb.tt
 - lib/jets/commands/templates/webpacker/app/javascript/packs/application.js.tt
 - lib/jets/commands/templates/webpacker/app/javascript/packs/theme.scss.tt
-- lib/jets/commands/templates/webpacker/app/javascript/src/jets/crud.js
 - lib/jets/commands/upgrade.rb
 - lib/jets/commands/upgrade/templates/bin/webpack
 - lib/jets/commands/upgrade/templates/bin/webpack-dev-server

data/lib/jets/commands/templates/webpacker/app/javascript/src/jets/crud.js

@@ -1,90 +0,0 @@
-// This file is automatically generated by Jets. It is used by
-// app/javascript/packs/application.js.
-//
-// It handles the delete and update action in an unobstrusive way.
-// Code could be improved and is meant to provide only a starting point.
-
-$(function() {
-  function handleAll(e) {
-    var target = $(e.target);
-    if (target.is('a') && target.data("method") == "delete") {
-      return handleDelete(e);
-    } else if (target.attr('type') == "submit") {
-      return handleUpdate(e);
-    } else {
-      return true;
-    }
-
-    e.preventDefault();
-  }
-
-  function handleDelete(e) {
-    event.preventDefault();
-    var link = $(e.target);
-    var message = link.data("confirm");
-    if (message) {
-      var sure = confirm(message);
-      if (sure) {
-        deleteItem(link);
-      } else {
-        console.log("Deletion cancelled");
-      }
-    }
-  }
-
-  function handleUpdate(e) {
-    var submit = $(e.target);
-    var form = submit.closest('form');
-    var url = form.attr("action");
-    var method = $("input[name=_method]");
-
-    if (method.attr("value") != "put") {
-      return true;
-    }
-
-    e.preventDefault();
-    var data = $(form).serialize();
-    $.ajax({
-       url: url,
-       type: 'PUT',
-       data: data,
-       dataType: "json",
-       success: function(response) {
-         window.location.href = response.location;
-       },
-       error: function(xhr, textStatus, errorThrown) {
-         console.log('Error!  Status = ' + xhr.status);
-       },
-       complete: function(data) {
-         console.log("data %o", data);
-       }
-    });
-  }
-
-  function deleteItem(link) {
-    var node = link.closest('.jets-element-to-delete');
-    node.hide(); // immediately hide element
-
-    var resource = link.attr("href");
-    var token = $('meta[name=csrf-token]').attr('content');
-    var data = { authenticity_token: token };
-    var request = $.ajax({
-      url: resource,
-      method: "DELETE",
-      data: data,
-      dataType: "json"
-    });
-
-    request.done(function(msg) {
-      console.log("msg %o", msg)
-      node.remove();
-    });
-
-    request.fail(function(jqXHR, textStatus) {
-      console.log("textStatus %o", textStatus)
-      node.show(); // in the event of a failure re-display the node
-    });
-  }
-
-  $('body').click(handleAll)
-});