convection 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52f9ff70289c904424ca0729efbb738275ae4ac9
-  data.tar.gz: c1a29763fc7d8d3bb533391070e8d8afa90a6a5c
+  metadata.gz: d7f560ff0230cc8a78bdc3e59c57d2b5befbfe37
+  data.tar.gz: 54969c701ca627f77a22a38a67e70aa43e1c93a8
 SHA512:
-  metadata.gz: 192a854ef9284ce12e6d4ad993745fb95c57549ffc1271c96c016f601863ff814a735b2062435d6b89814949665a30ef833c02103d5c466c30a5df26c5af5077
-  data.tar.gz: 5c7f9be96c5649c0833f2e7d059fc08497377fd8d26ea7477ff98fdd5a21432ee68e58ae4e5685cbc30a34e2af29de25c02b65d9d3da9622a715d32e4d5c7c75
+  metadata.gz: 1db320b7089911c0e28b80709348897131f11f4a15e3529e406c78d09760cb65d0aa8df505e98c1f2d84e707b3383311cc5c044198cc9f5ba25648beb5d3b01d
+  data.tar.gz: 11e1bce3c3781d8899f6ad2c5ac1a0acc6ba1ec3766160c0e1cc0c96f279330831b67121aab7e8173cf5ea55fae9f52ed3d1260be86aa17274a0410be0a9cd95

data/lib/convection/control/stack.rb

@@ -254,7 +254,7 @@ module Convection
       #   template has any changes compared to the current template (in
       #   CloudFormation).
       def resource_changes?
-        ours = { 'Resources' => @template.resources.map(&:render) }
+        ours = { 'Resources' => @template.all_resources.map(&:render) }
         thiers = { 'Resources' => @current_template['Resources'] }
 
         ours.diff(thiers).any?

data/lib/convection/model/template.rb

@@ -24,6 +24,12 @@ module Convection
               resources[rname] = resource
             end
           end
+
+          def attach_resource_collection(name, klass)
+            define_method(name) do |rname, &block|
+              resource_collections[rname] = klass.new(rname, self, &block)
+            end
+          end
         end
       end
 
@@ -187,6 +193,7 @@ module Convection
       attr_reader :parameters
       attr_reader :mappings
       attr_reader :conditions
+      attr_reader :resource_collections
       attr_reader :resources
       attr_reader :outputs
 
@@ -207,6 +214,7 @@ module Convection
         @mappings = Collection.new
         @conditions = Collection.new
         @resources = Collection.new
+        @resource_collections = Collection.new
         @outputs = Collection.new
         @metadata = Collection.new
       end
@@ -217,6 +225,11 @@ module Convection
 
       def execute
         instance_exec(&@definition)
+
+        resource_collections.each do |_, group|
+          group.run_definition
+          group.execute
+        end
       end
 
       def render(stack_ = nil)
@@ -231,12 +244,18 @@ module Convection
           'Parameters' => parameters.map(&:render),
           'Mappings' => mappings.map(&:render),
           'Conditions' => conditions.map(&:render),
-          'Resources' => resources.map(&:render),
+          'Resources' => all_resources.map(&:render),
           'Outputs' => outputs.map(&:render),
           'Metadata' => metadata.map(&:render)
         }
       end
 
+      def all_resources
+        resource_collections.reduce(resources) do |result, (_name, resource_collection)|
+          result.merge(resource_collection.resources)
+        end
+      end
+
       def diff(other, stack_ = nil)
         render(stack_).diff(other).map { |diff| Diff.new(diff[0], *diff[1]) }
       end
@@ -353,5 +372,6 @@ require_relative 'template/condition'
 require_relative 'template/resource'
 require_relative 'template/resource_property'
 require_relative 'template/resource_attribute'
+require_relative 'template/resource_collection'
 require_relative 'template/output'
 require_relative 'template/metadata'

data/lib/convection/model/template/resource_collection.rb

@@ -0,0 +1,48 @@
+require 'forwardable'
+require_relative './resource'
+require_relative '../mixin/conditional'
+
+module Convection
+  module Model
+    class Template
+      # A collection of different {Convection::Model::Template::Resource}s.
+      class ResourceCollection
+        extend Forwardable
+        include DSL::Helpers
+        include DSL::Template::Resource
+        include Mixin::Conditional
+
+        attr_reader :name
+        attr_reader :parent
+        attr_reader :template
+
+        def_delegator :@template, :stack
+
+        class << self
+          def attach_to_dsl(dsl_name)
+            DSL::Template::Resource.attach_resource_collection(dsl_name, self)
+          end
+        end
+
+        def initialize(name, parent, &definition)
+          @definition = definition
+          @name = name
+          @parent = parent
+          @template = parent.template
+        end
+
+        # @note This method is in place to be overriden by subclasses.
+        def execute
+        end
+
+        def run_definition
+          instance_exec(&@definition) if @definition
+        end
+
+        def resources
+          @resources ||= Convection::Model::Collection.new
+        end
+      end
+    end
+  end
+end

data/spec/convection/model/template/resource_collection_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+class Convection::Model::Template
+  describe ResourceCollection do
+    class WebService < Convection::Model::Template::ResourceCollection
+      attach_to_dsl(:web_service)
+
+      attribute :use_elastic_load_balancing
+
+      def execute
+        web_service = self # Expose this instance to nested template methods.
+
+        ec2_instance "#{name}WebService"
+
+        elb "#{name}LoadBalancer" do
+          tag 'Description', "Load balancer for the #{web_service.name} web service."
+        end if use_elastic_load_balancing
+      end
+    end
+
+    let(:use_elb_value) { nil }
+    let(:template) do
+      outer_scope = self
+      Convection.template do
+        description 'ResourceCollection Test Template'
+
+        # A lone resource for testing merging of resources and nested resources.
+        ec2_instance 'LoneResource1'
+
+        web_service 'ExampleDotOrg' do
+          use_elastic_load_balancing outer_scope.use_elb_value
+        end
+      end
+    end
+
+    subject do
+      template_json
+        .fetch('Resources')
+    end
+
+    context 'when the use_elastic_load_balancing attribute is set' do
+      let(:use_elb_value) { true }
+
+      it { is_expected.to have_key('LoneResource1') }
+      it { is_expected.to have_key('ExampleDotOrgWebService') }
+      it { is_expected.to have_key('ExampleDotOrgLoadBalancer') }
+    end
+
+    context 'when the use_elastic_load_balancing attribute is not set' do
+      let(:use_elb_value) { false }
+
+      it { is_expected.to have_key('LoneResource1') }
+      it { is_expected.to have_key('ExampleDotOrgWebService') }
+      it { is_expected.to_not have_key('ExampleDotOrgLoadBalancer') }
+    end
+
+    private
+
+    def template_json
+      JSON.parse(template.to_json)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - John Manero
@@ -203,6 +203,7 @@ files:
 - lib/convection/model/template/resource/aws_sqs_queue_policy.rb
 - lib/convection/model/template/resource_attribute.rb
 - lib/convection/model/template/resource_attribute/update_policy.rb
+- lib/convection/model/template/resource_collection.rb
 - lib/convection/model/template/resource_property.rb
 - lib/convection/model/template/resource_property/aws_cloudfront_cachebehavior.rb
 - lib/convection/model/template/resource_property/aws_cloudfront_customerrorresponse.rb
@@ -252,6 +253,7 @@ files:
 - spec/convection/model/template/resource/rds_security_groups_spec.rb
 - spec/convection/model/template/resource/vpc_endpoints_spec.rb
 - spec/convection/model/template/resource_attribute/update_policies_spec.rb
+- spec/convection/model/template/resource_collection_spec.rb
 - spec/convection/model/template/template_spec.rb
 - spec/convection/model/template/validate_bytesize_spec.rb
 - spec/convection/model/template/validate_description_spec.rb
@@ -284,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A fully generic, modular DSL for AWS CloudFormation
@@ -315,6 +317,7 @@ test_files:
 - spec/convection/model/template/resource/rds_security_groups_spec.rb
 - spec/convection/model/template/resource/vpc_endpoints_spec.rb
 - spec/convection/model/template/resource_attribute/update_policies_spec.rb
+- spec/convection/model/template/resource_collection_spec.rb
 - spec/convection/model/template/template_spec.rb
 - spec/convection/model/template/validate_bytesize_spec.rb
 - spec/convection/model/template/validate_description_spec.rb