chef-validation 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d0e9b458060b1ff05e0351dd1d96917b6f3d5a8
-  data.tar.gz: 4806e2f4670ad28454893828cc904c5610074c10
+  metadata.gz: 31e958e3ea66a331de897e17a49aa5c1f3c03a45
+  data.tar.gz: 492e81c01dbe899d9f719460ec82276a9b39fef2
 SHA512:
-  metadata.gz: 261ea5766065f68152e7b11a7975b2b0a6f4b2c644ddf449198bed3a93607c6961d6865046d315256ddc7e81a1392ea779bba38817a30efeae30c49a2f95fb15
-  data.tar.gz: 453e514792b2f9b588779881a1e9441307664027abe811ebf8672a48647296bbce91b0dba9ac500b55a5c7288e58a695fe59b1cd9ecd94d9133a67038e1b36bd
+  metadata.gz: c568fcf74d48cdb537fe658f27e8fd5bd00c11d60f4583e621ffdb6cd4761f0df3e2eec8459444fd488f9c1734ce4e4626051a30753c9ce8bda3082db440db4f
+  data.tar.gz: e4944d735b32db312b5aea8be505d1896dda5b9a16e62f1c5200986586d66d16cb36bc0b22537346dfb3a352f7d92a029564e985e062793c9738d02b9a4056f1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.1.4
+
+* Bug Fixes
+  * Fix issue with validating non-string required attributes
+
 # 0.1.3
 
 * Bug Fixes

data/lib/chef/validation/ext.rb

@@ -1,2 +1,3 @@
 require_relative "ext/context"
 require_relative "ext/hash"
+require_relative "ext/object"

data/lib/chef/validation/ext/object.rb

@@ -0,0 +1,150 @@
+# Copyright (c) 2005-2014 David Heinemeier Hansson
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Object
+  # An object is blank if it's false, empty, or a whitespace string.
+  # For example, '', '   ', +nil+, [], and {} are all blank.
+  #
+  # This simplifies
+  #
+  #   address.nil? || address.empty?
+  #
+  # to
+  #
+  #   address.blank?
+  #
+  # @return [true, false]
+  def blank?
+    respond_to?(:empty?) ? !!empty? : !self
+  end
+
+  # An object is present if it's not blank.
+  #
+  # @return [true, false]
+  def present?
+    !blank?
+  end
+
+  # Returns the receiver if it's present otherwise returns +nil+.
+  # <tt>object.presence</tt> is equivalent to
+  #
+  #    object.present? ? object : nil
+  #
+  # For example, something like
+  #
+  #   state   = params[:state]   if params[:state].present?
+  #   country = params[:country] if params[:country].present?
+  #   region  = state || country || 'US'
+  #
+  # becomes
+  #
+  #   region = params[:state].presence || params[:country].presence || 'US'
+  #
+  # @return [Object]
+  def presence
+    self if present?
+  end
+end
+
+class NilClass
+  # +nil+ is blank:
+  #
+  #   nil.blank? # => true
+  #
+  # @return [true]
+  def blank?
+    true
+  end
+end
+
+class FalseClass
+  # +false+ is blank:
+  #
+  #   false.blank? # => true
+  #
+  # @return [true]
+  def blank?
+    true
+  end
+end
+
+class TrueClass
+  # +true+ is not blank:
+  #
+  #   true.blank? # => false
+  #
+  # @return [false]
+  def blank?
+    false
+  end
+end
+
+class Array
+  # An array is blank if it's empty:
+  #
+  #   [].blank?      # => true
+  #   [1,2,3].blank? # => false
+  #
+  # @return [true, false]
+  alias_method :blank?, :empty?
+end
+
+class Hash
+  # A hash is blank if it's empty:
+  #
+  #   {}.blank?                # => true
+  #   { key: 'value' }.blank?  # => false
+  #
+  # @return [true, false]
+  alias_method :blank?, :empty?
+end
+
+class String
+  BLANK_RE = /\A[[:space:]]*\z/
+
+  # A string is blank if it's empty or contains whitespaces only:
+  #
+  #   ''.blank?       # => true
+  #   '   '.blank?    # => true
+  #   "\t\n\r".blank? # => true
+  #   ' blah '.blank? # => false
+  #
+  # Unicode whitespace is supported:
+  #
+  #   "\u00a0".blank? # => true
+  #
+  # @return [true, false]
+  def blank?
+    BLANK_RE === self
+  end
+end
+
+class Numeric #:nodoc:
+  # No number is blank:
+  #
+  #   1.blank? # => false
+  #   0.blank? # => false
+  #
+  # @return [false]
+  def blank?
+    false
+  end
+end

data/lib/chef/validation/validator.rb

@@ -37,13 +37,13 @@ module Chef::Validation
         value  = HashExt.dig(node.attributes, name, ATTR_SEPARATOR)
         errors = []
 
-        if (rules["required"] == "required" || rules["required"] == true)
+        if rules["required"].present?
           errors += validate_required(value, name)
         end
-        unless rules["type"].nil?
+        if rules["type"].present?
           errors += validate_type(value, rules["type"], name)
         end
-        unless rules["choice"].nil? || rules["choice"].empty?
+        if rules["choice"].present?
           errors += validate_choice(value, rules["choice"], name)
         end
 
@@ -70,7 +70,7 @@ module Chef::Validation
 
         def validate_required(value, name)
           errors = []
-          if value.nil? || value.empty?
+          if value.present?
             errors << "Required attribute but was not present."
           end
           errors

data/lib/chef/validation/version.rb

@@ -1,4 +1,4 @@
 class Chef; end;
 module Chef::Validation
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-validation
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jamie Winsor
@@ -76,6 +76,7 @@ files:
 - lib/chef/validation/ext.rb
 - lib/chef/validation/ext/context.rb
 - lib/chef/validation/ext/hash.rb
+- lib/chef/validation/ext/object.rb
 - lib/chef/validation/formatter.rb
 - lib/chef/validation/validator.rb
 - lib/chef/validation/version.rb