domain_name_validator 0.4.1 → 0.4.2

data/ChangeLog.md

@@ -9,6 +9,13 @@
   circumstances. This validation would, for example, reject a domain name
   such as "test.domain".
 
+* (0.4.1) Added "info" as a valid extra-long TLD. How i missed this one, I
+  have no idea.
+
+* (0.4.2) Added a check for zero-length domain names, either empty strings
+  or Ruby nil values being passed in. In practice, these edge cases were
+  actually happening.
+
 0.3 (2013-06-28)
 ----------------
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    domain_name_validator (0.4)
+    domain_name_validator (0.4.1)
 
 GEM
   remote: http://rubygems.org/

data/lib/domain_name_validator/validator.rb

@@ -13,7 +13,7 @@ class DomainNameValidator
 
   ERRS = {
     :bogus_tld =>
-       'Malformed TLD',
+       'Malformed TLD: Could not possibly match any valid TLD',
     :illegal_chars =>
        'Domain label contains an illegal character',
     :illegal_start =>
@@ -31,7 +31,9 @@ class DomainNameValidator
     :min_level_size =>
        'Minimum domain level limit of 2 not achieved',
     :top_numerical =>
-       'The top-level domain (TLD) cannot be numerical'
+       'The top-level domain (TLD) cannot be numerical',
+    :zero_size =>
+       'Zero-length domain name'
     }
 
   # Validates the proper formatting of a normalized domain name, i.e. - a
@@ -48,27 +50,31 @@ class DomainNameValidator
   # 6. A domain name cannot begin with a period.
 
   def validate(dn, errs = [])
-    errs << ERRS[:max_domain_size] if dn.size > MAX_DOMAIN_LENGTH
-    parts = dn.split('.')
-    errs << ERRS[:max_level_size] if parts.size > MAX_LEVELS
-    errs << ERRS[:min_level_size] if parts.size < MIN_LEVELS
-    parts.each do |p|
-      errs << ERRS[:max_label_size] if p.size > MAX_LABEL_LENGTH
-      errs << ERRS[:label_dash_begin] if p[0] == '-'
-      errs << ERRS[:label_dash_end] if p[-1] == '-'
-      errs << ERRS[:illegal_chars] unless p.match(/^[a-z0-9\-\_]+$/)
-    end
-    errs << ERRS[:top_numerical] if parts.last.match(/^[0-9]+$/)
-    if parts.last.size < MIN_TLD_LENGTH || parts.last.size > MAX_TLD_LENGTH
-      unless parts.last == 'arpa' ||
-             parts.last == 'aero' ||
-             parts.last == 'info' ||
-             parts.last == 'museum' ||
-             parts.last.match(/^xn--/)
-        errs << ERRS[:bogus_tld]   
+    errs << ERRS[:zero_size] if dn.nil? || dn.size == 0
+
+    if errs.size == 0
+      errs << ERRS[:max_domain_size] if dn.size > MAX_DOMAIN_LENGTH
+      parts = dn.split('.')
+      errs << ERRS[:max_level_size] if parts.size > MAX_LEVELS
+      errs << ERRS[:min_level_size] if parts.size < MIN_LEVELS
+      parts.each do |p|
+        errs << ERRS[:max_label_size] if p.size > MAX_LABEL_LENGTH
+        errs << ERRS[:label_dash_begin] if p[0] == '-'
+        errs << ERRS[:label_dash_end] if p[-1] == '-'
+        errs << ERRS[:illegal_chars] unless p.match(/^[a-z0-9\-\_]+$/)
+      end
+      errs << ERRS[:top_numerical] if parts.last.match(/^[0-9]+$/)
+      if parts.last.size < MIN_TLD_LENGTH || parts.last.size > MAX_TLD_LENGTH
+        unless parts.last == 'arpa' ||
+               parts.last == 'aero' ||
+               parts.last == 'info' ||
+               parts.last == 'museum' ||
+               parts.last.match(/^xn--/)
+          errs << ERRS[:bogus_tld]   
+        end
       end
+      errs << ERRS[:illegal_start] if parts.first[0] == '.'
     end
-    errs << ERRS[:illegal_start] if parts.first[0] == '.'
 
     errs.size == 0   # TRUE if valid, FALSE otherwise
   end

data/lib/domain_name_validator/version.rb

@@ -1,3 +1,3 @@
 class DomainNameValidator
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/domain_name_validator_spec.rb

@@ -13,6 +13,16 @@ describe DomainNameValidator do
       response.should be == true
     end
 
+    it 'should fail when it finds nil instead of a domain name' do
+      response = @validator.validate(nil)
+      response.should be == false
+    end
+
+    it 'should fail when it finds an empty string instead of a domain name' do
+      response = @validator.validate("")
+      response.should be == false
+    end
+
     it 'should fail when it finds a numeric top-level extension' do
       response = @validator.validate('keenertech.123')
       response.should be == false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: domain_name_validator
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &27415812 !ruby/object:Gem::Requirement
+  requirement: &28235004 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27415812
+  version_requirements: *28235004
 description: Checks the validity of domain names.
 email:
 - dkeener@keenertech.com