activevalidators 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bd023a35373d383c1b1fb97e202e8d1d21a23b1a
-  data.tar.gz: 98da67873560c378d040d18025524eb8182b4c4b
+SHA256:
+  metadata.gz: d79bea4382e56e4bf80508436b9f06c66a005a2b4a6ab609ac002ecdfc9a5dc6
+  data.tar.gz: 830a533ecac989ea80ad219372c02b5566b0b590d74fae108e8b30a873bc1e7f
 SHA512:
-  metadata.gz: c398449cecb367ce3af5bb06169d3fc3bb4c9a994ea9cf6bffaf2245f6ec3ac6b79c3e380e96f07fd31b3a11918b7b40be6e8aa0dec866bd165bdcadda96baa3
-  data.tar.gz: 7fabb25274d29f5e0dace47ce2a1cb45b5fc227085e46d7494985dfe1182617dfb4d9a5ad376757ee69f92eca12957fd8a172f8d4de0804faa7211be5f712486
+  metadata.gz: 981eeeb402816fb4f723f21e2e96376b1f36978567fabb625c1ec4c3ecc33e3fdcb655b69657600a96ca669dcf26057ca7a2f488cbeec3a35fe33c38435e0660
+  data.tar.gz: 25c1cc1548e7a7a114f2871248602dcb7e75671abe49cdd264ce47632fa06b05a8eda289dfa2e14f26e4ebca5b8e19e95f90e14aadb4aed7f9e9fed6b6b25ae7

data/.travis.yml

@@ -1,8 +1,13 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
   - ruby-head
   - jruby-head
-  - rbx-3.20
+  - rubinius-3.86
+matrix:
+  allow_failures:
+    - rvm: rubinius-3.86
 before_install:
   - gem install bundler

data/ChangeLog.md

@@ -8,6 +8,14 @@
 
 ## CHANGES
 
+
+# 4.0.3
+
+## CHANGES
+
+  * UrlValidator: add feature to support TLD validation
+
+
 # 4.0.2
 
 ## CHANGES

data/Rakefile

@@ -12,10 +12,6 @@ Rake::TestTask.new do |t|
   t.warning = true
 end
 
-# -*- encoding: utf-8 -*-
-$:.unshift File.expand_path("../lib", __FILE__)
-require 'activevalidators'
-
 def gemspec
   @gemspec ||= begin
                  file = File.expand_path('../activevalidators.gemspec', __FILE__)

data/activevalidators.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'activevalidators'
-  s.version     = '4.0.2'
+  s.version     = '4.0.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Franck Verrot', 'Paco Guzmán', 'Oriol Gual', 'Garrett Bjerkhoel', 'Renato Riccieri Santos Zannon', 'Brian Moseley', 'Serj L aka Loremaster']
   s.email       = ['franck@verrot.fr']

data/certs/franckverrot.pem

@@ -1,21 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ8wDQYDVQQDDAZmcmFu
-Y2sxFjAUBgoJkiaJk/IsZAEZFgZ2ZXJyb3QxEjAQBgoJkiaJk/IsZAEZFgJmcjAe
-Fw0xNjA1MTMxOTQ3NTlaFw0xNzA1MTMxOTQ3NTlaMD0xDzANBgNVBAMMBmZyYW5j
-azEWMBQGCgmSJomT8ixkARkWBnZlcnJvdDESMBAGCgmSJomT8ixkARkWAmZyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA12mvBkBdLx5lIPvd0hJ6Ccer
-t5fnF94UNRqE0zTxow9aAAtBb/G4fE/OkOBe69gq/5SSZRgF5m/qQ+//rZHSOUfR
-f+a1Qqbho0CfFpAurAtDZQS45L5txhz1pRUnz/8bF6nkeKUF0pdLbNNVS9axE3uc
-qBrfjUAP3yYe3K0TANgZym0TYJ3OhSeUV5Y8tuncuILHZI1hShYekjbPk3KLBJG5
-16x3sHS209Y5LbRbzs85+HNBcNaN/Yi42IFl+mgdfyQLmbgSTpMtASPCXfsnAxsl
-6QIiN9pQq9GSvCXA5wH+ZqYtFd6fJqDHVCDAlQ6lYBiCCpC/JV+lZj16c4yDnwID
-AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU7Ygnr1Sx
-42iryVPwtuJC/acw2TAwGwYDVR0RBBQwEoEQZnJhbmNrQHZlcnJvdC5mcjAbBgNV
-HRIEFDASgRBmcmFuY2tAdmVycm90LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBdZVhZ
-dhXujOsiysxAqtixFFXH9wSQNIltYQ8zuRLA/FgwqrNUQq+Qdiib5Kqj5hUK4okl
-rTx4uCkHJszIocIZiKE/Ntk6xooQVTC/L95K/yycDCyss2c8JF2wdg/+q38u7rOS
-fAbV2IGNLTPYWX+M2B08a6lVVRMD386TGrk0/ROjgZIhuHah4dY+ObAUyUv1oiyb
-PEaDVSbqqbtwQAsY87Vam7GUcH/IJnhdLadvNOJlLr8jxW+gm1ZFE9MOlsSmHeGe
-Z7BoH/Mfxw3P4yyir173p9JWvVqLiQE13XBeD13NPA8neoWpLJxm6k03PcTElT/E
-QrOSgKrHAb/fFJma
+MIIEMDCCApigAwIBAgIBATANBgkqhkiG9w0BAQsFADAhMR8wHQYDVQQDDBZmcmFu
+Y2svREM9dmVycm90L0RDPWZyMB4XDTE3MTExOTIxMTgyNVoXDTE4MTExOTIxMTgy
+NVowITEfMB0GA1UEAwwWZnJhbmNrL0RDPXZlcnJvdC9EQz1mcjCCAaIwDQYJKoZI
+hvcNAQEBBQADggGPADCCAYoCggGBANjZ/7L2ECEQAVOYvMl0JOwyVXKRCsLnVrmP
+mcwpCMFL0ennkpLJcqiDNsm0b/RkJHSLu3FMoYrIU5KoaP7iMIsLGv846aw2wSNI
+G5XWGnRY9dWVu7Gz2OZbsDi18WT94Y/s2yf+orPLAiaJb451decYEpHqLTiaJhhJ
+xHckJixfDVwZGJpow7rrJAJMbU9ZCJFUFAfNpgkOqhbBU4Ehi1umbC/ZBsVDiRVa
+ZjfNhe7kgx6jo3EfPY4izPW2IKkpk7nJKNfZnM2r0cnpPJbhyH1m5fsikBD5tRNe
+YxJpxDPf8UBTTXqoeSSQygiHWWZVbH3zj2jWzi5T0do5PbZcCeoIKR4TyOgbOgBW
+Ra7bm9uVXo6MQWpp0aeC/X+F2Y/dFjXAP/TPL89ownd3XZUaNDdZfS6aKBMG3a5C
+gcRLMt1hOJchslGNtvkq5W4Wq8hw+zNHzTMpRkIsYTbvlJCDxXRKR3jwPDTRvNAl
+aemBW1g3yerHeDQr6GtxKEvhmHdw/wIDAQABo3MwcTAJBgNVHRMEAjAAMAsGA1Ud
+DwQEAwIEsDAdBgNVHQ4EFgQUgG77cLAMzowManymHX63DbvfR5IwGwYDVR0RBBQw
+EoEQZnJhbmNrQHZlcnJvdC5mcjAbBgNVHRIEFDASgRBmcmFuY2tAdmVycm90LmZy
+MA0GCSqGSIb3DQEBCwUAA4IBgQB86Y8WM2ipynprTUdKBmO/i5kPev+pQjLQqPXI
+zzfv57KP8gg2sODWEdmNkSkeIvdx60pTENVsumaTPf6H4GKm0UXoUWkiXxyn1Pw+
+u+LjMqNhsZC/GniX76EwqyfXWr67ycxvNZjx76Kd9NvaHmVpoZMx94I4AkMQ/DLs
+xVOAKKocMUfYSOS9XBRSaBID35ct8IpOS8+AFTf/d1j9ZVRz+8FAwhUOqIJeV2Ze
+CxU5fLhrkxlQYRbXlmJpmR/4ri3vGvBpfx6GbS/vfjIX+FGaPXVdANtQmoChT3y+
+ZDTx0AmIrPp/g89SEoyrrRxy6BbhV7Jl68mwlS7v9EAaHVlQy2rhfB8RAO/ViuAl
+GVIuVSzE95Lb2Q+vxbLgk/fHcdoGDIB7SglNmP9b1d55AgQGnajipEukmy+smZko
+ZRwmWlrt39rxEcCGo4aKqwxpPeewNg7hjiCFkf2fO0XHvk+kyMr0JmF8GbS6oyj5
+cWLdZ4BYV1Mwu0NmUxVnvmrCRV8=
 -----END CERTIFICATE-----

data/lib/active_validators/active_model/validations/email_validator.rb

@@ -1,4 +1,9 @@
 require 'mail'
+
+old_w, $-w = $-w, false
+require 'mail/elements/address'
+$-w = old_w
+
 module ActiveModel
   module Validations
     class EmailValidator < EachValidator

data/lib/active_validators/active_model/validations/url_validator.rb

@@ -40,6 +40,16 @@ module ActiveModel
         super
       end
 
+      # Public: Validate URL, if it fails adds an error.
+      #
+      # Returns nothing.
+      def validate_each(record, attribute, value)
+        uri = as_uri(value)
+        tld_requirement_fullfilled = check_tld_requirement(value)
+        record.errors.add(attribute) unless uri && value.to_s =~ uri_regexp && tld_requirement_fullfilled
+      end
+
+      private
       # Internal: Ensures that at least one protocol is defined. If the protocols
       # are empty it throws an ArgumentError.
       #
@@ -66,6 +76,17 @@ module ActiveModel
         @uri_regexp ||= /\A#{URI::Parser.new.make_regexp(protocols)}\z/
       end
 
+      # Internal: Checks if the tld requirements are fullfilled
+      #
+      # When :require_tld option is set to true, the url will be searched for
+      # a dot anywhere inside the host except the first or last position
+      #
+      # Returns a boolean value.
+      def check_tld_requirement(value)
+        host = URI.parse(value.to_s).host rescue value
+        options[:require_tld] === true ? host =~ /.(\.)\w+/ : true
+      end
+
       # Internal: Tries to convert supplied string into URI,
       # if not possible returns nil => invalid URI.
       #
@@ -73,14 +94,6 @@ module ActiveModel
       def as_uri(value)
         URI.parse(value.to_s) rescue nil if value.present?
       end
-
-      # Public: Validate URL, if it fails adds an error.
-      #
-      # Returns nothing.
-      def validate_each(record, attribute, value)
-        uri = as_uri(value)
-        record.errors.add(attribute) unless uri && value.to_s =~ uri_regexp
-      end
     end
   end
 end

data/test/test_helper.rb

@@ -1,15 +1,10 @@
 gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/mock'
-require 'active_support/test_case'
-
-# silence warnings
 old_w, $-w = $-w, false
-
-require 'activevalidators'
-
-# unsilence warnings
+require 'active_support/test_case'
 $-w = old_w
+require 'activevalidators'
 
 class TestRecord
   include ActiveModel::Validations

data/test/validations/url_test.rb

@@ -8,6 +8,12 @@ describe "Url Validation" do
     TestRecord.new
   end
 
+  def build_url_record_require_tld
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :url, :url => { :require_tld => true }
+    TestRecord.new
+  end
+
   def build_ftp_record
     TestRecord.reset_callbacks(:validate)
     TestRecord.validates :url, :url => 'ftp'
@@ -49,6 +55,13 @@ describe "Url Validation" do
       subject.valid?.must_equal true
       subject.errors.size.must_equal 0
     end
+
+    it "accepts urls with tld when tld validation is required" do
+      subject = build_url_record_require_tld
+      subject.url = 'http://verrot.fr'
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
   end
 
   describe "for invalid urls" do
@@ -93,5 +106,26 @@ describe "Url Validation" do
       subject.valid?.must_equal false
       subject.errors.size.must_equal 1
     end
+
+    it "rejects urls that have no tld but required tld validation" do
+      subject = build_url_record_require_tld
+      subject.url = 'http://verrot'
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
+    end
+
+    it "will not accept domains that end with a dot as a tld" do
+      subject = build_url_record_require_tld
+      subject.url = 'http://verrot.'
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
+    end
+
+    it "will not accept domains that start with a dot as a tld" do
+      subject = build_url_record_require_tld
+      subject.url = 'http://.verrot'
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activevalidators
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Franck Verrot
@@ -16,27 +16,31 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ8wDQYDVQQDDAZmcmFu
-  Y2sxFjAUBgoJkiaJk/IsZAEZFgZ2ZXJyb3QxEjAQBgoJkiaJk/IsZAEZFgJmcjAe
-  Fw0xNjA1MTMxOTQ3NTlaFw0xNzA1MTMxOTQ3NTlaMD0xDzANBgNVBAMMBmZyYW5j
-  azEWMBQGCgmSJomT8ixkARkWBnZlcnJvdDESMBAGCgmSJomT8ixkARkWAmZyMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA12mvBkBdLx5lIPvd0hJ6Ccer
-  t5fnF94UNRqE0zTxow9aAAtBb/G4fE/OkOBe69gq/5SSZRgF5m/qQ+//rZHSOUfR
-  f+a1Qqbho0CfFpAurAtDZQS45L5txhz1pRUnz/8bF6nkeKUF0pdLbNNVS9axE3uc
-  qBrfjUAP3yYe3K0TANgZym0TYJ3OhSeUV5Y8tuncuILHZI1hShYekjbPk3KLBJG5
-  16x3sHS209Y5LbRbzs85+HNBcNaN/Yi42IFl+mgdfyQLmbgSTpMtASPCXfsnAxsl
-  6QIiN9pQq9GSvCXA5wH+ZqYtFd6fJqDHVCDAlQ6lYBiCCpC/JV+lZj16c4yDnwID
-  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU7Ygnr1Sx
-  42iryVPwtuJC/acw2TAwGwYDVR0RBBQwEoEQZnJhbmNrQHZlcnJvdC5mcjAbBgNV
-  HRIEFDASgRBmcmFuY2tAdmVycm90LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBdZVhZ
-  dhXujOsiysxAqtixFFXH9wSQNIltYQ8zuRLA/FgwqrNUQq+Qdiib5Kqj5hUK4okl
-  rTx4uCkHJszIocIZiKE/Ntk6xooQVTC/L95K/yycDCyss2c8JF2wdg/+q38u7rOS
-  fAbV2IGNLTPYWX+M2B08a6lVVRMD386TGrk0/ROjgZIhuHah4dY+ObAUyUv1oiyb
-  PEaDVSbqqbtwQAsY87Vam7GUcH/IJnhdLadvNOJlLr8jxW+gm1ZFE9MOlsSmHeGe
-  Z7BoH/Mfxw3P4yyir173p9JWvVqLiQE13XBeD13NPA8neoWpLJxm6k03PcTElT/E
-  QrOSgKrHAb/fFJma
+  MIIEMDCCApigAwIBAgIBATANBgkqhkiG9w0BAQsFADAhMR8wHQYDVQQDDBZmcmFu
+  Y2svREM9dmVycm90L0RDPWZyMB4XDTE3MTExOTIxMTgyNVoXDTE4MTExOTIxMTgy
+  NVowITEfMB0GA1UEAwwWZnJhbmNrL0RDPXZlcnJvdC9EQz1mcjCCAaIwDQYJKoZI
+  hvcNAQEBBQADggGPADCCAYoCggGBANjZ/7L2ECEQAVOYvMl0JOwyVXKRCsLnVrmP
+  mcwpCMFL0ennkpLJcqiDNsm0b/RkJHSLu3FMoYrIU5KoaP7iMIsLGv846aw2wSNI
+  G5XWGnRY9dWVu7Gz2OZbsDi18WT94Y/s2yf+orPLAiaJb451decYEpHqLTiaJhhJ
+  xHckJixfDVwZGJpow7rrJAJMbU9ZCJFUFAfNpgkOqhbBU4Ehi1umbC/ZBsVDiRVa
+  ZjfNhe7kgx6jo3EfPY4izPW2IKkpk7nJKNfZnM2r0cnpPJbhyH1m5fsikBD5tRNe
+  YxJpxDPf8UBTTXqoeSSQygiHWWZVbH3zj2jWzi5T0do5PbZcCeoIKR4TyOgbOgBW
+  Ra7bm9uVXo6MQWpp0aeC/X+F2Y/dFjXAP/TPL89ownd3XZUaNDdZfS6aKBMG3a5C
+  gcRLMt1hOJchslGNtvkq5W4Wq8hw+zNHzTMpRkIsYTbvlJCDxXRKR3jwPDTRvNAl
+  aemBW1g3yerHeDQr6GtxKEvhmHdw/wIDAQABo3MwcTAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUgG77cLAMzowManymHX63DbvfR5IwGwYDVR0RBBQw
+  EoEQZnJhbmNrQHZlcnJvdC5mcjAbBgNVHRIEFDASgRBmcmFuY2tAdmVycm90LmZy
+  MA0GCSqGSIb3DQEBCwUAA4IBgQB86Y8WM2ipynprTUdKBmO/i5kPev+pQjLQqPXI
+  zzfv57KP8gg2sODWEdmNkSkeIvdx60pTENVsumaTPf6H4GKm0UXoUWkiXxyn1Pw+
+  u+LjMqNhsZC/GniX76EwqyfXWr67ycxvNZjx76Kd9NvaHmVpoZMx94I4AkMQ/DLs
+  xVOAKKocMUfYSOS9XBRSaBID35ct8IpOS8+AFTf/d1j9ZVRz+8FAwhUOqIJeV2Ze
+  CxU5fLhrkxlQYRbXlmJpmR/4ri3vGvBpfx6GbS/vfjIX+FGaPXVdANtQmoChT3y+
+  ZDTx0AmIrPp/g89SEoyrrRxy6BbhV7Jl68mwlS7v9EAaHVlQy2rhfB8RAO/ViuAl
+  GVIuVSzE95Lb2Q+vxbLgk/fHcdoGDIB7SglNmP9b1d55AgQGnajipEukmy+smZko
+  ZRwmWlrt39rxEcCGo4aKqwxpPeewNg7hjiCFkf2fO0XHvk+kyMr0JmF8GbS6oyj5
+  cWLdZ4BYV1Mwu0NmUxVnvmrCRV8=
   -----END CERTIFICATE-----
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -246,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Collection of ActiveModel/ActiveRecord validations