validator 0.1.0 → 0.1.1

data/.gitignore

@@ -2,4 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
-.idea
+.idea
+*.swp

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format doc

data/README.markdown

@@ -1,7 +1,7 @@
 Active Model Validator [![Travis](https://secure.travis-ci.org/nahaylo/validator.png)](http://travis-ci.org/nahaylo/validator)
 ============================
 
-This is a ActiveModel validators for domains, ip addresses and email addresses.
+This is a ActiveModel validators for domains (including TLDs), ip addresses and email addresses.
 
 Installation
 ------------
@@ -22,6 +22,7 @@ In your models, the gem provides new validators like :domain, :ip_address or :em
 Domain Validator
 ----------------
 
+    # validate domain name by full length, label length, TLD existing
     validates :domain_name, :domain => true
 
     validates :domain_name, :domain => { :message => 'custom message' }
@@ -29,6 +30,9 @@ Domain Validator
     # custom full domain and label length
     validates :domain_name, :domain => { :length => 200, :label_length => 60 }
 
+    # skip TLD validation
+    validates :domain_name, :domain => { :check_tld => false }
+
 
 Ip Address Validator
 --------------------

data/lib/active_model/validations/domain_validator.rb

@@ -2,7 +2,7 @@ module ActiveModel
   module Validations
     class DomainValidator < ActiveModel::EachValidator
       def initialize(options)
-        options[:length] ||= ::Validator::Domain::LENGTH
+        options[:length]       ||= ::Validator::Domain::LENGTH
         options[:label_length] ||= ::Validator::Domain::LABEL_LENGTH
 
         super(options)
@@ -29,6 +29,15 @@ module ActiveModel
 
         unless @validator.valid_by_regexp?
           record.errors.add(attr_name, :'domain.invalid', options)
+          return
+        end
+
+        # if check_tld = true - check if TLD exists
+        if options[:check_tld] != false
+          tld = value.split('.').last.upcase
+          unless ::Validator::Domain::Tld.exists?(tld)
+            record.errors.add(attr_name, :'domain.unknown_tld', options)
+          end
         end
       end
     end

data/lib/validator/domain.rb

@@ -1,5 +1,7 @@
 module Validator
   class Domain
+    autoload :Tld, 'validator/domain/tld'
+
     LENGTH = 255
     LABEL_LENGTH = 63
     

data/lib/validator/domain/tld.rb

@@ -0,0 +1,20 @@
+module Validator
+  class Domain
+    # The purpose of this class is to provide user with current list of 
+    # available top level domain names including new ICANN additions and ccTLDs
+    # Currently TLD definitions have been acquired from the following sources:
+    #
+    #   http://www.icann.org/tlds/
+    #   http://www.dnso.org/constituency/gtld/gtld.html
+    #   http://www.iana.org/cctld/cctld-whois.htm
+    #   http://data.iana.org/TLD/tlds-alpha-by-domain.txt
+    #
+    class Tld
+      TLD = %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 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 CW CX CY CZ DE DJ DK DM DO DZ EC EDU EE EG 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 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 SX SY SZ TC TD TEL TF TG TH TJ TK TL TM TN TO TP TR TRAVEL TT TV TW TZ UA UG UK US UY UZ VA VC VE VG VI VN VU WF WS XN--0ZWM56D XN--11B5BS3A9AJ6G XN--3E0B707E XN--45BRJ9C XN--80AKHBYKNJ4F XN--90A3AC XN--9T4B11YI5A XN--CLCHC0EA0B2G2A9GCD XN--DEBA0AD XN--FIQS8S XN--FIQZ9S XN--FPCRJ9C3D XN--FZC2C9E2C XN--G6W251D XN--GECRJ9C XN--H2BRJ9C XN--HGBK6AJ7F53BBA XN--HLCJ6AYA9ESC7A XN--J6W193G XN--JXALPDLP XN--KGBECHTV XN--KPRW13D XN--KPRY57D XN--LGBBAT1AD8J XN--MGBAAM7A8H XN--MGBAYH7GPA XN--MGBBH1A71E XN--MGBC0A9AZCG XN--MGBERP4A5D4AR XN--O3CW4H XN--OGBPF8FL XN--P1AI XN--PGBS0DH XN--S9BRJ9C XN--WGBH1C XN--WGBL6A XN--XKC2AL3HYE2A XN--XKC2DL3A5EE0H XN--YFRO4I67O XN--YGBI2AMMX XN--ZCKZAH XXX YE YT ZA ZM ZW)
+
+      def self.exists?(tld)
+        TLD.include?(tld)
+      end
+    end
+  end
+end

data/lib/validator/locale/en.yml

@@ -3,6 +3,7 @@ en:
     messages:
       domain:
         invalid: "invalid domain name"
+        unknown_tld: "consists of unknown TLD"
         length: "domain name length is limited to %{length} characters"
         label_length: "each label length is limited to %{label_length} characters"
       ip_address:

data/lib/validator/version.rb

@@ -1,3 +1,3 @@
 module Validator
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/domain_validator_spec.rb

@@ -7,6 +7,7 @@ module ActiveModel
       let(:domain) { TestDomain.new }
       let(:domain_with_message) { TestDomainWithMessage.new }
       let(:domain_with_length) { TestDomainWithLength.new }
+      let(:domain_without_tld) { TestDomainWithoutTld.new }
 
       describe "validations" do
         # for blank domain
@@ -47,7 +48,7 @@ module ActiveModel
           end
 
           it "should be valid if TLD length is between 2 and 6" do
-            %w(ab abcabc).each do |tld|
+            %w(ua museum).each do |tld|
               domain.domain_name = "domain.#{tld}"
               domain.should_not have_errors_on(:domain_name)
             end
@@ -58,6 +59,11 @@ module ActiveModel
             domain_with_length.should be_valid
           end
 
+          it "should be valid with unknown TLD" do
+            domain_without_tld.domain_name = "valid-domain.abcabc"
+            domain_without_tld.should be_valid      
+          end
+
         end
 
         describe 'invalid' do
@@ -92,8 +98,13 @@ module ActiveModel
           end
 
           it "should not be valid with TLD length more than 6" do
-            domain.domain_name = "domain.abcabcd"
-            domain.should have_errors_on(:domain_name)
+            domain_without_tld.domain_name = "domain.abcabcd"
+            domain_without_tld.should have_errors_on(:domain_name)
+          end
+
+          it "should not be valid with unknown TLD" do
+            domain.domain_name = "domain.abcabc"
+            domain.should have_errors_on(:domain_name).with_message(I18n.t(:'errors.messages.domain.unknown_tld'))
           end
 
           it "should not be valid if TLD consists of numbers or special symbols (&, _, {, ], *, etc)" do

data/spec/test_classes/domain.rb

@@ -15,3 +15,7 @@ end
 class TestDomainWithMessage < BaseTestDomain
   validates :domain_name, :domain => { :message => 'invalid' }
 end
+
+class TestDomainWithoutTld < BaseTestDomain
+  validates :domain_name, :domain => { :check_tld  => false }
+end

data/validator.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Vitaliy Nahaylo"]
   s.email       = ["nahaylo@gmail.com"]
   s.homepage    = "https://github.com/nahaylo/validator"
-  s.summary     = "ActiveModel validations for domains, ip addresses and email addresses with fully localization support."
-  s.description = "ActiveModel validations for domains, ip addresses and email addresses with fully localization support."
+  s.summary     = "ActiveModel validations for domains (including TLDs), ip addresses and email addresses with fully localization support."
+  s.description = "ActiveModel validations for domains (including TLDs), ip addresses and email addresses with fully localization support."
 
   s.rubyforge_project = "validator"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: validator
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Vitaliy Nahaylo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-20 00:00:00 +02:00
+date: 2012-02-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,7 +78,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
-description: ActiveModel validations for domains, ip addresses and email addresses with fully localization support.
+description: ActiveModel validations for domains (including TLDs), ip addresses and email addresses with fully localization support.
 email: 
 - nahaylo@gmail.com
 executables: []
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - LICENSE
@@ -99,6 +100,7 @@ files:
 - lib/active_model/validations/ip_address_validator.rb
 - lib/validator.rb
 - lib/validator/domain.rb
+- lib/validator/domain/tld.rb
 - lib/validator/email.rb
 - lib/validator/ip_address.rb
 - lib/validator/locale/en.yml
@@ -144,7 +146,7 @@ rubyforge_project: validator
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: ActiveModel validations for domains, ip addresses and email addresses with fully localization support.
+summary: ActiveModel validations for domains (including TLDs), ip addresses and email addresses with fully localization support.
 test_files: 
 - spec/domain_validator_spec.rb
 - spec/email_validator_spec.rb