jets 3.0.0 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64340de503207710a82a13ca132501a65e030dd295edf2aff5fec1499c6e4d43
-  data.tar.gz: 615dea597ff7fefafb59352aa3a68ef0c0b4b1338c7c9df1c36121e54c68fb7f
+  metadata.gz: b6747e94dd8a8e896d3f6a539b25ebcdbc312e08e39f34d25def19475e9fc28c
+  data.tar.gz: 418eb70b04920716a3f1aa2db8e92db7ef7f6aefac2243d4b05d0d6ca3aa6307
 SHA512:
-  metadata.gz: 208dc2bbe537c0b99bd09927185d8e75dee87a76dc1320b6755e2e53136a85c66940ff3e6f0c74d5e806d3d49b49125d351ec27d8ceb7207d17b55cb593c1cbe
-  data.tar.gz: 8e2f0b5ea3c84f907cc72e4eae4779da20d31d11affe6987ad55d2e92861b320104deeec00aefe5121bf5043f73b5ab2c3e5653b86297faaac00b88181651157
+  metadata.gz: a8cd79aa34648cab12d41d0acc7edd41ce4c9125b576f6409533d5088fec7200bb0596cb4257de5f8cd658b0d6fd82f8f46855a9340eba2aeefb1970a60c6579
+  data.tar.gz: 59ae9ee9cccacd97cfc9ca7515b65826a15da99e5a198e068faf8f77adf25da2d2523c45169da3aee378080a7411ca3f08efd5a5d74f908065e267bdbee57260

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.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
+- [#539](https://github.com/boltops-tools/jets/pull/539) FIX DEPRECATION WARNING: connection_config is deprecated
+- [#540](https://github.com/boltops-tools/jets/pull/540) Allow body param for controller request spec helpers
+- update serverlessgems gem
+
+## [3.0.3] - 2021-03-24
+- [#532](https://github.com/boltops-tools/jets/pull/532) Update Copy Write Year
+- [#536](https://github.com/boltops-tools/jets/pull/536) use mini_mime instead
+
+## [3.0.2] - 2021-01-12
+- update serverlessgems gem
+
+## [3.0.1] - 2021-01-12
+- [#524](https://github.com/boltops-tools/jets/pull/524) fix native gem detection
+
 ## [3.0.0]
 * #328 i18n docs
 * #391 Deploy Option: Auto Replace API Gateway

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2019 Tung Nguyen
+Copyright (c) 2021 Tung Nguyen
 
 MIT License
 

data/README.md

@@ -12,8 +12,14 @@ Ruby and Lambda splat out a baby and that child's name is [Jets](http://rubyonje
 
 [![BoltOps Badge](https://img.boltops.com/boltops/badges/boltops-badge.png)](https://www.boltops.com)
 
+Please **watch/star** this repo to help grow and support the project.
+
 **Upgrading**: If you are upgrading Jets, please check on the [Upgrading Notes](http://rubyonjets.com/docs/extras/upgrading/).
 
+## Sponsors
+
+[![](https://img.boltops.com/boltops/tools/jets/sponsors/arist.png)](https://arist.co/)
+
 ## What is Ruby on Jets?
 
 Jets is a Ruby Serverless Framework.  Jets allows you to create serverless applications with a beautiful language: Ruby.  It includes everything required to build an application and deploy it to AWS Lambda.
@@ -189,7 +195,7 @@ For more documentation, check out the official docs: [Ruby on Jets](http://rubyo
 * [Official AWS Ruby Support for Jets](https://blog.boltops.com/2018/12/12/official-aws-ruby-support-for-jets-serverless-framework)
 * [Build an API with Jets](https://blog.boltops.com/2019/01/13/build-an-api-service-with-jets-ruby-serverless-framework)
 * [Serverless Ruby Cron Jobs Tutorial: Route53 Backup](https://blog.boltops.com/2019/01/03/serverless-ruby-cron-jobs-with-jets-route53-backup)
-* [Serverless Slack Commands: Fun with AWS Image Recognition](https://blog.boltops.com/2019/01/14/serverless-slack-commands-with-ruby)
+* [Serverless Slack Commands: Fun with AWS Image Recognition](https://blog.boltops.com/2021/02/02/serverless-slack-commands-with-ruby)
 * [Jets Afterburner: Rails Support](https://blog.boltops.com/2018/12/21/jets-afterburner-serverless-rails-on-aws-lambda-in-5-minutes)
 * [Jets Mega Mode: Jets and Rails](https://blog.boltops.com/2018/11/03/jets-mega-mode-run-rails-on-aws-lambda)
 * [Toronto Serverless Presentation](https://blog.boltops.com/2018/09/25/toronto-serverless-presentation-jets-framework-on-aws-lambda)

data/jets.gemspec

@@ -52,12 +52,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "jets-html-sanitizer"
   spec.add_dependency "kramdown"
   spec.add_dependency "memoist"
-  spec.add_dependency "mimemagic"
+  spec.add_dependency "mini_mime"
   spec.add_dependency "rack"
   spec.add_dependency "railties", "~> 6.1.0" # for ActiveRecord database_tasks.rb
   spec.add_dependency "rainbow"
   spec.add_dependency "recursive-open-struct"
-  spec.add_dependency "serverlessgems"
+  spec.add_dependency "serverlessgems", "~> 0.1.3"
   spec.add_dependency "shotgun"
   spec.add_dependency "text-table"
   spec.add_dependency "thor"

data/lib/jets/builders/gem_replacer.rb

@@ -20,11 +20,23 @@ module Jets::Builders
       found_gems.each do |gem_name|
         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/md5_zip.rb

@@ -23,7 +23,7 @@ module Jets::Builders
       # => Creating zip file for /tmp/jets/demo/stage/bundled
 
       # https://serverfault.com/questions/265675/how-can-i-zip-compress-a-symlink
-      command = "cd #{@path} && zip --symlinks -rq #{zip_file} ."
+      command = "cd #{@path} && chmod -R 755 . && zip --symlinks -rq #{zip_file} ."
       sh(command)
       # move out of the lower folder to the stage folder
       # mv /tmp/jets/demo/stage/code/code.zip /tmp/jets/demo/stage/code.zip

data/lib/jets/builders/ruby_packager.rb

@@ -67,7 +67,7 @@ module Jets::Builders
       end
       create_bundle_config(frozen: true)
 
-      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.
@@ -149,9 +149,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|
@@ -165,6 +166,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/internal/app/controllers/jets/public_controller.rb

@@ -1,5 +1,5 @@
 require "rack/mime"
-require "mimemagic"
+require "mini_mime"
 
 class Jets::PublicController < Jets::Controller::Base
   layout false
@@ -12,7 +12,7 @@ class Jets::PublicController < Jets::Controller::Base
 
     if File.exist?(catchall_path)
       content_type = Rack::Mime.mime_type(File.extname(catchall_path))
-      binary = !MimeMagic.by_path(catchall_path).text?
+      binary = !MiniMime.lookup_by_filename(catchall_path).content_type.include?("text")
 
       # For binary support to work, the client also has to send the right Accept header.
       # And the media type has been to added to api gateway.

data/lib/jets/overrides/rails/migration_checker.rb

@@ -1,11 +1,15 @@
 module ActiveRecord
   module MigrationChecker
     def prepare_test_db
-      current_config = ::ActiveRecord::Base.connection_config
+      current_config = ::ActiveRecord::Base.connection_db_config
       all_configs = ::ActiveRecord::Base.configurations.configs_for(env_name: Jets.env)
 
       needs_update = !all_configs.all? do |db_config|
-        ::ActiveRecord::Tasks::DatabaseTasks.schema_up_to_date?(db_config.config, ::ActiveRecord::Base.schema_format, nil, Jets.env, db_config.spec_name)
+        ::ActiveRecord::Tasks::DatabaseTasks.schema_up_to_date?(
+          db_config.configuration_hash, 
+          ::ActiveRecord::Base.schema_format, 
+          nil
+        )
       end
 
       if needs_update

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

@@ -136,6 +136,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
 

data/lib/jets/spec_helpers/controllers.rb

@@ -32,7 +32,8 @@ module Jets::SpecHelpers
         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.delete(:body)
+        request.params.body_params ||= params.delete(:params)
         request.params.body_params ||= params
       end
 

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

@@ -31,14 +31,20 @@ module Jets::SpecHelpers::Controllers
       json['headers'] = (headers || {}).stringify_keys
 
       if method != :get
-        json['headers']['Content-Type'] = 'application/x-www-form-urlencoded'
-        body = Rack::Multipart.build_multipart(params.body_params)
+        json['headers']['Content-Type'] ||= 'application/x-www-form-urlencoded'
 
-        if body
+        if params.body_params.is_a? String
+          body = params.body_params
           json['headers']['Content-Length'] ||= body.length.to_s
-          json['headers']['Content-Type'] = "multipart/form-data; boundary=#{Rack::Multipart::MULTIPART_BOUNDARY}"
         else
-          body = Rack::Utils.build_nested_query(params.body_params)
+          body = Rack::Multipart.build_multipart(params.body_params)
+
+          if body
+            json['headers']['Content-Length'] ||= body.length.to_s
+            json['headers']['Content-Type'] = "multipart/form-data; boundary=#{Rack::Multipart::MULTIPART_BOUNDARY}"
+          else
+            body = Rack::Utils.build_nested_query(params.body_params)
+          end
         end
 
         json['body'] = Base64.encode64(body)

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "3.0.0"
+  VERSION = "3.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -361,7 +361,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: mini_mime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -434,16 +434,16 @@ dependencies:
   name: serverlessgems
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: shotgun
   requirement: !ruby/object:Gem::Requirement
@@ -1096,7 +1096,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Ruby Serverless Framework