humidifier 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a87d6a8c680083d829f61fdbe36d81906621678b
-  data.tar.gz: 662a02218ada43bc9ea0df34d5e1f86970037e79
+  metadata.gz: ee7bf139de1b6381e11257368d6cd1acbd8e8739
+  data.tar.gz: e4fdc11b944852860856039b9ba92c827719f0c3
 SHA512:
-  metadata.gz: baf5e27e50335016952a6fe66be84d3fab9b3f8d0f50d916f74d971952042bda5ba23f2f6c86d2cf425aa485b1fa094c561a16c34598856abf6df462c213c8df
-  data.tar.gz: 53cf909473ebc4574b141837ad01ad843cd94bd4f6b9bbbd2b57f098919d6b3c547998edf5edcad04e0c17a97bb58b05e31a7d888ad1081a9941de5ba13af412
+  metadata.gz: 3eb8a3c2fff29252acae925ae9bf6b1254ec180d59b509c162da13eeca7f08b1e9cf03f0015e15eeb8d98647d9520b61d33d5c027512e076c78707876a4a5747
+  data.tar.gz: 58e0cb21ed854e887be41b33377b73ac567bc8a04ba6a32afa41879f3523e79f1e8819e4a9485493afbb22f2f1daae10e64e888e1aa484924418034aa95dba05

data/CloudFormationResourceSpecification.json

@@ -10096,7 +10096,7 @@
         },
         "EvaluationPeriods": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-evaluationperiods",
-          "PrimitiveType": "Double",
+          "PrimitiveType": "String",
           "Required": true,
           "UpdateType": "Mutable"
         },
@@ -10130,7 +10130,7 @@
         },
         "Period": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-period",
-          "PrimitiveType": "Integer",
+          "PrimitiveType": "String",
           "Required": true,
           "UpdateType": "Mutable"
         },
@@ -10142,7 +10142,7 @@
         },
         "Threshold": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-threshold",
-          "PrimitiveType": "Double",
+          "PrimitiveType": "String",
           "Required": true,
           "UpdateType": "Mutable"
         },

data/lib/humidifier/props/base.rb

@@ -15,11 +15,6 @@ module Humidifier
         after_initialize(substructs) if respond_to?(:after_initialize, true)
       end
 
-      # true if the property type knows how to convert its values
-      def convertable?
-        respond_to?(:convert)
-      end
-
       # the link to the AWS docs
       def documentation
         spec['Documentation']

data/lib/humidifier/props/boolean_prop.rb

@@ -2,19 +2,19 @@ module Humidifier
   module Props
     # A boolean property
     class BooleanProp < Base
-      # converts through value == 'true'
+      # converts the value through `value == 'true'` unless it is valid
       def convert(value)
-        if %w[true false].include?(value)
+        if valid?(value) || !%w[true false].include?(value)
+          value
+        else
           puts "WARNING: Property #{name} should be a boolean, not a string"
           value == 'true'
-        else
-          value
         end
       end
 
       # true if it is a boolean
       def valid?(value)
-        value.is_a?(TrueClass) || value.is_a?(FalseClass)
+        whitelisted_value?(value) || value.is_a?(TrueClass) || value.is_a?(FalseClass)
       end
     end
   end

data/lib/humidifier/props/double_prop.rb

@@ -2,10 +2,14 @@ module Humidifier
   module Props
     # A double property
     class DoubleProp < Base
-      # converts the value through #to_f unless it is whitelisted
+      # converts the value through #to_f unless it is valid
       def convert(value)
-        puts "WARNING: Property #{name} should be a double" unless valid?(value)
-        value.to_f
+        if valid?(value) || !value.respond_to?(:to_f)
+          value
+        else
+          puts "WARNING: Property #{name} should be a double"
+          value.to_f
+        end
       end
 
       # true if it is whitelisted, an Integer, or a Float

data/lib/humidifier/props/integer_prop.rb

@@ -2,10 +2,14 @@ module Humidifier
   module Props
     # An integer property
     class IntegerProp < Base
-      # converts the value through #to_i unless it is whitelisted
+      # converts the value through #to_i unless it is valid
       def convert(value)
-        puts "WARNING: Property #{name} should be an integer" unless valid?(value)
-        value.to_i
+        if valid?(value) || !value.respond_to?(:to_i)
+          value
+        else
+          puts "WARNING: Property #{name} should be an integer"
+          value.to_i
+        end
       end
 
       # true if it is whitelisted or a Integer

data/lib/humidifier/props/json_prop.rb

@@ -2,9 +2,27 @@ module Humidifier
   module Props
     # A Json property
     class JsonProp < Base
+      # converts the value through `Hash[value]` unless it is valid
+      def convert(value)
+        if valid?(value) || !convertable?(value)
+          value
+        else
+          puts "WARNING: Property #{name} should be a Hash"
+          Hash[value]
+        end
+      end
+
       # true if the value is whitelisted, a Hash, or an Array
       def valid?(value)
-        whitelisted_value?(value) || value.is_a?(Hash) || value.is_a?(Array)
+        whitelisted_value?(value) || value.is_a?(Hash)
+      end
+
+      private
+
+      def convertable?(value)
+        Hash[value]
+      rescue ArgumentError
+        false
       end
     end
   end

data/lib/humidifier/props/list_prop.rb

@@ -4,6 +4,11 @@ module Humidifier
     class ListProp < Base
       attr_reader :subprop
 
+      # converts the value through mapping using the subprop unless it is valid
+      def convert(list)
+        valid?(list) ? list : list.map { |value| subprop.convert(value) }
+      end
+
       # CFN stack syntax
       def to_cf(list)
         [key, list.map { |value| subprop.to_cf(value).last }]

data/lib/humidifier/props/map_prop.rb

@@ -4,6 +4,11 @@ module Humidifier
     class MapProp < Base
       attr_reader :subprop
 
+      # 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)] }
+      end
+
       # CFN stack syntax
       def to_cf(map)
         dumped =

data/lib/humidifier/props/string_prop.rb

@@ -2,10 +2,14 @@ module Humidifier
   module Props
     # A string property
     class StringProp < Base
-      # converts the value through #to_s unless it is whitelisted
+      # converts the value through #to_s unless it is valid
       def convert(value)
-        puts "WARNING: Property #{name} should be a string" unless valid?(value)
-        whitelisted_value?(value) ? value : value.to_s
+        if valid?(value)
+          value
+        else
+          puts "WARNING: Property #{name} should be a string"
+          value.to_s
+        end
       end
 
       # true if it is whitelisted or a String

data/lib/humidifier/props/structure_prop.rb

@@ -4,10 +4,22 @@ module Humidifier
     class StructureProp < Base
       attr_reader :subprops
 
+      # converts the value through mapping using the subprop unless it is valid
+      def convert(struct)
+        if valid?(struct)
+          struct
+        else
+          Utils.enumerable_to_h(struct) do |(subkey, subvalue)|
+            subkey = Utils.underscore(subkey.to_s)
+            [subkey.to_sym, subprops[subkey].convert(subvalue)]
+          end
+        end
+      end
+
       # CFN stack syntax
-      def to_cf(value)
+      def to_cf(struct)
         dumped =
-          Utils.enumerable_to_h(value) do |(subkey, subvalue)|
+          Utils.enumerable_to_h(struct) do |(subkey, subvalue)|
             subprops[subkey.to_s].to_cf(subvalue)
           end
         [key, dumped]
@@ -15,9 +27,7 @@ module Humidifier
 
       # true if the value is whitelisted or Hash and all keys are valid for their corresponding props
       def valid?(struct)
-        whitelisted_value?(struct) ||
-          (struct.is_a?(Hash) &&
-          struct.all? { |key, value| subprops.key?(key.to_s) && subprops[key.to_s].valid?(value) })
+        whitelisted_value?(struct) || (struct.is_a?(Hash) && valid_struct?(struct))
       end
 
       private
@@ -25,11 +35,15 @@ module Humidifier
       def after_initialize(substructs)
         type = spec['ItemType'] || spec['Type']
         @subprops =
-          Utils.enumerable_to_h(substructs[type]['Properties']) do |(key, config)|
+          Utils.enumerable_to_h(substructs.fetch(type, {}).fetch('Properties', {})) do |(key, config)|
             subprop = config['ItemType'] == type ? self : Props.from(key, config, substructs)
             [Utils.underscore(key), subprop]
           end
       end
+
+      def valid_struct?(struct)
+        struct.all? { |key, value| subprops.key?(key.to_s) && subprops[key.to_s].valid?(value) }
+      end
     end
   end
 end

data/lib/humidifier/props/timestamp_prop.rb

@@ -2,10 +2,14 @@ module Humidifier
   module Props
     # A timestamp (ISO 8601) property
     class TimestampProp < Base
-      # converts the value through #to_s unless it is whitelisted
+      # converts the value through DateTime.parse(value) unless it is valid
       def convert(value)
-        puts "WARNING: Property #{name} should be a Date or Time" unless valid?(value)
-        valid?(value) ? value : DateTime.parse(value)
+        if valid?(value) || !value.is_a?(String)
+          value
+        else
+          puts "WARNING: Property #{name} should be a Date or Time"
+          DateTime.parse(value)
+        end
       end
 
       # true if it is whitelisted, a Time, or a Date

data/lib/humidifier/resource.rb

@@ -106,7 +106,7 @@ module Humidifier
 
     def validate_value(property, value, raw)
       prop = self.class.props[property]
-      value = prop.convert(value) if raw && prop.convertable?
+      value = prop.convert(value) if raw
       unless prop.valid?(value)
         raise ArgumentError, "Invalid value for #{property}: #{value.inspect}"
       end

data/lib/humidifier/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: humidifier
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Localytics
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler