jets 2.3.13 → 2.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1c15ea91434727519b1531096940a485671580c71718567d2f2789d49b52919
-  data.tar.gz: 16b9fad79824140e0733c9753093d8e0ba969d6f8658cc0a2d846953cbbda3db
+  metadata.gz: ddbf1726e80a44319389bf13b4b22323517ae715d552fc503fe3b48dbc89160b
+  data.tar.gz: 4671ee27bbb47bb3c413de748cc0c01ef3bdf14289f4cf28d0690f9019e7f269
 SHA512:
-  metadata.gz: f51fcf5b4ddb7bcfd2423556c6bb6871471ae487dc83a5ed080896276236dfedc8785e310e6862659f54dce8a61decb8baedf3f61b62c65f0bf79438d86d6ac1
-  data.tar.gz: 9d4c6f4924acc0c62ea93265a94d1acc68436b5a41c9e9d1ae56c0b3325542f5a947b6b294ae88d6c7b17089aeab834ff675a1d60601b3365f7e282ae66e0526
+  metadata.gz: ad4a8ceb595f021253d2f93bb3ec70c06a58d574478d3be3503756926ee1d3ca85e39f633aadba9499c8d741d86bccd44cd249a3d063a109e6c77397bbfad74c
+  data.tar.gz: f00bcab89a774abea67c64a3b9aaf96a1b64ac0778303ac11a38043c343a7fd3cf9b2966bb92e1ee39603dc76d5b5eacdad157dcd0908e3c1bdc681d0bd892bc

data/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [2.3.14]
+- #432 filtered_parameters support
+- #447 improve nested routes support. order routes so that nested resources always work
+- #451 Fix Jets turbo DB encoding
+- #452 Print Cfn templates location after build
+- #458 update webpacker fork with jetpacker gem
+- #459 fix afterburner mode
+
 ## [2.3.13]
 - #430 Remove out-of-date note about FIFO Queue
 - #433 Fixed ApiResources with long names not included in the main CloudFormation template

data/Gemfile

@@ -9,6 +9,6 @@ gemspec
 group :development, :test do
   gem "mysql2", "~> 0.5.2"
   gem "dynomite"
-  gem "webpacker", git: "https://github.com/tongueroo/webpacker.git", branch: "jets"
+  gem "jetpacker"
   gem "rspec_junit_formatter"
 end

data/lib/jets/application/defaults.rb

@@ -149,6 +149,7 @@ class Jets::Application
 
       config.controllers = ActiveSupport::OrderedOptions.new
       config.controllers.default_protect_from_forgery = nil
+      config.controllers.filtered_parameters = []
 
       config.deploy = ActiveSupport::OrderedOptions.new
       config.deploy.stagger = ActiveSupport::OrderedOptions.new

data/lib/jets/builders/code_builder.rb

@@ -99,8 +99,17 @@ module Jets::Builders
 
       # Code prep and zipping
       check_code_size!
-      generate_shims
-      calculate_md5s # must be called before create_zip_files because checksums need to be populated
+      calculate_md5s # must be called before create_zip_files and generate_shims because checksums need to be populated
+      # generate_shims and create_zip_files use checksums
+      #
+      # Notes:
+      #
+      # Had moved calculate_md5s to fix a what thought was a subtle issue https://github.com/tongueroo/jets/pull/424
+      # But am unsure about that the fix now. This essentially reverts that issue.
+      #
+      # Fix in https://github.com/tongueroo/jets/pull/459
+      #
+      generate_shims # the generated handlers/data.yml has rack_zip key
       create_zip_files
     end
 
@@ -211,7 +220,7 @@ module Jets::Builders
       # Checking this way because when using jets standalone for Afterburner mode we don't want to run into
       # bundler gem collisions.  TODO: figure out the a better way to handle the collisions.
       lines = IO.readlines("#{Jets.root}/Gemfile")
-      lines.detect { |l| l =~ /webpacker/ }
+      lines.detect { |l| l =~ /webpacker/ || l =~ /jetpacker/ }
     end
 
     # This happens in the current app directory not the tmp code for simplicity

data/lib/jets/builders/gem_replacer.rb

@@ -6,7 +6,9 @@ module Jets::Builders
     end
 
     def run
-      check = Jets::Gems::Check.new
+      # use_gemspec to resolve http-parser gem issue
+      use_gemspec = !Jets::Turbo.afterburner? # gemspec approach breaks afterburner mode
+      check = Jets::Gems::Check.new(use_gemspec: use_gemspec)
       if Jets.config.lambda.layers.empty?
         found_gems = check.run! # exits early if missing gems found
       else

data/lib/jets/commands/build.rb

@@ -32,6 +32,7 @@ module Jets::Commands
       clean_templates
       build_minimal_template
       build_all_templates if full?
+      puts "Generated CloudFormation templates at #{Jets.build_root}/templates"
     end
 
     def full?

data/lib/jets/commands/gems.rb

@@ -3,7 +3,7 @@ module Jets::Commands
     desc "check", "Check if pre-built Lambda gems are available from the sources"
     long_desc Help.text("gems:check")
     def check
-      check = Jets::Gems::Check.new(cli: true)
+      check = Jets::Gems::Check.new
       check.run! # exits early if missing gems found
       # If reach here, means all gems are ok.
       puts "Congrats! All gems are available in as pre-built Lambda gems 👍"

data/lib/jets/commands/rake_tasks.rb

@@ -27,6 +27,7 @@ class Jets::Commands::RakeTasks
     def load_webpacker_tasks
       begin
         require "webpacker"
+        require "webpacker/rake_tasks"
       rescue LoadError
         # puts "WARN: unable to load gem. #{$!}. Running with 'bundle exec' might fix this warning."
         # Happens whne user calls jets help outside the jets project folder.

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

@@ -1,10 +1,10 @@
 source "https://rubygems.org"
 
-gem "jets"
+gem "jets", git: "https://github.com/tongueroo/jets.git", submodules: true, branch: "master"
 
 <% if @webpacker -%>
-# Include webpacker if you are you are building html pages
-gem "webpacker", git: "https://github.com/tongueroo/webpacker.git", branch: "jets"
+# Include jetpacker if you are you are building html pages
+gem "jetpacker"
 <% end -%>
 <% if @database == 'postgresql' %>
 # Include pg gem if you are using ActiveRecord, remove next line

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

@@ -1,5 +1,5 @@
 /* eslint no-console:0 */
-// This file is automatically compiled by Webpack and Jets, along with any other files
+// This file is automatically compiled by Webpack, along with any other files
 // present in this directory. You're encouraged to place your actual application logic in
 // a relevant structure within app/javascript and only use these pack files to reference
 // that code so it'll be compiled.
@@ -7,6 +7,14 @@
 // To reference this file, add <%%= javascript_pack_tag 'application' %> to the appropriate
 // layout file, like app/views/layouts/application.html.erb
 
+
+// Uncomment to copy all static images under ../images to the output folder and reference
+// them with the image_pack_tag helper in views (e.g <%%= image_pack_tag 'rails.png' %>)
+// or the `imagePath` JavaScript helper below.
+//
+// const images = require.context('../images', true)
+// const imagePath = (name) => images(name, true)
+
 <% if @bootstrap -%>
 import 'bootstrap/dist/js/bootstrap';
 <% end -%>

data/lib/jets/controller/base.rb

@@ -100,14 +100,27 @@ class Jets::Controller
     end
 
     def log_info_start
-      display_event = @event.dup
-      display_event['body'] = '[BASE64_ENCODED]' if @event['isBase64Encoded']
       # 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 "  Event: #{json_dump(display_event)}"
-      Jets.logger.info "  Parameters: #{JSON.dump(params(raw: true).to_h)}"
+      Jets.logger.info "  Event: #{event_log}"
+      Jets.logger.info "  Parameters: #{JSON.dump(filtered_parameters.to_h)}"
+    end
+
+    def event_log
+      display_event = @event.dup
+
+      if @event['isBase64Encoded']
+        display_event['body'] = '[BASE64_ENCODED]'
+      else
+        display_event['body'] = parameter_filter.filter_json(display_event['body'])
+      end
+
+      display_event["queryStringParameters"] = parameter_filter.filter(display_event['queryStringParameters'])
+      display_event["pathParameters"] = parameter_filter.filter(display_event['pathParameters'])
+      json_dump(display_event)
     end
 
     # Handles binary data safely

data/lib/jets/controller/parameters_filter.rb

@@ -0,0 +1,29 @@
+require "active_support/parameter_filter"
+
+class Jets::Controller
+  class ParametersFilter
+    attr_reader :filters, :params_filter
+
+    def initialize(filters)
+      @filters = filters
+      @params_filter = ActiveSupport::ParameterFilter.new(filters)
+    end
+
+    def filter(params)
+      params && params_filter.filter(params)
+    end
+
+    def filter_json(json_text)
+      return json_text if filters.blank? || json_text.blank?
+
+      begin
+        hash_params = JSON.parse(json_text)
+        filtered_params = filter(hash_params)
+        JSON.dump(filtered_params)
+      rescue JSON::ParserError
+        String.new
+      end
+    end
+
+  end
+end

data/lib/jets/controller/params.rb

@@ -29,6 +29,10 @@ class Jets::Controller
       end
     end
 
+    def filtered_parameters(**kwargs)
+      parameter_filter.filter params(**kwargs, raw: true) # Always filter raw hash
+    end
+
     def query_parameters
       event["queryStringParameters"] || {}
     end
@@ -83,5 +87,9 @@ class Jets::Controller
       return nil if body.nil?
       Base64.decode64(body)
     end
+
+    def parameter_filter
+      @parameter_filter ||= ParametersFilter.new Jets.config.controllers.filtered_parameters
+    end
   end
 end

data/lib/jets/router.rb

@@ -93,18 +93,18 @@ module Jets
     # Useful for RouterMatcher
     #
     # Precedence:
-    # 1. Routes with no captures get highest precedence: posts/new
-    # 2. Then consider the routes with captures: post/:id
-    # 3. Last consider the routes with wildcards: *catchall
+    # Routes with wildcards are considered after routes without wildcards
     #
-    # Within these 2 groups we consider the routes with the longest path first
-    # since posts/:id and posts/:id/edit can both match.
+    # Routes with fewer captures are ordered first since both
+    # /posts/:post_id/comments/new and /posts/:post_id/comments/:id are equally
+    # long
+    #
+    # Routes with the same amount of captures and wildcards are orderd so that
+    # the longest path is considered first since posts/:id and posts/:id/edit
+    # can both match.
     def ordered_routes
-      length = Proc.new { |r| r.path.length * -1 }
-      capture_routes = routes.select { |r| r.path.include?(':') }.sort_by(&length)
-      wildcard_routes = routes.select { |r| r.path.include?('*') }.sort_by(&length)
-      simple_routes = (routes - capture_routes - wildcard_routes).sort_by(&length)
-      simple_routes + capture_routes + wildcard_routes
+      length = Proc.new { |r| [r.path.count("*"), r.path.count(":"), r.path.length * -1] }
+      routes.sort_by(&length)
     end
 
     class << self

data/lib/jets/turbo/templates/config/database.yml

@@ -1,6 +1,10 @@
 default: &default
   adapter:  <%= @adapter %>
+<% if @adapter == 'postgresql' -%>
+  encoding: unicode
+<% else -%>
   encoding: utf8mb4
+<% end -%>
   pool: <%%= ENV["DB_POOL"] || 5  %>
   database: <%%= ENV['DB_NAME'] || '<%= @database_development %>' %>
 <% if @adapter == 'postgresql' -%>

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "2.3.13"
+  VERSION = "2.3.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 2.3.13
+  version: 2.3.14
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-23 00:00:00.000000000 Z
+date: 2020-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -786,6 +786,7 @@ files:
 - lib/jets/controller/middleware/main.rb
 - lib/jets/controller/middleware/reloader.rb
 - lib/jets/controller/middleware/webpacker_setup.rb
+- lib/jets/controller/parameters_filter.rb
 - lib/jets/controller/params.rb
 - lib/jets/controller/rack/adapter.rb
 - lib/jets/controller/rack/env.rb