validaty 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65e36ce029f6e67e16945db50fc428805cae04fa02ddf8e0b84681f1e205dbf1
-  data.tar.gz: f111f5e64cf1f3378d10f027f543b9b924bfeb6698186c7c312ca6e81b36d301
+  metadata.gz: c94f22233330f514a413262ffea2a2f611b6a5fec8fb500fe3dc8b5615b543ae
+  data.tar.gz: fa246c30efb3390a4d14aa3b4b2e3b874165d74a1f92d915ddc928fca6defe2c
 SHA512:
-  metadata.gz: 0f5b48d0b03e45217771628c252fe649776c41c77195e9ad031ffbfbfacd578142bfeac1ef05b338a33f5ff43af5186bda61d916d9f55c007f92574fd72fb974
-  data.tar.gz: 60b48deb8cda274af36b38f5b0d4222c4645f1ad8e7208aff439795c59ce9a59f75a430f81b65601b01d2fef9205f2217823c807ba449dc42a161f9504317e49
+  metadata.gz: 42c89ff164a4e3ec740cd5a4e5dd2d3eb937be51e0a1cf84112ed4964475c2fe73e4ac29511a917ab63eba63803b0e390f893c5b77e999cc565d3c6f9d1a3aac
+  data.tar.gz: c3942fa5ec96764027dbce2ba8201d4215b35dd78f0dc3214f6973df5ef75727d386d50ddc5cecabd7e82cdcd40cc0d52fe56790731bc416277bd96d1b43de3d

data/.rubocop.yml

@@ -1,7 +1,4 @@
 require:
-  - rubocop-rails
-  - rubocop-factory_bot
-  - rubocop-capybara
   - rubocop-rspec
   - rubocop-rake
 
@@ -10,5 +7,7 @@ inherit_gem:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 3.3
-  TargetRailsVersion: 7.1
+  TargetRubyVersion: 3.4
+
+RSpec/MultipleExpectations:
+  Max: 2

data/Makefile

@@ -6,3 +6,15 @@ build:
 publish:
 	@echo "gem push ${GEM_TO_PUSH}"
 	@gem push ${GEM_TO_PUSH}
+
+ci:
+	make rubocop rspec
+
+rspec:
+	bin/rspec
+
+rubocop:
+	bin/rubocop
+
+rubocop-fix:
+	bin/rubocop -A

data/README.md

@@ -7,7 +7,7 @@ Validaty has basic validations for Rails application
 Add this line to your application's Gemfile:
 
 ```ru
-gem "validaty", "~> 0.0.3"
+gem "validaty", "~> 0.0.5"
 ```
 
 And then execute:
@@ -28,7 +28,8 @@ Imagine this schema:
 
 ```rb
 create_table "pixes", force: :cascade do |t|
-  t.uuid "public_id", null: false
+  t.uuid "pid", null: false
+  t.string "name", null: false
   t.integer "kind"
   t.string "key", null: false
   t.string "url", null: false
@@ -45,12 +46,13 @@ You should validate this way:
 class Pix < ApplicationRecord
   enum :kind, {cpf: 0, cnpj: 1, email: 2, phone: 3, evp: 4}
 
-  validates :public_id, uuid: true
+  validates :pid, uuid: true
+  validates :name, presence: true, word_count: {min: 3, max: 10}
   validates :kind, presence: true
   validates :key, cpf: true, if: :cpf?
   validates :key, cnpj: true, if: :cnpj?
   validates :key, email: true, if: :email?
-  validates :key, phone: {country_code: :phone_country}, if: :phone?
+  validates :key, phone: {country_calling_code: :calling_code}, if: :phone?
   validates :key, uuid: true, if: :evp?
   validates :accepted, boolean: true
   validates :schedule_date, date: true
@@ -59,41 +61,10 @@ class Pix < ApplicationRecord
   # OR
   validates :url, presence: true, url: {domain: "domain.com"}
   # OR
-  validates :url, presence: true, url: {starts_with: "https://domain.com/path"}
+  validates :url, presence: true, url: {start_with: "https://domain.com/path"}
 end
 ```
 
-## Translations
-
-If you using url validation with options `:domain` or `:starts_with`, you must add in your locales:
-
-```yaml
-pt-BR:
-  ...
-  errors:
-    messages:
-      domain: "precisa ser do domínio %{domain}"
-      starts_with: "precisa começar com %{start}"
-```
-
-## Troubleshooting
-
-If you need use CPF or CNPJ validation you need add 2 acronym to `config/initializers/inflections.rb`
-
-```rb
-ActiveSupport::Inflector.inflections(:en) do |inflect|
-  inflect.acronym "CPF"
-  inflect.acronym "CNPJ"
-end
-```
-
-If you can't add inflections in your application, the suggestion is create an initializer `config/initializers/validaty.rb` with this content:
-
-```rb
-CnpjValidator = CNPJValidator
-CpfValidator = CPFValidator
-```
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/validaty.

data/lib/validators/cnpj_validator.rb

@@ -8,6 +8,6 @@ class CNPJValidator < Validaty::AllowBlankBase
   end
 
   def default_message_error
-    :invalid
+    :invalid_cnpj
   end
 end

data/lib/validators/cpf_validator.rb

@@ -8,6 +8,6 @@ class CPFValidator < Validaty::AllowBlankBase
   end
 
   def default_message_error
-    :invalid
+    :invalid_cpf
   end
 end

data/lib/validators/date_validator.rb

@@ -1,3 +1,5 @@
+require "date"
+
 class DateValidator < Validaty::AllowBlankBase
   private
 
@@ -9,6 +11,6 @@ class DateValidator < Validaty::AllowBlankBase
   end
 
   def default_message_error
-    :invalid
+    :invalid_date
   end
 end

data/lib/validators/email_validator.rb

@@ -8,6 +8,6 @@ class EmailValidator < Validaty::AllowBlankBase
   end
 
   def default_message_error
-    :invalid
+    :invalid_email
   end
 end

data/lib/validators/phone_validator.rb

@@ -1,6 +1,8 @@
 require "phone"
 
 class PhoneValidator < Validaty::AllowBlankBase
+  DEFAULT_COUNTRY_CALLING_CODE = "55"
+
   private
 
   def valid_value?(value)
@@ -8,14 +10,19 @@ class PhoneValidator < Validaty::AllowBlankBase
   end
 
   def prepare_params(resource, attribute, value)
-    country_code = resource.send(options[:country_code]).to_s.gsub(/[^0-9]/, "")
+    country_calling_code =
+      resource
+        .send(options[:country_calling_code])
+        .to_s
+        .gsub(/[^0-9]/, "")
+        .presence || DEFAULT_COUNTRY_CALLING_CODE
 
-    value = ["+", country_code, value.to_s.gsub(/[^0-9]/, "")].join
+    value = ["+", country_calling_code, value.to_s.gsub(/[^0-9]/, "")].join
 
     [resource, attribute, value]
   end
 
   def default_message_error
-    :invalid
+    :invalid_phone
   end
 end

data/lib/validators/url_validator.rb

@@ -6,8 +6,10 @@ class UrlValidator < Validaty::AllowBlankBase
       resource.errors.add(attribute, :domain, domain: options[:domain])
     end
 
-    if options[:starts_with].present? && !value.to_s.starts_with?(options[:starts_with])
-      resource.errors.add(attribute, :starts_with, start: options[:starts_with])
+    start = options[:start_with].presence || options[:starts_with]
+
+    if start.present? && !value.to_s.start_with?(start)
+      resource.errors.add(attribute, :start_with, start:)
     end
 
     super
@@ -23,6 +25,6 @@ class UrlValidator < Validaty::AllowBlankBase
   end
 
   def default_message_error
-    :invalid
+    :invalid_url
   end
 end

data/lib/validators/uuid_validator.rb

@@ -8,6 +8,6 @@ class UUIDValidator < Validaty::AllowBlankBase
   end
 
   def default_message_error
-    :invalid
+    :invalid_uuid
   end
 end

data/lib/validators/word_count_validator.rb

@@ -0,0 +1,23 @@
+class WordCountValidator < Validaty::Base
+  def validate_each(resource, attribute, value)
+    return if value.blank?
+
+    words = value.to_s.split.size
+    min = options[:min]
+    max = options[:max]
+
+    if min && words < min
+      resource.errors.add(attribute, :too_few_words, count: min)
+    end
+
+    if max && words > max
+      resource.errors.add(attribute, :too_many_words, count: max)
+    end
+  end
+
+  private
+
+  def valid_value?(value)
+    value.to_s.split.count >= WORDS_QUANTITY
+  end
+end

data/lib/validaty/base.rb

@@ -1,3 +1,5 @@
+require "active_model"
+
 module Validaty
   class Base < ActiveModel::EachValidator
     def validate_each(resource, attribute, value)
@@ -5,7 +7,7 @@ module Validaty
 
       return if valid_value?(value)
 
-      resource.errors.add(attribute, (options[:message] || default_message_error))
+      resource.errors.add(attribute, options[:message] || default_message_error)
     end
 
     private

data/lib/validaty/locales/en.yml

@@ -0,0 +1,15 @@
+en:
+  errors:
+    messages:
+      invalid_url: "is not a valid URL"
+      invalid_uuid: "is not a valid UUID"
+      invalid_phone: "is not a valid phone number"
+      invalid_email: "is not a valid email"
+      invalid_date: "is not a valid date"
+      invalid_cnpj: "is not a valid CNPJ"
+      invalid_cpf: "is not a valid CPF"
+      boolean: "must be true or false"
+      domain: "must be from the %{domain} domain"
+      start_with: "must start with '%{start}'"
+      too_few_words: "must have at least %{count} words"
+      too_many_words: "must have at most %{count} words"

data/lib/validaty/locales/pt-BR.yml

@@ -0,0 +1,15 @@
+pt-BR:
+  errors:
+    messages:
+      invalid_url: "não é uma URL válida"
+      invalid_uuid: "não é um UUID válido"
+      invalid_phone: "não é um telefone válido"
+      invalid_email: "não é um email válido"
+      invalid_date: "não é uma data válida"
+      invalid_cnpj: "não é um CNPJ válido"
+      invalid_cpf: "não é um CPF válido"
+      boolean: "deve ser verdadeiro ou falso"
+      domain: "precisa ser do domínio %{domain}"
+      start_with: "precisa começar com '%{start}'"
+      too_few_words: "deve ter no mínimo %{count} palavras"
+      too_many_words: "deve ter no máximo %{count} palavras"

data/lib/validaty/version.rb

@@ -1,3 +1,3 @@
 module Validaty
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/validaty.rb

@@ -10,7 +10,14 @@ require_relative "validators/email_validator"
 require_relative "validators/phone_validator"
 require_relative "validators/url_validator"
 require_relative "validators/uuid_validator"
+require_relative "validators/word_count_validator"
 
 module Validaty
+  I18n.load_path += Dir[File.join(__dir__, "validaty/locales/*.yml")]
+
   class Error < StandardError; end
 end
+
+CpfValidator = CPFValidator unless defined?(CpfValidator)
+CnpjValidator = CNPJValidator unless defined?(CnpjValidator)
+UuidValidator = UUIDValidator unless defined?(UuidValidator)

data/validaty.gemspec

@@ -35,4 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "cpf_cnpj"
   # https://github.com/carr/phone#examples
   spec.add_dependency "phone"
+  # https://github.com/rails/rails/tree/v8.1.2/activemodel
+  spec.add_development_dependency "activemodel", ">= 0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: validaty
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Lavenda Software
 bindir: exe
 cert_chain: []
-date: 2025-03-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cpf_cnpj
@@ -37,6 +37,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  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'
 email:
 - lavenda@lavenda.com.br
 executables: []
@@ -58,9 +72,12 @@ files:
 - lib/validators/phone_validator.rb
 - lib/validators/url_validator.rb
 - lib/validators/uuid_validator.rb
+- lib/validators/word_count_validator.rb
 - lib/validaty.rb
 - lib/validaty/allow_blank_base.rb
 - lib/validaty/base.rb
+- lib/validaty/locales/en.yml
+- lib/validaty/locales/pt-BR.yml
 - lib/validaty/version.rb
 - sig/validaty/spec.rbs
 - validaty.gemspec
@@ -86,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.4
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Validaty has basic validations for Rails application
 test_files: []