cloud_formation 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7947c1d9043cf5c8121895f04ea632dee1db5d5f
-  data.tar.gz: be5a73638e103ddafa4a018b5cfef1ff13a53572
+  metadata.gz: 5c28700bca1d3dad061e12b10d3587e60e2248f1
+  data.tar.gz: 2faf4c04795ecdcf492a00ebe4665aa9e51ef75a
 SHA512:
-  metadata.gz: 7fd95397e280ef0232a3dab26df66ed336418af34a8ad2391332bad492c8bb4ad9f55375d265167a56d011a52e043ecf2433f0f558450629f0a3847c3ac784a6
-  data.tar.gz: d57179e2befc0fc92e4118328ae88895d6a3e90581b75bfb635834e821ef04e3ee1e395668b9af9c30ce97616b186a9a7ed6ee80df92afce1fa49e5411f430d1
+  metadata.gz: 8b2174afbd62a8509242de4f1dd17c95e0fdf75e85dbb9a1d4f8990edeba4470bb2e2a65506b1cd39c252f4015e9119e86be15dabc9598aae99c6143571a4787
+  data.tar.gz: 1adad111f96331fb195abfe6685dfd2f4001a8dc50aff8458917b4a1b20f62f311b6c7115c635748ec9ee10b30f253911c86138cb541b7b99c165c8e276b38bc

data/lib/cloud_formation/dynamo_db.rb

@@ -1,47 +1,60 @@
 module CloudFormation
   class DynamoDB < Base
-    attribute_list :name, :read_capacity_units, :write_capacity_units, :hash_key, :range_key
 
-    def build_table &block
-      yield self
-      self
-    end
+    attr_accessor :tables
 
-    def serialize
-      properties = {
-        "Type" => "AWS::DynamoDB::Table",
-        "Properties" => {
-          "ProvisionedThroughput" => {
-            "WriteCapacityUnits" => @write_capacity_units.to_s,
-            "ReadCapacityUnits" => @read_capacity_units.to_s
-          }
-        }
-      }
-      properties["Properties"].merge! add_key_schemas
-      properties
+    def initialize
+      @tables = []
     end
 
+    def build_table &block
+      table = Table.new
+      yield table
+      @tables << table
+      table
+    end
 
     private
 
-      def key_type_mapping type
-        case type
-          when :string then "S"
-          when :number then "N"
-          when :binary then "B"
+      class Table < Base
+        attribute_list :name, :read_capacity_units, :write_capacity_units, :hash_key, :range_key
+
+        def serialize
+          properties = {
+            "Type" => "AWS::DynamoDB::Table",
+            "Properties" => {
+              "ProvisionedThroughput" => {
+                "WriteCapacityUnits" => @write_capacity_units.to_s,
+                "ReadCapacityUnits" => @read_capacity_units.to_s
+              }
+            }
+          }
+          properties["Properties"].merge! add_key_schemas
+          properties
         end
-      end
 
-      def add_key_schemas
-        key_schema = { "KeySchema" => {}}
-        key_schema["KeySchema"]["RangeKeyElement"] = add_key_schema_for(@range_key) if @range_key
-        key_schema["KeySchema"]["HashKeyElement"] = add_key_schema_for(@hash_key) if @hash_key
-        key_schema
-      end
+        private
+
+          def key_type_mapping type
+            case type
+              when :string then "S"
+              when :number then "N"
+              when :binary then "B"
+            end
+          end
+
+          def add_key_schemas
+            key_schema = { "KeySchema" => {}}
+            key_schema["KeySchema"]["RangeKeyElement"] = add_key_schema_for(@range_key) if @range_key
+            key_schema["KeySchema"]["HashKeyElement"] = add_key_schema_for(@hash_key) if @hash_key
+            key_schema
+          end
+
+          def add_key_schema_for key
+            k = key.keys.first
+            { "AttributeName" => k.to_s, "AttributeType" => key_type_mapping(key[k])  }
+          end
 
-      def add_key_schema_for key
-        k = key.keys.first
-        { "AttributeName" => k.to_s, "AttributeType" => key_type_mapping(key[k])  }
       end
 
   end

data/lib/cloud_formation/template.rb

@@ -15,6 +15,10 @@ module CloudFormation
       @resources[resource.name] = resource.serialize.tap { |a| a.delete("Name") }
     end
 
+    def add_resources resources
+      resources.each { |resource| add_resource resource }
+    end
+
     def render pretty: false, indentation: 2
       pretty ? JSON.pretty_generate(serialize, indent: " "*indentation) : serialize.to_json
     end

data/lib/cloud_formation/version.rb

@@ -1,3 +1,3 @@
 module CloudFormation
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/dynamo_db_test.rb

@@ -3,19 +3,25 @@ require 'test_helper'
 class DynamoDBTest < Minitest::Test
 
   def setup
-    @dynamo_db = CloudFormation::DynamoDB.new
+    @table = build_dynamo_table_instance
+  end
+
+  def test_build_table_should_return_table_class
+    dynamo_db = CloudFormation::DynamoDB.new
+    table = build_dynamo_table_instance
+    assert_instance_of CloudFormation::DynamoDB::Table, table
+  end
+
+  def test_build_table_should_add_table_to_tables_array
+    dynamo_db = CloudFormation::DynamoDB.new
+    assert_empty dynamo_db.tables
 
-    @dynamo_db.build_table do |t|
-      t.name = "tableName"
-      t.read_capacity_units = 10
-      t.write_capacity_units = 5
-      t.hash_key = { column_one_id: :number }
-      t.range_key = { column_two_id: :number }
-    end
+    build_dynamo_table_instance dynamo_db
+    assert_equal 1, dynamo_db.tables.length
   end
 
   def test_basic
-    expected = @dynamo_db.serialize
+    expected = @table.serialize
     assert_equal load_fixture("dynamo_db/basic"), expected
   end
 

data/test/factories/factory_helpers.rb

@@ -0,0 +1,39 @@
+module FactoryHelpers
+
+  def build_template_instance opts = {}
+    options = {
+      name: "stack-name",
+      description: "A description of the stack"
+    }
+    options.merge! opts
+    template = CloudFormation::Template.new
+
+    template.build do |t|
+      t.name = options[:name]
+      t.description = options[:description]
+    end
+    template
+  end
+
+  def build_dynamo_table_instance db = nil, opts = {}
+    db = CloudFormation::DynamoDB.new if db === nil
+    options = {
+      name: "tableName",
+      read_capacity_units: 10,
+      write_capacity_units: 5,
+      hash_key: { column_one_id: :number },
+      range_key: { column_two_id: :number }
+
+    }
+    options.merge! opts
+
+    table = db.build_table do |t|
+      t.name = options[:name]
+      t.read_capacity_units = options[:read_capacity_units]
+      t.write_capacity_units = options[:write_capacity_units]
+      t.hash_key = options[:hash_key]
+      t.range_key = options[:range_key]
+    end
+    table
+  end
+end

data/test/template_test.rb

@@ -3,12 +3,7 @@ require 'test_helper'
 class TemplateTest < Minitest::Test
 
   def setup
-    @template = CloudFormation::Template.new
-
-    @template.build do |t|
-      t.name = "stack-name"
-      t.description = "A description of the stack"
-    end
+    @template = build_template_instance
   end
 
   def test_default
@@ -21,4 +16,30 @@ class TemplateTest < Minitest::Test
     assert_equal load_fixture("template/default"), JSON.parse(rendered)
   end
 
+  def test_adding_single_resource
+    template = build_template_instance
+    table = build_dynamo_table_instance
+
+    template.add_resource table
+    rendered = template.render pretty: true
+
+    assert_equal load_fixture("template/adding_single_resource"), JSON.parse(rendered)
+  end
+
+
+  def test_adding_multiple_resources
+    template = build_template_instance
+    dynamo_db = CloudFormation::DynamoDB.new
+
+    build_dynamo_table_instance dynamo_db
+    build_dynamo_table_instance dynamo_db, name: "tableName2"
+
+
+    template.add_resources dynamo_db.tables
+
+    rendered = template.render pretty: true
+
+    assert_equal load_fixture("template/adding_multiple_resources"), JSON.parse(rendered)
+  end
+
 end

data/test/templates/template/adding_multiple_resources.json

@@ -0,0 +1,45 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Name": "stack-name",
+  "Description": "A description of the stack",
+  "Resources": {
+    "tableName": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "ProvisionedThroughput": {
+          "WriteCapacityUnits": "5",
+          "ReadCapacityUnits": "10"
+        },
+        "KeySchema": {
+          "RangeKeyElement": {
+            "AttributeName": "column_two_id",
+            "AttributeType": "N"
+          },
+          "HashKeyElement": {
+            "AttributeName": "column_one_id",
+            "AttributeType": "N"
+          }
+        }
+      }
+    },
+    "tableName2": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "ProvisionedThroughput": {
+          "WriteCapacityUnits": "5",
+          "ReadCapacityUnits": "10"
+        },
+        "KeySchema": {
+          "RangeKeyElement": {
+            "AttributeName": "column_two_id",
+            "AttributeType": "N"
+          },
+          "HashKeyElement": {
+            "AttributeName": "column_one_id",
+            "AttributeType": "N"
+          }
+        }
+      }
+    }
+  }
+}

data/test/templates/template/adding_single_resource.json

@@ -0,0 +1,26 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Name": "stack-name",
+  "Description": "A description of the stack",
+  "Resources": {
+    "tableName": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "ProvisionedThroughput": {
+          "WriteCapacityUnits": "5",
+          "ReadCapacityUnits": "10"
+        },
+        "KeySchema": {
+          "RangeKeyElement": {
+            "AttributeName": "column_two_id",
+            "AttributeType": "N"
+          },
+          "HashKeyElement": {
+            "AttributeName": "column_one_id",
+            "AttributeType": "N"
+          }
+        }
+      }
+    }
+  }
+}

data/test/test_helper.rb

@@ -3,6 +3,10 @@ require 'minitest/pride'
 require 'cloud_formation'
 require 'json'
 
+require 'factories/factory_helpers'
+
+include FactoryHelpers
+
 def load_fixture path
   JSON.parse File.read("test/templates/#{path}.json")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud_formation
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - David White
@@ -58,8 +58,11 @@ files:
 - lib/cloud_formation/template.rb
 - lib/cloud_formation/version.rb
 - test/dynamo_db_test.rb
+- test/factories/factory_helpers.rb
 - test/template_test.rb
 - test/templates/dynamo_db/basic.json
+- test/templates/template/adding_multiple_resources.json
+- test/templates/template/adding_single_resource.json
 - test/templates/template/default.json
 - test/templates/template/pretty.json
 - test/test_helper.rb
@@ -89,8 +92,11 @@ specification_version: 4
 summary: A Ruby gem to create AWS CloudFormation descriptions.
 test_files:
 - test/dynamo_db_test.rb
+- test/factories/factory_helpers.rb
 - test/template_test.rb
 - test/templates/dynamo_db/basic.json
+- test/templates/template/adding_multiple_resources.json
+- test/templates/template/adding_single_resource.json
 - test/templates/template/default.json
 - test/templates/template/pretty.json
 - test/test_helper.rb