jets 3.0.10 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b2e85111e507304b3bd11375499c70f4ba880e1f2523e5f7b2ff627e6558b76
-  data.tar.gz: 5e7bbb320f5e580726ab4d66e11cc47feca970edc61d6d01f1ed25fea2693bad
+  metadata.gz: 571efa758f33bf44042d6e8be73c933011680217cd4e87b0324f85b5fc7c37dc
+  data.tar.gz: fac7b4ceae0b9d7e0fe8f494f57cf409d71a08d26dbd259424800d3a9feb268b
 SHA512:
-  metadata.gz: 7dbf8891880be71e8b40da911ebb13e5ad39365158efa9bd62426b17e94d8b264a9832f14e32f10a8b402daf34cecda8f5986bcfcc70cb9278a7793b398b61d0
-  data.tar.gz: 6397148e88442a557552397ab01c7b7697f3642593f0aaedcbddd15f01c824e47b64922d21208bf99e01dd2929b547fcc3ef07a0c91afb6e49a58fe46185667f
+  metadata.gz: 3ee364750aaa8c1f74a92ec9da2363e77cd7af84db97977b54a40cb087a32bbbec4e413b5cac5117018468c84b23ed18646f5416b9aaf3d425e668dabfb21b6c
+  data.tar.gz: 446e82b01a2d07679d1f51f8dd7e461d7ddfd67a46759fc22fa59c740fe8f6011a711a7acdc80ea1d4e62786f8e79eec7596c283f3758fd9734546d2bb555953

data/CHANGELOG.md

@@ -3,6 +3,23 @@
 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
+
+## [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
+
 ## [3.0.10] - 2021-07-14
 - [#575](https://github.com/boltops-tools/jets/pull/575) fix missing webpacker helpers
 - [#576](https://github.com/boltops-tools/jets/pull/576) Fixes API Gateway base path Lambda not respecting various config opts

data/jets.gemspec

@@ -57,7 +57,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "railties", "~> 6.1.0" # for ActiveRecord database_tasks.rb
   spec.add_dependency "rainbow"
   spec.add_dependency "recursive-open-struct"
-  spec.add_dependency "serverlessgems", "~> 0.1.3"
+  spec.add_dependency "serverlessgems", "~> 0.1.4"
   spec.add_dependency "shotgun"
   spec.add_dependency "text-table"
   spec.add_dependency "thor"

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/gems.rb

@@ -2,7 +2,7 @@ module Jets::Commands
   class Gems < Jets::Commands::Base
     desc "check", "Check if pre-built Lambda gems are available from the sources"
     long_desc Help.text("gems:check")
-    option :show_source, type: :boolean, desc: "Show source"
+    option :verbose, type: :boolean, desc: "Verbose mode"
     def check
       check = Jets::Gems::Check.new(@options)
       check.run! # exits early if missing gems found

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,7 @@ 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")
+      run("yarn add bootstrap jquery popper.js postcss-cssnext @rails/ujs")
     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.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/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.10"
+  VERSION = "3.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.14
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -436,14 +436,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: shotgun
   requirement: !ruby/object:Gem::Requirement
@@ -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)
-});