refactor custom option handling in sensu_check type/provider

lib/puppet/provider/sensu_check/json.rb

@@ -44,28 +44,12 @@ def check_args
   end
 
   def custom
-    tmp = {}
-    conf['checks'][resource[:name]].each do |k,v|
-      if v.is_a?( Fixnum )
-        tmp.merge!( k => v.to_s )
-      else
-        tmp.merge!( k => v )
-      end
-    end
-    check_args.each do | del_arg |
-      tmp.delete(del_arg)
-    end
-    tmp
+    conf['checks'][resource[:name]].reject { |k,v| check_args.include?(k) }
   end
 
   def custom=(value)
-    tmp = custom
-    tmp.each_key do |k|
-      conf['checks'][resource[:name]].delete(k) unless check_args.include?(k)
-    end
-    value.each do | k, v |
-      conf['checks'][resource[:name]][ k ] =  to_type( v )
-    end
+    conf['checks'][resource[:name]].delete_if { |k,v| not check_args.include?(k) }
+    conf['checks'][resource[:name]].merge!(value)
   end
 
   def to_type(value)

lib/puppet/type/sensu_check.rb

@@ -51,7 +51,17 @@ def initialize(*args)
   end
 
   newproperty(:custom) do
-    desc "custom variable"
+    desc "Custom check variables"
+
+    def is_to_s(hash = @is)
+      hash.keys.sort.map {|key| "#{key} => #{hash[key]}"}.join(", ")
+    end
+
+    def should_to_s(hash = @should)
+      hash.keys.sort.map {|key| "#{key} => #{hash[key]}"}.join(", ")
+    end
+
+    defaultto {}
   end
 
   newproperty(:type) do