jets 2.3.16 → 3.0.2

data/lib/jets/resource/child_stack/api_deployment.rb

@@ -20,11 +20,13 @@ module Jets::Resource::ChildStack
 
     def parameters
       p = {
+        GemLayer: "!Ref GemLayer",
         IamRole: "!GetAtt IamRole.Arn",
         RestApi: "!GetAtt ApiGateway.Outputs.RestApi",
         S3Bucket: "!Ref S3Bucket",
       }
       p[:DomainName] = "!GetAtt ApiGateway.Outputs.DomainName" if Jets.custom_domain?
+      p[:BasePath] = Jets.config.domain.base_path unless Jets.config.domain.base_path.nil?
       p
     end
 

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

@@ -147,7 +147,7 @@ module Jets::Resource::Lambda
       map = {
         node: "nodejs8.10",
         python: "python3.6",
-        ruby: "ruby2.5",
+        ruby: Jets.ruby_runtime,
       }
       map[@task.lang]
     end

data/lib/jets/router/dsl.rb

@@ -5,7 +5,7 @@ class Jets::Router
     # Methods supported by API Gateway
     %w[any delete get head options patch post put].each do |method_name|
       define_method method_name do |path, options={}|
-        create_route(options.merge(path: path, method: __method__))
+        create_route(options.merge(path: escape_path(path), method: __method__))
       end
     end
 
@@ -62,6 +62,7 @@ class Jets::Router
       {
         as: options.delete(:as) || item, # delete as or it messes with create_route
         prefix: prefix,
+        param: options[:param],
         # module: options.delete(:module) || item, # NOTE: resources does not automatically set module, but namespace does
       }
     end
@@ -134,5 +135,10 @@ class Jets::Router
       MethodCreator.new(options, @scope).create_root_helper
       @routes << Route.new(options, @scope)
     end
+    private
+
+    def escape_path(path)
+      path.to_s.split('/').map { |s| s =~ /\A[:\*]/ ? s : CGI.escape(s) }.join('/')
+    end
   end
 end

data/lib/jets/router/method_creator/code.rb

@@ -67,7 +67,7 @@ class Jets::Router::MethodCreator
       return if @as == :disabled
       path_method_call = "#{full_meth_name(:path)}#{meth_args}"
       # Note: It is important lazily get the value of ENV['JETS_HOST'] within the method.
-      # Since it is not set until the requrest goes through the main middleware.
+      # Since it is not set until the request goes through the main middleware.
       <<~EOL
         def #{full_meth_name(:url)}#{meth_args}
           "\#{ENV['JETS_HOST']}\#{#{path_method_call}}"

data/lib/jets/router/scope.rb

@@ -35,9 +35,13 @@ module Jets
 
           case current.from
           when :resources
-            variable = prefix.to_s.split('/').last
-            variable = ":#{variable.singularize}_id"
-            result.unshift(variable)
+            path_param = if current.options[:param]
+              ":#{current.options[:param]}"
+            else
+              resource_name = prefix.to_s.split('/').last
+              resource_name = ":#{resource_name.singularize}_id"
+            end
+            result.unshift(path_param)
             result.unshift(prefix)
           else # resource, namespace or general scope
             result.unshift(prefix)

data/lib/jets/spec_helpers/controllers.rb

@@ -25,10 +25,17 @@ module Jets::SpecHelpers
       request.path = path
       request.headers.deep_merge!(params.delete(:headers) || {})
 
-      request.params.body_params = params.delete(:params) || params || {}
-
       request.params.query_params = params.delete(:query)
-      request.params.query_params ||= params if request.method == :get
+
+      if request.method == :get
+        request.params.body_params = {}
+        request.params.query_params ||= params.delete(:params)
+        request.params.query_params ||= params
+      else
+        request.params.body_params = params.delete(:params)
+        request.params.body_params ||= params
+      end
+
       request.params.query_params ||= {}
 
       request.params.path_params = params

data/lib/jets/spec_helpers/controllers/request.rb

@@ -10,7 +10,7 @@ module Jets::SpecHelpers::Controllers
     def event
       json = {}
       id_params = route.path.scan(%r{:([^/]+)}).flatten
-      expanded_path = path.dup
+      expanded_path = escape_path(path)
       path_parameters = {}
 
       id_params.each do |id_param|
@@ -19,11 +19,12 @@ module Jets::SpecHelpers::Controllers
         path_param_value = path_params[id_param.to_sym]
         raise "Path param :#{id_param} value cannot be blank" if path_param_value.blank?
 
-        expanded_path.gsub!(":#{id_param}", path_param_value.to_s)
-        path_parameters.deep_merge!(id_param => path_param_value.to_s)
+        escaped_path_param_value = CGI.escape(path_param_value.to_s)
+        expanded_path.gsub!(":#{id_param}", escaped_path_param_value)
+        path_parameters.deep_merge!(id_param => escaped_path_param_value)
       end
 
-      json['resource'] = path
+      json['resource'] = escape_path(path)
       json['path'] = expanded_path
       json['httpMethod'] = method.to_s.upcase
       json['pathParameters'] = path_parameters
@@ -46,7 +47,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.deep_dup
       end
 
       json
@@ -84,5 +85,11 @@ module Jets::SpecHelpers::Controllers
 
       Response.new(response) # converts APIGW hash to prettier object
     end
+
+    private
+
+    def escape_path(path)
+      path.to_s.split('/').map { |s| s =~ /\A[:\*]/ ? s : CGI.escape(s) }.join('/')
+    end
   end
 end

data/lib/jets/stack/main/dsl/lambda.rb

@@ -41,7 +41,7 @@ module Jets::Stack::Main::Dsl
       defaults[:function_name] = function_name if function_name
 
       props = defaults.merge(props)
-      props[:runtime] = "ruby2.5" if props[:runtime].to_s == "ruby"
+      props[:runtime] = Jets.ruby_runtime if props[:runtime].to_s == "ruby"
       props[:handler] = handler(props[:handler])
 
       logical_id = id.to_s.gsub('/','_')

data/lib/jets/turbo.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'memoist'
 
 module Jets
   class Turbo

data/lib/jets/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 2.3.16
+  version: 3.0.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: aws-mfa-secure
   requirement: !ruby/object:Gem::Requirement
@@ -235,35 +235,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cfn_camelizer
+  name: cfn-status
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: cfnresponse
+  name: cfn_camelizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: cfn_response
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -277,7 +277,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gems
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -291,7 +291,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: gems
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -305,7 +305,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jets-gems
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -394,14 +394,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -430,6 +430,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: serverlessgems
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: shotgun
   requirement: !ruby/object:Gem::Requirement
@@ -487,7 +501,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -501,7 +515,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -528,6 +542,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: render_me_pretty
+  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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -654,6 +682,7 @@ files:
 - lib/jets/commands/clean/base.rb
 - lib/jets/commands/clean/build.rb
 - lib/jets/commands/clean/log.rb
+- lib/jets/commands/configure.rb
 - lib/jets/commands/console.rb
 - lib/jets/commands/db.rb
 - lib/jets/commands/db/environment-task.rake
@@ -813,6 +842,7 @@ files:
 - lib/jets/internal/app/controllers/jets/public_controller.rb
 - lib/jets/internal/app/controllers/jets/rack_controller.rb
 - lib/jets/internal/app/functions/jets/base_path.rb
+- lib/jets/internal/app/functions/jets/base_path_mapping.rb
 - lib/jets/internal/app/helpers/jets/mailers_helper.rb
 - lib/jets/internal/app/jobs/jets/preheat_job.rb
 - lib/jets/internal/app/shared/functions/jets/s3_bucket_config.rb
@@ -885,6 +915,7 @@ files:
 - lib/jets/resource/api_gateway/rest_api.rb
 - lib/jets/resource/api_gateway/rest_api/change_detection.rb
 - lib/jets/resource/api_gateway/rest_api/logical_id.rb
+- lib/jets/resource/api_gateway/rest_api/logical_id/message.rb
 - lib/jets/resource/api_gateway/rest_api/routes.rb
 - lib/jets/resource/api_gateway/rest_api/routes/change.rb
 - lib/jets/resource/api_gateway/rest_api/routes/change/base.rb
@@ -1006,30 +1037,6 @@ files:
 - lib/jets/version.rb
 - readme/prerelease.md
 - readme/testing.md
-- vendor/cfn-status/CHANGELOG.md
-- vendor/cfn-status/Gemfile
-- vendor/cfn-status/Gemfile.lock
-- vendor/cfn-status/LICENSE.txt
-- vendor/cfn-status/README.md
-- vendor/cfn-status/Rakefile
-- vendor/cfn-status/bin/console
-- vendor/cfn-status/bin/setup
-- vendor/cfn-status/cfn-status.gemspec
-- vendor/cfn-status/lib/cfn-status.rb
-- vendor/cfn-status/lib/cfn_status.rb
-- vendor/cfn-status/lib/cfn_status/aws_service.rb
-- vendor/cfn-status/lib/cfn_status/version.rb
-- vendor/cfn-status/spec/fixtures/cfn/pages/fresh/describe_stack_events-1.json
-- vendor/cfn-status/spec/fixtures/cfn/pages/fresh/describe_stack_events-2.json
-- vendor/cfn-status/spec/fixtures/cfn/pages/fresh/describe_stack_events-3.json
-- vendor/cfn-status/spec/fixtures/cfn/pages/updating/describe_stack_events-1.json
-- vendor/cfn-status/spec/fixtures/cfn/pages/updating/describe_stack_events-2.json
-- vendor/cfn-status/spec/fixtures/cfn/pages/updating/describe_stack_events-3.json
-- vendor/cfn-status/spec/fixtures/cfn/stack-events-complete.json
-- vendor/cfn-status/spec/fixtures/cfn/stack-events-in-progress.json
-- vendor/cfn-status/spec/fixtures/cfn/stack-events-update-rollback-complete.json
-- vendor/cfn-status/spec/lib/cfn_status_spec.rb
-- vendor/cfn-status/spec/spec_helper.rb
 homepage: https://rubyonjets.com
 licenses:
 - MIT
@@ -1089,7 +1096,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