jets 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56dd075a80453ed4f7e6e684f64060915cfbb01cec7ccff68427507a403b5cf7
-  data.tar.gz: a0f48fffbdb695cff01a05494402013945d7a51cab62def79beee48722dd2964
+  metadata.gz: ce580a14e5051954606f507aa2a9f4edcca4930045970966762d8ceb9857c814
+  data.tar.gz: da3d1d6d89c829ee6c28b9808f45c4db6b648925502f20164a725a5ad2acc59f
 SHA512:
-  metadata.gz: 1f278333701df438a6e55db6a1b15999b00a4e5d41e0bea1df098920006eadf38eff02885ee93a7efaad9bf03bb04b847bf57151f06d306bd0235ff0cb0447c3
-  data.tar.gz: c17110bf29063c2e2256f20fa295b906857b7e9161884ba5635397cbba7ad73ec5949a1eec94ee97a158febd9516aabf876265f4503b6541e884a913d512fc54
+  metadata.gz: 9a77865cdc7eea19c9bbfb7a82d33c1196c9dbfdb29a990c5c5e268cd9cb3c4dc569d59fe88be10f0ad68b59af9800ed7809fede94f691d4a8e10763af46ea90
+  data.tar.gz: b1fab039f595fa5555d4239499868d66d9e1ed72f007c7e9f0fa10bb85fadb41c4cb26e470eedd839f42bd5fcb7da8412a069c5a658e49f004ccc5544178c4a5

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/), even before v1.0.
 
+## [0.8.9]
+- clean up convenience properties and add rest of them PR #24
+
 ## [0.8.8]
 - fix cron expression
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (0.8.8)
+    jets (0.8.9)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)
@@ -69,7 +69,7 @@ GEM
     aws-sdk-cloudformation (1.8.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-cloudwatchlogs (1.7.0)
+    aws-sdk-cloudwatchlogs (1.8.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
     aws-sdk-core (3.27.0)

data/lib/jets/lambda/dsl.rb

@@ -19,68 +19,75 @@ module Jets::Lambda::Dsl
       end
       alias_method :class_props, :class_properties
 
-      def class_timeout(value)
-        class_properties(timeout: value)
+      def properties(options={})
+        @properties ||= {}
+        @properties.deep_merge!(options)
       end
+      alias_method :props, :properties
 
       def class_environment(hash)
-        environment = {}
-        environment[:variables] ||= {}
-        environment[:variables].merge!(hash)
+        environment = standardize_env(hash)
         class_properties(environment: environment)
       end
       alias_method :class_env, :class_environment
 
-      def class_memory_size(value)
-        class_properties(memory_size: value)
-      end
-      alias_method :class_memory, :class_memory_size
-
-      def class_role(name)
-        class_properties(role: name)
-      end
-
-      def class_handler(name)
-        class_properties(handler: name)
+      def environment(hash)
+        environment = standardize_env(hash)
+        properties(environment: environment)
       end
+      alias_method :env, :environment
 
-      def class_runtime(value)
-        class_properties(runtime: value)
-      end
+      # Allows user to pass in hash with or without the :variables key.
+      def standardize_env(hash)
+        return hash if hash.key?(:variables)
 
-      # convenience method that set properties
-      def timeout(value)
-        properties(timeout: value)
-      end
-
-      # convenience method that set properties
-      def environment(hash)
         environment = {}
         environment[:variables] ||= {}
         environment[:variables].merge!(hash)
-        properties(environment: environment)
+        environment
       end
-      alias_method :env, :environment
 
-      # convenience method that set properties
-      def memory_size(value)
-        properties(memory_size: value)
+      # Convenience method that set properties. List based on https://amzn.to/2oSph1P
+      # Not all properites are included because some properties are not meant to be set
+      # directly. For example, function_name is a calculated setting by Jets.
+      PROPERTIES = %W[
+        dead_letter_config
+        description
+        handler
+        kms_key_arn
+        memory_size
+        reserved_concurrent_executions
+        role
+        runtime
+        timeout
+        tracing_config
+        vpc_config
+        tags
+      ]
+      PROPERTIES.each do |property|
+        # Example:
+        #   def timeout(value)
+        #     properties(timeout: value)
+        #   end
+        #
+        #   def class_timeout(value)
+        #     class_properties(timeout: value)
+        #   end
+        class_eval <<~CODE
+          def #{property}(value)
+            properties(#{property}: value)
+          end
+
+          def class_#{property}(value)
+            class_properties(#{property}: value)
+          end
+        CODE
       end
+      # More convenience aliases
       alias_method :memory, :memory_size
-
-      def handler(value)
-        properties(handler: value)
-      end
-
-      def runtime(value)
-        properties(runtime: value)
-      end
-
-      def properties(options={})
-        @properties ||= {}
-        @properties.deep_merge!(options)
-      end
-      alias_method :props, :properties
+      alias_method :class_memory, :class_memory_size
+      alias_method :desc, :description
+      alias_method :class_desc, :class_description
 
       # definitions: one or more definitions
       def iam_policy(*definitions)
@@ -123,8 +130,8 @@ module Jets::Lambda::Dsl
       end
 
       #############################
-      # Generic method that registers a resource to be associated with the Lambda function.
-      # In the future all DSL methods can lead here.
+      # Main methood that registers resources associated with the Lambda function.
+      # All resources methods lead here.
       def resources(*definitions)
         if definitions == [nil] # when resources called with no arguments
           @resources || []

data/lib/jets/resource/permission.rb

@@ -1,46 +1,30 @@
 class Jets::Resource
-  class Permission
-    extend Memoist
-
+  class Permission < Jets::Resource::Base
     def initialize(replacements, associated_resource)
       @replacements = replacements
-      # puts caller
-      # puts "replacements #{replacements.inspect}"
       @associated_resource = associated_resource
     end
 
-    def logical_id
-      logical_id = "{namespace}Permission"
-      md = @associated_resource.logical_id.match(/(\d+)/)
-      counter = md[1] if md
-      logical_id = [logical_id, counter].compact.join('')
-      # replace possible {namespace} in the logical id
-      logical_id = replacer.replace_value(logical_id)
-      Jets::Camelizer.camelize(logical_id)
-    end
-
-    def type
-      attributes['Type']
-    end
-
-    def properties
-      attributes['Properties']
-    end
-
-    def attributes
-      attributes = {
-        type: "AWS::Lambda::Permission",
-        properties: {
-          function_name: "!GetAtt {namespace}LambdaFunction.Arn",
-          action: "lambda:InvokeFunction",
-          principal: principal,
-          source_arn: source_arn,
+    def definition
+      {
+        permission_logical_id => {
+          type: "AWS::Lambda::Permission",
+          properties: {
+            function_name: "!GetAtt {namespace}LambdaFunction.Arn",
+            action: "lambda:InvokeFunction",
+            principal: principal,
+            source_arn: source_arn,
+          }
         }
       }
-      attributes = replacer.replace_placeholders(attributes)
-      Jets::Camelizer.transform(attributes)
     end
-    memoize :attributes
+
+    def permission_logical_id
+      logical_id = "{namespace}_permission"
+      md = @associated_resource.logical_id.match(/(\d+)/)
+      counter = md[1] if md
+      [logical_id, counter].compact.join('').underscore
+    end
 
     # Auto-detect principal from the associated resources.
     def principal
@@ -51,10 +35,5 @@ class Jets::Resource
       default_arn = "!GetAtt #{@associated_resource.logical_id}.Arn"
       Replacer.source_arn_map(@associated_resource.type) || default_arn
     end
-
-    def replacer
-      Replacer.new(@replacements)
-    end
-    memoize :replacer
   end
 end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2018-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor