richurls 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 693d986c664aa571150f5c426a7ee496125e615321c1156d2c0eaf0b3f0db6e7
-  data.tar.gz: 4699ba24e5a8f2ed3ccfd2e8aa632c4243033e72d0f6db5b54e5faa16313514d
+  metadata.gz: db4d6b2a40debb931cb10f2ff022d85743502f486b316f1046837a28d99275c4
+  data.tar.gz: 7ab58ccab0303530fe78c23d33f8e9b58c27131f41267df2428e7a1a4ab1ca18
 SHA512:
-  metadata.gz: b5d7b35375f42c0bdfecdbd05179c984c1ec0d05669c3067280bbcea38bf9f9a34e79794ce587d4f23d0b26dfd1f45a664a6575551eccea7038bd89f3a168eb1
-  data.tar.gz: 04c2167a8ee0dad5a80447522a96d188a9687771e49609bf0857aa0d223fb47659a73de66225b376ce23000271f8dbb7546f48e72cc3ace62a1aa1fd6e130b92
+  metadata.gz: e45af9667708ee4e787dba1b01da0a341557eac3c76f7ad2cea685282de862b6fdcb6e178365064514ced571bd79133205a393416e27d8eb71cd9bbb010741fb
+  data.tar.gz: fbc11283743e3198bb60469d7c592aac515134f18ce13937b9d804b8fb12ecde82e2dc81224ae81af1933fbc6ab7e402a66a02d07a2f084d6e4364d562785818

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    richurls (0.5.5)
+    richurls (0.5.6)
       addressable (~> 2)
       oj (~> 3)
       ox (~> 2)
@@ -21,7 +21,7 @@ GEM
     parser (2.7.1.1)
       ast (~> 2.4.0)
     patron (0.13.3)
-    public_suffix (4.0.4)
+    public_suffix (4.0.5)
     rainbow (3.0.0)
     redis (4.1.4)
     rexml (3.2.4)

data/lib/url_helper.rb

@@ -9,34 +9,32 @@ class UrlHelper
 
   def initialize(domain, url)
     @domain = domain
-
-    # In some rare cases it appears to be that URL's are ending with a
-    # single whitespace character resulting in an invalid URL.
-    @url = url&.strip
+    @url = url
   end
 
   def url
     return if @url.nil?
-    return Addressable::URI.escape(@url) if valid_url?
 
-    build_url
+    parsed = Addressable::URI.parse(@url)
+    full_url = valid?(parsed) ? parsed.to_s : domain_uri
+    Addressable::URI.escape(full_url)
+  rescue Addressable::URI::InvalidURIError
   end
 
   private
 
-  def build_url
-    domain_uri = URI(@domain)
-    base = domain_uri.scheme + '://' + domain_uri.host
-    escaped_url = Addressable::URI.escape(@url)
-
-    if @url.start_with?('/')
-      base + escaped_url
-    else
-      base + domain_uri.path + '/' + escaped_url
-    end
+  def valid?(parsed)
+    parsed.host && (parsed.scheme || @url.start_with?('//'))
   end
 
-  def valid_url?
-    @url.start_with?('//') || @url =~ URI::DEFAULT_PARSER.make_regexp
+  def domain_uri
+    domain = Addressable::URI.parse(@domain)
+    domain.query = nil
+    domain.path = if @url.start_with?('/')
+                    @url
+                  else
+                    domain.path + '/' + @url
+                  end
+    domain.to_s
   end
 end

data/richurls.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name = 'richurls'
-  spec.version = '0.5.5'
+  spec.version = '0.5.6'
   spec.authors = ['grdw']
   spec.email = ['gerard@wetransfer.com']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: richurls
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - grdw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable