active_validation 3.0.0 → 4.0.0

data/lib/active_validation/validators/type_validator.rb

@@ -6,14 +6,15 @@ class TypeValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value, options)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.type"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.type'))
     end
   end
 
   private
 
   def valid?(value, options)
-    klass = options.fetch(:with, nil)
+    klass = options[:with]
 
     if klass == Boolean
       value.is_a?(TrueClass) || value.is_a?(FalseClass)

data/lib/active_validation/validators/url_validator.rb

@@ -1,20 +1,21 @@
-require "uri"
+require 'uri'
 class UrlValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     uri = URI.parse(value.to_s)
     raise URI::InvalidURIError unless valid?(uri, options)
   rescue URI::InvalidURIError
-    record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.url"))
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.url'))
   end
 
   private
 
-  DEFAULT_SCHEMES = [:http, :https]
+  DEFAULT_SCHEMES = [:http, :https].freeze
 
   def valid_domain?(value, options)
     value_downcased = value.host.to_s.downcase
-    options.empty? || options.any? { |d| value_downcased.end_with?(".#{d.downcase}") }
+    options.empty? || options.any? { |dom| value_downcased.end_with?(".#{dom.downcase}") }
   end
 
   def valid_length?(value)
@@ -23,23 +24,23 @@ class UrlValidator < ActiveModel::EachValidator
 
   def valid_scheme?(value, options)
     value_downcased = value.scheme.to_s.downcase
-    options.empty? || options.any? { |s| value_downcased == s.to_s.downcase }
+    options.empty? || options.any? { |sch| value_downcased == sch.to_s.downcase }
   end
 
   def valid_root?(value)
-    ["/", ""].include?(value.path) && value.query.blank? && value.fragment.blank?
+    ['/', ''].include?(value.path) && value.query.blank? && value.fragment.blank?
   end
 
   def valid_uri?(value)
-    value.kind_of?(URI::Generic)
+    value.is_a?(URI::Generic)
   end
 
   def valid?(value, options)
     valid_length?(value) &&
-    valid_uri?(value) &&
-    valid_domain?(value, [*(options.fetch(:domain, nil))]) &&
-    valid_scheme?(value, [*(options.fetch(:scheme, UrlValidator::DEFAULT_SCHEMES))]) &&
-    (options.fetch(:root, false) ? valid_root?(value) : true)
+      valid_uri?(value) &&
+      valid_domain?(value, [*(options[:domain])]) &&
+      valid_scheme?(value, [*(options[:scheme] || UrlValidator::DEFAULT_SCHEMES)]) &&
+      (options[:root] ? valid_root?(value) : true)
   end
 
 end

data/lib/active_validation/validators/username_validator.rb

@@ -2,7 +2,8 @@ class UsernameValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value.to_s)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.username"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.username'))
     end
   end
 

data/lib/active_validation/validators/uuid_validator.rb

@@ -2,23 +2,24 @@ class UuidValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value.to_s, options)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.uuid"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.uuid'))
     end
   end
 
   private
 
   def valid_format?(value, options)
-    value =~ case options.fetch(:version, 0)
-    when 3
-      /^[0-9A-F]{8}-[0-9A-F]{4}-3[0-9A-F]{3}-[0-9A-F]{4}-[0-9A-F]{12}$/i
-    when 4
-      /^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
-    when 5
-      /^[0-9A-F]{8}-[0-9A-F]{4}-5[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
-    else
-      /^[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/i
-    end
+    value =~ case options[:version]
+             when 3
+               /^[0-9A-F]{8}-[0-9A-F]{4}-3[0-9A-F]{3}-[0-9A-F]{4}-[0-9A-F]{12}$/i
+             when 4
+               /^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
+             when 5
+               /^[0-9A-F]{8}-[0-9A-F]{4}-5[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
+             else
+               /^[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/i
+             end
   end
 
   def valid_length?(value)

data/lib/active_validation/version.rb

@@ -1,3 +1,3 @@
 module ActiveValidation
-  VERSION = "3.0.0"
+  VERSION = '4.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_validation
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -108,6 +108,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fasterer
+  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: reek
+  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: rubocop
+  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: Validate commonly used attributes easily with ActiveValidation.
 email:
 - j.gomez@drexed.com
@@ -115,9 +157,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".coveralls.yml"
+- ".fasterer.yml"
 - ".gitignore"
+- ".reek"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -129,34 +175,10 @@ files:
 - bin/rake
 - bin/setup
 - config/locales/en.yml
+- lib/.DS_Store
 - lib/active_validation.rb
-- lib/active_validation/matchers/ensure_valid_alpha_format_of.rb
-- lib/active_validation/matchers/ensure_valid_alpha_numeric_format_of.rb
-- lib/active_validation/matchers/ensure_valid_base64_format_of.rb
-- lib/active_validation/matchers/ensure_valid_boolean_format_of.rb
-- lib/active_validation/matchers/ensure_valid_coordinate_format_of.rb
-- lib/active_validation/matchers/ensure_valid_credit_card_format_of.rb
-- lib/active_validation/matchers/ensure_valid_currency_format_of.rb
-- lib/active_validation/matchers/ensure_valid_cusip_format_of.rb
-- lib/active_validation/matchers/ensure_valid_email_format_of.rb
-- lib/active_validation/matchers/ensure_valid_equality_matcher_of.rb
-- lib/active_validation/matchers/ensure_valid_hex_format_of.rb
-- lib/active_validation/matchers/ensure_valid_imei_format_of.rb
-- lib/active_validation/matchers/ensure_valid_ip_format_of.rb
-- lib/active_validation/matchers/ensure_valid_isbn_format_of.rb
-- lib/active_validation/matchers/ensure_valid_isin_format_of.rb
-- lib/active_validation/matchers/ensure_valid_mac_address_format_of.rb
-- lib/active_validation/matchers/ensure_valid_name_format_of.rb
-- lib/active_validation/matchers/ensure_valid_password_format_of.rb
-- lib/active_validation/matchers/ensure_valid_phone_format_of.rb
-- lib/active_validation/matchers/ensure_valid_sedol_format_of.rb
-- lib/active_validation/matchers/ensure_valid_slug_format_of.rb
-- lib/active_validation/matchers/ensure_valid_ssn_format_of.rb
-- lib/active_validation/matchers/ensure_valid_tracking_number_format_of.rb
-- lib/active_validation/matchers/ensure_valid_type_format_of.rb
-- lib/active_validation/matchers/ensure_valid_url_format_of.rb
-- lib/active_validation/matchers/ensure_valid_username_format_of.rb
-- lib/active_validation/matchers/ensure_valid_uuid_format_of.rb
+- lib/active_validation/.DS_Store
+- lib/active_validation/railtie.rb
 - lib/active_validation/validators/alpha_numeric_validator.rb
 - lib/active_validation/validators/alpha_validator.rb
 - lib/active_validation/validators/base64_validator.rb

data/lib/active_validation/matchers/ensure_valid_alpha_format_of.rb

@@ -1,26 +0,0 @@
-RSpec::Matchers.define :ensure_valid_alpha_format_of do |attribute|
-  match do |model|
-    model.send("#{attribute}=", "$1234.56")
-    model.valid?
-
-    if model.errors.has_key?(attribute)
-      model.errors[attribute].include?(I18n.t("active_validation.errors.messages.alpha"))
-    end
-  end
-
-  failure_message do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_alpha_format_of.failure_message_for_should",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-
-  failure_message_when_negated do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_alpha_format_of.failure_message_for_should_not",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-end

data/lib/active_validation/matchers/ensure_valid_alpha_numeric_format_of.rb

@@ -1,26 +0,0 @@
-RSpec::Matchers.define :ensure_valid_alpha_numeric_format_of do |attribute|
-  match do |model|
-    model.send("#{attribute}=", "$1234.56")
-    model.valid?
-
-    if model.errors.has_key?(attribute)
-      model.errors[attribute].include?(I18n.t("active_validation.errors.messages.alpha_numeric"))
-    end
-  end
-
-  failure_message do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_alpha_numeric_format_of.failure_message_for_should",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-
-  failure_message_when_negated do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_alpha_numeric_format_of.failure_message_for_should_not",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-end

data/lib/active_validation/matchers/ensure_valid_base64_format_of.rb

@@ -1,26 +0,0 @@
-RSpec::Matchers.define :ensure_valid_base64_format_of do |attribute|
-  match do |model|
-    model.send("#{attribute}=", "1a.b2==")
-    model.valid?
-
-    if model.errors.has_key?(attribute)
-      model.errors[attribute].include?(I18n.t("active_validation.errors.messages.base64"))
-    end
-  end
-
-  failure_message do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_base64_format_of.failure_message_for_should",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-
-  failure_message_when_negated do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_base64_format_of.failure_message_for_should_not",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-end

data/lib/active_validation/matchers/ensure_valid_boolean_format_of.rb

@@ -1,26 +0,0 @@
-RSpec::Matchers.define :ensure_valid_boolean_format_of do |attribute|
-  match do |model|
-    model.send("#{attribute}=", nil)
-    model.valid?
-
-    if model.errors.has_key?(attribute)
-      model.errors[attribute].include?(I18n.t("active_validation.errors.messages.boolean"))
-    end
-  end
-
-  failure_message do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_boolean_format_of.failure_message_for_should",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-
-  failure_message_when_negated do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_boolean_format_of.failure_message_for_should_not",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-end

data/lib/active_validation/matchers/ensure_valid_coordinate_format_of.rb

@@ -1,26 +0,0 @@
-RSpec::Matchers.define :ensure_valid_coordinate_format_of do |attribute|
-  match do |model|
-    model.send("#{attribute}=", [91, 181])
-    model.valid?
-
-    if model.errors.has_key?(attribute)
-      model.errors[attribute].include?(I18n.t("active_validation.errors.messages.coordinate.coordinate"))
-    end
-  end
-
-  failure_message do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_coordinate_format_of.failure_message_for_should",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-
-  failure_message_when_negated do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_coordinate_format_of.failure_message_for_should_not",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-end

data/lib/active_validation/matchers/ensure_valid_credit_card_format_of.rb

@@ -1,26 +0,0 @@
-RSpec::Matchers.define :ensure_valid_credit_card_format_of do |attribute|
-  match do |model|
-    model.send("#{attribute}=", "9999")
-    model.valid?
-
-    if model.errors.has_key?(attribute)
-      model.errors[attribute].include?(I18n.t("active_validation.errors.messages.credit_card"))
-    end
-  end
-
-  failure_message do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_credit_card_format_of.failure_message_for_should",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-
-  failure_message_when_negated do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_credit_card_format_of.failure_message_for_should_not",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-end

data/lib/active_validation/matchers/ensure_valid_currency_format_of.rb

@@ -1,26 +0,0 @@
-RSpec::Matchers.define :ensure_valid_currency_format_of do |attribute|
-  match do |model|
-    model.send("#{attribute}=", "$1234.56")
-    model.valid?
-
-    if model.errors.has_key?(attribute)
-      model.errors[attribute].include?(I18n.t("active_validation.errors.messages.currency"))
-    end
-  end
-
-  failure_message do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_currency_format_of.failure_message_for_should",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-
-  failure_message_when_negated do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_currency_format_of.failure_message_for_should_not",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-end

data/lib/active_validation/matchers/ensure_valid_cusip_format_of.rb

@@ -1,26 +0,0 @@
-RSpec::Matchers.define :ensure_valid_cusip_format_of do |attribute|
-  match do |model|
-    model.send("#{attribute}=", "1234567890")
-    model.valid?
-
-    if model.errors.has_key?(attribute)
-      model.errors[attribute].include?(I18n.t("active_validation.errors.messages.cusip"))
-    end
-  end
-
-  failure_message do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_cusip_format_of.failure_message_for_should",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-
-  failure_message_when_negated do |model|
-    I18n.t(
-      "active_validation.errors.matchers.ensure_valid_cusip_format_of.failure_message_for_should_not",
-      attr: attribute.inspect,
-      model: model.class.name
-    )
-  end
-end