lib/util/params/params.rb in util-params-0.2.10 vs lib/util/params/params.rb in util-params-0.2.11

@@ -22,11 +22,11 @@
 
     def get_params options
       options = options.deep_symbolize_keys
 
       key = options[:key]
-      val = _load_val params, key, options[:default], options[:require]
+      val = _load_val params.permit!.to_h, key, options[:default], options[:require]
 
       return nil if val.nil?
 
       _validate key, options[:type], val, options
     end
@@ -124,11 +124,11 @@
 
       if enum
         for e in enum
           return v if e === v
         end
-        _push_error "#{key.to_s} == unknone val [#{v.to_s}]"
+        _push_error "#{key.to_s} == unknown val [#{v.to_s}]"
       end
 
       if min && (v < min)
         _push_error "#{key.to_s} val [#{v.to_s}] < #{min.to_s}"
       end
@@ -147,11 +147,11 @@
 
       if enum
         enum.each do |e|
           return v if e === v
         end
-        _push_error "#{key.to_s} == unknone val [#{v.to_s}]"
+        _push_error "#{key.to_s} == unknown val [#{v.to_s}]"
       end
 
       if min && (v.length < min)
         _push_error "#{key.to_s}.length < #{min.to_s} ('#{v.to_s}')"
       end
@@ -233,13 +233,18 @@
     end
 
     def _validate_object key, val, elements
       return nil if val.nil?
 
+      unless val.kind_of? Hash
+        _push_error "#{key.to_s}.type != Hash"
+        return nil
+      end
+
       r = {}
 
       if elements.nil?
-        return val.permit!.to_h
+        return val.to_h
       end
 
       elements.map do |options|
         options ||= {}
         elem_key = options[:key]