Merge pull request #1 from menno/ips

Add support for parsing IP addresses

.gitignore

@@ -0,0 +1 @@
+.rvmrc

lib/domainatrix.rb

@@ -4,6 +4,11 @@
 require 'domainatrix/domain_parser.rb'
 require 'domainatrix/url.rb'
 
+begin
+  require 'uri'
+rescue LoadError
+end
+
 module Domainatrix
   VERSION = "0.0.8"
 

lib/domainatrix/domain_parser.rb

@@ -72,9 +72,13 @@ def split_domain(parts, tld_size)
 
     def parse_domains_from_host(host)
       parts = host.split(".").reverse
+      ip_address = false
 
       if host == '*'
         tld_size = 0
+      elsif !parts.map { |part| part.match(/\d+/) }.include?(nil)
+        # host is an ip address
+        ip_address = true
       else
         main_tld = parts.first
 
@@ -112,8 +116,13 @@ def parse_domains_from_host(host)
         end
       end
 
-      subdomain, domain, tld = split_domain(parts, tld_size)
-      {:public_suffix => tld, :domain => domain, :subdomain => subdomain}
+      if ip_address
+        subdomain, domain, tld = '', host, ''
+      else
+        subdomain, domain, tld = split_domain(parts, tld_size)
+      end
+
+      {:public_suffix => tld, :domain => domain, :subdomain => subdomain, :ip_address => ip_address}
     end
   end
 end

lib/domainatrix/url.rb

@@ -1,6 +1,6 @@
 module Domainatrix
   class Url
-    attr_accessor :public_suffix, :domain, :subdomain, :path, :url, :scheme, :host
+    attr_accessor :public_suffix, :domain, :subdomain, :path, :url, :scheme, :host, :ip_address
 
     def initialize(attrs = {})
       @scheme = attrs[:scheme]
@@ -10,6 +10,7 @@ def initialize(attrs = {})
       @domain = attrs[:domain]
       @subdomain = attrs[:subdomain]
       @path = attrs[:path]
+      @ip_address = attrs[:ip_address]
     end
 
     def canonical(options = {})

spec/domainatrix/domain_parser_spec.rb

@@ -105,5 +105,18 @@
       lambda { @domain_parser.parse("http:/") }.should raise_error(Domainatrix::ParseError)
     end
 
+    it "parses an ip address" do
+      @domain_parser.parse("http://123.123.123.123/foo/bar")[:domain].should == "123.123.123.123"
+      @domain_parser.parse("http://123.123.123.123/foo/bar")[:path].should == "/foo/bar"
+      @domain_parser.parse("http://123.123.123.123/foo/bar")[:ip_address].should == true
+    end
+
+    it "parses a host with numeric domain" do
+      @domain_parser.parse("http://123.123.123.co.uk/foo/bar")[:subdomain].should == "123.123"
+      @domain_parser.parse("http://123.123.123.co.uk/foo/bar")[:domain].should == "123"
+      @domain_parser.parse("http://123.123.123.co.uk/foo/bar")[:public_suffix].should == "co.uk"
+      @domain_parser.parse("http://123.123.123.co.uk/foo/bar")[:ip_address].should == false
+    end
+
   end
 end

spec/domainatrix/url_spec.rb

@@ -21,6 +21,10 @@
     Domainatrix::Url.new(:path => "/asdf.html").path.should == "/asdf.html"
   end
 
+  it "reports if it is an ip address" do
+    Domainatrix::Url.new(:ip_address => true).ip_address.should == true
+  end
+
   it "canonicalizes the url" do
     Domainatrix::Url.new(:domain => "pauldix", :public_suffix => "net").canonical.should == "net.pauldix"
     Domainatrix::Url.new(:subdomain => "foo", :domain => "pauldix", :public_suffix => "net").canonical.should == "net.pauldix.foo"

spec/spec_helper.rb

@@ -1,10 +1,18 @@
 require "rubygems"
-require "spec"
+
+begin
+  require "spec"
+rescue LoadError
+end
 
 # gem install redgreen for colored test output
 begin require "redgreen" unless ENV['TM_CURRENT_LINE']; rescue LoadError; end
 
 path = File.expand_path(File.dirname(__FILE__) + "/../lib/")
 $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
 
-require "lib/domainatrix"
+begin
+  require "lib/domainatrix"
+rescue LoadError
+  require 'domainatrix'
+end