jets 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edcc031b3ecbf752200590a6b964983604f0fd95e15d0270abe26341a3013cfe
-  data.tar.gz: 2b12ab8e0dcd3d7ad5cddb5169a32b189968d946ccc8fbe059dd0a3e37541f3d
+  metadata.gz: 222bfa44ac05628217a64b6f48266ed78ee3c880767b867c3a63e5d3cd88e87c
+  data.tar.gz: a02c9e363b665e2aee1e96448bc591bb56e3c1e293fb18aa6ed336e2a9db324f
 SHA512:
-  metadata.gz: 778038a7c6b3d5deb3e78d65061095ffa2c52add54d66aba17abdf1feefcea29e37a9f673eb96ced091f5d58ece36781ac7e72e12e0a4bc99f542f0046d6038d
-  data.tar.gz: f6e6aebfe968362c36083e3dc6d60a4ace9772a6135aff0bfc7e138618f43050503010014ad61d1c12425b4f071fd7fca2cdea4797ab3f82da1ead1c98da3977
+  metadata.gz: bb07d8fb5c9de83582a60f73bbb77a835a7290fecffd356668d90d3c4b51fc43d53fdc8ff688a8a144f124670cf513ea3ff179b9e017e6eb8b054d16e9a3d800
+  data.tar.gz: 8d218da7a87d8ad0e835804a68fd6fffe1a87af3c333f70e7175552311c35b58afe3783f5f3d76700cbf7b3fbe67a02e39e94f78b2c18c8f55c1fac87f5193aa

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.3.2]
+- #394 introduce internal_finisher to fix shared resource extensions
+
 ## [2.3.1]
 - #378 use JETS_TEST=1 env var instead of TEST=1 and favor Jets.env.test? method
 - #382 associated resources support for controllers

data/lib/jets/booter.rb

@@ -25,6 +25,7 @@ class Jets::Booter
 
       setup_db # establish db connections in Lambda Execution Context.
       # The eager load calls connects_to in models and establish those connections in Lambda Execution Context also.
+      internal_finisher
       eager_load
 
       # TODO: Figure out how to build middleware during Jets.boot without breaking jets new and webpacker:install
@@ -33,6 +34,26 @@ class Jets::Booter
       @booted = true
     end
 
+    # Runs right before eager_load
+    def internal_finisher
+      load_shared_extensions
+    end
+
+    # Shared extensions are added near the end because they require the Jets app load paths to first.
+    # We eager load the extensions and then use the loaded modules to extend Jets::Stack directly.
+    # Originally used an included hook but thats too early before app/shared/extensions is in the load_path.
+    def load_shared_extensions
+      Jets::Autoloaders.once.preload("#{Jets.root}/app/shared/extensions")
+      base_path = "#{Jets.root}/app/shared/extensions"
+      Dir.glob("#{base_path}/**/*.rb").each do |path|
+        next unless File.file?(path)
+
+        class_name = path.sub("#{base_path}/", '').sub(/\.rb/,'').camelize
+        mod = class_name.constantize # autoload
+        Jets::Stack.extend(mod)
+      end
+    end
+
     def eager_load
       preload_extensions
       Jets::Autoloaders.main.eager_load # Eager load project code. Rather have user find out early than later on AWS Lambda.

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

@@ -12,17 +12,6 @@ class Jets::Stack
         include Sns
         include Sqs
       end
-
-      def self.included(base)
-        base_path = "#{Jets.root}/app/shared/extensions"
-        Dir.glob("#{base_path}/**/*.rb").each do |path|
-          next unless File.file?(path)
-
-          class_name = path.sub("#{base_path}/", '').sub(/\.rb/,'').camelize
-          klass = class_name.constantize # autoload
-          base.extend(klass)
-        end
-      end
     end
   end
 end

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

@@ -4,8 +4,22 @@ module Jets::Stack::Main::Dsl
       "!Ref #{value.to_s.camelize}"
     end
 
-    def getatt(value, attribute=:arn)
-      "!GetAtt #{value.to_s.camelize}.#{attribute.to_s.camelize}"
+    # Examples:
+    #   get_attr("logical_id.attribute")
+    #   get_attr("logical_id", "attribute")
+    #   get_attr(["logical_id", "attribute"])
+    def get_att(*item)
+      item = item.flatten
+      options = item.last.is_a?(Hash) ? item.pop : {}
+
+      # list is an Array
+      list = if item.size == 1
+                item.first.split('.')
+              else
+                item
+              end
+      list.map! { |s| s.to_s.camelize } unless options[:autoformat] == false
+      { "Fn::GetAtt" => list }
     end
 
     def logical_id(value)

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

@@ -3,7 +3,7 @@ module Jets::Stack::Main::Dsl
     def sqs_queue(id, props={})
       # props[:queue_name] ||= id.to_s # comment out to allow CloudFormation to generate name
       resource(id, "AWS::SQS::Queue", props)
-      output(id, getatt(id, :arn)) # normal !Ref returns the sqs url the ARN is useful for nested stacks depends_on
+      output(id, get_att(id, :arn)) # normal !Ref returns the sqs url the ARN is useful for nested stacks depends_on
       output("#{id}_url", ref(id)) # useful for Stack.lookup method. IE: List.lookup(:waitlist_url)
     end
   end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-12 00:00:00.000000000 Z
+date: 2019-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer