jets 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b8feeca879fd1adda5fb63cd872c48fe16db73fc07e12589e82074dc2d23a21
-  data.tar.gz: 6719c8ea953c06b04e09af7942ff51696027af86ae67b7eadeafdcea9d536d31
+  metadata.gz: 123389cefd68a8b8a119f83358019cd456d76d181c42a320051a73e1c03c87e6
+  data.tar.gz: d805927821c334310cdb8ae2c998f4e1b3ef87921a660d48dfc90e923789b595
 SHA512:
-  metadata.gz: 6f98de3cc8fb239474ed79cbf0031b8ec3d880f2fc862e21e09d5f3f59d1743ccd071320c9e0984a6cb5b9608c15cd338a8ddb6096245e6fe822abd9d73aeb5f
-  data.tar.gz: 9d118c05ac914b609e4a4e4d792723fa3e017f954327ecfdc96648be186a8db18a7246255ed736dca468c59582f9253ec7dda83d43bc45508878c69bfbd06cba
+  metadata.gz: 80ffdd4a8cf53d311c0db441ca44d15acab2c107cb45f09e857bf9245b57b875ad6504ca65beebb55ae263484750681e737c6c66d513e4fc3701a3150d62a6e0
+  data.tar.gz: e9a0be9ea49d69363426a161f07cfec13a0a9ca14f351a543f48c9589674d850a1e9ea9d147e712cdd50805eb8605ffde957b83d7a529904b70663f7c91ddee2

data/.circleci/config.yml

@@ -112,12 +112,6 @@ jobs:
             output = json
             EOL
 
-            cat >~/.aws/credentials <<EOL
-            [default]
-            aws_secret_access_key = ${AWS_SECRET_ACCESS_KEY}
-            aws_access_key_id = ${AWS_ACCESS_KEY_ID}
-            EOL
-
       # collect reports
       - store_test_results:
           path: /tmp/test-results

data/.github/ISSUE_TEMPLATE/question.md

@@ -7,10 +7,8 @@ assignees: ''
 
 ---
 
-<!--
-The Jets issue tracker IS NOT for usage questions! Please post your question on our dedicated forum at https://community.rubyonjets.com 
+The Jets issue tracker IS NOT for usage questions! Please post your question on our dedicated forum at https://community.rubyonjets.com
 
-To be sensitive to everyone's time, we may close issues asking questions without comment. Posting your questions in the Jets community forum is the best place. It also benefits others by making the questions easier to find. Here are some additional options also http://rubyonjets.com/docs/support/ 👌
+To be sensitive to everyone's time, we may close issues asking questions without comment. If you repeatedly post questions in the issues tracker, you may be blocked from ever submitting issues to Jets again. Please use your best judgment. 👍
 
-Thank you!
--->
+Posting your questions in the Jets community forum benefits others by grouping questions in a dedicated place. Here are some additional options also http://rubyonjets.com/docs/support/ 😁

data/CHANGELOG.md

@@ -3,6 +3,17 @@
 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.0.5]
+- #333 Always keep vendor directory
+- #335 Controller action_name method
+- #336 Escape paths passed to rsync
+- #338 Support for "apiKeyRequired" option for API method
+- #339 Implement endpoint_policy configuration
+- #340 Fix tidy_spec from #333
+- #341 Return exist status 1 if deployment fails
+- #342 Adding support for `:only` option, to the skip\_before_action method
+- #343 spec helpers: dont cache request headers between specs
+
 ## [2.0.4]
 - #332 spec helpers: include routes helper
 

data/lib/jets/application/defaults.rb

@@ -99,6 +99,8 @@ class Jets::Application
       config.api.cors_authorization_type = nil # nil so ApiGateway::Cors#cors_authorization_type handles
       config.api.binary_media_types = ['multipart/form-data']
       config.api.endpoint_type = 'EDGE' # PRIVATE, EDGE, REGIONAL
+      config.api.endpoint_policy = nil # required when endpoint_type is EDGE
+      config.api.api_key_required = false # Turn off API key required
 
       config.domain = ActiveSupport::OrderedOptions.new
       # config.domain.name = "#{Jets.project_namespace}.coolapp.com" # Default is nil

data/lib/jets/builders/tidy.rb

@@ -55,7 +55,7 @@ module Jets::Builders
     # We clean out ignored files pretty aggressively. So provide
     # a way for users to keep files from being cleaned out.
     def jetskeep
-      always = %w[.bundle packs]
+      always = %w[.bundle packs vendor]
       path = "#{@project_root}/.jetskeep"
       return always unless File.exist?(path)
 

data/lib/jets/cfn/ship.rb

@@ -40,7 +40,7 @@ module Jets::Cfn
           The specific child stack usually shows more detailed information and can be used to resolve the issue.
           Example of checking the CloudFormation console: https://rubyonjets.com/docs/debugging/cloudformation/
         EOL
-        return
+        exit 1
       end
 
       prewarm

data/lib/jets/controller/base.rb

@@ -97,6 +97,10 @@ class Jets::Controller
       paths
     end
 
+    def action_name
+      @meth
+    end
+
     def self.controller_path
       name.sub(/Controller$/, "".freeze).underscore
     end
@@ -127,5 +131,14 @@ class Jets::Controller
         self.auth_type
       end
     end
+
+    class_attribute :api_key_needed
+    def self.api_key_required(value=nil)
+      if !value.nil?
+        self.api_key_needed = value
+      else
+        self.api_key_needed
+      end
+    end
   end
 end

data/lib/jets/controller/callbacks.rb

@@ -8,25 +8,28 @@ class Jets::Controller
       class_attribute :after_actions, default: []
 
       class << self
-        def before_action(meth, options={})
+        def before_action(meth, options = {})
           self.before_actions += [[meth, options]]
         end
 
-        def prepend_before_action(meth, options={})
+        def prepend_before_action(meth, options = {})
           self.before_actions = [[meth, options]] + self.before_actions
         end
 
-        def skip_before_action(meth)
-          self.before_actions = self.before_actions.reject { |el| el.first.to_s == meth.to_s }
+        def skip_before_action(meth, options = {})
+          # adds the methods in the only to the exception list for the callback
+          return append_except_to_callbacks(self.before_actions, meth, options[:only]) if options[:only].present?
+            
+          self.before_actions.reject! { |el| el.first.to_s == meth.to_s }
         end
 
         alias_method :append_before_action, :before_action
 
-        def after_action(meth, options={})
+        def after_action(meth, options = {})
           self.after_actions += [[meth, options]]
         end
 
-        def prepend_after_action(meth, options={})
+        def prepend_after_action(meth, options = {})
           self.after_actions = [[meth, options]] + self.after_actions
         end
 
@@ -35,6 +38,20 @@ class Jets::Controller
         end
 
         alias_method :append_after_action, :after_action
+
+        private
+
+        def append_except_to_callbacks(callback_methods, meth, excepted_methods)
+          callback_methods.map! do |callback_method|
+            if callback_method.first.to_s == meth.to_s
+              exceptions = callback_method.second[:except] || []
+              exceptions.concat(Array.wrap(excepted_methods))
+              callback_method.second[:except] = exceptions
+            end
+
+            callback_method
+          end
+        end
       end
     end # included
 

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

@@ -20,6 +20,7 @@ module Jets::Resource::ApiGateway
             http_method: @route.method,
             request_parameters: {},
             authorization_type: authorization_type,
+            api_key_required: api_key_required?,
             integration: {
               integration_http_method: "POST",
               type: "AWS_PROXY",
@@ -72,10 +73,26 @@ module Jets::Resource::ApiGateway
     end
 
     def controller_auth_type
-      controller_name = @route.to.split('#').first
-      controller = "#{controller_name}_controller".camelize.constantize
       # Already handles inheritance via class_attribute
-      controller.authorization_type
+      controller_klass.authorization_type
+    end
+
+    def api_key_required?
+      api_key_required == true
+    end
+
+    def api_key_required
+      @route.api_key_required ||
+        controller_klass.api_key_required ||
+        Jets.config.api.api_key_required
+    end
+
+    def controller_klass
+      @controller_klass ||= "#{controller_name}_controller".camelize.constantize
+    end
+
+    def controller_name
+      @controller_name ||= @route.to.split('#').first
     end
 
     def resource_id

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

@@ -6,6 +6,7 @@ module Jets::Resource::ApiGateway
         endpoint_configuration: { types: endpoint_types }
       }
       properties[:binary_media_types] = binary_media_types if binary_media_types
+      properties[:policy] = endpoint_policy if endpoint_policy
 
       {
         internal_logical_id => {
@@ -52,5 +53,12 @@ module Jets::Resource::ApiGateway
 
       [types].flatten
     end
+
+    def endpoint_policy
+      endpoint_policy = Jets.config.api.endpoint_policy
+      return nil if endpoint_policy.nil? || endpoint_policy.empty?
+
+      endpoint_policy
+    end
   end
 end

data/lib/jets/router/method_creator.rb

@@ -33,10 +33,6 @@ class Jets::Router
       klass = class_name.constantize # Index, Show, Edit, New
       code = klass.new(@options, @scope, @controller)
 
-      # puts "define_#{action}_methods:".color(:yellow) if code.path_method
-      # puts code.path_method.color(:blue) if code.path_method
-      # puts code.url_method.color(:blue) if code.url_method
-
       def_meth(code.path_method) if code.path_method
       def_meth(code.url_method) if code.url_method
     end

data/lib/jets/router/route.rb

@@ -187,6 +187,10 @@ class Jets::Router
       @options[:authorization_type]
     end
 
+    def api_key_required
+      @options[:api_key_required]
+    end
+
   private
     def ensure_jets_format(path)
       path.split('/').map do |s|
@@ -223,4 +227,4 @@ class Jets::Router
       text
     end
   end
-end
+end

data/lib/jets/spec_helpers/controllers.rb

@@ -2,12 +2,11 @@ module Jets::SpecHelpers
   module Controllers
     include Jets::Router::Helpers # must be at the top because response is overridden later
 
-    attr_reader :request, :response
-
-    def initialize(*)
-      super
-      @request = Request.new(:get, '/', {}, Params.new)
-      @response = nil # will be set after http_call
+    attr_reader :response
+    # Note: caching it like this instead of within the initialize results in the headers not being cached
+    # See: https://community.rubyonjets.com/t/is-jets-spechelpers-controllers-request-being-cached/244/2
+    def request
+      @request ||= Request.new(:get, '/', {}, Params.new)
     end
 
     rest_methods = %w[get post put patch delete]

data/lib/jets/util.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 class Jets::Util
   class << self
     # Make sure that the result is a text.
@@ -14,7 +16,7 @@ class Jets::Util
       src.chop! if src.ends_with?('/')
       dest.chop! if dest.ends_with?('/')
       check_rsync_installed!
-      sh "rsync -a --links --no-specials --no-devices #{src}/ #{dest}/", quiet: true
+      sh "rsync -a --links --no-specials --no-devices #{Shellwords.escape(src)}/ #{Shellwords.escape(dest)}/", quiet: true
     end
 
     @@rsync_installed = false

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer