lhc 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2827291e4ad9cb6ff9752a2a091feb0b2a2434ef
-  data.tar.gz: 30c81d451d22d7d52dd0890c5c98405d5dfed24b
+  metadata.gz: 9144e7e4cdc63f0dfd45813de1d4c75ae28a6c12
+  data.tar.gz: 6e0856848c3c817c4ebfb60f57c385c216cb9c60
 SHA512:
-  metadata.gz: e0a84470ea8886ee64fa2e93793faa1dba4ed63741ece2a7de4b318955971f0c9827ba8f915d492a45030ea5adcc7aea00de67f922bb2235c6c39e7eb442a159
-  data.tar.gz: 6ff625ec53ebd93d97165a89c06118d31f4dbd45cb11de593e52c58f6c42cdebcfffcda1a1bba1364b8edaab40e8918a9afb091080894c8ddc2cf9ad0d506ebf
+  metadata.gz: 726fbf0e6a53970ce7afbfdb26739381487ba1a9da33f959eb6f75be1d42a4aefaf28673687977fcd2641b5378d23754197f691c028f7b6170e45271db6d7c5c
+  data.tar.gz: 3671e777ec3db226d0082a678eaf378337f0ac0fe93d7a9d523a601344ff74b5856c0903e60a2819648b9fa89b65ac0e847471e87cc2b556e16332556809164b

data/lib/lhc/endpoint.rb

@@ -14,16 +14,42 @@ class LHC::Endpoint
     self.options = options
   end
 
+  def uri
+    @uri ||= parse_url_gracefully(url)
+  end
+
+  def parse_url_gracefully(url)
+    URI.parse(url)
+  rescue URI::InvalidURIError
+    url
+  end
+
   def compile(params)
-    url.gsub(PLACEHOLDER) do |match|
-      replacement =
-        if params.is_a? Proc
-          params.call(match)
-        else
-          find_value(match, params)
-        end
-      replacement || fail("Compilation incomplete. Unable to find value for #{match.gsub(':', '')}.")
-    end
+    add_basic_auth(
+      without_basic_auth(url).gsub(PLACEHOLDER) do |match|
+        replacement =
+          if params.is_a? Proc
+            params.call(match)
+          else
+            find_value(match, params)
+          end
+        replacement || fail("Compilation incomplete. Unable to find value for #{match.gsub(':', '')}.")
+      end
+    )
+  end
+
+  def add_basic_auth(url)
+    return url if !uri || !uri.is_a?(URI) || (uri.user.blank? && uri.password.blank?)
+    new_uri = parse_url_gracefully(url)
+    new_uri.user = uri.user
+    new_uri.password = uri.password
+    new_uri.to_s
+  end
+
+  # Strips basic auth from the url
+  def without_basic_auth(url)
+    return url if !uri || !uri.is_a?(URI) || (uri.user.blank? && uri.password.blank?)
+    url.gsub("#{uri.user}:#{uri.password}@", '')
   end
 
   # Endpoint options are immutable

data/lib/lhc/version.rb

@@ -1,3 +1,3 @@
 module LHC
-  VERSION ||= "6.1.1"
+  VERSION ||= "6.1.2"
 end

data/spec/endpoint/placeholders_spec.rb

@@ -16,5 +16,13 @@ describe LHC::Endpoint do
         LHC.get("https://d123token:@api.github.com/search")
       }).not_to raise_error
     end
+
+    it 'allows complete basic auth (username password) in url, like used for the gemserer' do
+      stub_request(:get, "https://name:password@gemserver.com")
+        .to_return(body: {}.to_json)
+      expect(->{
+        LHC.get("https://name:password@gemserver.com")
+      }).not_to raise_error
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus