lib/domainatrix/url.rb in domainatrix-0.0.10 vs lib/domainatrix/url.rb in domainatrix-0.0.11

@@ -1,17 +1,17 @@
 module Domainatrix
   class Url
     attr_reader :public_suffix, :domain, :subdomain, :path, :url, :scheme, :host
 
     def initialize(attrs = {})
-      @scheme = attrs[:scheme]
-      @host = attrs[:host]
-      @url = attrs[:url]
-      @public_suffix = attrs[:public_suffix]
-      @domain = attrs[:domain]
-      @subdomain = attrs[:subdomain]
-      @path = attrs[:path]
+      @scheme = attrs[:scheme] || ''
+      @host = attrs[:host] || ''
+      @url = attrs[:url] || ''
+      @public_suffix = attrs[:public_suffix] || ''
+      @domain = attrs[:domain] || ''
+      @subdomain = attrs[:subdomain] || ''
+      @path = attrs[:path] || ''
     end
 
     def canonical(options = {})
       public_suffix_parts = @public_suffix.split(".")
       url = "#{public_suffix_parts.reverse.join(".")}.#{@domain}"
@@ -23,10 +23,10 @@
 
       url
     end
 
     def domain_with_public_suffix
-      "#{@domain}.#{@public_suffix}"
+      [@domain, @public_suffix].compact.reject{|s|s==''}.join('.')
     end
     alias domain_with_tld domain_with_public_suffix
 
   end
 end