lib/shared/uri.rb in yawast-0.7.0.beta1 vs lib/shared/uri.rb in yawast-0.7.0.beta2

@@ -1,40 +1,40 @@
+# frozen_string_literal: true
+
 require 'ipaddress'
 
 module Yawast
   module Shared
     class Uri
       def self.extract_uri(url)
-        #this might be buggy - actually, I know it is...
+        # this might be buggy - actually, I know it is...
         url = 'http://' + url unless url.include?('http://') || url.include?('https://')
 
-        #make sure the path is at least a slash
+        # make sure the path is at least a slash
         uri = URI.parse(url)
         uri.path = '/' if uri.path == ''
 
-        #this is buggy, but we don't handle files anyhow...
-        #if the path doesn't end in a slash, add one.
-        if uri.path[-1, 1] != '/'
-          uri.path.concat '/'
-        end
+        # this is buggy, but we don't handle files anyhow...
+        # if the path doesn't end in a slash, add one.
+        uri.path.concat '/' if uri.path[-1, 1] != '/'
 
-        #see if we can resolve the host
+        # see if we can resolve the host
         # we don't really need it, it just serves as validation
         begin
           dns = Resolv::DNS.new
           dns.getaddress(uri.host)
-        rescue => e
+        rescue => e # rubocop:disable Style/RescueStandardError
           if uri.host == 'localhost'
-            #do nothing, in this case, we just don't care.
+            # do nothing, in this case, we just don't care.
           elsif IPAddress.valid? uri.host
-            #in this case the host name is actually a IP, let it go through.
+            # in this case the host name is actually a IP, let it go through.
           else
-            #we've passed all the exceptions, if we are here, it's a problem
-            raise ArgumentError.new("Invalid URL (#{e.message})")
+            # we've passed all the exceptions, if we are here, it's a problem
+            raise ArgumentError, "Invalid URL (#{e.message})"
           end
         end
 
-        return uri
+        uri
       end
     end
   end
 end