domainatrix 0.0.6 → 0.0.7

data/lib/domainatrix/domain_parser.rb

@@ -1,5 +1,7 @@
 module Domainatrix
   class DomainParser
+    include Addressable
+    
     attr_reader :public_suffixes
 
     def initialize(file_name)
@@ -28,7 +30,12 @@ module Domainatrix
       else
         path = uri.path
       end
-      parse_domains_from_host(uri.host).merge({:path => path, :url => url})
+      parse_domains_from_host(uri.host).merge({
+        :scheme => uri.scheme,
+        :host   => uri.host,
+        :path   => path,
+        :url    => url
+      })
     end
 
     def parse_domains_from_host(host)

data/lib/domainatrix/url.rb

@@ -1,8 +1,10 @@
 module Domainatrix
   class Url
-    attr_reader :public_suffix, :domain, :subdomain, :path, :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]

data/lib/domainatrix.rb

@@ -1,11 +1,11 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__)) unless $LOAD_PATH.include?(File.dirname(__FILE__))
 
-require 'uri'
+require 'addressable/uri'
 require 'domainatrix/domain_parser.rb'
 require 'domainatrix/url.rb'
 
 module Domainatrix
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 
   def self.parse(url)
     @domain_parser ||= DomainParser.new("#{File.dirname(__FILE__)}/effective_tld_names.dat")

data/spec/domainatrix/domain_parser_spec.rb

@@ -33,6 +33,14 @@ describe "domain parser" do
       @domain_parser.parse("http://www.pauldix.net")[:url].should == "http://www.pauldix.net"
     end
 
+    it "includes the scheme" do
+      @domain_parser.parse("http://www.pauldix.net")[:scheme].should == "http"
+    end
+    
+    it "includes the full host" do
+      @domain_parser.parse("http://www.pauldix.net")[:host].should == "www.pauldix.net"      
+    end
+    
     it "parses out the path" do
       @domain_parser.parse("http://pauldix.net/foo.html?asdf=foo")[:path].should == "/foo.html?asdf=foo"
       @domain_parser.parse("http://pauldix.net?asdf=foo")[:path].should == "?asdf=foo"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: domainatrix
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Paul Dix
@@ -11,8 +11,17 @@ cert_chain: []
 
 date: 2009-12-10 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: addressable
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: paul@pauldix.net
 executables: []