jets 3.0.8 → 3.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db3aab7667c9ee9aaa2149d30132dbf423516b4195e643dad4f8a2108fe03bfc
-  data.tar.gz: 5e126f386e4d0bba1c3714e66470e692c08c099c932f8f6a1c9a62556487aabe
+  metadata.gz: df619199e09ad52bd8f622f765867bb6560d3818a3b6297d9f82dd9ed7b4a9a4
+  data.tar.gz: d66d07f780595a0075caeadd6869a7e26aa85edb3b5af1c4a9680d2958201dd7
 SHA512:
-  metadata.gz: 3c57ac868b4d54d0eff01884597af16188f59584eb20c8a348ce9bb8936e19dd50cc6f5d2271b7e0a4a0078586b40be9dcb5f47f92a870164482369662831aaa
-  data.tar.gz: 83757df158f81b1447652c1edbe5e684c3cad325a7326a567d6fab391f6bae3ed86b847a87b17a62fb07314053e40e1a10575b8a97d76c8107ff598980ad285d
+  metadata.gz: a77badece003642190f7f7054d690d1c716d3d74a835275ac639dda48fa4f42fd80158e2559ff7ddfea175cb7e53a5bc353071d11448162c9b919a8a61620a76
+  data.tar.gz: b2cc100b93f46fc0625146ef6ac6d5579fb814aa764d30440abda2b5f31e9e236e9eff7a3fc5d159fdf1cb4a992a00429fbe42625e14b7b32da4a28b8b2ad6a7

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.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
+- [#577](https://github.com/boltops-tools/jets/pull/577) Adjust .jetskeep handling and add .jetsignore docs
+- fix dbconsole (#568)
+
+## [3.0.9] - 2021-06-14
+- fix content type s3 metadata (#564)
+
 ## [3.0.8] - 2021-06-03
 - Update cli.md (#560)
 - respect .jetsignore also (#562)

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/builders/tidy.rb

@@ -38,7 +38,7 @@ module Jets::Builders
       removals += get_removals("#{@project_root}/.jetsignore")
       removals = removals.reject do |p|
         jetskeep.find do |keep|
-          p.include?(keep)
+          p == keep
         end
       end
       removals.uniq
@@ -56,7 +56,7 @@ module Jets::Builders
     # We clean out ignored files pretty aggressively. So provide
     # a way for users to keep files from being cleaned out.
     def jetskeep
-      always = %w[.bundle packs vendor]
+      always = %w[.bundle /public/packs /public/packs-test vendor]
       path = "#{@project_root}/.jetskeep"
       return always unless File.exist?(path)
 

data/lib/jets/cfn/upload.rb

@@ -1,5 +1,6 @@
 require 'action_view'
 require 'digest'
+require 'rack/mime'
 
 module Jets::Cfn
   class Upload
@@ -8,12 +9,6 @@ module Jets::Cfn
 
     attr_reader :bucket_name
 
-    CONTENT_TYPES_BY_EXTENSION = {
-      '.css' => 'text/css',
-      '.js' => 'application/javascript',
-      '.html' => 'text/html'
-    }
-
     def initialize(bucket_name)
       @bucket_name = bucket_name
     end
@@ -93,16 +88,23 @@ module Jets::Cfn
     end
 
     def upload_to_s3(full_path)
-      return if identical_on_s3?(full_path)
+      return if identical_on_s3?(full_path) && !ENV['JETS_ASSET_UPLOAD_FORCE']
 
       key = s3_key(full_path)
       obj = s3_resource.bucket(bucket_name).object(key)
-      puts "Uploading and setting content type for s3://#{bucket_name}/#{key}" # uncomment to see and debug
-      obj.upload_file(full_path, { acl: "public-read", cache_control: cache_control }.merge(content_type_headers(full_path)))
+      content_type = content_type_headers(full_path)
+      puts "Uploading and setting content type for s3://#{bucket_name}/#{key} content_type #{content_type[:content_type].inspect}"
+      obj.upload_file(full_path, { acl: "public-read", cache_control: cache_control }.merge(content_type))
     end
 
+    CONTENT_TYPES_BY_EXTENSION = {
+      '.css'  => 'text/css',
+      '.html' => 'text/html',
+      '.js'   => 'application/javascript',
+    }
     def content_type_headers(full_path)
-      content_type = CONTENT_TYPES_BY_EXTENSION[File.extname(full_path)]
+      ext = File.extname(full_path)
+      content_type = CONTENT_TYPES_BY_EXTENSION[ext] || Rack::Mime.mime_type(ext)
       if content_type
         { content_type: content_type }
       else

data/lib/jets/commands/dbconsole.rb

@@ -1,12 +1,15 @@
 # Thanks: Rails dbconsole_command.rb
 module Jets::Commands
   class Dbconsole
+    extend Memoist
+
     def self.start(*args)
       new(*args).start
     end
 
     def initialize(options = {})
-      @options = options
+      defaults = {"include_password" => true}
+      @options = defaults.merge(options)
     end
 
     def start
@@ -85,14 +88,14 @@ module Jets::Commands
     end
 
     def config
-      @config ||= begin
-        if configurations[environment].blank?
-          raise ActiveRecord::AdapterNotSpecified, "'#{environment}' database is not configured. Available configuration: #{configurations.inspect}"
-        else
-          configurations[environment]
-        end
+      configs = configurations.configs_for(env_name: environment)
+      if configs.blank?
+        raise ActiveRecord::AdapterNotSpecified, "'#{environment}' database is not configured. Available configuration: #{configurations.inspect}"
+      else
+        configs.first.configuration_hash.dup.stringify_keys!
       end
     end
+    memoize :config
 
     def environment
       Jets.env.to_s

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

@@ -43,7 +43,7 @@ module Jets::Core
   memoize :logger
 
   def webpacker?
-    Gem.loaded_specs.keys.include?("webpacker")
+    Gem.loaded_specs.keys.any?{|k| k.start_with?("webpacker")}
   end
   memoize :webpacker?
 

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/resource/api_gateway/base_path/function.rb

@@ -25,7 +25,9 @@ module Jets::Resource::ApiGateway::BasePath
     end
 
     def layers
-      ["!Ref GemLayer"]
+      return Jets.config.lambda.layers if Jets.config.gems.disable
+
+      ["!Ref GemLayer"] + Jets.config.lambda.layers
     end
 
     def function_name

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "3.0.8"
+  VERSION = "3.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.12
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2021-08-08 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)
-});