validators 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a52bd8c6c0154e31767455e8a2e1037c6e6a8c2e
-  data.tar.gz: 22b34fe94029f994f37a2d8165ec377567d16c3b
+  metadata.gz: c8b6da51895c47e9292d6a9f3e69e1344f048b9e
+  data.tar.gz: 00ce9db1e34727a6e1dd45d0c1664555a75de332
 SHA512:
-  metadata.gz: 2468097e60de4e9296bbe3271ce78390f303b73252a5982e32e2af084fe34b9d49b63f2b0dacc19e6a5edd33870456efeb8730a1e3bed48ef30bdaa86646f7b1
-  data.tar.gz: 1213ca2a3b9472dbf599d005de080dc62b158ec416e09a18bd46855063120541116d24ffa3d9abacf22f07715821527e8e2683c358f149a832808ced8d2c1a1f
+  metadata.gz: a95bfe1cd0d18157e457c349e47712b486980c75dfb31caf92e7a7ec7ee45bfe824807a35b0acdcc682c6bf3ad821153d4789cda1fe59224df9deba13528f3c2
+  data.tar.gz: d0d92d572381475e0c252bdafe45f3fc2f71c9cf98d5d553081ef9be9027ba8a251a14ca2298655d6584bca98afec13320ae574fc1ffee902fbceb424726c4c2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    validators (2.4.1)
+    validators (2.4.2)
 
 GEM
   remote: http://rubygems.org/

data/lib/validators.rb

@@ -1,6 +1,7 @@
 module Validators
   require "validators/constants"
   require "validators/ip"
+  require "validators/tld"
   require "validators/validates_datetime"
   require "validators/validates_ip_address"
   require "validators/validates_email_format_of"

data/lib/validators/tld.rb

@@ -0,0 +1,18 @@
+module Validators
+  class TLD
+    TLD_FILE_PATH = File.expand_path('../../../data/tld.txt', __FILE__)
+
+    def self.all
+      @tld ||= File.read(TLD_FILE_PATH).lines.map(&:chomp)
+    end
+
+    def self.host_with_valid_tld?(host)
+      return false if host.split('.').size == 1
+      valid? host[/\.([^.]+)$/, 1].to_s.downcase
+    end
+
+    def self.valid?(tld)
+      all.include?(tld)
+    end
+  end
+end

data/lib/validators/validates_hostname_format_of.rb

@@ -38,10 +38,7 @@ module ActiveModel
 
       def valid_tld?(host)
         return true unless options[:tld]
-        return false if host.split('.').size == 1
-
-        tld = host[/\.(.*?)$/, 1].to_s.downcase
-        UrlValidator.tlds.include?(tld)
+        Validators::TLD.host_with_valid_tld?(host)
       end
     end
 

data/lib/validators/validates_url_format_of.rb

@@ -1,12 +1,6 @@
 module ActiveModel
   module Validations
     class UrlValidator < EachValidator
-      TLD_FILE_PATH = File.expand_path('../../../data/tld.txt', __FILE__)
-
-      def self.tlds
-        @tld ||= File.read(TLD_FILE_PATH).lines.map(&:chomp)
-      end
-
       def validate_each(record, attribute, value)
         return if value.blank? && options[:allow_blank]
         return if value.nil? && options[:allow_nil]
@@ -32,9 +26,7 @@ module ActiveModel
 
       def valid_tld?(host)
         return true unless options[:tld]
-        tld = host[/\.(.*?)$/, 1].to_s.downcase
-
-        self.class.tlds.include?(tld)
+        Validators::TLD.host_with_valid_tld?(host)
       end
     end
 

data/lib/validators/version.rb

@@ -2,7 +2,7 @@ module Validators
   module Version
     MAJOR = 2
     MINOR = 4
-    PATCH = 1
+    PATCH = 2
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ require "validators"
 require "active_support/all"
 
 Time.zone = "America/Sao_Paulo"
-TLDs = ActiveModel::Validations::UrlValidator.tlds.sample(100)
+TLDs = Validators::TLD.all.sample(100)
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 

data/spec/validators/validates_hostname_format_of_spec.rb

@@ -18,6 +18,11 @@ describe ".validates_hostname_format_of" do
         expect(server).to be_valid
       end
     end
+
+    it "accepts example.com.br" do
+      server = ServerWithTLD.new("example.com.br")
+      expect(server).to be_valid
+    end
   end
 
   context "without TLD validation" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validators
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Nando Vieira
@@ -140,6 +140,7 @@ files:
 - lib/validators.rb
 - lib/validators/constants.rb
 - lib/validators/ip.rb
+- lib/validators/tld.rb
 - lib/validators/validates_cnpj_format_of.rb
 - lib/validators/validates_cpf_format_of.rb
 - lib/validators/validates_datetime.rb