jets 2.3.14 → 2.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddbf1726e80a44319389bf13b4b22323517ae715d552fc503fe3b48dbc89160b
-  data.tar.gz: 4671ee27bbb47bb3c413de748cc0c01ef3bdf14289f4cf28d0690f9019e7f269
+  metadata.gz: 67a692a8d7ee829132db3e1e89d656b5b7885c6f280185cfe7bd6c9a3b9ebc59
+  data.tar.gz: e2e410d872acf41f19284e610043c5b39159469eb7f576b395b27c2db0ab6dde
 SHA512:
-  metadata.gz: ad4a8ceb595f021253d2f93bb3ec70c06a58d574478d3be3503756926ee1d3ca85e39f633aadba9499c8d741d86bccd44cd249a3d063a109e6c77397bbfad74c
-  data.tar.gz: f00bcab89a774abea67c64a3b9aaf96a1b64ac0778303ac11a38043c343a7fd3cf9b2966bb92e1ee39603dc76d5b5eacdad157dcd0908e3c1bdc681d0bd892bc
+  metadata.gz: 9f05d1c81c5d69b3a2921301c69a5522a8b81e3be48515e7219f8ffdb76e90e441a1a5234c1465403545b3034a4073c82a478229f02fed1506b6bafca57bb1f6
+  data.tar.gz: 15ff2fdda4c2bc469f9cd08ebcbac4e393a29fdca7ac1980274d7ffcf9a4669b919af596e29088411a8896914a57acf7fe4f06ffcd9377fa72422eec764b36f0

data/CHANGELOG.md

@@ -3,6 +3,38 @@
 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.19] - 2021-01-28
+- #529 fix gem detection for some gems
+
+## [2.3.18]
+- #514 Allow to define route that contains dot
+- #515 set content type on upload by using extension so cloudfront will compress when serving
+- #517 support nested query params in tests
+
+## [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

data/backers.md

@@ -15,4 +15,5 @@ Funds donated via Patreon go directly to support Tung Nguyen's full-time work on
 - Nate Clark
 - Hirokatsu Endo
 - Michael Choi
+- Phan Lam
 <!--10 end-->

data/jets.gemspec

@@ -48,9 +48,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dotenv"
   spec.add_dependency "gems" # jets-gems dependency
   spec.add_dependency "hashie"
-  spec.add_dependency "jets-gems"
+  spec.add_dependency "jets-gems", "~> 0.2.3"
   spec.add_dependency "jets-html-sanitizer"
-  spec.add_dependency "json"
   spec.add_dependency "kramdown"
   spec.add_dependency "memoist"
   spec.add_dependency "mimemagic"
@@ -67,4 +66,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "cfn-status"
 end

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

@@ -21,11 +21,23 @@ module Jets::Builders
         options = @options.merge(source_url: source)
         gem_extractor = Jets::Gems::Extract::Gem.new(gem_name, options)
         gem_extractor.run
+        rename_gem(gem_name)
       end
 
       tidy
     end
 
+    def rename_gem(gem_name)
+      ruby_folder = "#{Jets.build_root}/stage/opt/ruby/gems/#{Jets::Gems.ruby_folder}"
+      gems_folder = "#{ruby_folder}/gems"
+      expr = "#{gems_folder}/#{gem_name}-x*-{darwin,linux}"
+      src = Dir.glob(expr).first
+      return unless src
+
+      dest = src.sub("-darwin", "-linux")
+      FileUtils.mv(src, dest) unless File.exist?(dest) # looks like rename_gem actually runs twice
+    end
+
     def sh(command)
       puts "=> #{command}".color(:green)
       success = system(command)

data/lib/jets/builders/ruby_packager.rb

@@ -59,14 +59,14 @@ 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"
         )
       end
 
-      remove_bundled_with("#{cache_area}/Gemfile.lock")
+      rewrite_gemfile_lock("#{cache_area}/Gemfile.lock")
 
       # Copy the Gemfile.lock back to the project in case it was updated.
       # For example we add the jets-rails to the Gemfile.
@@ -150,9 +150,10 @@ module Jets::Builders
 
     # Remove the BUNDLED WITH line since we don't control the bundler gem version on AWS Lambda
     # And this can cause issues with require 'bundler/setup'
-    def remove_bundled_with(gemfile_lock)
+    def rewrite_gemfile_lock(gemfile_lock)
       lines = IO.readlines(gemfile_lock)
 
+      # Remove BUNDLED WITH
       # amount is the number of lines to remove
       new_lines, capture, count, amount = [], true, 0, 2
       lines.each do |l|
@@ -166,6 +167,27 @@ module Jets::Builders
         end
       end
 
+      # Replace things like nokogiri (1.11.1-x86_64-darwin) => nokogiri (1.11.1)
+      lines, new_lines = new_lines, []
+      lines.each do |l|
+        if l.include?("-x86_64-darwin")
+          l = l.sub('-x86_64-darwin','')
+        end
+        new_lines << l
+      end
+
+      # Make sure platform is ruby
+      lines, new_lines, marker = new_lines, [], false
+      lines.each do |l|
+        if marker # the next loop has the platform we want to replace
+          new_lines << "  ruby\n"
+          marker = false
+          next
+        end
+        marker = l.include?('PLATFORMS')
+        new_lines << l
+      end
+
       content = new_lines.join('')
       IO.write(gemfile_lock, content)
     end

data/lib/jets/cfn/upload.rb

@@ -7,6 +7,13 @@ module Jets::Cfn
     include ActionView::Helpers::NumberHelper # number_to_human_size
 
     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
@@ -90,8 +97,17 @@ module Jets::Cfn
 
       key = s3_key(full_path)
       obj = s3_resource.bucket(bucket_name).object(key)
-      puts "Uploading s3://#{bucket_name}/#{key}" # uncomment to see and debug
-      obj.upload_file(full_path, acl: "public-read", cache_control: cache_control)
+      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)))
+    end
+
+    def content_type_headers(full_path)
+      content_type = CONTENT_TYPES_BY_EXTENSION[File.extname(full_path)]
+      if content_type
+        { content_type: content_type }
+      else
+        {}
+      end
     end
 
     def s3_key(full_path)

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/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,9 +1,9 @@
 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
+# Include jetpacker if you are building html pages
 gem "jetpacker"
 <% end -%>
 <% if @database == 'postgresql' %>

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/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/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
 
@@ -94,7 +96,7 @@ module Jets::Resource::ApiGateway
     def camelized_path
       path = @route.path
       path = "homepage" if path == ''
-      path.gsub('/','_').gsub(':','').gsub('*','').camelize
+      path.gsub('/','_').gsub(':','').gsub('*','').gsub('.','').camelize
     end
   end
 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/api_gateway/resource.rb

@@ -76,7 +76,7 @@ module Jets::Resource::ApiGateway
   private
     # Similar path_logical_id method in resource/route.rb
     def path_logical_id(path)
-      path.gsub('/','_').gsub(':','').gsub('*','').gsub('-','_').camelize
+      path.gsub('/','_').gsub(':','').gsub('*','').gsub('-','_').gsub('.','_').camelize
     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/spec_helpers/controllers/request.rb

@@ -46,7 +46,7 @@ module Jets::SpecHelpers::Controllers
 
       params.query_params.each do |key, value|
         json['queryStringParameters'] ||= {}
-        json['queryStringParameters'][key.to_s] = value.to_s
+        json['queryStringParameters'][key.to_s] = value
       end
 
       json

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.14"
+  VERSION = "2.3.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 2.3.14
+  version: 2.3.19
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -308,16 +308,16 @@ dependencies:
   name: jets-gems
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: jets-html-sanitizer
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -556,6 +542,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cfn-status
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Jets is a framework that allows you to create serverless applications
   with a beautiful language: Ruby. It includes everything required to build and deploy
   an application.  Jets leverages the power of Ruby to make serverless joyful for
@@ -797,6 +797,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
@@ -1102,7 +1103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Ruby Serverless Framework