jets 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a1e324ead9b88c6b0bb6086abfa1335cda56a02f1e99626fd670ebbb0c24c11
-  data.tar.gz: fb549594a20485ac5b0102b1693bc37e0082ef5031b073557cb4ffea7d90a73d
+  metadata.gz: 96421520e6785d9b0ecf33b41d2e2b86d7d516f417c634fa0ec537b50ec462c1
+  data.tar.gz: 36c7a0111342c116e6c9fa90da21f8b6beadf0657a3e88f38c94fc1741e3ad09
 SHA512:
-  metadata.gz: 04307b921ea8deb8a0b9db73aef2ba1920ec6e975a71d0b913d0d903b0e160a6bafe02cd4c3203684aaf9fa892b5370c8dd97b4e853778b534b064682e4321c5
-  data.tar.gz: 0a60c57975f1e121fd8bd35150ce9d8469d15616ff91c4a71c9f0bc04d7201707ee27427b5b3bf893599e0219ccf67adfc45edc6fc0524dcc3933c00f6842a43
+  metadata.gz: 8cc413d4a3c20e6b039d19c40ce28e2cc018c334bc6183b907832235ab43df113c78b22fe9c05b69f03627cb42c72ca46889cf4523ac160ad7caaaee2b85b785
+  data.tar.gz: 4e4f81cd56d96bc637fc8d1bad521039f9c1693e4f2e9b46a98f047bad200ac239b8af66269d1f4330a71ee61a73ce202419e64236563cf118e12ca6ec2b706d

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.8.5]
+- Rename to Camelizer PR #23
+- Fix helpers PR #22 from tongueroo/helpers
+
 ## [0.8.4]
 - fix custom iam policies
 - fix edge case: allow stack to be delete in rollback completed state

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (0.8.4)
+    jets (0.8.5)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)
@@ -66,28 +66,28 @@ GEM
     arel (9.0.0)
     aws-eventstream (1.0.1)
     aws-partitions (1.102.0)
-    aws-sdk-cloudformation (1.6.0)
-      aws-sdk-core (~> 3)
+    aws-sdk-cloudformation (1.8.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-cloudwatchlogs (1.5.0)
-      aws-sdk-core (~> 3)
+    aws-sdk-cloudwatchlogs (1.7.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.25.0)
+    aws-sdk-core (3.27.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-dynamodb (1.11.0)
-      aws-sdk-core (~> 3)
+    aws-sdk-dynamodb (1.13.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-kms (1.7.0)
-      aws-sdk-core (~> 3)
+    aws-sdk-kms (1.9.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-lambda (1.8.0)
-      aws-sdk-core (~> 3)
+    aws-sdk-lambda (1.10.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.17.1)
-      aws-sdk-core (~> 3, >= 3.21.2)
+    aws-sdk-s3 (1.19.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.3)

data/lib/jets.rb

@@ -1,6 +1,6 @@
 $:.unshift(File.expand_path("../", __FILE__))
 require "jets/version"
-require "jets/pascalize"
+require "jets/camelizer"
 require "active_support/core_ext/string"
 require "active_support/ordered_hash"
 require "colorize"

data/lib/jets/application.rb

@@ -21,7 +21,7 @@ class Jets::Application
 
     config.prewarm = ActiveSupport::OrderedOptions.new
     config.prewarm.enable = true
-    config.prewarm.rate = '2 hours'
+    config.prewarm.rate = '30 minutes'
     config.prewarm.concurrency = 2
     config.prewarm.public_ratio = 10
 

data/lib/jets/camelizer.rb

@@ -0,0 +1,64 @@
+# Custom Camelizer with CloudFormation specific handling.
+# Based on: https://stackoverflow.com/questions/8706930/converting-nested-hash-keys-from-camelcase-to-snake-case-in-ruby
+module Jets
+  class Camelizer
+    class << self
+      def transform(value, parent_keys=[])
+        case value
+        when Array
+          value.map { |v| transform(v) }
+        when Hash
+          initializer = value.map do |k, v|
+            new_key = camelize_key(k, parent_keys)
+            [new_key, transform(v, parent_keys+[new_key])]
+          end
+          Hash[initializer]
+        else
+          value # do not transform values
+         end
+      end
+
+      def camelize_key(k, parent_keys=[])
+        k = k.to_s
+
+        if passthrough?(k, parent_keys)
+          k # pass through untouch
+        elsif parent_keys.last == "EventPattern" # top-level
+          k.dasherize
+        elsif parent_keys.include?("EventPattern")
+          # Any keys at 2nd level under EventPattern will be pascalized
+          pascalize(k)
+        else
+          camelize(k)
+        end
+      end
+
+      def passthrough?(k, parent_keys)
+        parent_keys.include?("Variables") || # do not transform keys anything under Variables
+        parent_keys.include?("ResponseParameters") || # do not transform keys anything under Variables
+        k.include?('-') || k.include?('/')
+      end
+
+      def camelize(value)
+        return value if value.is_a?(Integer)
+
+        value = value.to_s.camelize
+        special_map[value] || value
+      end
+
+      def pascalize(value)
+        new_value = value.camelize
+        first_char = new_value[0..0].downcase
+        new_value[0] = first_char
+        new_value
+      end
+
+      # Some keys have special mappings
+      def special_map
+        {
+          "TemplateUrl" => "TemplateURL"
+        }
+      end
+    end
+  end
+end

data/lib/jets/cfn/builders/interface.rb

@@ -110,7 +110,7 @@ class Jets::Cfn::Builders
     #   )
     #
     def add_template_resource(logical_id, type, options)
-      options = Jets::Pascalize.pascalize(options)
+      options = Jets::Camelizer.transform(options)
 
       attributes = if options.include?('Type')
                      base = { 'Type' => type }

data/lib/jets/commands/delete.rb

@@ -56,6 +56,7 @@ class Jets::Commands::Delete
 
   def empty_s3_bucket
     return unless s3_bucket_name # Happens when minimal stack fails to build
+    return unless bucket_exists?(s3_bucket_name)
 
     resp = s3.list_objects(bucket: s3_bucket_name)
     if resp.contents.size > 0
@@ -74,7 +75,6 @@ class Jets::Commands::Delete
 
   def s3_bucket_name
     return @s3_bucket_name if defined?(@s3_bucket_name)
-    return unless bucket_exists?
 
     resp = cfn.describe_stacks(stack_name: parent_stack_name)
     outputs = resp.stacks[0].outputs
@@ -86,10 +86,10 @@ class Jets::Commands::Delete
   end
 
   # Thanks: https://docs.aws.amazon.com/sdk-for-ruby/v3/developer-guide/s3-example-does-bucket-exist.html
-  def bucket_exists?
+  def bucket_exists?(bucket_name)
     bucket_exists = false
     begin
-      resp = s3.head_bucket(bucket: @s3_bucket_name, use_accelerate_endpoint: false)
+      resp = s3.head_bucket(bucket: bucket_name, use_accelerate_endpoint: false)
       bucket_exists = true
     rescue
     end
@@ -104,12 +104,12 @@ class Jets::Commands::Delete
     if @options[:sure]
       sure = 'y'
     else
-      puts "Are you sure you want to want to delete the '#{Jets.config.project_namespace}' project? (y/N)"
+      puts "Are you sure you want to want to delete the #{Jets.config.project_namespace.colorize(:green)} project? (y/N)"
       sure = $stdin.gets
     end
 
     unless sure =~ /^y/
-      puts "Phew! Jets '#{Jets.config.project_namespace}' project was not deleted."
+      puts "Phew! Jets #{Jets.config.project_namespace.colorize(:green)} project was not deleted."
       exit 0
     end
   end

data/lib/jets/commands/templates/skeleton/config/application.rb.tt

@@ -3,7 +3,7 @@ Jets.application.configure do
   config.api_generator = <%= !!@options[:api] %>
 
   # config.prewarm.enable = true # default is true
-  # config.prewarm.rate = '2 hours' # default is '2 hours'
+  # config.prewarm.rate = '30 minutes' # default is '30 minutes'
   # config.prewarm.concurrency = 2 # default is 2
   # config.prewarm.public_ratio = 10 # default is 10
 

data/lib/jets/commands/templates/skeleton/spec/fixtures/payloads/posts-index.json

@@ -24,7 +24,7 @@
   "stageVariables": null,
   "requestContext": {
     "path": "/prod/posts",
-    "accountId": "160619113767",
+    "accountId": "123456789012",
     "resourceId": "ery965",
     "stage": "prod",
     "requestId": "292fbcc8-c015-11e7-94fa-cd109b693f3c",

data/lib/jets/commands/templates/skeleton/spec/fixtures/payloads/posts-show.json

@@ -26,7 +26,7 @@
   "stageVariables": null,
   "requestContext": {
     "path": "/prod/posts/tung",
-    "accountId": "160619113767",
+    "accountId": "123456789012",
     "resourceId": "wf2gvu",
     "stage": "prod",
     "requestId": "3feafb4e-c015-11e7-85c9-194f38f4c414",

data/lib/jets/controller/renderers/template_renderer.rb

@@ -11,8 +11,6 @@ module Jets::Controller::Renderers
     end
 
     def render
-      setup_action_controller # setup only when necessary
-
       # Rails rendering does heavy lifting
       renderer = ActionController::Base.renderer.new(renderer_options)
       body = renderer.render(render_options)
@@ -73,35 +71,55 @@ module Jets::Controller::Renderers
       render_options
     end
 
-    def setup_action_controller
-      require "action_controller"
-      require "jets/rails_overrides"
-
-      # laod helpers
-      helper_class = self.class.name.to_s.sub("Controller", "Helper")
-      helper_path = "#{Jets.root}app/helpers/#{helper_class.underscore}.rb"
-      ActiveSupport.on_load :action_view do
-        include ApplicationHelper
-        include helper_class.constantize if File.exist?(helper_path)
-      end
+    class << self
+      def setup!
+        require "action_controller"
+        require "jets/rails_overrides"
 
-      ActionController::Base.append_view_path("#{Jets.root}app/views")
+        # Load helpers
+        # Assign local variable because scoe in the `:action_view do` changes
+        app_helper_classes = find_app_helper_classes
+        ActiveSupport.on_load :action_view do
+          include ApplicationHelper # include first
+          app_helper_classes.each do |helper_class|
+            include helper_class
+          end
+        end
 
-      setup_webpacker if Jets.webpacker?
-    end
+        ActionController::Base.append_view_path("#{Jets.root}app/views")
 
-    def setup_webpacker
-      require 'webpacker'
-      require 'webpacker/helper'
+        setup_webpacker if Jets.webpacker?
+      end
 
-      ActiveSupport.on_load :action_controller do
-        ActionController::Base.helper Webpacker::Helper
+      # Does not include ApplicationHelper, will include ApplicationHelper explicitly first.
+      def find_app_helper_classes
+        klasses = []
+        expression = "#{Jets.root}app/helpers/**/*"
+        Dir.glob(expression).each do |path|
+          next unless File.file?(path)
+          class_name = path.sub("#{Jets.root}app/helpers/","").sub(/\.rb/,'')
+          unless class_name == "application_helper"
+            klasses << class_name.classify.constantize # autoload
+          end
+        end
+        klasses
       end
 
-      ActiveSupport.on_load :action_view do
-        include Webpacker::Helper
+      def setup_webpacker
+        require 'webpacker'
+        require 'webpacker/helper'
+
+        ActiveSupport.on_load :action_controller do
+          ActionController::Base.helper Webpacker::Helper
+        end
+
+        ActiveSupport.on_load :action_view do
+          include Webpacker::Helper
+        end
       end
     end
 
   end
 end
+
+Jets::Controller::Renderers::TemplateRenderer.setup!

data/lib/jets/resource.rb

@@ -20,7 +20,7 @@ class Jets::Resource
     id = definition.keys.first
     # replace possible {namespace} in the logical id
     id = replacer.replace_value(id)
-    Jets::Pascalize.pascalize_string(id)
+    Jets::Camelizer.camelize(id)
   end
 
   def type
@@ -34,7 +34,7 @@ class Jets::Resource
   def attributes
     attributes = definition.values.first
     attributes = replacer.replace_placeholders(attributes)
-    Jets::Pascalize.pascalize(attributes)
+    Jets::Camelizer.transform(attributes)
   end
 
   def parameters

data/lib/jets/resource/iam/policy_document.rb

@@ -16,7 +16,7 @@ module Jets::Resource::Iam
 
     def policy_document
       definitions.map { |definition| standardize(definition) }
-      Jets::Pascalize.pascalize(@policy)
+      Jets::Camelizer.transform(@policy)
     end
     memoize :policy_document # only process policy_document once
 

data/lib/jets/resource/permission.rb

@@ -16,7 +16,7 @@ class Jets::Resource
       logical_id = [logical_id, counter].compact.join('')
       # replace possible {namespace} in the logical id
       logical_id = replacer.replace_value(logical_id)
-      Jets::Pascalize.pascalize_string(logical_id)
+      Jets::Camelizer.camelize(logical_id)
     end
 
     def type
@@ -38,7 +38,7 @@ class Jets::Resource
         }
       }
       attributes = replacer.replace_placeholders(attributes)
-      Jets::Pascalize.pascalize(attributes)
+      Jets::Camelizer.transform(attributes)
     end
     memoize :attributes
 

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -439,6 +439,7 @@ files:
 - lib/jets/builders/handler_generator.rb
 - lib/jets/builders/node-hello.js
 - lib/jets/builders/node-shim.js
+- lib/jets/camelizer.rb
 - lib/jets/cfn.rb
 - lib/jets/cfn/builders.rb
 - lib/jets/cfn/builders/api_deployment_builder.rb
@@ -591,7 +592,6 @@ files:
 - lib/jets/lambda/task.rb
 - lib/jets/logger.rb
 - lib/jets/naming.rb
-- lib/jets/pascalize.rb
 - lib/jets/poly_fun.rb
 - lib/jets/poly_fun/base_executor.rb
 - lib/jets/poly_fun/lambda_executor.rb

data/lib/jets/pascalize.rb

@@ -1,58 +0,0 @@
-module Jets
-  class Pascalize
-    class << self
-      # Specialized pascalize that will not pascalize keys under the
-      # Variables part of the hash structure.
-      # Based on: https://stackoverflow.com/questions/8706930/converting-nested-hash-keys-from-camelcase-to-snake-case-in-ruby
-      def pascalize(value, parent_keys=[])
-        case value
-          when Array
-            value.map { |v| pascalize(v) }
-          when Hash
-            initializer = value.map do |k, v|
-              new_key = pascal_key(k, parent_keys)
-              [new_key, pascalize(v, parent_keys+[new_key])]
-            end
-            Hash[initializer]
-          else
-            value
-         end
-      end
-
-      def pascal_key(k, parent_keys=[])
-        k = k.to_s
-        if parent_keys.include?("Variables") # do not pascalize keys anything under Variables
-          k # pass through untouch
-        elsif parent_keys.include?("ResponseParameters")
-          k # pass through untouch
-        elsif k.include?('-') || k.include?('/')
-          k # pass through untouch
-        elsif parent_keys.last == "EventPattern" # top-level
-          k.dasherize
-        elsif parent_keys.include?("EventPattern")
-          # any keys at 2nd level under EventPattern will be camelize
-          new_k = k.camelize # an earlier pascalize has made the first char upcase
-          # so we need to downcase it again
-          first_char = new_k[0..0].downcase
-          new_k[0] = first_char
-          new_k
-        else
-          pascalize_string(k)
-        end
-      end
-
-      def pascalize_string(s)
-        s = s.to_s.camelize
-        s = s.slice(0,1).capitalize + s.slice(1..-1) # capitalize first letter only
-        special_map[s] || s
-      end
-
-      # Some keys have special mappings
-      def special_map
-        {
-          "TemplateUrl" => "TemplateURL"
-        }
-      end
-    end
-  end
-end