drexed-validators 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f314feca89c2256b04e440521356729b39b8053
-  data.tar.gz: 32628191163fcce1e2b04d5cd35afca1bcc65f60
+  metadata.gz: 4433d34c4246c278a52fd5b5ddb19821f6ca55df
+  data.tar.gz: f7d5e49fcf1ad6ab598a58a4ee278a7cb173a19f
 SHA512:
-  metadata.gz: aac895f1e0c55dde4f3f0c13e183b9b55963daad7013bd1be56118647c3c839d4f7dc224b10c7772e6a5075b6a062b09e3cc07d31ad15a2fb354848b583fe026
-  data.tar.gz: fc44d8de5c8f8e77ba0ce670935d88442c34bf6aa8faa42f32a8558ed4b17f301a9e600083bf0dc1d23e6873ef27b74651e3fdff25fff7b3f53ca0f5aea481e7
+  metadata.gz: 8d45a0819809817eb325de9377d6a3e6448d36281f9350dc7fe1453eb4b5801d898815de83581b8025da8586b178039a4c3cafc84f5f56928e6f5df622131ed2
+  data.tar.gz: 5f328bd4c845eb544e4a2e9606376ef9324f79333a4aa2069c62d72a44605a74e1cd748d5365b21ee4d7884eba470e4619110fb939589ca9b3593795d08b78c8

data/app/validators/currency_validator.rb

@@ -1,7 +1,9 @@
 class CurrencyValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
-    unless value =~ /^\d*+(\.\d{1,2})?$/
-      object.errors[attribute] << (options[:message] || "is not formatted properly")
+    unless options[:allow_blank] || options[:allow_nil]
+      unless value =~ /^\d*+(\.\d{1,2})?$/
+        object.errors[attribute] << (options[:message] || "is not formatted properly")
+      end
     end
   end
 end

data/app/validators/email_validator.rb

@@ -1,7 +1,9 @@
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
-    unless value =~ /\A[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}\z/i
-      object.errors[attribute] << (options[:message] || "is not formatted properly")
+    unless options[:allow_blank] || options[:allow_nil]
+      unless value =~ /\A[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}\z/i
+        object.errors[attribute] << (options[:message] || "is not formatted properly")
+      end
     end
   end
 end

data/app/validators/hex_validator.rb

@@ -1,7 +1,9 @@
 class HexValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
-    unless value =~ /^#?([a-f0-9]{6}|[a-f0-9]{3})$/
-      object.errors[attribute] << (options[:message] || "is not formatted properly")
+    unless options[:allow_blank] || options[:allow_nil]
+      unless value =~ /^#?([a-f0-9]{6}|[a-f0-9]{3})$/
+        object.errors[attribute] << (options[:message] || "is not formatted properly")
+      end
     end
   end
 end

data/app/validators/html_validator.rb

@@ -1,7 +1,9 @@
 class HtmlValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
-    unless value =~ /^<([a-z]+)([^<]+)*(?:>(.*)<\/\1>|\s+\/>)$/
-      object.errors[attribute] << (options[:message] || "is not formatted properly")
+    unless options[:allow_blank] || options[:allow_nil]
+      unless value =~ /^<([a-z]+)([^<]+)*(?:>(.*)<\/\1>|\s+\/>)$/
+        object.errors[attribute] << (options[:message] || "is not formatted properly")
+      end
     end
   end
 end

data/app/validators/ip_validator.rb

@@ -1,7 +1,9 @@
 class IpValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
-    unless value =~ /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/ 
-      object.errors[attribute] << (options[:message] || "is not formatted properly")
+    unless options[:allow_blank] || options[:allow_nil]
+      unless value =~ /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/ 
+        object.errors[attribute] << (options[:message] || "is not formatted properly")
+      end
     end
   end
 end

data/app/validators/name_validator.rb

@@ -1,7 +1,9 @@
 class NameValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
-    unless value =~ /\A([a-zA-Z'-]+\s+){0,4}[a-zA-Z'-]*\z/i
-      object.errors[attribute] << (options[:message] || "is not formatted properly")
+    unless options[:allow_blank] || options[:allow_nil]
+      unless value =~ /\A([a-zA-Z'-]+\s+){0,4}[a-zA-Z'-]*\z/i
+        object.errors[attribute] << (options[:message] || "is not formatted properly")
+      end
     end
   end
 end

data/app/validators/password_validator.rb

@@ -1,7 +1,9 @@
 class PasswordValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
-    unless value =~ /^[a-z0-9_-]{6,18}$/
-      object.errors[attribute] << (options[:message] || "is not formatted properly")
+    unless options[:allow_blank] || options[:allow_nil]
+      unless value =~ /^[a-z0-9_-]{6,18}$/
+        object.errors[attribute] << (options[:message] || "is not formatted properly")
+      end
     end
   end
 end

data/app/validators/phone_validator.rb

@@ -1,20 +1,17 @@
 class PhoneFormatValidator < ActiveModel::EachValidator
-  def validate_each record, attribute, value
-    region = options[:region] || :north_america
-    
-    formatted_value = value.gsub(/[\s\.\+\(\)-]*/, "")
-    is_number = !(formatted_value =~ /^[-+]?[0-9]+$/).nil?
-    unless is_number && validate_by_region(region, formatted_value)
-      message = attribute.to_s.humanize + ' doesn\'t match an acceptable format.'
-      record.errors[attribute] << (options[:message] || message )
+  def validate_each(record, attribute, value)
+    unless options[:allow_blank] || options[:allow_nil]
+      formatted_value = value.gsub(/[\s\.\+\(\)-]*/, "")
+      is_number = !(formatted_value =~ /^[-+]?[0-9]+$/).nil?
+      unless is_number && validate_by_region(options[:region], formatted_value)
+        object.errors[attribute] << (options[:message] || "is not formatted properly")
+      end
     end
   end
 
   def validate_by_region(region, formatted_value)
     if region == :north_america
       valid_eleven_digit?(formatted_value) || valid_ten_digit?(formatted_value) || valid_seven_digit?(formatted_value)
-    else
-      false
     end
   end
 

data/app/validators/slug_validator.rb

@@ -1,7 +1,9 @@
 class SlugValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
-    unless value =~ /^[a-z0-9-]+$/
-      object.errors[attribute] << (options[:message] || "is not formatted properly")
+    unless options[:allow_blank] || options[:allow_nil]
+      unless value =~ /^[a-z0-9-]+$/
+        object.errors[attribute] << (options[:message] || "is not formatted properly")
+      end
     end
   end
 end

data/app/validators/ssn_validator.rb

@@ -1,7 +1,9 @@
 class UrlValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
-    unless value =~ /^\A([\d]{3}\-[\d]{2}\-[\d]{4}|[\d]{9})\Z$/
-      object.errors[attribute] << (options[:message] || "is not formatted properly")
+    unless options[:allow_blank] || options[:allow_nil]
+      unless value =~ /^\A([\d]{3}\-[\d]{2}\-[\d]{4}|[\d]{9})\Z$/
+        object.errors[attribute] << (options[:message] || "is not formatted properly")
+      end
     end
   end
 end

data/app/validators/url_validator.rb

@@ -1,7 +1,9 @@
 class UrlValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
-    unless value =~ /^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$/
-      object.errors[attribute] << (options[:message] || "is not formatted properly")
+    unless options[:allow_blank] || options[:allow_nil]
+      unless value =~ /^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$/
+        object.errors[attribute] << (options[:message] || "is not formatted properly")
+      end
     end
   end
 end

data/app/validators/username_validator.rb

@@ -1,7 +1,9 @@
 class UsernameValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
-    unless value =~ /^[a-z0-9_-]{3,16}$/
-      object.errors[attribute] << (options[:message] || "is not formatted properly")
+    unless options[:allow_blank] || options[:allow_nil]
+      unless value =~ /^[a-z0-9_-]{3,16}$/
+        object.errors[attribute] << (options[:message] || "is not formatted properly")
+      end
     end
   end
 end

data/app/validators/zipcode_validator.rb

@@ -1,7 +1,9 @@
 class ZipcodeValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
-    unless value =~ /^\A[\d]{5}(?:[-|\s][\d]{4})?\Z$/
-      object.errors[attribute] << (options[:message] || "is not formatted properly")
+    unless options[:allow_blank] || options[:allow_nil]
+      unless value =~ /^\A[\d]{5}(?:[-|\s][\d]{4})?\Z$/
+        object.errors[attribute] << (options[:message] || "is not formatted properly")
+      end
     end
   end
 end

data/lib/drexed/validators/version.rb

@@ -1,5 +1,5 @@
 module Drexed
   module Validators
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drexed-validators
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler