lib/smart_kv.rb in smart_kv-0.1.2 vs lib/smart_kv.rb in smart_kv-0.1.3

@@ -13,12 +13,16 @@
   def initialize(required_keys = [], optional_keys = [], object_class = nil, kv = {})
     prevent_direct_instantiation
 
     @object_class = object_class || kv.class
     @kv = kv.dup
-    hash = kv.to_h.dup
 
+    if @object_class.respond_to?(:members) && @object_class.members != @kv.to_h.keys
+      raise ArgumentError, "#{ @object_class } struct size differs"
+    end
+
+    hash = kv.to_h.dup
     missing_keys = required_keys - hash.keys
     unless missing_keys.empty?
       raise KeyError, "missing required key(s): #{missing_keys.map{|k| "`:#{k}'" }.join(', ')} in #{self.class}"
     end
 
@@ -27,14 +31,13 @@
       raise NotImplementedError, "unrecognized key(s): #{unrecognized_keys.map{|k| "`:#{k}'" }.join(', ')} in #{self.class}"
     end
   end
 
   def method_missing(m, *args)
-    @object ||= if @object_class <= Struct
-                  Struct.new(*@kv.keys).new(*@kv.values)
-                elsif @object_class.respond_to?(:members)
-                  raise "#{ @object_class } struct members don't match" unless (@object_class.members - @kv.keys).empty?
-                  @object_class.new(*@kv.values)
+    @object ||= if @object_class == Struct
+                  Struct.new(*@kv.to_h.keys).new(*@kv.to_h.values)
+                elsif @object_class < Struct
+                  @object_class.new(*@kv.to_h.values)
                 elsif @object_class <= Hash
                   @kv
                 else
                   @object_class.new(@kv.to_h)
                 end