simple-validations-rails 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae93033c7c8e3db906f2dfd06c1f29f45f50d006c74c1731de4776c0486366f2
-  data.tar.gz: 49ee19512f886913717a062a1832adcfc3e5f53d2bfe18d21ae117372c765f8b
+  metadata.gz: e4533056f636e7aa0e5c3c262097b443bbcc02d5b38fb14c263820c0f4187d8b
+  data.tar.gz: 5dfeae219e97e8b3363bb42dea7d2503e5f7909b06924fab29d4a3e97e9c2243
 SHA512:
-  metadata.gz: 3f3dc2badb19ebba702101b1e755bb9a457148a91b8d4989aeb44fb1144d87a832fd722a643228375ee8f8aa6fb3122b7a5391df5ded1e8c564accdcd9a93d5a
-  data.tar.gz: 0cbee6466c5dc04d85b0cf9f991cf71512d2c920d751e41595aa7b3dffe10f5a39764d4a722832cffab41f3d436e7bfba053ecf20a4fad1489bc6cb802459220
+  metadata.gz: b1e331ae556d23eb138317658a82ac8ca2a9969109882e86afa5ae3945d32510030359ef585a8ed408aa49fa650b4359b264e4df556b45349f6b4ca0de8be492
+  data.tar.gz: 45777113c8557f6e6bada83db9f2dc623117a057e3595b5a7bb5dd9057472514c938f5d2b298d7f51d1c53231918762920462ebf9e9a5fbe7d270d4e5c7497b3

data/README.md

@@ -1,4 +1,5 @@
 # simple-validations-rails
+![Gem](https://img.shields.io/gem/v/simple-validations-rails.svg)
 A simple set of validations I got tired of writing over and over and over again. Includes boolean, locale, and email validators.
 
 ## Installation
@@ -44,10 +45,21 @@ validates :strict_preference_that_can_be_null, boolean: {strict: true, allow_nil
 Validates that the value is within the allowed locales for the application.
 ```ruby
 # Allows strings/symbols, checks against available locales.
-validates locale, locale: true
+validates :locale, locale: true
 
 # Same as above, but nil is valid.
-validates locale, locale: {allow_nil: true}
+validates :locale, locale: {allow_nil: true}
+```
+
+### Timezone Validator
+
+Validates that the value is a valid timezone.
+```ruby
+# Allows strings/symbols, checks against available locales.
+validates :time_zone, timezone: true
+
+# Same as above, but nil is valid.
+validates :time_zone, timezone: {allow_nil: true}
 ```
 
 ### Email Validator

data/lib/simple-validations-rails/version.rb

@@ -1,3 +1,3 @@
 module SimpleValidationsRails
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/simple-validations-rails.rb

@@ -1,5 +1,7 @@
 require 'simple-validations-rails/railtie'
 require 'active_model'
+require 'validators/plugin_validator'
 require 'validators/boolean_validator'
 require 'validators/email_validator'
 require 'validators/locale_validator'
+require 'validators/timezone_validator'

data/lib/validators/boolean_validator.rb

@@ -1,5 +1,14 @@
-class BooleanValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    record.errors.add attribute, 'is not a valid boolean' unless (!options[:strict] && value.present?) || [true, false].include?(value) || (options[:allow_nil] && value.nil?)
+class BooleanValidator < PluginValidator
+  protected
+
+  def validation_message
+    'is not a valid value.'
+  end
+
+  def is_valid?(value)
+    return true if !options[:strict] && value.present?
+    return true if [true, false].include?(value)
+    return true if allows_nil? && value.nil?
+    return false
   end
 end

data/lib/validators/email_validator.rb

@@ -1,13 +1,20 @@
-class EmailValidator < ActiveModel::EachValidator
+class EmailValidator < PluginValidator
   MAX_EMAIL_LENGTH = 254
 
-  def validate_each(record, attribute, value)
-    record.errors.add attribute, 'is not a valid locale' unless (options[:allow_nil] && value.nil?) || ( asdfasdfasdfasdfadfa && value.legnth <= MAX_EMAIL_LENGTH || options[:skip_length])
+  protected
+
+  def validation_message
+    'is not a valid email'
   end
 
-  protected
+  def is_valid?(value)
+    unless options[:skip_length]
+      return false if value.legnth > MAX_EMAIL_LENGTH
+    end
+    return email_regex.match?(value)
+  end
 
-  def self.regex(options = {})
+  def self.email_regex()
     options = {mode: :normal}.merge options
 
     case options[:mode]

data/lib/validators/locale_validator.rb

@@ -1,5 +1,11 @@
-class LocaleValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    record.errors.add attribute, 'is not a valid locale' unless I18n.locale_available?(value) || (options[:allow_nil] && value.nil?)
+class LocaleValidator < PluginValidator
+  protected
+
+  def validation_message
+    'is not a valid locale.'
+  end
+
+  def is_valid?(value)
+    I18n.locale_available?(value)
   end
 end

data/lib/validators/plugin_validator.rb

@@ -0,0 +1,28 @@
+class PluginValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    record.errors.add attribute, (options[:message] || validation_message) unless (allows_nil? && value.nil?) || is_valid?(value)
+  end
+
+  protected
+
+  def allows_nil?()
+    if options[:allow_nil]
+      ActiveSupport::Deprecation.warn('allow_nil is depreciated in favor of the more standard allow_blank')
+      return true
+    elsif options[:allow_blank]
+      return true
+    else
+      return false
+    end
+  end
+
+  # Called to validate the value:
+  def is_valid?(value)
+    raise NotImplementedError, 'PluginValidator is not designed to be used directly'
+  end
+
+  # Returns the default validation message:
+  def validation_message
+    raise NotImplementedError, 'PluginValidator is not designed to be used directly'
+  end
+end

data/lib/validators/timezone_validator.rb

@@ -0,0 +1,11 @@
+class TimezoneValidator < PluginValidator
+  protected
+
+  def validation_message
+    'is not a valid time zone.'
+  end
+
+  def is_valid?(value)
+    ActiveSupport::TimeZone.all.map(&:name).include?(value)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-validations-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Matthew Schultz
@@ -52,6 +52,8 @@ files:
 - lib/validators/boolean_validator.rb
 - lib/validators/email_validator.rb
 - lib/validators/locale_validator.rb
+- lib/validators/plugin_validator.rb
+- lib/validators/timezone_validator.rb
 homepage: https://github.com/MatthewSchultz/simple-validations-rails
 licenses:
 - MIT
@@ -65,7 +67,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="