jets 2.3.15 → 2.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4075836f430003ceb870fea1ea766e80b309721fcdf8094020e85c438366eab6
-  data.tar.gz: ca1b516d29eb67b76bc54e4d18bc2ea60e20a046352f013285963705e2a1dc66
+  metadata.gz: 044aba70f94ce9b1894daf0a763d0a36bfa5687c79beed5acfebc3f1f0db6086
+  data.tar.gz: 28ce72323a8e5bb93db5598f2a2ba60b60921e3d969fb13f237384489902b734
 SHA512:
-  metadata.gz: 8b794f90f2a2c6da415867f61cc5d6b60b65a29b62015a3f2dbeb39220e64059f0bb03835fee2bbd4db30a4e1130d53ff897baf0fa557aeec04501f5603dc360
-  data.tar.gz: ec39e2b5519c7dc95bac0ecfd0f6e3cd4d235653372f0e6237bcbf3226bd2e90a4452f394de194014755eceade754fcbddf7d4a121e93a2a98f08c2583717768
+  metadata.gz: 17888c72f237bd56a10c61ecc783ba59ec2aa8ff5345750689ebc1fa7a6d0d221bf604c6879e71cf5787baa45c36cb0b9525a015e0b4159ad7e9a46b58f95d77
+  data.tar.gz: 106ca34b5c04e3c774a27ec9431c0c7cef7b5311ae624e975ee061b31aaa7b3f536c6267d67e34d26ed1504a289b7de46d0746e54cead594c9482b62ab2f8dd8

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.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
 

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/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
@@ -235,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/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/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/templates/skeleton/Gemfile.tt

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "jets", git: "https://github.com/tongueroo/jets.git", submodules: true, branch: "master"
+gem "jets"
 
 <% if @webpacker -%>
 # Include jetpacker if you are you are building html pages

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/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/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/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
 

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

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "2.3.15"
+  VERSION = "2.3.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 2.3.15
+  version: 2.3.16
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-04-19 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
@@ -797,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