Merge branch 'master' of https://github.com/benburkert/faraday into default-fetch-fixes

lib/faraday/options.rb

@@ -48,8 +48,9 @@ module Faraday
 
     # Public
     def fetch(key, default = nil)
-      send(key) || send("#{key}=", default ||
+      return send(key) if keys.include?(key)
-        (block_given? ? Proc.new.call : nil))
+
+      send("#{key}=", default || (block_given? ? Proc.new.call : nil))
     end
 
     # Public

test/options_test.rb

@@ -164,4 +164,10 @@ class OptionsTest < Faraday::TestCase
     e["custom"] = :boom
     assert_equal :boom, e["custom"]
   end
+
+  def test_env_fetch_ignores_false
+    ssl = Faraday::SSLOptions.new
+    ssl.verify = false
+    assert !ssl.fetch(:verify, true)
+  end
 end