Turn normalize uri back into a module method

2 files changed, 11 insertions, 13 deletions

diff --git a/lib/bundler/mirror.rb b/lib/bundler/mirror.rb
index 4a65f16a37..827f910947 100644
--- a/lib/bundler/mirror.rb
+++ b/lib/bundler/mirror.rb
@@ -19,7 +19,7 @@ module Bundler
         if @all.validate!(@prober).valid?
           @all
         else
-          fetch_valid_mirror_for(AbsoluteURI.normalize(uri))
+          fetch_valid_mirror_for(Settings.normalize_uri(uri))
         end
       end
 
@@ -120,7 +120,7 @@ module Bundler
         if uri == "all"
           @all = true
         else
-          @uri = AbsoluteURI.normalize(uri)
+          @uri = Settings.normalize_uri(uri)
         end
         @value = value
       end
@@ -133,7 +133,7 @@ module Bundler
         if @fallback
           mirror.fallback_timeout = @value
         else
-          mirror.uri = AbsoluteURI.normalize(@value)
+          mirror.uri = Settings.normalize_uri(@value)
         end
       end
     end
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index 4f2fbe1050..5c6daf0d65 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -156,7 +156,7 @@ module Bundler
   private
 
     def key_for(key)
-      key = AbsoluteURI.normalize(key).to_s if key.is_a?(String) && /https?:/ =~ key
+      key = Settings.normalize_uri(key).to_s if key.is_a?(String) && /https?:/ =~ key
       key = key.to_s.gsub(".", "__").upcase
       "BUNDLE_#{key}"
     end
@@ -239,16 +239,14 @@ module Bundler
 
     # TODO: duplicates Rubygems#normalize_uri
     # TODO: is this the correct place to validate mirror URIs?
-    class AbsoluteURI
-      def self.normalize(uri)
-        uri = uri.to_s
-        uri = "#{uri}/" unless uri =~ %r{/\Z}
-        uri = URI(uri)
-        unless uri.absolute?
-          raise ArgumentError, "Gem sources must be absolute. You provided '#{uri}'."
-        end
-        uri
+    def self.normalize_uri(uri)
+      uri = uri.to_s
+      uri = "#{uri}/" unless uri =~ %r{/\Z}
+      uri = URI(uri)
+      unless uri.absolute?
+        raise ArgumentError, "Gem sources must be absolute. You provided '#{uri}'."
       end
+      uri
     end
   end
 end