f1sherman-domainatrix 0.0.10 → 0.0.11

data/lib/domainatrix.rb

@@ -5,10 +5,10 @@ require 'domainatrix/domain_parser.rb'
 require 'domainatrix/url.rb'
 
 module Domainatrix
-  VERSION = "0.0.9"
+  VERSION = "0.0.11"
   DOMAIN_PARSER = DomainParser.new("#{File.dirname(__FILE__)}/effective_tld_names.dat")
 
   def self.parse(url)
     Url.new(DOMAIN_PARSER.parse(url))
   end
-end
+end

data/lib/domainatrix/domain_parser.rb

@@ -31,6 +31,7 @@ module Domainatrix
     end
 
     def parse(url)
+      url.downcase!
       uri = URI.parse(url)
       if uri.query
         path = "#{uri.path}?#{uri.query}"
@@ -46,6 +47,7 @@ module Domainatrix
     end
 
     def parse_domains_from_host(host)
+      host.downcase!
       parts = host.split(".").reverse
       public_suffix = []
       domain = ""
@@ -74,4 +76,4 @@ module Domainatrix
       {:public_suffix => public_suffix.reverse.join("."), :domain => domain, :subdomain => subdomains.reverse.join(".")}
     end
   end
-end
+end

data/spec/domainatrix/domain_parser_spec.rb

@@ -24,7 +24,7 @@ describe "domain parser" do
     end
   end
 
-  describe "parsing" do
+  describe :parse do
     it "returns a hash of parts" do
       @domain_parser.parse("http://pauldix.net").should be_a Hash
     end
@@ -68,4 +68,30 @@ describe "domain parser" do
       @domain_parser.parse("http://bar.foo.pauldix.co.uk")[:subdomain].should == "bar.foo"
     end
   end
-end
+
+  describe :parse_domains_from_host do
+    it "should parse from a lowercase host" do
+      @domain_parser.parse_domains_from_host("foo.pauldix.net")[:domain].should == "pauldix"
+      @domain_parser.parse_domains_from_host("foo.pauldix.net")[:subdomain].should == "foo"
+      @domain_parser.parse_domains_from_host("foo.pauldix.net")[:public_suffix].should == "net"
+    end
+    it "should parse from a mixed case host" do
+      @domain_parser.parse_domains_from_host("foo.pauldix.NET")[:domain].should == "pauldix"
+      @domain_parser.parse_domains_from_host("foo.pauldix.NET")[:subdomain].should == "foo"
+      @domain_parser.parse_domains_from_host("foo.pauldix.NET")[:public_suffix].should == "net"
+    end
+    it "should parse from an uppercase host" do
+      @domain_parser.parse_domains_from_host("FOO.PAULDIX.NET")[:domain].should == "pauldix"
+      @domain_parser.parse_domains_from_host("FOO.PAULDIX.NET")[:subdomain].should == "foo"
+      @domain_parser.parse_domains_from_host("FOO.PAULDIX.NET")[:public_suffix].should == "net"
+    end
+    it "should parse from an empty host" do
+      @domain_parser.parse_domains_from_host("")[:domain].should == ""
+      @domain_parser.parse_domains_from_host("")[:subdomain].should == ""
+      @domain_parser.parse_domains_from_host("")[:public_suffix].should == ""
+    end
+    it "should raise an error for invalid input" do
+      lambda { @domain_parser.parse_domains_from_host(nil) }.should raise_error
+    end
+  end
+end

data/spec/domainatrix_spec.rb

@@ -5,12 +5,20 @@ describe "domainatrix" do
     Domainatrix.parse("http://pauldix.net").should be_a Domainatrix::Url
   end
 
-  it "should canonicalize" do
-    Domainatrix.parse("http://pauldix.net").canonical.should == "net.pauldix"
-    Domainatrix.parse("http://pauldix.net/foo.html").canonical.should == "net.pauldix/foo.html"
-    Domainatrix.parse("http://pauldix.net/foo.html?asdf=bar").canonical.should == "net.pauldix/foo.html?asdf=bar"
-    Domainatrix.parse("http://foo.pauldix.net").canonical.should == "net.pauldix.foo"
-    Domainatrix.parse("http://foo.bar.pauldix.net").canonical.should == "net.pauldix.bar.foo"
-    Domainatrix.parse("http://pauldix.co.uk").canonical.should == "uk.co.pauldix"
+  describe :parse do
+    it "should canonicalize" do
+      Domainatrix.parse("http://pauldix.net").canonical.should == "net.pauldix"
+      Domainatrix.parse("http://pauldix.NET").canonical.should == "net.pauldix"
+      Domainatrix.parse("http://PAULDIX.net").canonical.should == "net.pauldix"
+      Domainatrix.parse("http://PAULDIX.NET").canonical.should == "net.pauldix"
+      Domainatrix.parse("HTTP://PAULDIX.NET").canonical.should == "net.pauldix"
+      lambda { Domainatrix.parse("") }.should raise_error
+      lambda { Domainatrix.parse(nil) }.should raise_error
+      Domainatrix.parse("http://pauldix.net/foo.html").canonical.should == "net.pauldix/foo.html"
+      Domainatrix.parse("http://pauldix.net/foo.html?asdf=bar").canonical.should == "net.pauldix/foo.html?asdf=bar"
+      Domainatrix.parse("http://foo.pauldix.net").canonical.should == "net.pauldix.foo"
+      Domainatrix.parse("http://foo.bar.pauldix.net").canonical.should == "net.pauldix.bar.foo"
+      Domainatrix.parse("http://pauldix.co.uk").canonical.should == "uk.co.pauldix"
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: f1sherman-domainatrix
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Paul Dix