gman 2.1.0 → 2.1.1

data/lib/gman.rb

@@ -61,7 +61,8 @@ module Gman
       return false unless PublicSuffix.valid?(domain)
 
       # Ensure non-edu
-      return false if domain_parts(domain).sld && Swot::is_academic?(domain)
+      return false if domain_parts(domain).sld && Swot::is_academic?(domain) &&
+        Swot::BLACKLIST.none? { |d| domain =~ /(\A|\.)#{Regexp.escape(d)}\z/ }
 
       # check using public suffix's standard logic
       rule = list.find domain

data/test/helper.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'bundler'
+require 'minitest/autorun'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -7,7 +9,7 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
+
 require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -17,5 +19,3 @@ require 'net/dns'
 require 'net/dns/resolver'
 require './lib/gman/parser'
 
-class Test::Unit::TestCase
-end

data/test/test_gman.rb

@@ -25,8 +25,7 @@ INVALID = [ "foo.bar.com",
             " ",
           ]
 
-class TestGman < Test::Unit::TestCase
-
+class TestGman < Minitest::Test
 
   should "recognize government email addresses and domains" do
     VALID.each do |test|
@@ -54,9 +53,9 @@ class TestGman < Test::Unit::TestCase
   end
 
   should "not err out on invalid domains" do
-    assert_equal false, Gman.valid?("foo@act.gov.au")
-    assert_equal "act.gov.au", Gman.get_domain("foo@act.gov.au")
-    assert_equal nil, Gman.domain_parts("foo@act.gov.au")
+    assert_equal false, Gman.valid?("foo@gov.invalid")
+    assert_equal "gov.invalid", Gman.get_domain("foo@gov.invalid")
+    assert_equal nil, Gman.domain_parts("foo@gov.invalid")
   end
 
   should "return public suffix domain" do
@@ -72,9 +71,7 @@ class TestGman < Test::Unit::TestCase
   end
 
   should "not err out on invalid hosts" do
-    assert_nothing_raised do
-      assert_equal nil, Gman.get_domain("</@foo.com")
-    end
+    assert_equal nil, Gman.get_domain("</@foo.com")
   end
 
   should "returns the path to domains.txt" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gman
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: swot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.6
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.6
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement