jets 3.2.1 → 4.0.0

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

@@ -136,9 +136,9 @@ module Jets::Resource::Lambda
     end
 
     def get_layers(runtime)
-      return nil unless runtime =~ /^ruby/
+      return nil unless runtime =~ /^ruby/ || runtime =~ /^provided/
       return Jets.config.lambda.layers if Jets.config.gems.disable
-      
+
       ["!Ref GemLayer"] + Jets.config.lambda.layers
     end
 
@@ -208,7 +208,7 @@ module Jets::Resource::Lambda
     def get_descripton(props)
       props[:description] || default_description
     end
-      
+
     def default_description
       # Example values:
       #   @app_class: Admin/PagesController

data/lib/jets/router/route.rb

@@ -16,6 +16,22 @@ class Jets::Router
       @path = compute_path
       @to = compute_to
       @as = compute_as
+      # Pretty tricky. The @options[:mount_class] is a class that is mounted.
+      # For Grape apps, calling ActiveSupport to_json on a Grape class causes an infinite loop.
+      # Can reproduce with `GrapeApp.to_json`
+      # There's some type of collision between Grape and ActiveSupport to_json.
+      # Coerce mount_class option into a string so that when the route is serialized to JSON
+      # it is a string it won't cause an infinite loop. This allows the apigw routes to be
+      # saved to s3 and loaded back up at the end of a deploy.
+      # Related PR: smarter apigw routes paging calculation #635
+      # https://github.com/boltops-tools/jets/pull/635
+      # Debugging notes: https://gist.github.com/tongueroo/c9baa7e98d5ad68bbdd770fde4651963
+      @options[:mount_class] = @options[:mount_class].to_s if @options[:mount_class]
+    end
+
+    # Constantize back to the original class
+    def mount_class
+      @options[:mount_class].constantize
     end
 
     def compute_path
@@ -187,10 +203,6 @@ class Jets::Router
       end.to_h
     end
 
-    def mount_class
-      @options[:mount_class]
-    end
-
     def to_h
       JSON.load(to_json)
     end

data/lib/jets/tmp_loader.rb

@@ -9,7 +9,7 @@ module Jets
     def initialize(yaml_path=nil)
       yaml_path ||= "#{Jets.root}/handlers/data.yml"
       return unless File.exist?(yaml_path)
-      @data = YAML.load_file(yaml_path)
+      @data = Jets::Util::Yamler.load_file(yaml_path)
       @s3_bucket = @data['s3_bucket']
       @rack_zip = @data['rack_zip']
     end

data/lib/jets/turbo/database_yaml.rb

@@ -5,7 +5,7 @@ class Jets::Turbo
       return unless File.exist?(current_yaml)
 
       vars = {}
-      current_database = YAML.load_file(current_yaml)
+      current_database = Jets::Util::Yamler.load_file(current_yaml)
       database_names = infer_database_name(current_database)
       vars.merge!(database_names)
       vars['adapter'] = current_database['development']['adapter']

data/lib/jets/util/yamler.rb

@@ -0,0 +1,16 @@
+# Named Yamler to make it clear it's not the YAML class.
+class Jets::Util
+  class Yamler
+    class << self
+      def load(text)
+        options = RUBY_VERSION =~ /^3/ ? {aliases: true} : {} # Ruby 3.0.0 deprecates aliases: true
+        YAML.load(text, **options)
+      end
+
+      def load_file(path)
+        options = RUBY_VERSION =~ /^3/ ? {aliases: true} : {} # Ruby 3.0.0 deprecates aliases: true
+        YAML.load_file(path, **options)
+      end
+    end
+  end
+end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "3.2.1"
+  VERSION = "4.0.0"
 end

data/lib/jets.rb

@@ -3,6 +3,7 @@ $stdout.sync = true unless ENV["JETS_STDOUT_SYNC"] == "0"
 $:.unshift(File.expand_path("../", __FILE__))
 
 require "jets/core_ext/bundler"
+require "jets/core_ext/file"
 require "jets/autoloaders"
 Jets::Autoloaders.log! if ENV["JETS_AUTOLOAD_LOG"]
 Jets::Autoloaders.once.setup # must be called before cli.setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -599,9 +599,7 @@ files:
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".gitmodules"
-- ".python-version"
 - ".rspec"
-- ".ruby-version"
 - CHANGELOG.md
 - CONDUCT.md
 - CONTRIBUTING.md
@@ -814,6 +812,7 @@ files:
 - lib/jets/controller/stage.rb
 - lib/jets/core.rb
 - lib/jets/core_ext/bundler.rb
+- lib/jets/core_ext/file.rb
 - lib/jets/core_ext/kernel.rb
 - lib/jets/db.rb
 - lib/jets/dotenv.rb
@@ -882,7 +881,7 @@ files:
 - lib/jets/middleware/default_stack.rb
 - lib/jets/middleware/layer.rb
 - lib/jets/middleware/stack.rb
-- lib/jets/naming.rb
+- lib/jets/names.rb
 - lib/jets/overrides/lambda.rb
 - lib/jets/overrides/lambda/marshaller.rb
 - lib/jets/overrides/rails.rb
@@ -947,6 +946,7 @@ files:
 - lib/jets/resource/iam/class_role.rb
 - lib/jets/resource/iam/function_role.rb
 - lib/jets/resource/iam/managed_policy.rb
+- lib/jets/resource/iam/policy.rb
 - lib/jets/resource/iam/policy_document.rb
 - lib/jets/resource/iot/topic_rule.rb
 - lib/jets/resource/lambda/event_source_mapping.rb
@@ -1038,6 +1038,7 @@ files:
 - lib/jets/turbo/rails.rb
 - lib/jets/turbo/templates/config/database.yml
 - lib/jets/util.rb
+- lib/jets/util/yamler.rb
 - lib/jets/version.rb
 - readme/prerelease.md
 - readme/testing.md
@@ -1094,16 +1095,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.5.0
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Ruby Serverless Framework

data/.python-version

@@ -1 +0,0 @@
-3.8.6

data/.ruby-version

@@ -1 +0,0 @@
-2.7.7