validators 2.5.3 → 2.5.4

data/test/validators/validates_ssh_private_key/common_test.rb

@@ -0,0 +1,37 @@
+require "test_helper"
+
+class ValidatesSshPrivateKeyCommonTest < Minitest::Test
+  let(:model) { Class.new {
+    def self.name
+      "User"
+    end
+
+    include ActiveModel::Model
+    validates_ssh_private_key :key
+    attr_accessor :key
+  } }
+
+  test "requires valid key" do
+    record = model.new(key: "invalid")
+    record.valid?
+
+    refute record.errors[:key].empty?
+  end
+
+  test "accepts valid key" do
+    record = model.new(key: SSHKey.generate.private_key)
+    record.valid?
+
+    assert record.errors[:key].empty?
+  end
+
+  test "sets translated error message" do
+    I18n.locale = "pt-BR"
+    message = "não é uma chave privada de SSH válida"
+
+    record = model.new(key: "invalid")
+    record.valid?
+
+    assert_includes record.errors[:key], message
+  end
+end

data/test/validators/validates_ssh_private_key/dsa_test.rb

@@ -0,0 +1,36 @@
+require "test_helper"
+
+class DsaTest < Minitest::Test
+  let(:model) { Class.new {
+    def self.name
+      "User"
+    end
+
+    include ActiveModel::Model
+    validates_ssh_private_key :key, type: "dsa"
+    attr_accessor :key
+  } }
+
+  test "accepts dsa key" do
+    record = model.new(key: SSHKey.generate(type: "dsa").private_key)
+    record.valid?
+
+    assert record.errors[:key].empty?
+  end
+
+  test "rejects rsa key" do
+    record = model.new(key: SSHKey.generate(type: 'rsa').private_key)
+    record.valid?
+
+    refute record.errors[:key].empty?
+  end
+
+  test "sets translated error message" do
+    I18n.locale = "pt-BR"
+
+    record = model.new(key: SSHKey.generate(type: 'rsa').private_key)
+    record.valid?
+
+    assert_includes record.errors[:key], "precisa ser uma chave DSA"
+  end
+end

data/test/validators/validates_ssh_private_key/rsa_test.rb

@@ -0,0 +1,36 @@
+require "test_helper"
+
+class RsaTest < Minitest::Test
+  let(:model) { Class.new {
+    def self.name
+      "User"
+    end
+
+    include ActiveModel::Model
+    validates_ssh_private_key :key, type: 'rsa'
+    attr_accessor :key
+  } }
+
+  test "accepts rsa key" do
+    record = model.new(key: SSHKey.generate(type: "rsa").private_key)
+    record.valid?
+
+    assert record.errors[:key].empty?
+  end
+
+  test "rejects dsa key" do
+    record = model.new(key: SSHKey.generate(type: "dsa").private_key)
+    record.valid?
+
+    refute record.errors[:key].empty?
+  end
+
+  test "sets translated error message" do
+    I18n.locale = "pt-BR"
+
+    record = model.new(key: SSHKey.generate(type: "dsa").private_key)
+    record.valid?
+
+    assert_includes record.errors[:key], "precisa ser uma chave RSA"
+  end
+end

data/test/validators/validates_ssh_public_key_test.rb

@@ -0,0 +1,37 @@
+require "test_helper"
+
+class ValidatesSsshPublicKeyCommonTest < Minitest::Test
+  let(:model) { Class.new {
+    def self.name
+      "User"
+    end
+
+    include ActiveModel::Model
+    validates_ssh_public_key :key
+    attr_accessor :key
+  } }
+
+  test "requires valid key" do
+    record = model.new(key: nil)
+    record.valid?
+
+    refute record.errors[:key].empty?
+  end
+
+  test "accepts valid key" do
+    record = model.new(key: SSHKey.generate.ssh_public_key)
+    record.valid?
+
+    assert record.errors[:key].empty?
+  end
+
+  test "sets translated error message" do
+    I18n.locale = "pt-BR"
+    message = "não é uma chave pública de SSH válida"
+
+    record = model.new(key: "invalid")
+    record.valid?
+
+    assert_includes record.errors[:key], message
+  end
+end

data/test/validators/validates_url_format_of/with_tld_validation_test.rb

@@ -0,0 +1,15 @@
+require "test_helper"
+
+class ValidatesurlFormatUrlWithTldValidationTest < Minitest::Test
+  test "rejects invalid TLD" do
+    user = UserWithTLD.new('http://example.xy')
+    refute user.valid?
+  end
+
+  TLDs.each do |tld|
+    test "accepts #{tld} as TLD" do
+      user = UserWithTLD.new("http://example.#{tld}")
+      assert user.valid?
+    end
+  end
+end

data/test/validators/validates_url_format_of/without_tld_validation_test.rb

@@ -0,0 +1,48 @@
+require "test_helper"
+
+class ValidatesurlFormatUrlWithoutTldValidationTest < Minitest::Test
+  setup do
+    User.validates_url_format_of :url, :allow_blank => false
+  end
+
+  VALID_URLS.each do |url|
+    test "accepts #{url.inspect} as a valid url" do
+      user = User.new(:url => url)
+      assert user.valid?
+    end
+  end
+
+  INVALID_URLS.each do |url|
+    test "rejects #{url.inspect} as a valid url" do
+      user = User.new(:url => url)
+      refute user.valid?
+    end
+  end
+
+  test "defines alias method" do
+    assert User.respond_to?(:validates_url)
+  end
+
+  test "uses default error message" do
+    user = User.new(:url => "invalid")
+    refute user.valid?
+    assert_includes user.errors[:url], "is not a valid address"
+  end
+
+  test "uses I18n string as error message [pt-BR]" do
+    I18n.locale = :'pt-BR'
+    user = User.new(:url => "invalid")
+    refute user.valid?
+    assert_includes user.errors[:url], "não parece ser uma URL válida"
+  end
+
+  test "rejects nil urls" do
+    user = User.new(url: nil)
+    refute user.valid?
+  end
+
+  test "rejects blank urls" do
+    user = User.new(url: '')
+    refute user.valid?
+  end
+end

data/validators.gemspec

@@ -1,7 +1,7 @@
 require "./lib/validators/version"
 
 Gem::Specification.new do |s|
-  s.required_ruby_version = ">= 1.9"
+  s.required_ruby_version = ">= 2.0"
   s.name        = "validators"
   s.version     = Validators::Version::STRING
   s.platform    = Gem::Platform::RUBY
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "activerecord", ">= 3.0"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "minitest-utils"
   s.add_development_dependency "sqlite3-ruby"
   s.add_development_dependency "rake"
   s.add_development_dependency "pry-meta"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validators
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -132,7 +132,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -157,27 +156,36 @@ files:
 - lib/validators/validates_ssh_public_key.rb
 - lib/validators/validates_url_format_of.rb
 - lib/validators/version.rb
-- spec/schema.rb
-- spec/spec_helper.rb
-- spec/support/dates.rb
-- spec/support/emails.rb
-- spec/support/hostnames.rb
-- spec/support/ips.rb
-- spec/support/models.rb
-- spec/support/translations.yml
-- spec/support/urls.rb
-- spec/validators/disposable_email_spec.rb
-- spec/validators/ip_spec.rb
-- spec/validators/validates_cnpj_format_of_spec.rb
-- spec/validators/validates_cpf_format_of_spec.rb
-- spec/validators/validates_datetime_spec.rb
-- spec/validators/validates_email_format_of_spec.rb
-- spec/validators/validates_hostname_format_of_spec.rb
-- spec/validators/validates_ip_address_spec.rb
-- spec/validators/validates_ownership_of_spec.rb
-- spec/validators/validates_ssh_private_key_spec.rb
-- spec/validators/validates_ssh_public_key_spec.rb
-- spec/validators/validates_url_format_of_spec.rb
+- test/schema.rb
+- test/support/dates.rb
+- test/support/emails.rb
+- test/support/hostnames.rb
+- test/support/ips.rb
+- test/support/models.rb
+- test/support/translations.yml
+- test/support/urls.rb
+- test/test_helper.rb
+- test/validators/disposable_email_test.rb
+- test/validators/ip_test.rb
+- test/validators/validates_cnpj_format_of_test.rb
+- test/validators/validates_cpf_format_of_test.rb
+- test/validators/validates_datetime/after_option_test.rb
+- test/validators/validates_datetime/before_option_test.rb
+- test/validators/validates_datetime/defaults_test.rb
+- test/validators/validates_email_format_of_test.rb
+- test/validators/validates_hostname_format_of/with_tld_validation_test.rb
+- test/validators/validates_hostname_format_of/without_tld_validation_test.rb
+- test/validators/validates_ip_address/ipv4_test.rb
+- test/validators/validates_ip_address/ipv6_test.rb
+- test/validators/validates_ip_address_test.rb
+- test/validators/validates_ownership_of_test.rb
+- test/validators/validates_ssh_private_key/bits_test.rb
+- test/validators/validates_ssh_private_key/common_test.rb
+- test/validators/validates_ssh_private_key/dsa_test.rb
+- test/validators/validates_ssh_private_key/rsa_test.rb
+- test/validators/validates_ssh_public_key_test.rb
+- test/validators/validates_url_format_of/with_tld_validation_test.rb
+- test/validators/validates_url_format_of/without_tld_validation_test.rb
 - validators.gemspec
 homepage: http://rubygems.org/gems/validators
 licenses:
@@ -191,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -199,30 +207,38 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Add some nice ActiveModel/ActiveRecord validators.
 test_files:
-- spec/schema.rb
-- spec/spec_helper.rb
-- spec/support/dates.rb
-- spec/support/emails.rb
-- spec/support/hostnames.rb
-- spec/support/ips.rb
-- spec/support/models.rb
-- spec/support/translations.yml
-- spec/support/urls.rb
-- spec/validators/disposable_email_spec.rb
-- spec/validators/ip_spec.rb
-- spec/validators/validates_cnpj_format_of_spec.rb
-- spec/validators/validates_cpf_format_of_spec.rb
-- spec/validators/validates_datetime_spec.rb
-- spec/validators/validates_email_format_of_spec.rb
-- spec/validators/validates_hostname_format_of_spec.rb
-- spec/validators/validates_ip_address_spec.rb
-- spec/validators/validates_ownership_of_spec.rb
-- spec/validators/validates_ssh_private_key_spec.rb
-- spec/validators/validates_ssh_public_key_spec.rb
-- spec/validators/validates_url_format_of_spec.rb
-has_rdoc: 
+- test/schema.rb
+- test/support/dates.rb
+- test/support/emails.rb
+- test/support/hostnames.rb
+- test/support/ips.rb
+- test/support/models.rb
+- test/support/translations.yml
+- test/support/urls.rb
+- test/test_helper.rb
+- test/validators/disposable_email_test.rb
+- test/validators/ip_test.rb
+- test/validators/validates_cnpj_format_of_test.rb
+- test/validators/validates_cpf_format_of_test.rb
+- test/validators/validates_datetime/after_option_test.rb
+- test/validators/validates_datetime/before_option_test.rb
+- test/validators/validates_datetime/defaults_test.rb
+- test/validators/validates_email_format_of_test.rb
+- test/validators/validates_hostname_format_of/with_tld_validation_test.rb
+- test/validators/validates_hostname_format_of/without_tld_validation_test.rb
+- test/validators/validates_ip_address/ipv4_test.rb
+- test/validators/validates_ip_address/ipv6_test.rb
+- test/validators/validates_ip_address_test.rb
+- test/validators/validates_ownership_of_test.rb
+- test/validators/validates_ssh_private_key/bits_test.rb
+- test/validators/validates_ssh_private_key/common_test.rb
+- test/validators/validates_ssh_private_key/dsa_test.rb
+- test/validators/validates_ssh_private_key/rsa_test.rb
+- test/validators/validates_ssh_public_key_test.rb
+- test/validators/validates_url_format_of/with_tld_validation_test.rb
+- test/validators/validates_url_format_of/without_tld_validation_test.rb

data/.rspec

@@ -1 +0,0 @@
---color

data/spec/spec_helper.rb

@@ -1,38 +0,0 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
-
-require "bundler/setup"
-require "active_record"
-require "validators"
-require "active_support/all"
-
-Time.zone = "America/Sao_Paulo"
-TLDs = Validators::TLD.all.sample(50)
-DISPOSABLE_EMAILS = Validators::DisposableHostnames.all.sample(50)
-
-Dir[File.dirname(__FILE__) + "/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"
-
-RSpec.configure do |config|
-  config.before do
-    I18n.locale = :en
-    Time.zone = "America/Sao_Paulo"
-
-    ActiveRecord::Base.descendants.each do |model|
-      next if model.name == "ActiveRecord::SchemaMigration"
-
-      model.delete_all
-
-      Object.class_eval {
-        remove_const model.name if const_defined?(model.name)
-      }
-    end
-
-    load File.dirname(__FILE__) + "/support/models.rb"
-  end
-end

data/spec/validators/disposable_email_spec.rb

@@ -1,31 +0,0 @@
-require "spec_helper"
-
-describe ".validates_email_format_of" do
-  context "when using disposable e-mail" do
-    before do
-      User.validates_email_format_of :email
-    end
-
-    DISPOSABLE_EMAILS.each do |domain|
-      it "rejects disposable e-mail (#{domain})" do
-        user = User.new(email: "user@#{domain}")
-        user.valid?
-
-        expect(user.errors[:email]).to include(I18n.t('activerecord.errors.messages.disposable_email'))
-      end
-    end
-  end
-
-  context "disable disposable e-mail" do
-    before do
-      User.validates_email_format_of :email, disposable: true
-    end
-
-    it "accepts e-mail" do
-      user = User.new(email: "user@mailinator.com")
-      user.valid?
-
-      expect(user.errors[:email]).to be_empty
-    end
-  end
-end

data/spec/validators/ip_spec.rb

@@ -1,25 +0,0 @@
-require "spec_helper"
-
-describe Validators::Ip do
-  context "IPv4" do
-    VALID_IPV4.each do |ip|
-      it "should accept #{ip.inspect} as ip address" do
-        expect(Validators::Ip).to be_v4(ip)
-      end
-    end
-  end
-
-  context "IPv6" do
-    VALID_IPV6.each do |ip|
-      it "should accept #{ip.inspect} as ip address" do
-        expect(Validators::Ip).to be_v6(ip)
-      end
-    end
-  end
-
-  (VALID_IPV4 + VALID_IPV6).each do |ip|
-    it "should accept #{ip.inspect} as ip address" do
-      expect(Validators::Ip).to be_valid(ip)
-    end
-  end
-end

data/spec/validators/validates_datetime_spec.rb

@@ -1,125 +0,0 @@
-require "spec_helper"
-
-describe ".validates_datetime" do
-  subject { User.new }
-
-  context "default options" do
-    before do
-      User.validates_datetime :registered_at
-      User.validates :birthday, :datetime => true
-    end
-
-    VALID_DATES.each do |date|
-      it "accepts #{date.inspect} as valid date" do
-        subject.registered_at = date
-        subject.birthday = date
-
-        expect(subject).to be_valid
-      end
-    end
-
-    INVALID_DATES.each do |date|
-      it "rejects #{date.inspect} as valid date" do
-        subject.registered_at = date
-        subject.birthday = date
-        expect(subject).not_to be_valid
-
-        expect(subject.errors[:registered_at]).not_to be_empty
-        expect(subject.errors[:birthday]).not_to be_empty
-      end
-    end
-
-    it "includes default error message" do
-      subject.registered_at = nil
-      expect(subject).not_to be_valid
-
-      expect(subject.errors[:registered_at]).to eq(["is not a valid date"])
-    end
-  end
-
-  context "after option" do
-    it "rejects when date is set to before :after option" do
-      future_date = 1.week.from_now
-      User.validates_datetime :registered_at, :after => future_date
-      subject.registered_at = Time.now
-
-      expect(subject).not_to be_valid
-      expect(subject.errors[:registered_at]).to eq(["needs to be after #{I18n.l(future_date)}"])
-    end
-
-    it "accepts when date is set accordingly to the :after option" do
-      User.validates_datetime :registered_at, :after => 1.week.from_now
-      subject.registered_at = 2.weeks.from_now
-
-      expect(subject).to be_valid
-    end
-
-    it "validates using today as date" do
-      User.validates_datetime :registered_at, :after => :today
-
-      subject.registered_at = Time.now
-      expect(subject).not_to be_valid
-
-      subject.registered_at = Date.today
-      expect(subject).not_to be_valid
-
-      subject.registered_at = Date.tomorrow
-      expect(subject).to be_valid
-
-      subject.registered_at = 1.day.from_now
-      expect(subject).to be_valid
-    end
-
-    it "validates using now as date" do
-      User.validates_datetime :registered_at, :after => :now
-
-      subject.registered_at = Time.now
-      expect(subject).not_to be_valid
-
-      subject.registered_at = Date.today
-      expect(subject).not_to be_valid
-
-      subject.registered_at = Date.tomorrow
-      expect(subject).to be_valid
-
-      subject.registered_at = 1.day.from_now
-      expect(subject).to be_valid
-    end
-
-    it "validates using method as date" do
-      User.validates_datetime :starts_at
-      User.validates_datetime :ends_at, :after => :starts_at, :if => :starts_at?
-
-      subject.starts_at = nil
-      subject.ends_at = Time.now
-      expect(subject).not_to be_valid
-      expect(subject.errors[:ends_at]).to be_empty
-
-      subject.starts_at = Time.parse("Apr 26 2010")
-      subject.ends_at = Time.parse("Apr 25 2010")
-      expect(subject).not_to be_valid
-      expect(subject.errors[:ends_at]).to eq(["needs to be after #{I18n.l(Time.parse("Apr 26 2010"))}"])
-
-      subject.starts_at = Time.now
-      subject.ends_at = 1.hour.from_now
-      expect(subject).to be_valid
-    end
-  end
-
-  context "before option" do
-    it "rejects when date is set to after :before option" do
-      User.validates_datetime :registered_at, :before => 1.week.ago
-      subject.registered_at = Time.now
-
-      expect(subject).not_to be_valid
-      expect(subject.errors[:registered_at]).to eq(["needs to be before #{I18n.l(1.week.ago)}"])
-    end
-
-    it "accepts when date is set accordingly to the :before option" do
-      User.validates_datetime :registered_at, :before => 1.week.ago
-      subject.registered_at = 2.weeks.ago
-
-      expect(subject).to be_valid
-    end
-  end
-end