humidifier 1.0.6 → 1.2.1

data/README.md

@@ -8,7 +8,7 @@ Humidifier allows you to build AWS CloudFormation (CFN) templates programmatical
 
 For the full docs, go to [https://localytics.github.io/humidifier/](http://localytics.github.io/humidifier/). For local development instructions, see the [Development](https://localytics.github.io/humidifier/#label-Development) section.
 
-Humidifier is tested with Ruby 2.0.0 and higher.
+Humidifier is tested with Ruby `2.1` and higher. The gem version is linked to AWS' CloudFormation resource specification version since `1.2.1`.
 
 ## Getting started
 
@@ -80,7 +80,7 @@ end
 
 ## Development
 
-To get started, ensure you have ruby installed, version 2.0 or later. From there, install the `bundler` gem: `gem install bundler` and then `bundle install` in the root of the repository.
+To get started, ensure you have ruby installed, version 2.1 or later. From there, install the `bundler` gem: `gem install bundler` and then `bundle install` in the root of the repository.
 
 ### Testing
 

data/ext/humidifier/humidifier.c

@@ -1,6 +1,7 @@
 #include <humidifier.h>
 
-// takes a substring from underscore_preprocess like EC2T or AWST and converts it to Ec2T or AwsT
+// takes a substring from underscore_preprocess like EC2T or AWST and converts
+// it to Ec2T or AwsT
 static void format_substring(char* substr, const int substr_idx, const int capitalize)
 {
   int idx;
@@ -15,8 +16,8 @@ static void format_substring(char* substr, const int substr_idx, const int capit
   }
 }
 
-// finds occurences of EC2Thing or AWSThing and makes them into Ec2Thing and AwsThing so that underscore can be
-// simpler and just look for capitals
+// finds occurences of EC2Thing or AWSThing and makes them into Ec2Thing and
+// AwsThing so that underscore can be simpler and just look for capitals
 static void preprocess(char* str)
 {
   char substr[strlen(str)];
@@ -41,7 +42,8 @@ static void preprocess(char* str)
   }
 }
 
-// takes a string and returns a downcased version where capitals are now separated by underscores
+// takes a string and returns a downcased version where capitals are now
+// separated by underscores
 static VALUE underscore(VALUE self, VALUE str)
 {
   if (TYPE(str) == T_NIL) return Qnil;
@@ -52,7 +54,8 @@ static VALUE underscore(VALUE self, VALUE str)
   strcpy(orig_str, str_value);
   preprocess(orig_str);
 
-  // manually null-terminating the string because on Fedora for strings of length 16 this breaks otherwise
+  // manually null-terminating the string because on Fedora for strings of
+  // length 16 this breaks otherwise
   orig_str[strlen(str_value)] = '\0';
 
   char new_str[strlen(orig_str) * 2];

data/lib/humidifier/aws_adapters/base.rb

@@ -1,11 +1,8 @@
 module Humidifier
-
   # A container module for all adapters for the SDK
   module AwsAdapters
-
     # The parent class for the adapters for both versions of the SDK
     class Base
-
       # Create a CFN stack
       def create(payload)
         try_valid do

data/lib/humidifier/aws_adapters/noop.rb

@@ -1,9 +1,7 @@
 module Humidifier
   module AwsAdapters
-
     # An adapter used when neither SDK is loaded
     class Noop
-
       # Capture all STACK_METHODS method calls and warn that they will not be run
       def method_missing(method, *)
         if AwsShim::STACK_METHODS.include?(method)

data/lib/humidifier/aws_adapters/sdkv1.rb

@@ -1,9 +1,7 @@
 module Humidifier
   module AwsAdapters
-
     # The adapter for v1 of aws-sdk
     class SDKV1 < Base
-
       # Cannot create change sets in V1
       def create_change_set(*)
         unsupported('create change set')

data/lib/humidifier/aws_adapters/sdkv2.rb

@@ -1,9 +1,7 @@
 module Humidifier
   module AwsAdapters
-
     # The adapter for v2 of aws-sdk
     class SDKV2 < Base
-
       # Create a change set in CFN
       def create_change_set(payload)
         payload.merge(change_set_name: "changeset-#{Time.now.strftime('%Y-%m-%d-%H-%M-%S')}")

data/lib/humidifier/aws_shim.rb

@@ -4,10 +4,8 @@ require 'humidifier/aws_adapters/sdkv1'
 require 'humidifier/aws_adapters/sdkv2'
 
 module Humidifier
-
   # Optionally provides aws-sdk functionality if the gem is loaded
   class AwsShim
-
     # The AWS region, can be set through the environment, defaults to us-east-1
     REGION = ENV['AWS_REGION'] || 'us-east-1'
 

data/lib/humidifier/condition.rb

@@ -1,8 +1,6 @@
 module Humidifier
-
   # Represents a CFN stack condition
   class Condition
-
     attr_accessor :opts
 
     def initialize(opts)

data/lib/humidifier/configuration.rb

@@ -1,8 +1,6 @@
 module Humidifier
-
   # a container for user params
   class Configuration
-
     # The message that gets displayed when the stack body is too large to use
     # the template_body option
     UPLOAD_MESSAGE = <<-MSG.freeze

data/lib/humidifier/fn.rb

@@ -1,8 +1,6 @@
 module Humidifier
-
   # Builds CFN function calls
   class Fn
-
     # The list of all internal functions provided by AWS from
     # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference.html
     FUNCTIONS = Utils.underscored(%w[And Base64 Equals FindInMap GetAtt GetAZs

data/lib/humidifier/loader.rb

@@ -1,17 +1,20 @@
 module Humidifier
-  # Pre-setting this module because AWS has a "Config" module and the below register method dynamically looks up the
-  # module to see whether or not it exists, which before ruby 2.2 would result in the warning:
+  # Pre-setting this module because AWS has a "Config" module and the below
+  # register method dynamically looks up the module to see whether or not it
+  # exists, which before ruby 2.2 would result in the warning:
   #   `const_defined?': Use RbConfig instead of obsolete and deprecated Config.
   # @aws AWS::Config
   module Config
   end
 
-  # Reads the specs/CloudFormationResourceSpecification.json file and load each resource as a class
+  # Reads the specs/CloudFormationResourceSpecification.json file and load each
+  # resource as a class
   class Loader
     # The path to the specification file
     SPECPATH = File.expand_path(File.join('..', '..', '..', 'CloudFormationResourceSpecification.json'), __FILE__)
 
-    # Handles searching the PropertyTypes specifications for a specific resource type
+    # Handles searching the PropertyTypes specifications for a specific
+    # resource type
     class StructureContainer
       attr_reader :structs
 
@@ -28,7 +31,7 @@ module Humidifier
       private
 
       def global
-        @global ||= structs.select { |key, _| !key.match(/AWS/) }
+        @global ||= structs.reject { |key, _| key.match(/AWS/) }
       end
     end
 
@@ -54,10 +57,10 @@ module Humidifier
       Class.new(Resource) do
         self.aws_name = aws_name
         self.props =
-          Utils.enumerable_to_h(spec['Properties']) do |(key, config)|
+          spec['Properties'].map do |(key, config)|
             prop = Props.from(key, config, substructs)
             [prop.name, prop]
-          end
+          end.to_h
       end
     end
 

data/lib/humidifier/mapping.rb

@@ -1,8 +1,6 @@
 module Humidifier
-
   # Represents a CFN stack mapping
   class Mapping
-
     attr_accessor :opts
 
     def initialize(opts = {})

data/lib/humidifier/output.rb

@@ -1,8 +1,6 @@
 module Humidifier
-
   # Represents a CFN stack output
   class Output
-
     attr_accessor :description, :value
 
     def initialize(opts = {})

data/lib/humidifier/parameter.rb

@@ -1,8 +1,6 @@
 module Humidifier
-
   # Represents a CFN stack parameter
   class Parameter
-
     # The allowed properties of all stack parameters
     PROPERTIES = Utils.underscored(%w[AllowedPattern AllowedValues ConstraintDescription Default Description
                                       MaxLength MaxValue MinLength MinValue NoEcho])

data/lib/humidifier/props/base.rb

@@ -2,7 +2,6 @@ module Humidifier
   module Props
     # Superclass for all CFN properties
     class Base
-
       # The list of classes that are valid beyond the normal values for each prop
       WHITELIST = [Fn, Ref].freeze
 

data/lib/humidifier/props/map_prop.rb

@@ -6,19 +6,16 @@ module Humidifier
 
       # converts the value through mapping using the subprop unless it is valid
       def convert(map)
-        valid?(map) ? map : Utils.enumerable_to_h(map) { |(key, value)| [key, subprop.convert(value)] }
+        valid?(map) ? map : map.map { |key, value| [key, subprop.convert(value)] }.to_h
       end
 
       # CFN stack syntax
       def to_cf(map)
-        dumped =
-          Utils.enumerable_to_h(map) do |(subkey, subvalue)|
-            [subkey, subprop.to_cf(subvalue).last]
-          end
-        [key, dumped]
+        [key, map.map { |subkey, subvalue| [subkey, subprop.to_cf(subvalue).last] }.to_h]
       end
 
-      # Valid if the value is whitelisted or every value in the map is valid on the subprop
+      # Valid if the value is whitelisted or every value in the map is valid on
+      # the subprop
       def valid?(map)
         whitelisted_value?(map) || (map.is_a?(Hash) && map.values.all? { |value| subprop.valid?(value) })
       end

data/lib/humidifier/props/structure_prop.rb

@@ -9,20 +9,16 @@ module Humidifier
         if valid?(struct)
           struct
         else
-          Utils.enumerable_to_h(struct) do |(subkey, subvalue)|
+          struct.map do |subkey, subvalue|
             subkey = Utils.underscore(subkey.to_s)
             [subkey.to_sym, subprops[subkey].convert(subvalue)]
-          end
+          end.to_h
         end
       end
 
       # CFN stack syntax
       def to_cf(struct)
-        dumped =
-          Utils.enumerable_to_h(struct) do |(subkey, subvalue)|
-            subprops[subkey.to_s].to_cf(subvalue)
-          end
-        [key, dumped]
+        [key, struct.map { |subkey, subvalue| subprops[subkey.to_s].to_cf(subvalue) }.to_h]
       end
 
       # true if the value is whitelisted or Hash and all keys are valid for their corresponding props
@@ -35,10 +31,10 @@ module Humidifier
       def after_initialize(substructs)
         type = spec['ItemType'] || spec['Type']
         @subprops =
-          Utils.enumerable_to_h(substructs.fetch(type, {}).fetch('Properties', {})) do |(key, config)|
+          substructs.fetch(type, {}).fetch('Properties', {}).map do |key, config|
             subprop = config['ItemType'] == type ? self : Props.from(key, config, substructs)
             [Utils.underscore(key), subprop]
-          end
+          end.to_h
       end
 
       def valid_struct?(struct)

data/lib/humidifier/props.rb

@@ -1,5 +1,4 @@
 module Humidifier
-
   # Container for property of CFN resources
   module Props
     class << self

data/lib/humidifier/ref.rb

@@ -1,8 +1,6 @@
 module Humidifier
-
   # Builds CFN references
   class Ref
-
     attr_accessor :reference
 
     def initialize(reference)

data/lib/humidifier/resource.rb

@@ -1,8 +1,6 @@
 module Humidifier
-
   # Superclass for all AWS resources
   class Resource
-
     # Attributes that are available to every stack
     COMMON_ATTRIBUTES =
       Utils.underscored(%w[Condition CreationPolicy DeletionPolicy DependsOn Metadata UpdatePolicy])
@@ -35,7 +33,7 @@ module Humidifier
 
     # CFN stack syntax
     def to_cf
-      props_cf = Utils.enumerable_to_h(properties) { |(key, value)| self.class.props[key].to_cf(value) }
+      props_cf = properties.map { |key, value| self.class.props[key].to_cf(value) }.to_h
       { 'Type' => self.class.aws_name, 'Properties' => props_cf }.merge(common_attributes)
     end
 

data/lib/humidifier/sdk_payload.rb

@@ -1,8 +1,6 @@
 module Humidifier
-
   # The payload sent to the shim methods, representing the stack and the options
   class SdkPayload
-
     # The maximum size a template body can be before it has to be put somewhere and referenced through a URL
     MAX_TEMPLATE_BODY_SIZE = 51_200
 

data/lib/humidifier/serializer.rb

@@ -1,13 +1,11 @@
 module Humidifier
-
   # Dumps an object to CFN syntax
   class Serializer
-
     class << self
       # dumps the given object out to CFN syntax recursively
       def dump(node)
         case node
-        when Hash    then Utils.enumerable_to_h(node) { |(key, value)| [key, dump(value)] }
+        when Hash    then node.map { |key, value| [key, dump(value)] }.to_h
         when Array   then node.map { |value| dump(value) }
         when Ref, Fn then dump(node.to_cf)
         when Date    then node.iso8601

data/lib/humidifier/sleeper.rb

@@ -1,8 +1,6 @@
 module Humidifier
-
   # Manages waiting for stack events for v1 of the SDK
   class Sleeper
-
     attr_accessor :attempts
 
     # Store attempts and wait for the block to return true

data/lib/humidifier/stack.rb

@@ -1,8 +1,6 @@
 module Humidifier
-
   # Represents a CFN stack
   class Stack
-
     # Single settings on the stack
     STATIC_RESOURCES     = Utils.underscored(%w[AWSTemplateFormatVersion Description Metadata])
 
@@ -67,9 +65,10 @@ module Humidifier
       ENUMERABLE_RESOURCES.each_with_object({}) do |(name, prop), list|
         resources = send(prop)
         next if resources.empty?
-        list[name] = Utils.enumerable_to_h(resources) do |resource_name, resource|
-          [resource_name, resource.to_cf]
-        end
+        list[name] =
+          resources.map do |resource_name, resource|
+            [resource_name, resource.to_cf]
+          end.to_h
       end
     end
 

data/lib/humidifier/utils.rb

@@ -1,21 +1,9 @@
 module Humidifier
-
   # Dumps an object to CFN syntax
   module Utils
-
-    class << self
-      # back-supporting ruby 2.0's lack of Enumerable#to_h
-      def enumerable_to_h(enumerable)
-        enumerable.each_with_object({}) do |item, result|
-          key, value = yield item
-          result[key] = value
-        end
-      end
-
-      # a frozen hash of the given names mapped to their underscored version
-      def underscored(names)
-        names.each_with_object({}) { |name, map| map[name] = underscore(name).to_sym }.freeze
-      end
+    # a frozen hash of the given names mapped to their underscored version
+    def self.underscored(names)
+      names.map { |name| [name, underscore(name).to_sym] }.to_h.freeze
     end
   end
 end

data/lib/humidifier/version.rb

@@ -1,4 +1,4 @@
 module Humidifier
   # Gem version
-  VERSION = '1.0.6'.freeze
+  VERSION = '1.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: humidifier
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.2.1
 platform: ruby
 authors:
 - Localytics
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -196,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: CloudFormation made easy