validators 2.8.1 → 3.0.0

data/test/test_helper.rb

@@ -1,5 +1,20 @@
+# frozen_string_literal: true
+
 require "simplecov"
-SimpleCov.start
+require "simplecov-console"
+
+SimpleCov.minimum_coverage 100
+SimpleCov.minimum_coverage_by_file 100
+SimpleCov.refuse_coverage_drop
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
+  SimpleCov::Formatter::Console,
+  SimpleCov::Formatter::HTMLFormatter
+])
+
+SimpleCov.start do
+  add_filter "test/support"
+end
 
 require "bundler/setup"
 require "active_record"
@@ -10,16 +25,16 @@ require "minitest/utils"
 require "minitest/autorun"
 
 Time.zone = "America/Sao_Paulo"
-TLDs = Validators::TLD.all.sample(50)
-DISPOSABLE_EMAILS = Validators::DisposableHostnames.all.sample(50)
+TLDs = Validators::TLD.all.sample(10)
+DISPOSABLE_EMAILS = Validators::DisposableHostnames.all.sample(10)
 
-Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f }
+Dir[File.join(__dir__, "support/**/*.rb")].each {|f| require f }
 
 ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
 load "schema.rb"
 
 I18n.enforce_available_locales = false
-I18n.load_path << File.dirname(__FILE__) + "/support/translations.yml"
+I18n.load_path << File.join(__dir__, "support/translations.yml")
 
 module Minitest
   class Test
@@ -35,7 +50,7 @@ module Minitest
         Object.class_eval { remove_const model.name if const_defined?(model.name) }
       end
 
-      load File.dirname(__FILE__) + "/support/models.rb"
+      load File.join(__dir__, "support/models.rb")
     end
   end
 end

data/test/validators/disposable_email_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class DisposableEmailTest < Minitest::Test

data/test/validators/ip_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class IpTest < Minitest::Test

data/test/validators/validates_cnpj_format_of_test.rb

@@ -1,15 +1,30 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ValidatesCnpjFormatOfTest < Minitest::Test
-  let(:model) { Class.new {
-    def self.name
-      "User"
+  let(:model) do
+    Class.new do
+      def self.name
+        "User"
+      end
+
+      include ActiveModel::Model
+      validates_cnpj_format_of :document
+      attr_accessor :document
     end
+  end
+
+  test "fails when gem is not available" do
+    assert_raises do
+      Class.new do
+        expects(:require).with("cnpj").raises(LoadError)
 
-    include ActiveModel::Model
-    validates_cnpj_format_of :document
-    attr_accessor :document
-  } }
+        include ActiveModel::Model
+        validates_cnpj_format_of :document
+      end
+    end
+  end
 
   test "requires valid CNPJ" do
     record = model.new(document: "invalid")

data/test/validators/validates_cpf_format_of_test.rb

@@ -1,15 +1,30 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ValidatesCpfFormatOfTest < Minitest::Test
-  let(:model) { Class.new {
-    def self.name
-      "User"
+  let(:model) do
+    Class.new do
+      def self.name
+        "User"
+      end
+
+      include ActiveModel::Model
+      validates_cpf_format_of :document
+      attr_accessor :document
     end
+  end
+
+  test "fails when gem is not available" do
+    assert_raises do
+      Class.new do
+        expects(:require).with("cpf").raises(LoadError)
 
-    include ActiveModel::Model
-    validates_cpf_format_of :document
-    attr_accessor :document
-  } }
+        include ActiveModel::Model
+        validates_cpf_format_of :document
+      end
+    end
+  end
 
   test "requires valid CPF" do
     record = model.new(document: "invalid")

data/test/validators/validates_datetime/after_option_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ValidatesDatetimeAfterOptionTest < Minitest::Test
@@ -63,9 +65,33 @@ class ValidatesDatetimeAfterOptionTest < Minitest::Test
 
     user.starts_at = Time.parse("Apr 26 2010")
     user.ends_at = Time.parse("Apr 25 2010")
+    formatted_date = I18n.l(Time.parse("Apr 26 2010"))
+
+    refute user.valid?
+    assert_includes user.errors[:ends_at], "needs to be after #{formatted_date}"
+
+    user.starts_at = Time.now
+    user.ends_at = 1.hour.from_now
+
+    assert user.valid?
+  end
+
+  test "validates using proc as date" do
+    User.validates_datetime :starts_at
+    User.validates_datetime :ends_at, after: ->(record) { record.starts_at }, if: :starts_at?
+
+    user.starts_at = nil
+    user.ends_at = Time.now
+
+    refute user.valid?
+    assert user.errors[:ends_at].empty?
+
+    user.starts_at = Time.parse("Apr 26 2010")
+    user.ends_at = Time.parse("Apr 25 2010")
+    formatted_date = I18n.l(Time.parse("Apr 26 2010"))
 
     refute user.valid?
-    assert_includes user.errors[:ends_at], "needs to be after #{I18n.l(Time.parse("Apr 26 2010"))}"
+    assert_includes user.errors[:ends_at], "needs to be after #{formatted_date}"
 
     user.starts_at = Time.now
     user.ends_at = 1.hour.from_now

data/test/validators/validates_datetime/before_option_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ValidatesDatetimeBeforeOptionTest < Minitest::Test

data/test/validators/validates_datetime/defaults_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ValidatesDatetimeDefaultsTest < Minitest::Test

data/test/validators/validates_email_format_of_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ValidatesEmailFormatOfTest < Minitest::Test

data/test/validators/validates_hostname_format_of/with_tld_validation_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class WithTldValidationTest < Minitest::Test

data/test/validators/validates_hostname_format_of/without_tld_validation_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class WithoutTldValidationTest < Minitest::Test
@@ -24,4 +26,9 @@ class WithoutTldValidationTest < Minitest::Test
     server = ServerWithoutTLD.new("")
     refute server.valid?
   end
+
+  test "rejects invalid uris" do
+    server = ServerWithoutTLD.new("\\DERP!")
+    refute server.valid?
+  end
 end

data/test/validators/validates_ip_address/ipv4_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class Ipv4Test < Minitest::Test
@@ -17,4 +19,10 @@ class Ipv4Test < Minitest::Test
     refute user.valid?
     assert_includes user.errors[:url], "is not a valid IPv4 address"
   end
+
+  test "rejects invalid types" do
+    assert_raises ArgumentError, ":only accepts a symbol that can be either :v6 or :v4" do
+      User.validates_ip_address :url, only: :invalid
+    end
+  end
 end

data/test/validators/validates_ip_address/ipv6_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class Ipv6Test < Minitest::Test

data/test/validators/validates_ip_address_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ValidatesIpAddressTest < Minitest::Test

data/test/validators/validates_ownership_of_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ValidatesOwnershipOfTest < Minitest::Test

data/test/validators/validates_ssh_private_key/bits_test.rb

@@ -1,15 +1,19 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class BitsTest < Minitest::Test
-  let(:model) { Class.new {
-    def self.name
-      "User"
+  let(:model) do
+    Class.new do
+      def self.name
+        "User"
+      end
+
+      include ActiveModel::Model
+      validates_ssh_private_key :key, bits: 2048
+      attr_accessor :key
     end
-
-    include ActiveModel::Model
-    validates_ssh_private_key :key, bits: 2048
-    attr_accessor :key
-  } }
+  end
 
   test "accepts bits equals to required" do
     record = model.new(key: SSHKey.generate(bits: 2048).private_key)

data/test/validators/validates_ssh_private_key/common_test.rb

@@ -1,15 +1,30 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ValidatesSshPrivateKeyCommonTest < Minitest::Test
-  let(:model) { Class.new {
-    def self.name
-      "User"
+  let(:model) do
+    Class.new do
+      def self.name
+        "User"
+      end
+
+      include ActiveModel::Model
+      validates_ssh_private_key :key
+      attr_accessor :key
     end
+  end
+
+  test "fails when gem is not available" do
+    assert_raises do
+      Class.new do
+        expects(:require).with("sshkey").raises(LoadError)
 
-    include ActiveModel::Model
-    validates_ssh_private_key :key
-    attr_accessor :key
-  } }
+        include ActiveModel::Model
+        validates_ssh_private_key :key
+      end
+    end
+  end
 
   test "requires valid key" do
     record = model.new(key: "invalid")

data/test/validators/validates_ssh_private_key/dsa_test.rb

@@ -1,15 +1,19 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class DsaTest < Minitest::Test
-  let(:model) { Class.new {
-    def self.name
-      "User"
+  let(:model) do
+    Class.new do
+      def self.name
+        "User"
+      end
+
+      include ActiveModel::Model
+      validates_ssh_private_key :key, type: "dsa"
+      attr_accessor :key
     end
-
-    include ActiveModel::Model
-    validates_ssh_private_key :key, type: "dsa"
-    attr_accessor :key
-  } }
+  end
 
   test "accepts dsa key" do
     record = model.new(key: SSHKey.generate(type: "dsa").private_key)

data/test/validators/validates_ssh_private_key/rsa_test.rb

@@ -1,15 +1,19 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class RsaTest < Minitest::Test
-  let(:model) { Class.new {
-    def self.name
-      "User"
+  let(:model) do
+    Class.new do
+      def self.name
+        "User"
+      end
+
+      include ActiveModel::Model
+      validates_ssh_private_key :key, type: "rsa"
+      attr_accessor :key
     end
-
-    include ActiveModel::Model
-    validates_ssh_private_key :key, type: "rsa"
-    attr_accessor :key
-  } }
+  end
 
   test "accepts rsa key" do
     record = model.new(key: SSHKey.generate(type: "rsa").private_key)

data/test/validators/validates_ssh_public_key_test.rb

@@ -1,15 +1,30 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ValidatesSsshPublicKeyCommonTest < Minitest::Test
-  let(:model) { Class.new {
-    def self.name
-      "User"
+  let(:model) do
+    Class.new do
+      def self.name
+        "User"
+      end
+
+      include ActiveModel::Model
+      validates_ssh_public_key :key
+      attr_accessor :key
     end
+  end
+
+  test "fails when gem is not available" do
+    assert_raises do
+      Class.new do
+        expects(:require).with("sshkey").raises(LoadError)
 
-    include ActiveModel::Model
-    validates_ssh_public_key :key
-    attr_accessor :key
-  } }
+        include ActiveModel::Model
+        validates_ssh_public_key :key
+      end
+    end
+  end
 
   test "requires valid key" do
     record = model.new(key: nil)

data/test/validators/validates_url_format_of/with_tld_validation_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ValidatesurlFormatUrlWithTldValidationTest < Minitest::Test

data/test/validators/validates_url_format_of/without_tld_validation_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ValidatesurlFormatUrlWithoutTldValidationTest < Minitest::Test

data/validators.gemspec

@@ -1,7 +1,9 @@
-require "./lib/validators/version"
+# frozen_string_literal: true
+
+require_relative "lib/validators/version"
 
 Gem::Specification.new do |s|
-  s.required_ruby_version = ">= 2.0"
+  s.required_ruby_version = ">= 2.4"
   s.name        = "validators"
   s.version     = Validators::Version::STRING
   s.platform    = Gem::Platform::RUBY
@@ -14,15 +16,18 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map {|f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_development_dependency "activerecord"
+  s.add_development_dependency "cpf_cnpj"
   s.add_development_dependency "minitest-utils"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "rake"
+  s.add_development_dependency "mocha"
   s.add_development_dependency "pry-meta"
-  s.add_development_dependency "cpf_cnpj"
-  s.add_development_dependency "sshkey"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rubocop"
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "simplecov-console"
+  s.add_development_dependency "sqlite3", "~> 1.3.6"
+  s.add_development_dependency "sshkey"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validators
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2019-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-utils
+  name: cpf_cnpj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: minitest-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cpf_cnpj
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sshkey
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,6 +122,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+- !ruby/object:Gem::Dependency
+  name: sshkey
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Add some nice ActiveModel/ActiveRecord validators.
 email:
 - fnando.vieira@gmail.com
@@ -132,6 +174,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -200,15 +243,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Add some nice ActiveModel/ActiveRecord validators.