postrank-uri 1.0.16 → 1.0.17

data/Rakefile

@@ -2,5 +2,4 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-
-Rspec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec)

data/lib/postrank-uri.rb

@@ -1,22 +1,16 @@
 # -*- encoding: utf-8 -*-
 
 require 'addressable/uri'
-require 'domainatrix'
 require 'digest/md5'
 require 'nokogiri'
+require 'public_suffix'
 require 'yaml'
 
 module Addressable
   class URI
     def domain
-      begin
-        dp = Domainatrix.parse(self)
-      rescue
-        return nil
-      end
-
-      dom = dp.public_suffix
-      dom = dp.domain.downcase + "." + dom unless dp.domain.empty?
+      host = self.host
+      (host && PublicSuffix.valid?(host)) ? PublicSuffix.parse(host).domain : nil
     end
 
     def normalized_query
@@ -103,11 +97,10 @@ module PostRank
       return [] if !text
       urls = []
       text.to_s.scan(URIREGEX[:valid_url]) do |all, before, url, protocol, domain, path, query|
-        begin
+        # Only extract the URL if the domain is valid
+        if PublicSuffix.valid?(domain)
           url = clean(url)
-          Domainatrix.parse(url)
           urls.push url.to_s
-        rescue NoMethodError
         end
       end
 
@@ -223,10 +216,18 @@ module PostRank
     end
 
     def valid?(uri)
-      Domainatrix.parse(uri)
-      true
-    rescue
-      false
+      # URI is only valid if it is not nil, parses cleanly as a URI,
+      # and the domain has a recognized, valid TLD component
+      return false if uri.nil?
+
+      is_valid = false
+      cleaned_uri = clean(uri, :raw => true)
+
+      if host = cleaned_uri.host
+        is_valid = PublicSuffix.valid?(host)
+      end
+
+      is_valid
     end
   end
 end

data/lib/postrank-uri/version.rb

@@ -1,5 +1,5 @@
 module PostRank
   module URI
-    VERSION = "1.0.16"
+    VERSION = "1.0.17"
   end
 end

data/postrank-uri.gemspec

@@ -14,11 +14,11 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "postrank-uri"
 
-  s.add_dependency "addressable", ">= 2.3.0"
-  s.add_dependency "domainatrix"
-  s.add_dependency "nokogiri"
+  s.add_dependency "addressable",   "~> 2.3.0"
+  s.add_dependency "public_suffix", "~> 1.1.3"
+  s.add_dependency "nokogiri",      "~> 1.5.5"
+
   s.add_development_dependency "rspec"
-  #s.add_development_dependency "idn" # test with idn
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/postrank-uri_spec.rb

@@ -339,6 +339,10 @@ describe PostRank::URI do
   end
 
   context 'valid?' do
+    it 'marks incomplete URI string as invalid' do
+      PostRank::URI.valid?('/path/page.html').should be_false
+    end
+
     it 'marks www.test.c as invalid' do
       PostRank::URI.valid?('http://www.test.c').should be_false
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postrank-uri
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
@@ -24,41 +24,41 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: domainatrix
+  name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,3 +122,4 @@ test_files:
 - spec/c18n_hosts.yml
 - spec/helper.rb
 - spec/postrank-uri_spec.rb
+has_rdoc: