cloud_former 0.5.13 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 455e08fb6d89772ae26e8aafe48860c97e478bd1
-  data.tar.gz: 24e931c5c1c05ed6806a4c0a669dfa240229010d
+  metadata.gz: 228a945844501639913bc971d61276654210c011
+  data.tar.gz: 5670f5b5440d5920e0ce636f4343a0165b0f3836
 SHA512:
-  metadata.gz: 034974211ab749ba87fab1230d1f39703434064134903ba5f0c728697dd7329f1eb6b70a3e1abf18d171955cbe7cedb1fc10ed16af25ac67e7967114620f7881
-  data.tar.gz: c90be0ed15425253c2ecb05e182da9cc283a855942a224bf7a95c9316e38b607830a3d5957369fabe8d1c2ece2e847f6c38710c46521dd63ae957b6a1a22c27b
+  metadata.gz: f0b2d65941582dd6531efec310865eeb5294b0e657a56b833ecd3f8b069fdc7bda5bb6a5bfe3140f413ce67db9e4b3f584a0b66f661aba34e899bc82a6bcfca0
+  data.tar.gz: e7fce25974730950842addbfd79ca0f3fad68af2cb5dc5f0550b02612c1ada22809f7317540d79155b21659b21d4c8687043bafdadf41c5a30d1c624026dc930

data/lib/cloud_former.rb

@@ -83,14 +83,7 @@ module CloudFormer
     autoload :MetricDimension, 'cloud_former/resource_properties/cloud_watch/metric_dimension'
   end
 
-  module Conditions
-    autoload :And, 'cloud_former/conditions/and'
-    autoload :Condition, 'cloud_former/conditions/condition'
-    autoload :Equals, 'cloud_former/conditions/equals'
-    autoload :If, 'cloud_former/conditions/if'
-    autoload :Not, 'cloud_former/conditions/not'
-    autoload :Or, 'cloud_former/conditions/or'
-  end
+  autoload :Condition, 'cloud_former/conditions/condition'
 
   module DirectoryService
     autoload :MicrosoftAD, 'cloud_former/resources/directory_service/microsoft_ad'
@@ -169,11 +162,16 @@ module CloudFormer
   end
 
   module Functions
+    autoload :And, 'cloud_former/functions/and'
     autoload :Base64, 'cloud_former/functions/base_64'
+    autoload :Equals, 'cloud_former/functions/equals'
+    autoload :FindInMap, 'cloud_former/functions/find_in_map'
     autoload :GetAtt, 'cloud_former/functions/get_att'
     autoload :GetAZs, 'cloud_former/functions/get_azs'
-    autoload :FindInMap, 'cloud_former/functions/find_in_map'
+    autoload :If, 'cloud_former/functions/if'
     autoload :Join, 'cloud_former/functions/join'
+    autoload :Not, 'cloud_former/functions/not'
+    autoload :Or, 'cloud_former/functions/or'
   end
 
   module IAM

data/lib/cloud_former/conditions/condition.rb

@@ -1,13 +1,18 @@
 module CloudFormer
-  module Conditions
-    class Condition
-      def initialize(name)
-        @name = name
-      end
+  class Condition
+    attr_reader :function
 
-      def get_name
-        @name
-      end
+    def initialize(name, function)
+      @name = name
+      @function = function
+    end
+
+    def get_name
+      @name
+    end
+
+    def dump_json
+      function.dump_json
     end
   end
 end

data/lib/cloud_former/functions/and.rb

@@ -0,0 +1,26 @@
+module CloudFormer
+  module Functions
+    class And < Function
+
+      def initialize(*conditions)
+        @conditions = conditions
+      end
+
+      def dump_json
+        mapped = @conditions.map do |cond|
+          if cond.is_a?(Condition)
+            { 'Condition' => cond.get_name }
+          elsif cond.is_a?(Function)
+            cond.dump_json
+          elsif cond.respond_to?(:get_name)
+            { 'Ref' => cond.get_name }
+          elsif cond.respond_to?(:to_s)
+            cond.to_s
+          end
+        end
+
+        { 'Fn::And' => mapped }
+      end
+    end
+  end
+end

data/lib/cloud_former/{conditions → functions}/equals.rb

@@ -1,9 +1,8 @@
 module CloudFormer
-  module Conditions
-    class Equals < Condition
+  module Functions
+    class Equals < Function
 
-      def initialize(name, value1, value2)
-        super(name)
+      def initialize(value1, value2)
         @value1 = value1
         @value2 = value2
       end

data/lib/cloud_former/functions/find_in_map.rb

@@ -13,8 +13,8 @@ module CloudFormer
           'Fn::FindInMap' => [
             @map_name,
             transform_key(@top_level_key),
-            transform_key(@second_level_key)
-          ]
+            transform_key(@second_level_key),
+          ],
         }
       end
 

data/lib/cloud_former/functions/if.rb

@@ -0,0 +1,28 @@
+module CloudFormer
+  module Functions
+    class If < Function
+
+      def initialize(condition, true_value, false_value)
+        @condition = condition
+        @true_value = true_value
+        @false_value = false_value
+      end
+
+      def dump_json
+        if @true_value.respond_to?(:get_name)
+          tv = { 'Ref' => @value1.get_name }
+        elsif @true_value.respond_to?(:to_s)
+          tv = @true_value.to_s
+        end
+
+        if @false_value.respond_to?(:get_name)
+          fv = { 'Ref' => @false_value.get_name }
+        elsif @false_value.respond_to?(:to_s)
+          fv = @false_value.to_s
+        end
+
+        { 'Fn::If' => [@condition.get_name, tv, fv] }
+      end
+    end
+  end
+end

data/lib/cloud_former/functions/not.rb

@@ -0,0 +1,14 @@
+module CloudFormer
+  module Functions
+    class Not < Function
+
+      def initialize(function)
+        @function = function
+      end
+
+      def dump_json
+        { 'Fn::Not' => [@function.dump_json] }
+      end
+    end
+  end
+end

data/lib/cloud_former/functions/or.rb

@@ -0,0 +1,26 @@
+module CloudFormer
+  module Functions
+    class Not < Function
+
+      def initialize(*conditions)
+        @conditions = conditions
+      end
+
+      def dump_json
+        mapped = @conditions.map do |cond|
+          if cond.is_a?(Condition)
+            { 'Condition' => cond.get_name }
+          elsif cond.is_a?(Function)
+            cond.dump_json
+          elsif cond.respond_to?(:get_name)
+            { 'Ref' => cond.get_name }
+          elsif cond.respond_to?(:to_s)
+            cond.to_s
+          end
+        end
+
+        { 'Fn::Or' => mapped }
+      end
+    end
+  end
+end

data/lib/cloud_former/version.rb

@@ -1,3 +1,3 @@
 module CloudFormer
-  VERSION = '0.5.13'
+  VERSION = '0.6.0'
 end

data/spec/conditions_spec.rb

@@ -9,38 +9,107 @@ describe CloudFormer::Template do
       user_name 'Aubrey'
     end
   end
+  let(:simple_equals_func) do
+    CloudFormer::Functions::Equals.new(1, 2)
+  end
+  let(:param_equals_func) do
+    CloudFormer::Functions::Equals.new(parameter1, 2)
+  end
   let(:simple_equals) do
-    CloudFormer::Conditions::Equals.new('TestEquals', 1, 2)
+    CloudFormer::Condition.new('TestEquals', simple_equals_func)
   end
   let(:param_equals) do
-    CloudFormer::Conditions::Equals.new('TestEquals', parameter, 2)
+    CloudFormer::Condition.new('TestEquals', param_equals_func)
   end
 
-  it 'should include parameters' do
-    template.add_condition(simple_equals)
-    expect(template.dump_json).to eq(
-      'AWSTemplateFormatVersion' => '2010-09-09',
-      "Conditions" => {
-        "TestEquals" => {
-          "Fn::Equals" => ["1", "2"],
+  describe 'equals' do
+    it 'should include parameters' do
+      template.add_condition(simple_equals)
+      expect(template.dump_json).to eq(
+        'AWSTemplateFormatVersion' => '2010-09-09',
+        "Conditions" => {
+          "TestEquals" => {
+            "Fn::Equals" => ["1", "2"],
+          },
         },
-      },
-    )
-  end
-
-  it 'should include slightly mode complex parameters' do
-    template.add_parameter(parameter)
-    template.add_condition(param_equals)
-    expect(template.dump_json).to eq(
-      'AWSTemplateFormatVersion' => '2010-09-09',
-      "Parameters" => {
-        "sweet" => { "Type" => "String" },
-      },
-      "Conditions" => {
-        "TestEquals" => {
-          "Fn::Equals" => [{ "Ref" => "sweet" }, "2"],
+      )
+    end
+
+    it 'should include slightly mode complex parameters' do
+      template.add_parameter(parameter1)
+      template.add_condition(param_equals)
+      expect(template.dump_json).to eq(
+        'AWSTemplateFormatVersion' => '2010-09-09',
+        "Parameters" => {
+          "sweet" => { "Type" => "String" },
+        },
+        "Conditions" => {
+          "TestEquals" => {
+            "Fn::Equals" => [{ "Ref" => "sweet" }, "2"],
+          },
+        },
+      )
+    end
+  end
+
+  describe 'if' do
+    let(:simple_if_func) do
+      CloudFormer::Functions::If.new(simple_equals, 1, 2)
+    end
+    let(:simple_if) do
+      CloudFormer::Condition.new('TestIf', simple_if_func)
+    end
+
+    it 'should work with simple values' do
+      template.add_condition(simple_equals)
+      template.add_condition(simple_if)
+      expect(template.dump_json).to eq(
+        "AWSTemplateFormatVersion" => "2010-09-09",
+        "Conditions" => {
+          "TestEquals" => { "Fn::Equals" => ["1", "2"] },
+          "TestIf" => { "Fn::If" => ["TestEquals", "1", "2"] },
         },
-      },
-    )
+      )
+    end
+  end
+
+  describe 'and' do
+    let(:simple_and_func) do
+      CloudFormer::Functions::And.new(simple_equals_func, param_equals)
+    end
+    let(:simple_and) do
+      CloudFormer::Condition.new('TestAnd', simple_and_func)
+    end
+
+    it 'should work' do
+      template.add_condition(param_equals)
+      template.add_condition(simple_and)
+      expect(template.dump_json).to eq(
+        "AWSTemplateFormatVersion" => "2010-09-09",
+        "Conditions" => {
+          "TestEquals" => { "Fn::Equals" => [{ "Ref" => "sweet" }, "2"] },
+          "TestAnd" => { "Fn::And" => [{ "Fn::Equals" => ["1", "2"] }, { "Condition" => "TestEquals" }] },
+        },
+      )
+    end
+  end
+
+  describe 'not' do
+    let(:simple_not_func) do
+      CloudFormer::Functions::Not.new(simple_equals_func)
+    end
+    let(:simple_not) do
+      CloudFormer::Condition.new('TestNot', simple_not_func)
+    end
+
+    it 'should work' do
+      template.add_condition(simple_not)
+      expect(template.dump_json).to eq(
+        "AWSTemplateFormatVersion" => "2010-09-09",
+        "Conditions" => {
+          "TestNot" => { "Fn::Not" => [{ "Fn::Equals" => ["1", "2"] }] },
+        },
+      )
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud_former
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.6.0
 platform: ruby
 authors:
 - Aubrey Holland
@@ -99,18 +99,18 @@ files:
 - cloud_former.gemspec
 - lib/cloud_former.rb
 - lib/cloud_former/boolean.rb
-- lib/cloud_former/conditions/and.rb
 - lib/cloud_former/conditions/condition.rb
-- lib/cloud_former/conditions/equals.rb
-- lib/cloud_former/conditions/if.rb
-- lib/cloud_former/conditions/not.rb
-- lib/cloud_former/conditions/or.rb
+- lib/cloud_former/functions/and.rb
 - lib/cloud_former/functions/base_64.rb
+- lib/cloud_former/functions/equals.rb
 - lib/cloud_former/functions/find_in_map.rb
 - lib/cloud_former/functions/function.rb
 - lib/cloud_former/functions/get_att.rb
 - lib/cloud_former/functions/get_azs.rb
+- lib/cloud_former/functions/if.rb
 - lib/cloud_former/functions/join.rb
+- lib/cloud_former/functions/not.rb
+- lib/cloud_former/functions/or.rb
 - lib/cloud_former/has_properties_and_attributes.rb
 - lib/cloud_former/makes_json.rb
 - lib/cloud_former/metadata_resources/cloud_formation/authentication.rb

data/lib/cloud_former/conditions/and.rb

@@ -1,6 +0,0 @@
-module CloudFormer
-  module Conditions
-    class And < Condition
-    end
-  end
-end

data/lib/cloud_former/conditions/if.rb

@@ -1,6 +0,0 @@
-module CloudFormer
-  module Conditions
-    class If < Condition
-    end
-  end
-end

data/lib/cloud_former/conditions/not.rb

@@ -1,6 +0,0 @@
-module CloudFormer
-  module Conditions
-    class Not < Condition
-    end
-  end
-end

data/lib/cloud_former/conditions/or.rb

@@ -1,6 +0,0 @@
-module CloudFormer
-  module Conditions
-    class Or < Condition
-    end
-  end
-end