jets 3.0.4 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bab0f795e30686ac36cb7ca8065a2b17e0eabe96e80ca620c3d05e5240f9687
-  data.tar.gz: 30cdf0d11b9514d3b03842a9dba10beb490b51b2023a4f4825bf4cfe5ab57a7e
+  metadata.gz: bccb565973aab7e6793924820d026a97e056a75fc5827f0e227d11d17f2c76d8
+  data.tar.gz: c0935a069903b2406e4c06948d35e679d4a2837dc002bc56168f94a4c441774f
 SHA512:
-  metadata.gz: 262caf0c7c8300e0357b9d4edd04084a27236df6cef19c301c60f8528e7e9f9cde08011cb10a46f2148976b58b6fd0122e78e74a97b301e652f306fcc2fe318f
-  data.tar.gz: cdb67db4e614b1fe070958f551aad768d455a930a6d8789594558c07d617ffb0e1899f3b70ff4fc9a6395700ad3dafc81ad5dac655926d22dc8b6f0a97466ff6
+  metadata.gz: a0368aad05b5cd49fb3e5f175e672306c62906b9f3909fc8e9df29ca722cff15695a8c9de2a9d5f34bfe404828fc06401f04bc1b63ed6486c57f963191d3de43
+  data.tar.gz: 90eab98e9f5664bb27b67a14f5d3b2cba53f4cdfabd8828629d467cd0c00351746c6425ef5a38080cdec814ebd2d69aa480d132415bf6531bf1775f37bf944d1

data/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [3.0.9] - 2021-06-14
+- fix content type s3 metadata (#564)
+
+## [3.0.8] - 2021-06-03
+- Update cli.md (#560)
+- respect .jetsignore also (#562)
+
+## [3.0.7] - 2021-05-27
+- Dont bypass class_attribute setters (#559)
+- update pg version in jets new Gemfile to latest (#558)
+
+## [3.0.6] - 2021-05-27
+- Handle Errors::InvalidClientTokenId when `get_caller_identity` fails (#543)
+- Use description specifed in function properties (#545)
+- allow multi value response headers (#556)
+- rails support update
+
+## [3.0.5] - 2021-04-23
+- [#542](https://github.com/boltops-tools/jets/pull/542) fix custom layers
+
 ## [3.0.4] - 2021-04-13
 - [#537](https://github.com/boltops-tools/jets/pull/537) Docs Add instructions for aws-cli prerequisite
 - [#528](https://github.com/boltops-tools/jets/pull/528) Adjust permissions to fix custom layer

data/lib/jets/aws_info.rb

@@ -55,7 +55,7 @@ module Jets
       ENV['AWS_REGION'] ||= region
       begin
         sts.get_caller_identity.account
-      rescue Aws::Errors::MissingCredentialsError, Aws::Errors::NoSuchEndpointError
+      rescue Aws::Errors::MissingCredentialsError, Aws::Errors::NoSuchEndpointError, Aws::STS::Errors::InvalidClientTokenId
         puts "INFO: You're missing AWS credentials. Only local services are currently available"
       rescue Seahorse::Client::NetworkingError
         puts "INFO: No internet connection available. Only local services are currently available"

data/lib/jets/builders/tidy.rb

@@ -35,6 +35,7 @@ module Jets::Builders
       removals = always_removals
       removals += get_removals("#{@project_root}/.gitignore")
       removals += get_removals("#{@project_root}/.dockerignore")
+      removals += get_removals("#{@project_root}/.jetsignore")
       removals = removals.reject do |p|
         jetskeep.find do |keep|
           p.include?(keep)

data/lib/jets/cfn/upload.rb

@@ -1,5 +1,6 @@
 require 'action_view'
 require 'digest'
+require 'rack/mime'
 
 module Jets::Cfn
   class Upload
@@ -8,12 +9,6 @@ module Jets::Cfn
 
     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
@@ -93,16 +88,23 @@ module Jets::Cfn
     end
 
     def upload_to_s3(full_path)
-      return if identical_on_s3?(full_path)
+      return if identical_on_s3?(full_path) && !ENV['JETS_ASSET_UPLOAD_FORCE']
 
       key = s3_key(full_path)
       obj = s3_resource.bucket(bucket_name).object(key)
-      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)))
+      content_type = content_type_headers(full_path)
+      puts "Uploading and setting content type for s3://#{bucket_name}/#{key} content_type #{content_type[:content_type].inspect}"
+      obj.upload_file(full_path, { acl: "public-read", cache_control: cache_control }.merge(content_type))
     end
 
+    CONTENT_TYPES_BY_EXTENSION = {
+      '.css'  => 'text/css',
+      '.html' => 'text/html',
+      '.js'   => 'application/javascript',
+    }
     def content_type_headers(full_path)
-      content_type = CONTENT_TYPES_BY_EXTENSION[File.extname(full_path)]
+      ext = File.extname(full_path)
+      content_type = CONTENT_TYPES_BY_EXTENSION[ext] || Rack::Mime.mime_type(ext)
       if content_type
         { content_type: content_type }
       else

data/lib/jets/commands/templates/skeleton/Gemfile.tt

@@ -9,11 +9,11 @@ gem "jetpacker"
 <% if @database == 'postgresql' %>
 # Include pg gem if you are using ActiveRecord, remove next line
 # and config/database.yml file if you are not
-gem "pg", "~> 1.1.3"
+gem "pg", "~> 1.2.3"
 <% elsif @database == 'mysql' %>
 # Include mysql2 gem if you are using ActiveRecord, remove next line
 # and config/database.yml file if you are not
-gem "mysql2", "~> 0.5.2"
+gem "mysql2", "~> 0.5.3"
 <% end %>
 <% unless options[:mode] == 'job' -%>
 gem "dynomite"

data/lib/jets/controller/callbacks.rb

@@ -17,10 +17,12 @@ class Jets::Controller
         end
 
         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 }
+          self.before_actions = before_actions
+                                  .reject { |act| act.first.to_s == meth.to_s }
+
+          # If options include the `only` option,
+          # re-add the action using the setter with the `except` option 
+          before_action(meth, { except: options[:only] }) if options[:only].present?
         end
 
         alias_method :append_before_action, :before_action
@@ -38,20 +40,6 @@ 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/controller/rack/adapter.rb

@@ -34,14 +34,20 @@ module Jets::Controller::Rack
       body = body.respond_to?(:read) ? body.read : body
       body = Base64.encode64(body) if base64
 
-      resp = {
-        "statusCode" => status,
-        "headers" => headers,
-        "body" => body,
-        "isBase64Encoded" => base64,
-      }
-      adjust_for_elb(resp)
-      resp
+      {}.tap do |resp|
+        resp['statusCode'] = status
+        resp['body'] = body
+        resp['isBase64Encoded'] = base64
+        add_response_headers(resp, headers)
+        adjust_for_elb(resp)
+      end
+    end
+
+    def add_response_headers(resp, headers)
+      resp['headers'] = headers.reject { |_, val| val.is_a?(Array) }
+      multi_value_headers = headers.select { |_, val| val.is_a?(Array) }
+
+      resp['multiValueHeaders'] = multi_value_headers unless multi_value_headers.blank?
     end
 
     # Note: ELB is not officially support. This is just in case users wish to manually

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

@@ -123,6 +123,7 @@ module Jets::Resource::Lambda
     def finalize_properties!(props)
       handler = full_handler(props)
       runtime = get_runtime(props)
+      description = get_descripton(props)
       managed = {
         handler: handler,
         runtime: runtime,
@@ -136,6 +137,8 @@ module Jets::Resource::Lambda
 
     def get_layers(runtime)
       return nil unless runtime =~ /^ruby/
+      return Jets.config.lambda.layers if Jets.config.gems.disable
+      
       ["!Ref GemLayer"] + Jets.config.lambda.layers
     end
 
@@ -202,7 +205,11 @@ module Jets::Resource::Lambda
       function_name.size > Jets::MAX_FUNCTION_NAME_SIZE ? nil : function_name
     end
 
-    def description
+    def get_descripton(props)
+      props[:description] || default_description
+    end
+      
+    def default_description
       # Example values:
       #   @app_class: Admin/PagesController
       #   @task.meth: index

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "3.0.4"
+  VERSION = "3.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.9
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer