hashstructor 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17721f8a9d6290570bc704b98b9ac7c946c28783
-  data.tar.gz: 8620ad7296bc271d28c2b7e7b9cd08f75ab3b6e4
+  metadata.gz: 53417f9ad796f3bdbadd248016ebb1aed623160c
+  data.tar.gz: 0a653553b55d4d333bc0be0d4d53d337beb7b7a5
 SHA512:
-  metadata.gz: a4d0f4aade414dd0bcd7b3bb8c249b68050098274b6146c9b30df3b787e68b1a67ef3eee56579ccfd560543b7707cbf7c409332f648b0eade531ba68d7e47fa9
-  data.tar.gz: 0bacfbb30a8bf7a9404be306048287ba4cae1f23ce25d96c3a5b9fcc690cb4590f0ba40b52edf2debd4f8e5145ec75be8315b862237587bfa7403f4bfa881ea0
+  metadata.gz: 2f2ffb6a2a38ea3577dc2352d017af7b57f0ba5a4ada604703c4b500859b0ccb5c18328801e3a11555c9c4fd93d8792b2dcb18178723e3daf61c0c018ea21ec6
+  data.tar.gz: 88e18912f12e341dc4427b015c6e594b9990e78f227d8cdc167ddf8f3d4f9d84b18089549d00546bc0d76bf1358b4de27670fc846c78478cf44e2beefa706af1

data/lib/hashstructor/member.rb

@@ -132,6 +132,7 @@ module Hashstructor
         if !required && options[:default_value]
       @required = required
 
+      raise HashstructorError, "'validation' must be a Proc." unless options[:validation].nil? || options[:validation].is_a?(Proc)
 
 
       case attr_kind
@@ -150,15 +151,27 @@ module Hashstructor
     # Parses the passed-in value (always a single item; {InstanceMethods#hashstruct} handles
     # the breaking down of arrays and hashes) and returns a value according to {#value_type}.
     def parse_single(value)
-      if value_type.nil?
-        value
-      elsif value_type.ancestors.include?(Hashstructor)
-        raise HashstructorError, "No hash provided for building a Hashstructor object." unless value.is_a?(Hash)
-
-        value_type.new(value)
-      else
-        VALID_VALUE_TYPES[value_type].call(value)
+      retval = 
+        if value_type.nil?
+          value
+        elsif value_type.ancestors.include?(Hashstructor)
+          raise HashstructorError, "No hash provided for building a Hashstructor object." unless value.is_a?(Hash)
+
+          value_type.new(value)
+        else
+          VALID_VALUE_TYPES[value_type].call(value)
+        end
+
+      if options[:validation]
+        errors = []
+        options[:validation].call(retval, errors)
+
+        if !errors.empty?
+          raise HashstructorError, "Validation failure for '#{name}': #{errors.join("; ")}"
+        end
       end
+
+      retval
     end
   end
 end

data/lib/hashstructor/version.rb

@@ -1,4 +1,4 @@
 module Hashstructor
   # The gem version. As one does.
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashstructor
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Ed Ropple