hashstructor 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25c3d81e055c0cca5478fee6bd9cf66e59eabf09
-  data.tar.gz: 94d08297f5e8d6542d0859ae60513b8ee16245d1
+  metadata.gz: 675a97fc95885219b7cdaa51ddd36f67a231c5d3
+  data.tar.gz: ca05c6be506989b23d5afb11fe912bbdd7c6914b
 SHA512:
-  metadata.gz: c160223d4139c04f3e93d50511a4570480f4792d20bb256639033852fa70cfcb29505b7f8a220df4ddd7afb94d98badd9ffff2a4813dc179b6868b27ad75d864
-  data.tar.gz: c0a65ffeca251df3d1ea9263a84de50087c80917dcf283ab84f3f1c105da64abfff473f30f5110d0d7a564d21627468521912d5ab01d69832218b14f239063fb
+  metadata.gz: 9cda2a0d1e8f58565bab6a92fe0c6f488777667b04ba5af61e543af68b45a95d328ff5da609c3e60185bef37f58685cbdb11fa0930ad890af8c6439d9195eeb5
+  data.tar.gz: 0ae36d6db64cb120b4158b5c97d8f68123f8a2329df7ca9b61f644a0641a9169e4677be7a7b00112809bb5fdfb6b894d1b3dba9b2fb4dc45ea5a0416d06a9c0d

data/lib/hashstructor/instance_methods.rb

@@ -29,13 +29,19 @@ module Hashstructor
 
       existing_members = partitioned_members[0]
       missing_members = partitioned_members[1]
-      raise HashstructorError, "Missing required members: #{missing_members.map { |m| m.name }.join(", ")}" \
-        if missing_members.any? { |m| m.required }
 
-      missing_members.reject { |m| m.required }.each do |member|
+      partitioned_missing_members = missing_members.partition { |m| !m.required || (m.required && m.options[:default_value]) }
+
+      acceptable_missing_members = partitioned_missing_members[0]
+      unacceptable_missing_members = partitioned_missing_members[1]
+
+      raise HashstructorError, "Missing required members: #{unacceptable_missing_members.map { |m| m.name }.join(", ")}" \
+        unless unacceptable_missing_members.empty?
+
+      acceptable_missing_members.each do |member|
         out_value = case member.member_type
                       when :normal
-                        # already nil
+                        member.options[:default_value]
                       when :array
                         []
                       when :set

data/lib/hashstructor/member.rb

@@ -95,6 +95,9 @@ module Hashstructor
       raise HashstructorError, "'member_type' (#{member_type}) must be one of: [ #{VALID_MEMBER_TYPES.join(", ")} ]" \
         unless VALID_MEMBER_TYPES.include?(member_type.to_sym)
 
+      raise HashstructorError, "'member_type' must be :normal to use 'default_value'." \
+        if member_type != :normal && options[:default_value]
+
       @member_type = member_type.to_sym
 
       raise HashstructorError, "'value_type' must be nil or a Class." \
@@ -106,17 +109,21 @@ module Hashstructor
 
       @value_type = value_type
 
+      raise HashstructorError, "'required' must be true if 'default_value'" \
+        if !required && options[:default_value]
       @required = required
 
+
+
       case attr_kind
-      when nil
-        # do nothing
-      when :reader
-        klass.send(:attr_reader, @name)
-      when :accessor
-        klass.send(:attr_accessor, @name)
-      else
-        raise HashstructorError, "Unrecognized attr_kind: #{attr_kind}"
+        when nil
+          # do nothing
+        when :reader
+          klass.send(:attr_reader, @name)
+        when :accessor
+          klass.send(:attr_accessor, @name)
+        else
+          raise HashstructorError, "Unrecognized attr_kind: #{attr_kind}"
       end
       @attr_kind = attr_kind
     end

data/lib/hashstructor/version.rb

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

metadata

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