gman 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c14780a8da17be7dbcd93d3f1623da401aa5124
-  data.tar.gz: 82aecc0617942671dd7beec7601ddef10a1b9262
+  metadata.gz: d5f81c5dc5d03e961dc8830f91d8f17a04cc7eff
+  data.tar.gz: 1c4c914aca60114856034e3cfd1254c555552d49
 SHA512:
-  metadata.gz: e1431c5933b0eb033945732d265640da90b59e2f420b4f97bc7a84158f1793ea489a630b371702bfe9a5342e9c06f4839daeeee3fafc521588628d83cecddd93
-  data.tar.gz: 2e03f15a543f54d5a56b1abc6646c86496a1e72d9e4f42a5f862c18725df6f50f17a90704f76da0b8efb31eeecbb492eb2992ec714a39e480d892a22067b2cc5
+  metadata.gz: e463cf1a41e87be42a1bae6b82e9b5961a210ea4374750ee9e111406589199adaf0e15be60b31dd65f4cee1e49b510a1e6eacc3f3a7c75c7e4c05fb70313bf8c
+  data.tar.gz: be4371cf714f72cf0b0d0bafdc3de1e26c8b549849f70cce3779bb334bbecad5668f4bc65b5356a5e163d8782b270e8cae3b219ffd0cbc58e8f0a83162809c8a

data/config/domains.txt

@@ -206,8 +206,6 @@ cochrane.ca
 coldlake.com
 colemantownship.ca
 colwood.ca
-communityofmillertown.ca
-communityofoleary.com
 comox.ca
 conceptionbaysouth.ca
 consort.ca
@@ -596,7 +594,6 @@ municipalite.saint-armand.qc.ca
 municipalite.saint-isidore.qc.ca
 municipalite.saint-philippe.qc.ca
 municipalite.saint-valerien.qc.ca
-municipalite.sainte-angele-de-monnoir.qc.ca
 municipalite.sainte-martine.qc.ca
 municipaliteboileau.ca
 municipalitedeboltonouest.com
@@ -608,7 +605,6 @@ municipalityofmcdougall.com
 municipalityofshelburne.ca
 muniles.ca
 munmilan.qc.ca
-munpontiac.com
 munstdenis.com
 munstratford.qc.ca
 mycallander.ca
@@ -883,7 +879,6 @@ snowlake.com
 sooke.ca
 sourismanitoba.com
 sourispei.com
-southbrook.tripod.com
 southey.ca
 southhuron.ca
 southwestmiddlesex.ca
@@ -1092,7 +1087,6 @@ townofgrandbank.com
 townofhague.com
 townofhampton.ca
 townofhighprairie.com
-townofhmcclv.com
 townofhudsonbay.com
 townofindianhead.com
 townofkearney.com
@@ -1218,7 +1212,6 @@ villageofalliance.ca
 villageofbitternlake.ca
 villageofbriercrest.ca
 villageofcentreville.ca
-villageofchauvin.ca
 villageofconquest.ca
 villageofdorintosh.sasktelwebsite.net
 villageofduchess.com
@@ -3255,7 +3248,6 @@ vardanalys.se
 vinnova.se
 vr.se
 vti.se
-y.lst.se
 yhmyndigheten.se
 
 // Swiss Cantons (Federal States)
@@ -4128,7 +4120,6 @@ jeffco.us
 kitcarsoncounty.org
 lakewood.org
 littletongov.org
-metrodenvercfc.org
 metromayors.org
 minturn.org
 mountain-village.co.us
@@ -4268,7 +4259,6 @@ waterfordct.org
 watertownct.org
 west-hartford.com
 westbrookct.us
-weston-ct.com
 wethersfieldct.com
 willingtonct.org
 wiltonct.org
@@ -4450,7 +4440,6 @@ pbgc.org
 pcaobus.org
 pepfar.net
 predict.org
-project-open-data.github.io
 psctool.us
 r3coastal.com
 radiosawa.com
@@ -4926,7 +4915,6 @@ odumgeorgia.com
 oxfordgeorgia.org
 peachcounty.net
 peachtree-city.org
-pearson-ga.com
 pembrokega.net
 pinelakega.com
 polkcountygeorgia.us
@@ -5555,7 +5543,6 @@ newhavenin.org
 newtoncountyin.com
 nirpc.org
 nmanchester.org
-nobleco.squarespace.com
 perrycountyil.org
 porterco.org
 portertownship.com
@@ -5937,7 +5924,6 @@ rppj.com
 ruston.org
 sbpg.net
 sjbparish.com
-springhillla.com
 state.lib.la.us
 stfrancisville.net
 stjamesla.com
@@ -7637,10 +7623,8 @@ shpnc.org
 smithfield-nc.com
 sosnc.com
 southernpines.net
-southernshores.org
 spindalenc.net
 spring-lake.org
-sprucepineonline.com
 startsquad.org
 startwithyourheart.com
 summerfieldgov.com
@@ -7742,7 +7726,6 @@ dvlnd.com
 edgeley.com
 edinburgnd.com
 ellendalend.com
-emmonscounty.tripod.com
 enderlinnd.com
 fessendennd.com
 finleynd.com
@@ -7843,7 +7826,6 @@ westfargo.org
 williamsnd.com
 willistonnd.com
 wiltonnd.org
-wingnd.com
 wishek-nd.com
 wrtc.com
 
@@ -8688,7 +8670,6 @@ poncatribe-ne.org
 portlions.net
 potawatomi.org
 powhatan.org
-prairieisland.org
 pueblodecochiti.org
 puyallup-tribe.com
 redding-rancheria.com
@@ -8792,7 +8773,6 @@ attica.org
 auroranewyork.us
 austerlitzny.com
 avon-ny.org
-b-ville.com
 bainbridgeny.org
 baldwinsville.org
 batavianewyork.com
@@ -9328,7 +9308,6 @@ townofstonypoint.org
 townofsweden.org
 townofthompson.com
 townofthurston.com
-townofticonderoga.com
 townoftully.org
 townofulster.org
 townofunion.com
@@ -10151,7 +10130,6 @@ lehighcounty.org
 lehmantownship.com
 libertytwp-adamscounty.com
 limerickpa.org
-lincolnboro.tripod.com
 littlebritain.org
 littlestownboro.org
 liverpoolpa.us
@@ -10176,7 +10154,6 @@ manortwp.org
 mantwp.com
 marpletwp.com
 marysvilleboro.com
-mckeesport.org
 mckeesrocks.com
 mechanicsburgborough.org
 mediaborough.com
@@ -10384,7 +10361,6 @@ wesleyvilleborough.com
 west-chester.com
 westbradford.org
 westcaln.org
-westconshohockenboro.com
 westdeertownship.com
 westeastonborough.org
 westgroveborough.org
@@ -10542,7 +10518,6 @@ fortmillsc.org
 fountaininn.org
 gastonsc.org
 georgetowncountysc.org
-greatfallssc.net
 greenvillecounty.org
 hamptoncountysc.org
 hamptonsc.net
@@ -10561,7 +10536,6 @@ libertysc.com
 lincolnvillesc.com
 littlemountainsc.info
 llronline.com
-mayesvillesc.com
 midlandsareacfc.org
 mtcroghan.com
 mullinssc.us
@@ -11361,7 +11335,6 @@ vaao.org
 vaboard.org
 vadrs.org
 vadsa.org
-vafamilyconnections.com
 vafire.com
 valottery.com
 vaports.com
@@ -11513,7 +11486,6 @@ stjvt.com
 swcrpc.org
 thetfordvermont.us
 tinmouthvt.org
-town-of-orwell.org
 townofbrandon.com
 townofcraftsbury.com
 townofgeorgia.com

data/lib/gman/importer.rb

@@ -55,20 +55,23 @@ class Gman
 
     def valid_domain?(domain, options={})
       return false if domain.empty?
-      return reject(domain, "home. regex")  if domain =~ /^home\./
-      return reject(domain, "user. regex")  if domain =~ /^users?\./
-      return reject(domain, "sites. regex") if domain =~ /^sites?\./
-      return reject(domain, "weebly")       if domain =~ /weebly\.com$/
-      return reject(domain, "wordpress")    if domain =~ /wordpress\.com$/
-      return reject(domain, "govoffice")    if domain =~ /govoffice\d?\.com$/
-      return reject(domain, "homestead")    if domain =~ /homestead\.com$/
-      return reject(domain, "wix.com")      if domain =~ /wix\.com$/
-      return reject(domain, "blogspot.com") if domain =~ /blogspot\.com$/
-      return reject(domain, "locality")     if domain =~ Gman::LOCALITY_REGEX
-      return reject(domain, "blacklist")    if BLACKLIST.include?(domain)
-      return reject(domain, "duplicate")    if !options[:skip_dupe] && current.domains.include?(domain)
-      return reject(domain, "invalid")      unless PublicSuffix.valid?(".#{domain}")
-      return reject(domain, "academic")     if Swot::is_academic?(domain)
+      return reject(domain, "home. regex")     if domain =~ /^home\./
+      return reject(domain, "user. regex")     if domain =~ /^users?\./
+      return reject(domain, "sites. regex")    if domain =~ /^sites?\./
+      return reject(domain, "weebly")          if domain =~ /weebly\.com$/
+      return reject(domain, "wordpress")       if domain =~ /wordpress\.com$/
+      return reject(domain, "govoffice")       if domain =~ /govoffice\d?\.com$/
+      return reject(domain, "homestead")       if domain =~ /homestead\.com$/
+      return reject(domain, "wix.com")         if domain =~ /wix\.com$/
+      return reject(domain, "blogspot.com")    if domain =~ /blogspot\.com$/
+      return reject(domain, "tripod.com")      if domain =~ /tripod\.com$/
+      return reject(domain, "squarespace.com") if domain =~ /squarespace\.com$/
+      return reject(domain, "github.io")       if domain =~ /github\.io$/
+      return reject(domain, "locality")        if domain =~ Gman::LOCALITY_REGEX
+      return reject(domain, "blacklist")       if BLACKLIST.include?(domain)
+      return reject(domain, "duplicate")       if !options[:skip_dupe] && current.domains.include?(domain)
+      return reject(domain, "invalid")         unless PublicSuffix.valid?(".#{domain}")
+      return reject(domain, "academic")        if Swot::is_academic?(domain)
 
       if !options[:skip_dupe] && subdomain = current.domains.find { |c| domain =~ /\.#{Regexp.escape(c)}$/}
         return reject(domain, "subdomain of #{subdomain}")
@@ -122,13 +125,18 @@ class Gman
       @resolver ||= Resolv::DNS.new(:nameserver => ["8.8.8.8","8.8.4.4"])
     end
 
+    def resolve_without_errors
+      yield
+    rescue Resolv::ResolvError
+      false
+    end
+
     # Verifies that the given domain has an MX record, and thus is valid
     def domain_resolves?(domain)
       domain = Addressable::URI.new(:host => domain).normalize.host
-      resolver.getresource(domain, Resolv::DNS::Resource::IN::NS) ||
-      resolver.getresource(domain, Resolv::DNS::Resource::IN::MX)
-    rescue Resolv::ResolvError
-      false
+      resolve_without_errors { resolver.getaddress(domain) } ||
+      resolve_without_errors { resolver.getresource(domain, Resolv::DNS::Resource::IN::NS) } ||
+      resolve_without_errors { resolver.getresource(domain, Resolv::DNS::Resource::IN::MX) }
     end
   end
 end

data/lib/gman/version.rb

@@ -1,3 +1,3 @@
 class Gman
-  VERSION = '5.0.2'
+  VERSION = '5.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gman
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Ben Balter