addressabler 0.0.2 → 0.0.3

data/lib/addressabler.rb

@@ -20,6 +20,7 @@ module Addressabler
 
   module InstanceMethods
     def domain
+      return nil unless host
       parse_domain_parts[:domain]
     end
 
@@ -36,6 +37,7 @@ module Addressabler
     end
 
     def subdomain
+      return nil unless host
       parse_domain_parts[:subdomain]
     end
 
@@ -44,6 +46,7 @@ module Addressabler
     end
 
     def tld
+      return nil unless host
       self.class.parse_tld(host)
     end
 
@@ -60,11 +63,7 @@ module Addressabler
 
     def parse_domain_parts
       tld = self.tld
-      begin
-        subdomain_parts = host.gsub(/\.#{tld}$/, '').split('.')
-      rescue
-        raise host.inspect
-      end
+      subdomain_parts = host.to_s.gsub(/\.#{tld}$/, '').split('.')
       @domain_parts = {
         :domain => subdomain_parts.pop,
         :subdomain => subdomain_parts.join('.'),

data/spec/addressabler_spec.rb

@@ -72,4 +72,20 @@ describe Addressabler do
     uri.tld = 'co.uk'
     uri.to_s.should == 'http://www.google.co.uk'
   end
+
+  it "should handle things with no subdomain" do
+    uri = Addressable::URI.parse("http://google.com")
+    uri.host.should == "google.com"
+    uri.domain.should == "google"
+    uri.tld.should == "com"
+    uri.subdomain.should == ""
+  end
+
+  it "should handle empty strings" do
+    uri = Addressable::URI.parse("")
+    uri.host.should be_nil
+    uri.domain.should be_nil
+    uri.tld.should be_nil
+    uri.subdomain.should be_nil
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: addressabler
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Flip Sasser