jets 2.3.12 → 2.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14f4e12068a48f8ff8d9114f69f9b01da482d89c78a4f7027a42c4c33995de93
-  data.tar.gz: 2a078028215d546115310857ec3c37ec629b0be726182e4c6a4f1d6ddd2f9dd2
+  metadata.gz: 570f01c2fe2cff82700a1c8110b340a6897381d61fa5248f118b785fe399cefe
+  data.tar.gz: 64ad72c3d50974e7e816e5647dbcd3f5e26277144ab409b867e7f7ccc58e166e
 SHA512:
-  metadata.gz: ae698eaaba985b224cb01b43e2ac90015ae5e7a5fd1eaf4a4c9a97e76303b9fc700fe3e251843bc7fb6c209a94c51f7a07743a98203bdb27e79c6dc19c18c026
-  data.tar.gz: 40142abe6a735a848f1931fa1f044f5964191b1c0326cce0b00d3850b05023ab238b97b5c793d13e7c7b78bf5e4e3a1baa747f0fb233c7fd5f4e3535c9207e44
+  metadata.gz: 10c4489b8c063d2a3e94f63b9ebb0fda617a31f41bc92dcd77a32755307fef81930ba1359a3364f13baf8a3ea746234019343b7621bdf2ff27c6b86076fa473e
+  data.tar.gz: 76bf5d77ab7f8b3064174aea1baea7eac92a787d217fb8a91c431132da9fba95ef342a6f8f145f2174c74cb6f4a914c5ba74ce8a6c06c5984528fdee0ce86c24

data/.cody/docs/bin/git_setup.sh

@@ -10,12 +10,3 @@
 git config --global user.email "tongueroo@gmail.com"
 git config --global user.name "Tung Nguyen"
 
-set +u # cb start will not have CODEBUILD_WEBHOOK_TRIGGER set
-if [ -n "$CODEBUILD_WEBHOOK_TRIGGER" ]; then # git push
-  BRANCH=$(echo $CODEBUILD_WEBHOOK_TRIGGER | sed "s/.*\///")
-elif [ -n "$CODEBUILD_SOURCE_VERSION" ]; then # cb start
-  BRANCH=$CODEBUILD_SOURCE_VERSION # contains the actual branch
-else
-  BRANCH=UNKNOWN-BRANCH
-fi
-git checkout $BRANCH

data/.ruby-version

@@ -1 +1 @@
-2.5.6
+2.5.7

data/CHANGELOG.md

@@ -3,6 +3,47 @@
 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.17]
+- #472 Docs: Update cors-support.md
+- #475 Docs: Update activerecord.md to include db:create step
+- #476 Docs: Update authorizer-cognito.md
+- #482 Docs: Fixed description for "jetpacker" gem in Gemfile
+- #483 Docs: controllers Fix minor typo
+- #489 Docs: call typo
+- #490 Docs: authorizers typo
+- #504 Docs: tutorial series
+- #505 Docs: display more tutorial articles
+- #509 Docs: Update lamdba permissions for minimal-iam-policy doc
+- #512 Bug fix: fix on_lambda? check allow testing #512
+
+## [2.3.16]
+- #466 fix application_config typo
+- #467 Handle forbidden error from s3
+- #468 authorization_scopes
+- #469 Fixed typo from STMP to SMTP
+- #470 remove json dependency
+- #471 use `Bundler.with_unbundled_env` remove bundler deprecation
+
+## [2.3.15]
+- #461 fix guesser lookup for long function names
+
+## [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
+- #435 fix typo SMTP
+- #437 Ignore *.local files when JETS_ENV_REMOTE=1
+- #438 Forcing sort of initializers
+- #446 temp fix for actionmailer turbine initializer
+- update to ruby 2.5.7
+
 ## [2.3.12]
 - #421 use underscore for database name in database.yml
 - #422 url_for: allow any activemodel compatiable object to work

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/jets.gemspec

@@ -50,7 +50,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "hashie"
   spec.add_dependency "jets-gems"
   spec.add_dependency "jets-html-sanitizer"
-  spec.add_dependency "json"
   spec.add_dependency "kramdown"
   spec.add_dependency "memoist"
   spec.add_dependency "mimemagic"

data/lib/jets.rb

@@ -18,6 +18,8 @@ $:.unshift("#{gem_root}/lib")
 $:.unshift("#{gem_root}/vendor/cfn-status/lib")
 require "cfn_status"
 
+require "jets/core_ext/bundler"
+
 require "jets/autoloaders"
 Jets::Autoloaders.log! if ENV["JETS_AUTOLOAD_LOG"]
 Jets::Autoloaders.once.setup

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

@@ -120,7 +120,7 @@ class Jets::Booter
 
     # All Turbines
     def app_initializers
-      Dir.glob("#{Jets.root}/config/initializers/**/*").each do |path|
+      Dir.glob("#{Jets.root}/config/initializers/**/*").sort.each do |path|
         load path
       end
     end

data/lib/jets/builders/code_builder.rb

@@ -82,7 +82,7 @@ module Jets::Builders
       begin
         s3.head_object(bucket: s3_bucket, key: s3_key)
         true
-      rescue Aws::S3::Errors::NotFound
+      rescue Aws::S3::Errors::NotFound, Aws::S3::Errors::Forbidden
         false
       end
     end
@@ -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
@@ -226,7 +235,7 @@ module Jets::Builders
 
       # Need to capture JETS_ROOT since can be changed by Turbo mode
       jets_root = Jets.root
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         # Switch gemfile for Afterburner mode
         gemfile = ENV['BUNDLE_GEMFILE']
         ENV['BUNDLE_GEMFILE'] = "#{jets_root}/rack/Gemfile"

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

@@ -59,7 +59,7 @@ module Jets::Builders
 
       FileUtils.rm_rf("#{cache_area}/.bundle")
       require "bundler" # dynamically require bundler so user can use any bundler
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         sh(
           "cd #{cache_area} && " \
           "env bundle install --path #{cache_area}/vendor/gems --without development test"

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

@@ -140,7 +140,7 @@ class Jets::Commands::Call
     puts "Pro tip: The Lambda Console Link to the #{function_name} function has been added to your clipboard." unless @options[:mute]
   end
 
-  # TODO: Hook client_context up and maek sure it works. Think I've figure out how to sign client_context below.
+  # TODO: Hook client_context up and make sure it works. Think I've figure out how to sign client_context below.
   # Client context must be a valid Base64-encoded JSON object
   # Example: http://docs.aws.amazon.com/mobileanalytics/latest/ug/PutEvents.html
   def client_context

data/lib/jets/commands/call/base_guesser.rb

@@ -36,9 +36,11 @@ class Jets::Commands::Call
     def generated_function_name(function_name)
       if function_name.size > Jets::MAX_FUNCTION_NAME_SIZE # name generated by CloudFormation
         logical_id = @class_name.gsub('::','')
-        app_stack_arn = lookup(parent_stack[:outputs], logical_id)
 
-        resources = stack_resources(app_stack_arn)
+        parent_resources = stack_resources(parent_stack.stack_id)
+        app_stack = parent_resources.find { |s| s.logical_resource_id == logical_id }
+
+        resources = stack_resources(app_stack.physical_resource_id)
         resource = resources.find { |r| r.logical_resource_id == method_name.camelize + "LambdaFunction" } # method_name only contains the method
         resource.physical_resource_id # actual function name
       else

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/import/base.rb

@@ -41,7 +41,7 @@ class Jets::Commands::Import
     end
 
     def bundle_install
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         run "cd rack && bundle install"
       end
     end

data/lib/jets/commands/main.rb

@@ -43,7 +43,7 @@ module Jets::Commands
       puts Jets::Booter.message
       Jets::Booter.check_config_ru!
       Jets::RackServer.start(options) unless ENV['JETS_RACK'] == '0' # rack server runs in background by default
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         system(command)
       end
     end

data/lib/jets/commands/new.rb

@@ -61,7 +61,7 @@ module Jets::Commands
     end
 
     def bundle_install
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         system("BUNDLE_IGNORE_CONFIG=1 bundle install")
       end
     end

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

@@ -3,8 +3,8 @@ source "https://rubygems.org"
 gem "jets"
 
 <% 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 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/authorization.rb

@@ -6,7 +6,8 @@ class Jets::Controller
       class_attribute :auth_type,
                       :auth_to,
                       :auth_options, # for only and except filters
-                      :api_key_needed
+                      :api_key_needed,
+                      :authorization_scopes_value
     end
 
     class_methods do
@@ -31,6 +32,14 @@ class Jets::Controller
         end
       end
 
+      def authorization_scopes(value=nil)
+        if !value.nil?
+          self.authorization_scopes_value = value
+        else
+          self.authorization_scopes_value
+        end
+      end
+
       def authorizer_metadata
         Jets::Router::Route::Authorizer.metadata(auth_to)
       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/core_ext/bundler.rb

@@ -0,0 +1,7 @@
+# Bundler 2.0 does yet not have with_unbundled_env
+# Bundler 2.1 deprecates with_unbundled_env for with_unbundled_env
+
+require "bundler"
+def Bundler.with_unbundled_env(&block)
+  with_clean_env(&block)
+end unless Bundler.respond_to?(:with_unbundled_env)

data/lib/jets/dotenv.rb

@@ -22,18 +22,18 @@ class Jets::Dotenv
   # dotenv files with the following precedence:
   #
   # - .env.development.jets_env_extra (highest)
-  # - .env.development.remote (2nd highest)
-  # - .env.development.local
+  # - .env.development.remote (2nd highest, only if JETS_ENV_REMOTE=1)
+  # - .env.development.local (unless JETS_ENV_REMOTE=1)
   # - .env.development
-  # - .env.local - This file is loaded for all environments _except_ `test`.
+  # - .env.local - This file is loaded for all environments _except_ `test` or unless JETS_ENV_REMOTE=1
   # - .env - The original (lowest)
   #
   def dotenv_files
     files = [
       root.join(".env"),
-      (root.join(".env.local") unless Jets.env.test?),
+      (root.join(".env.local") unless (Jets.env.test? || @remote)),
       root.join(".env.#{Jets.env}"),
-      root.join(".env.#{Jets.env}.local"),
+      (root.join(".env.#{Jets.env}.local") unless @remote),
     ]
     files << root.join(".env.#{Jets.env}.remote") if @remote
     if ENV["JETS_ENV_EXTRA"]

data/lib/jets/internal/turbines/jets/mailer.rb

@@ -8,6 +8,7 @@ module Jets
     end
 
     initializer "action_mailer.set_configs" do |app|
+      app.config.action_mailer ||= ActiveSupport::OrderedOptions.new # TODO: temp fix. only happens sometimes?
       options = app.config.action_mailer
       options.default_url_options ||= {}
       options.default_url_options[:protocol] ||= "https"

data/lib/jets/job/base.rb

@@ -42,7 +42,7 @@ module Jets::Job
 
     private
       def on_lambda?
-        !!ENV['AWS_LAMBDA_FUNCTION_NAME'] || Jets.env.test?
+        !!ENV['AWS_LAMBDA_FUNCTION_NAME']
       end
     end
   end

data/lib/jets/rack_server.rb

@@ -34,7 +34,7 @@ module Jets
     def serve
       # Note, looks like stopping jets server with Ctrl-C sends the TERM signal
       # down to the sub bin/rackup command cleans up the child process fine.
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         args = ''
         # only forward the host option, port is always 9292 for simplicity
         if @options[:host]

data/lib/jets/resource.rb

@@ -26,14 +26,14 @@ class Jets::Resource
     Jets::Resource.truncate_id(id)
   end
 
-  def self.truncate_id(id)
+  def self.truncate_id(id, postfix = '')
     # Api Gateway resource name has a limit of 64 characters.
     # Yet it throws not found when ID is longer than 62 characters and I don't know why.
     # To keep it safe, let's stick to the 62 characters limit.
-    if id.size > 62
-      "#{id[0..55]}#{Digest::MD5.hexdigest(id)[0..5]}"
+    if id.size + postfix.size > 62
+      "#{id[0..(55 - postfix.size)]}#{Digest::MD5.hexdigest(id)[0..5]}#{postfix}"
     else
-      id
+      "#{id}#{postfix}"
     end
   end
 

data/lib/jets/resource/api_gateway/method.rb

@@ -36,6 +36,8 @@ module Jets::Resource::ApiGateway
         method_responses: []
       }
       props[:authorizer_id] = authorizer_id if authorizer_id
+      props[:authorization_scopes] = authorization_scopes if authorization_scopes
+
       props
     end
 
@@ -83,7 +85,7 @@ module Jets::Resource::ApiGateway
     def resource_id
       @route.path == '' ?
        "RootResourceId" :
-       Jets::Resource.truncate_id("#{resource_logical_id.camelize}ApiResource")
+       Jets::Resource.truncate_id(resource_logical_id.camelize, "ApiResource")
     end
 
     # Example: Posts

data/lib/jets/resource/api_gateway/method/authorization.rb

@@ -28,5 +28,14 @@ class Jets::Resource::ApiGateway::Method
         controller_klass.api_key_required ||
         Jets.config.api.api_key_required
     end
+
+    def authorization_scopes
+      if @route.authorization_scopes
+        authorization_scopes = @route.authorization_scopes
+      elsif controller_klass.authorization_scopes
+        authorization_scopes = controller_klass.authorization_scopes
+      end
+      authorization_scopes
+    end
   end
 end

data/lib/jets/resource/api_gateway/resource.rb

@@ -28,7 +28,7 @@ module Jets::Resource::ApiGateway
       if @path == ''
         "RootResourceId"
       else
-        Jets::Resource.truncate_id "#{path_logical_id(@path)}ApiResource"
+        Jets::Resource.truncate_id path_logical_id(@path), "ApiResource"
       end
     end
 
@@ -41,7 +41,7 @@ module Jets::Resource::ApiGateway
       if @path.include?('/') # posts/:id or posts/:id/edit
         parent_path = @path.split('/')[0..-2].join('/')
         parent_logical_id = path_logical_id(parent_path)
-        Jets::Resource.truncate_id("#{parent_logical_id}ApiResource")
+        Jets::Resource.truncate_id(parent_logical_id, "ApiResource")
       else
         "RootResourceId"
       end

data/lib/jets/resource/lambda/function.rb

@@ -52,8 +52,8 @@ module Jets::Resource::Lambda
         environment: { variables: environment },
       }
 
-      appplication_config = Jets.application.config.function.to_h
-      baseline.merge(appplication_config)
+      application_config = Jets.application.config.function.to_h
+      baseline.merge(application_config)
     end
 
     # Class properties example:
@@ -211,4 +211,4 @@ module Jets::Resource::Lambda
       "#{@app_class}##{@task.meth}"
     end
   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/router/route/authorizer.rb

@@ -16,6 +16,10 @@ class Jets::Router::Route
       @options[:authorizer]
     end
 
+    def authorization_scopes
+      @options[:authorization_scopes]
+    end
+
     def authorization_type
       @options[:authorization_type] || inferred_authorization_type
     end

data/lib/jets/turbo/rails.rb

@@ -110,7 +110,7 @@ class Jets::Turbo
     # TODO: remove duplication, copied from jets/commands/import/base.rb
     # And modified it slightly
     def bundle_install
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         sh "cd #{build_area}/#{@project_folder}/rack && bundle install"
       end
     end

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.12"
+  VERSION = "2.3.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 2.3.12
+  version: 2.3.17
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -332,20 +332,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -786,6 +772,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
@@ -796,6 +783,7 @@ files:
 - lib/jets/controller/response.rb
 - lib/jets/controller/stage.rb
 - lib/jets/core.rb
+- lib/jets/core_ext/bundler.rb
 - lib/jets/core_ext/kernel.rb
 - lib/jets/db.rb
 - lib/jets/dotenv.rb