validates_hostname 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f22a46962c7ec3fce9de05c3382e9ec5ad8f2a21
-  data.tar.gz: 4e8e292b92f385c00148a1d742ccef1fb39b569c
+  metadata.gz: 95afd4c7854435996ba31b490d2fe4472460c6e0
+  data.tar.gz: a3ab78cc20012156408c984225c274556772f8c8
 SHA512:
-  metadata.gz: 6935ccc2c596c927ec26d302635612830c5eef05d61a01dbe863561a9cb9b479118a71b6e1d64e4593066ac487a0efd95bae0024fffcad7e6421d245e8db4ab3
-  data.tar.gz: 52a4ac6e1c8cdf17d04b08218642f31a6f3d8e411f38dd086dc28b17b69aa078a5b381f3af91b53fc22fb55b724d8e2f82066a5584b1bd16b31358282b2d99e5
+  metadata.gz: 01762b519ad24527b5a39f9a956693dd7b3f4e45ddec56323ec10349e2d34601d7c8031a612d9812b8ae22938d28cf37ea8cc3bec64f71bef178a70f449608e0
+  data.tar.gz: 94d45c227dede08a555069d661644252b2553c48559d52ff25331332b64537183348fe699ee9202522150e2be10fd38b66be96a4a79f9737c0b4ccec215f2f50

data/lib/validates_hostname.rb

@@ -1,4 +1,5 @@
 require 'active_support/concern'
+require 'active_record'
 require 'active_model'
 
 module PAK
@@ -6,45 +7,86 @@ module PAK
     autoload :VERSION, 'validates_hostname/version'
 
     # List from IANA: http://www.iana.org/domains/root/db/
+    #                 http://data.iana.org/TLD/tlds-alpha-by-domain.txt
     ALLOWED_TLDS = %w(
-      ac ad ae aero af ag ai al am an ao aq ar arpa as asia at au aw ax az 
-      ba bb bd be bf bg bh bi biz bj bl bm bn bo br bs bt bv bw by bz 
-      ca cat cc cd cf cg ch ci ck cl cm cn co com coop cr cu cv cx cy cz 
-      de dj dk dm do dz 
-      ec edu ee eg eh er es et eu 
-      fi fj fk fm fo fr 
-      ga gb gd ge gf gg gh gi gl gm gn gov gp gq gr gs gt gu gw gy 
-      hk hm hn hr ht hu 
-      id ie il im in info int io iq ir is it 
-      je jm jo jobs jp 
-      ke kg kh ki km kn kp kr kw ky kz 
-      la lb lc li lk lr ls lt lu lv ly 
-      ma mc md me mf mg mh mil mk ml mm mn mo mobi mp mq mr ms mt mu museum 
-      mv mw mx my mz 
-      na name nc ne net nf ng ni nl no np nr nu nz 
-      om org 
-      pa pe pf pg ph pk pl pm pn pr pro ps pt pw py 
-      qa 
-      re ro rs ru rw 
-      sa sb sc sd se sg sh si sj sk sl sm sn so sr st su sv sy sz 
-      tc td tel tf tg th tj tk tl tm tn to tp tr travel tt tv tw tz 
-      ua ug uk um us uy uz 
-      va vc ve vg vi vn vu 
-      wf ws 
-      ye yt yu 
-      za zm zw
+      . abogado ac academy accountants active actor ad adult ae aero af ag agency ai
+      airforce al allfinanz alsace am amsterdam an android ao aq aquarelle ar archi
+      army arpa as asia associates at attorney au auction audio autos aw ax axa az ba
+      band bank bar bargains bayern bb bd be beer berlin best bf bg bh bi bid bike
+      bio biz bj black blackfriday bloomberg blue bm bmw bn bnpparibas bo boo
+      boutique br brussels bs bt budapest build builders business buzz bv bw by bz
+      bzh ca cab cal camera camp cancerresearch capetown capital caravan cards care
+      career careers cartier casa cash cat catering cc cd center ceo cern cf cg ch
+      channel cheap christmas chrome church ci citic city ck cl claims cleaning click
+      clinic clothing club cm cn co coach codes coffee college cologne com community
+      company computer condos construction consulting contractors cooking cool coop
+      country cr credit creditcard cricket crs cruises cu cuisinella cv cw cx cy
+      cymru cz dad dance dating day de deals degree delivery democrat dental dentist
+      desi dev diamonds diet digital direct directory discount dj dk dm dnp do docs
+      domains doosan durban dvag dz eat ec edu education ee eg email emerck energy
+      engineer engineering enterprises equipment er es esq estate et eu eurovision
+      eus events everbank exchange expert exposed fail farm fashion feedback fi
+      finance financial firmdale fish fishing fit fitness fj fk flights florist
+      flowers flsmidth fly fm fo foo forsale foundation fr frl frogans fund furniture
+      futbol ga gal gallery garden gb gbiz gd ge gent gf gg ggee gh gi gift gifts
+      gives gl glass gle global globo gm gmail gmo gmx gn google gop gov gp gq gr
+      graphics gratis green gripe gs gt gu guide guitars guru gw gy hamburg haus
+      healthcare help here hiphop hiv hk hm hn holdings holiday homes horse host
+      hosting house how hr ht hu ibm id ie il im immo immobilien in industries info
+      ing ink institute insure int international investments io iq ir irish is it iwc
+      je jetzt jm jo jobs joburg jp juegos kaufen kddi ke kg kh ki kim kitchen kiwi
+      km kn koeln kp kr krd kred kw ky kz la lacaixa land lat latrobe lawyer lb lc
+      lds lease legal lgbt li lidl life lighting limited limo link lk loans london
+      lotto lr ls lt ltda lu luxe luxury lv ly ma madrid maison management mango
+      market marketing mc md me media meet melbourne meme memorial menu mg mh miami
+      mil mini mk ml mm mn mo mobi moda moe monash money mormon mortgage moscow
+      motorcycles mov mp mq mr ms mt mu museum mv mw mx my mz na nagoya name navy nc
+      ne net network neustar new nexus nf ng ngo nhk ni ninja nl no np nr nra nrw nu
+      nyc nz okinawa om ong onl ooo org organic osaka otsuka ovh pa paris partners
+      parts party pe pf pg ph pharmacy photo photography photos physio pics pictures
+      pink pizza pk pl place plumbing pm pn pohl poker porn post pr praxi press pro
+      prod productions prof properties property ps pt pub pw py qa qpon quebec re
+      realtor recipes red rehab reise reisen reit ren rentals repair report
+      republican rest restaurant reviews rich rio rip ro rocks rodeo rs rsvp ru ruhr
+      rw ryukyu sa saarland sale samsung sarl sb sc sca scb schmidt schule schwarz
+      science scot sd se services sew sexy sg sh shiksha shoes shriram si singles sj
+      sk sky sl sm sn so social software sohu solar solutions soy space spiegel sr st
+      su supplies supply support surf surgery suzuki sv sx sy sydney systems sz
+      taipei tatar tattoo tax tc td technology tel tf tg th tienda tips tires tirol
+      tj tk tl tm tn to today tokyo tools top town toys tp tr trade training travel
+      trust tt tui tv tw tz ua ug uk university uno uol us uy uz va vacations vc ve
+      vegas ventures versicherung vet vg vi viajes video villas vision vlaanderen vn
+      vodka vote voting voto voyage vu wales wang watch webcam website wed wedding wf
+      whoswho wien wiki williamhill wme work works world ws wtc wtf xn--1qqw23a
+      xn--3bst00m xn--3ds443g xn--3e0b707e xn--45brj9c xn--45q11c xn--4gbrim
+      xn--55qw42g xn--55qx5d xn--6frz82g xn--6qq986b3xl xn--80adxhks xn--80ao21a
+      xn--80asehdb xn--80aswg xn--90a3ac xn--c1avg xn--cg4bki xn--clchc0ea0b2g2a9gcd
+      xn--czr694b xn--czrs0t xn--czru2d xn--d1acj3b xn--d1alf xn--fiq228c5hs
+      xn--fiq64b xn--fiqs8s xn--fiqz9s xn--flw351e xn--fpcrj9c3d xn--fzc2c9e2c
+      xn--gecrj9c xn--h2brj9c xn--hxt814e xn--i1b6b1a6a2e xn--io0a7i xn--j1amh
+      xn--j6w193g xn--kprw13d xn--kpry57d xn--kput3i xn--l1acc xn--lgbbat1ad8j
+      xn--mgb9awbf xn--mgba3a4f16a xn--mgbaam7a8h xn--mgbab2bd xn--mgbayh7gpa
+      xn--mgbbh1a71e xn--mgbc0a9azcg xn--mgberp4a5d4ar xn--mgbx4cd0ab xn--ngbc5azd
+      xn--node xn--nqv7f xn--nqv7fs00ema xn--o3cw4h xn--ogbpf8fl xn--p1acf xn--p1ai
+      xn--pgbs0dh xn--q9jyb4c xn--qcka1pmc xn--rhqv96g xn--s9brj9c xn--ses554g
+      xn--unup4y xn--vermgensberater-ctb xn--vermgensberatung-pwb xn--vhquv
+      xn--wgbh1c xn--wgbl6a xn--xhq521b xn--xkc2al3hye2a xn--xkc2dl3a5ee0h
+      xn--yfro4i67o xn--ygbi2ammx xn--zfr164b xxx xyz yachts yandex ye yoga yokohama
+      youtube yt za zip zm zone zuerich zw
     )
-    
+
     DEFAULT_ERROR_MSG = {
-      :invalid_hostname_length            => 'hostname must be between 1 and 255 characters long',
-      :invalid_label_length               => 'label must be between 1 and 63 characters long',
-      :label_begins_or_ends_with_hyphen   => 'label begins or ends with hyphen',
-      :label_contains_invalid_characters  => "label contains invalid characters (valid characters: [%{valid_chars}])",
+      :invalid_hostname_length            => 'must be between 1 and 255 characters long',
+      :invalid_label_length               => 'must be between 1 and 63 characters long',
+      :label_begins_or_ends_with_hyphen   => 'begins or ends with hyphen',
+      :label_contains_invalid_characters  => "contains invalid characters (valid characters: [%{valid_chars}])",
       :hostname_label_is_numeric          => 'unqualified hostname part cannot consist of numeric values only',
-      :hostname_is_not_fqdn               => 'hostname is not a fully qualified domain name',
-      :single_numeric_hostname_label      => 'hostnames cannot consist of a single numeric label'
+      :hostname_is_not_fqdn               => 'is not a fully qualified domain name',
+      :single_numeric_hostname_label      => 'cannot consist of a single numeric label',
+      :hostname_contains_consecutive_dots => 'must not contain consecutive dots',
+      :hostname_ends_with_dot             => 'must not end with a dot'
     }.freeze
-    
+
     class HostnameValidator < ActiveModel::EachValidator
       def initialize(options)
         opts = {
@@ -52,16 +94,18 @@ module PAK
           :require_valid_tld       => false,
           :valid_tlds              => ALLOWED_TLDS,
           :allow_numeric_hostname  => false,
-          :allow_wildcard_hostname => false
+          :allow_wildcard_hostname => false,
+          :allow_root_label        => false
         }.merge(options)
         super(opts)
       end
-      
+
       def validate_each(record, attribute, value)
         value ||= ''
+
         # maximum hostname length: 255 characters
         add_error(record, attribute, :invalid_hostname_length) unless value.length.between?(1, 255)
-        
+
         # split each hostname into labels and do various checks
         if value.is_a?(String)
           labels = value.split '.'
@@ -84,7 +128,7 @@ module PAK
 
           # CHECK 4: the unqualified hostname portion cannot consist of 
           #          numeric values only
-          if options[:allow_numeric_hostname] == false
+          if options[:allow_numeric_hostname] == false and labels.length > 0
             is_numeric_only = (
               (
                 Integer(labels[0]) rescue false
@@ -96,14 +140,28 @@ module PAK
           # CHECK 5: in order to be fully qualified, the full hostname's
           #          TLD must be valid
           if options[:require_valid_tld] == true
+            my_tld = value == '.' ? value : labels.last
+            my_tld ||= ''
             has_tld = options[:valid_tlds].select {
-              |tld| tld =~ /^#{Regexp.escape(labels.last || '')}$/i
+              |tld| tld =~ /^#{Regexp.escape(my_tld)}$/i
             }.empty? ? false : true
             add_error(record, attribute, :hostname_is_not_fqdn) unless has_tld
           end
+
+          # CHECK 6: hostname may not contain consecutive dots
+          if value =~ /\.\./
+            add_error(record, attribute, :hostname_contains_consecutive_dots)
+          end
+
+          # CHECK 7: do not allow trailing dot unless option is set
+          if options[:allow_root_label] == false
+            if value =~ /\.$/
+              add_error(record, attribute, :hostname_ends_with_dot)
+            end
+          end
         end
       end
-      
+
       def add_error(record, attr_name, message, *interpolators)
         args = {
           :default => [DEFAULT_ERROR_MSG[message], options[:message]],
@@ -121,10 +179,10 @@ module PAK
         }.merge(options)
         super(opts)
       end
-      
+
       def validate_each(record, attribute, value)
         super
-        
+
         if value.is_a?(String)
           labels = value.split '.'
           labels.each do |label|
@@ -143,7 +201,7 @@ module PAK
           end
         end
       end
-      
+
       def add_error(record, attr_name, message, *interpolators)
         args = {
           :default => [DEFAULT_ERROR_MSG[message], options[:message]],
@@ -173,4 +231,4 @@ module PAK
   end
 end
 
-ActiveRecord::Base.send(:include, PAK::ValidatesHostname)
+ActiveRecord::Base.send(:include, PAK::ValidatesHostname)

data/lib/validates_hostname/version.rb

@@ -1,5 +1,5 @@
 module PAK
   module ValidatesHostname
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

data/validates_hostname.gemspec

@@ -16,9 +16,12 @@ Gem::Specification.new do |s|
   s.licenses                  = 'MIT'
   s.require_paths             = ["lib"]
 
-  s.add_runtime_dependency 'rails'
-  s.add_runtime_dependency 'rspec'
-  s.add_runtime_dependency 'rspec-rails'
-  s.add_runtime_dependency 'activerecord'
-  s.add_runtime_dependency 'sqlite3-ruby'
+  s.add_runtime_dependency 'activerecord', '>= 3.0'
+  s.add_runtime_dependency 'activesupport', '>= 3.0'
+
+  s.add_development_dependency 'rspec', '~> 2.14'
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'rails-all'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'pry-debugger'
 end

metadata

@@ -1,37 +1,65 @@
 --- !ruby/object:Gem::Specification
 name: validates_hostname
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Kim Nørgaard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rails-all
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,13 +81,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,13 +95,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
+  name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -89,13 +117,13 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - MIT-LICENSE
 files:
-- validates_hostname.gemspec
-- MIT-LICENSE
 - CHANGELOG.rdoc
+- MIT-LICENSE
 - README.rdoc
 - Rakefile
-- lib/validates_hostname/version.rb
 - lib/validates_hostname.rb
+- lib/validates_hostname/version.rb
+- validates_hostname.gemspec
 homepage: https://github.com/KimNorgaard/validates_hostname
 licenses:
 - MIT
@@ -116,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Checks for valid hostnames