humidifier 1.6.0 → 1.6.1

data/README.md

@@ -94,10 +94,6 @@ The default rake task runs the tests. Coverage is reported on the command line,
 
 The specs pulled from the CFN docs is saved to `CloudFormationResourceSpecification.json`. You can update it by running `bundle exec rake specs`. This script will pull down the latest [resource specification](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-resource-specification.html) to be used with Humidifier.
 
-### Extension
-
-The `underscore` string utility method does a lot of the heavy lifting of changing AWS property names over to ruby method names. As such, it's been extracted to a native extension to increase speed and efficiency. To compile it locally run `rake compile`.
-
 ### Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/localytics/humidifier.

data/lib/humidifier/parameter.rb

@@ -8,7 +8,7 @@ module Humidifier
     attr_accessor :type, *PROPERTIES.values
 
     def initialize(opts = {})
-      PROPERTIES.values.each { |prop| send(:"#{prop}=", opts[prop]) }
+      PROPERTIES.each_value { |prop| send(:"#{prop}=", opts[prop]) }
       self.type = opts.fetch(:type, 'String')
     end
 

data/lib/humidifier/stack.rb

@@ -14,8 +14,8 @@ module Humidifier
       self.id   = opts[:id]
       self.default_identifier = self.class.next_default_identifier
 
-      ENUMERABLE_RESOURCES.values.each { |prop| send(:"#{prop}=", opts.fetch(prop, {})) }
-      STATIC_RESOURCES.values.each { |prop| send(:"#{prop}=", opts[prop]) }
+      ENUMERABLE_RESOURCES.each_value { |prop| send(:"#{prop}=", opts.fetch(prop, {})) }
+      STATIC_RESOURCES.each_value { |prop| send(:"#{prop}=", opts[prop]) }
     end
 
     # Add a resource to the stack and optionally set its attributes

data/lib/humidifier/utils.rb

@@ -1,6 +1,13 @@
 module Humidifier
   # Dumps an object to CFN syntax
   module Utils
+    # convert from UpperCamelCase to lower_snake_case
+    def self.underscore(name)
+      return nil unless name
+      name.gsub(/([A-Z]+)([0-9]|[A-Z]|\z)/) { "#{$1.capitalize}#{$2}" }
+          .gsub(/(.)([A-Z])/, '\1_\2').downcase
+    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

data/lib/humidifier/version.rb

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

data/lib/humidifier.rb

@@ -3,9 +3,7 @@ require 'json'
 require 'pathname'
 require 'yaml'
 
-require 'humidifier/humidifier'
 require 'humidifier/utils'
-
 require 'humidifier/fn'
 require 'humidifier/ref'
 require 'humidifier/props'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: humidifier
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Localytics
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: benchmark-ips
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -141,16 +113,12 @@ description: Programmatically generate and manage AWS CloudFormation templates,
 email:
 - oss@localytics.com
 executables: []
-extensions:
-- ext/humidifier/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - CloudFormationResourceSpecification.json
 - LICENSE
 - README.md
-- ext/humidifier/extconf.rb
-- ext/humidifier/humidifier.c
-- ext/humidifier/humidifier.h
 - lib/humidifier.rb
 - lib/humidifier/aws_adapters/base.rb
 - lib/humidifier/aws_adapters/noop.rb
@@ -160,7 +128,6 @@ files:
 - lib/humidifier/condition.rb
 - lib/humidifier/configuration.rb
 - lib/humidifier/fn.rb
-- lib/humidifier/humidifier.bundle
 - lib/humidifier/loader.rb
 - lib/humidifier/mapping.rb
 - lib/humidifier/output.rb
@@ -204,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: CloudFormation made easy

data/ext/humidifier/extconf.rb

@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile 'humidifier/humidifier'

data/ext/humidifier/humidifier.c

@@ -1,81 +0,0 @@
-#include "humidifier.h"
-
-// 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;
-
-  for (idx = 0; idx < substr_idx; idx++) {
-    if (idx == 0) {
-      substr[idx] = toupper(substr[idx]);
-    }
-    else if ((idx != substr_idx - 1) || capitalize == 0) {
-      substr[idx] = tolower(substr[idx]);
-    }
-  }
-}
-
-// 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)];
-  int idx, substr_idx;
-
-  for (idx = 0, substr_idx = 0; str[idx] != '\0'; idx++) {
-    if (isupper(str[idx])) {
-      substr[substr_idx++] = str[idx];
-
-      if (str[idx + 1] == '\0') {
-        format_substring(substr, substr_idx, 0);
-        memcpy(str + (idx - substr_idx) + 1, substr, substr_idx);
-      }
-    }
-    else if (isdigit(str[idx]) || (substr_idx != 0)) {
-      if (substr_idx != 1) {
-        format_substring(substr, substr_idx, islower(str[idx]));
-        memcpy(str + (idx - substr_idx), substr, substr_idx);
-      }
-      substr_idx = 0;
-    }
-  }
-}
-
-// 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;
-
-  char *str_value = rb_string_value_cstr(&str);
-  char orig_str[strlen(str_value) + 1];
-
-  strcpy(orig_str, str_value);
-  preprocess(orig_str);
-
-  // 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];
-  char prev;
-  int orig_idx, new_idx;
-
-  for (orig_idx = 0, new_idx = 0; orig_str[orig_idx] != '\0'; orig_idx++) {
-    if (orig_idx != 0 && isupper(orig_str[orig_idx])) {
-      new_str[new_idx++] = '_';
-    }
-    new_str[new_idx++] = tolower(orig_str[orig_idx]);
-    prev = tolower(orig_str[orig_idx]);
-  }
-
-  return rb_str_new(new_str, new_idx);
-}
-
-void Init_humidifier()
-{
-  VALUE Humidifier = rb_define_module("Humidifier");
-  VALUE Utils = rb_define_module_under(Humidifier, "Utils");
-  rb_define_singleton_method(Utils, "underscore", underscore, 1);
-}

data/ext/humidifier/humidifier.h

@@ -1,9 +0,0 @@
-#ifndef RUBY_HUMIDIFIER
-#define RUBY_HUMIDIFIER
-
-#include <ctype.h>
-#include <ruby.h>
-
-void Init_humidifier();
-
-#endif