convection 0.3.2 → 0.3.3.pre.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28794b0bf83508a07221ce39fb4618d474b4661b
-  data.tar.gz: 2e5fff11023f29aeac41e943885b47cd7e0d7746
+  metadata.gz: 92bb70d18fb3687340fc65242ff82a60e85b8fd0
+  data.tar.gz: 8f337a4df378596d37ebac562f5f8934c55a8342
 SHA512:
-  metadata.gz: 003097ab01fecbeb958fa111b850b5e8898c562a5fe3800229a3d528728b232805cb0ca77a76b1932bc6cb1b5bd4f71ca37a3bad973fe496e15ef9a0ea48efca
-  data.tar.gz: 48256617657cc9ddb72e3b46c520ff5c6eedb4986355b1114c982a9af4d309eeada53d07ea6933f6edc6d0bcae7c0748dc9ea9433c15193d4c8794feb47b7680
+  metadata.gz: c75506899cc2c95d0f43c47d16a69d01860211ab7181120f5a986821815e7d6241b8a5e08629fa12d593272923b731408dd782e69b7627bbdb571bd7c8d19cd9
+  data.tar.gz: 0b7dc45590327bd36dc8468342dd146a58fb12ca024f4bcf316c0d0b649dcbf18ceefada272c86b90c3e971a961c4a85dd219225ca0aba65542a494343012a75

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.3.2
+  version: 0.3.3.pre.beta.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
@@ -279,12 +281,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 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