lib/httpx/options.rb in httpx-0.15.1 vs lib/httpx/options.rb in httpx-0.15.2

@@ -142,11 +142,11 @@
 
     def_option(:addresses, <<-OUT)
       Array(value)
     OUT
 
-    %w[
+    %i[
       params form json body ssl http2_settings
       request_class response_class headers_class request_body_class response_body_class connection_class
       io fallback_protocol debug debug_level transport_options resolver_class resolver_options
       persistent
     ].each do |method_name|
@@ -169,9 +169,11 @@
         end
       end
     end
 
     def merge(other)
+      raise ArgumentError, "#{other.inspect} is not a valid set of options" unless other.respond_to?(:to_hash)
+
       h2 = other.to_hash
       return self if h2.empty?
 
       h1 = to_hash