simple-http 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6297e0992a3d447dd6803a3692d48a737e63420c
-  data.tar.gz: c33f894babece51848969ccccf3a3f6425231cdf
+  metadata.gz: 2cb84068e2541d62fd7a5739099e657cbf6bd20e
+  data.tar.gz: a91e047d0c67b341cf1abeb3369ef8cfb4a2ce3f
 SHA512:
-  metadata.gz: ad178342ff251fcc2702f09432c96406b37095cec930cf7917f33b97be6f08a214f7a5ce77b10acbdc7385369d20699ad3c8745ee237df5129904d396453f882
-  data.tar.gz: 8586f61a9529b83894a76e13020ff7e06840fd70b103676fb76a9f8461eeb524f2a16ea33de44535927325a8456bc6f8b683daf9c6d69b1cee8d4c09cb1e898a
+  metadata.gz: 7d511ae7fe48339375fc6326c0356866b5b60552f94587a01539e676262930456d90d6e5cc6837f6dbf76bf7716712d02a93660eb4b04e3538021671c887b70e
+  data.tar.gz: 6c9745a3dc55dac702ae1f5c7fd407901158262c0dc0050d8b09dceb052381b1806ca86a2390145e598c9baaed089be2217a73cc61c966012763ee601b0ab675

data/lib/simple/http/version.rb

@@ -5,5 +5,5 @@
 
 module Simple; end
 class Simple::HTTP
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/simple/http.rb

@@ -159,9 +159,10 @@ class Simple::HTTP
     klass = REQUEST_CLASSES.fetch(method)
     request = klass.new(uri.request_uri)
 
-    if basic_auth
-      username, password = *basic_auth
-      request.basic_auth(username, password)
+    if uri.user
+      request.basic_auth(uri.user, uri.password)
+    elsif basic_auth
+      request.basic_auth(*basic_auth)
     end
 
     # set request headers

data/test/basic_auth_test.rb

@@ -23,4 +23,18 @@ class SimpleHttpTest < Simple::HTTP::TestCase
       http.get "http://eu.httpbin.org/basic-auth/user/passwd"
     end
   end
+
+  def test_url_auth
+    http.get "http://user:passwd@eu.httpbin.org/basic-auth/user/passwd"
+  end
+
+  def test_url_auth_overrides_basic_auth
+    http.basic_auth = [ "wronguser", "passwd" ]
+    http.get "http://user:passwd@eu.httpbin.org/basic-auth/user/passwd"
+
+    http.basic_auth = [ "user", "passwd" ]
+    assert_http_error 401 do
+      http.get "http://wronguser:passwd@eu.httpbin.org/basic-auth/user/passwd"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-http
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - radiospiel