validates_email_format_of 1.6.0 → 1.6.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Nzc3NWIyMDUwNDM0NWRiMTViYmE2MjU4MWNiNjQwM2I1MjBiYTZiYw==
+    OWRlNjBlN2VmN2QxNmM4ZWYzODA2YTRmNzNlZjg0MTRlZTlhYjVlNw==
   data.tar.gz: !binary |-
-    MjJiOTNiNzBiNjcyZTlkY2I3NTZjMmRlZjcwZTZiYTNiNDg4ZmE2Yg==
+    YTg5ZGY1MWEzYWFkYTUzOTVlYzQ0N2FlZGRjNDY0OWY0ZmU2NTA3OA==
 SHA512:
   metadata.gz: !binary |-
-    NDk4ZmFjYzgzN2Y1N2FiOTE1ZjUwZGU0YjQzOTY4YzE3ZTY5NTYyZDVlNDIw
-    YTRmN2JjYzQ3N2M3ZDZhOTc4OTU3YjFjMWMyNjY4Mzg5YjkyNmM3ZjFlZWYw
-    ZDlhNzQ2MTIwNGYyODJiMDA0OWQxODM0ZmM0OGEwMzliMmFlYTI=
+    NDdjMTljZWE2ODRkMTk1MzFmY2FkZDkwMzg4NjUzYmFhMjczMDJlYTcxODI2
+    YjQyNDI0ZmYyZGRhZmYwN2U0MjEyYzVmYzJmZDk1ZDAwMjcwOWZhOGU2YTZl
+    MjdjNmIyNDE3ZjE5YzJmOGI2ZGVjZWRiMWI5ZDFkNjQ1NzRiYjg=
   data.tar.gz: !binary |-
-    N2Q1OTQyMjQ4ZWFkMWMzODU2MmMxMTc0MmZmYzhhMzY2ZTU3ZjhkMWQzZDY2
-    Y2VmYjZmMzRkY2I4NzEzYjAwN2Y4YmZmMjIzM2U0MDkwNjMzNDBkZWRkMzFj
-    NjU4NTMzODU3OTkyMzRiMTM5OWVhNzc5ZWUxZGUyZWJkYjAyMTA=
+    YTI2Zjg0ZjQ3MzRlZTE2MjEzOTI2NjkwZDUzYjk3MjRmYmYzZDJhNmYzOTUz
+    YWM2MDJiZjkxOGQyNmU2ZDVlZTZiNDMwYWY2YzcwMzU3ZWYyNjVmYmQ1Mzc3
+    MzY1YTgxZmJlMDBiODgyYjVmYmZlZDM0NDhlZGQwYmIyOWM0NTU=

data/CHANGELOG

@@ -0,0 +1,3 @@
+== 1.6.1 (8 Sept 2014)
+
+* In a Rails context, this gem now uses ActiveModel's default logic for constructing I18n keys, to make it easier to override them on a model/attribute basis.

data/README.rdoc

@@ -46,6 +46,8 @@ Or in your Gemfile:
     Maximum number of characters allowed in the local part (everything before the '@') (default is 64)
   :domain_length
     Maximum number of characters allowed in the domain part (everything after the '@') (default is 255)
+  :generate_message
+    Boolean. Return the I18n key of the error message instead of the error message itself (default is false)
   :with
     Specify a custom Regex as the valid email format.
   :on, :if, :unless, :allow_nil, :allow_blank, :strict

data/config/locales/en.yml

@@ -1,6 +1,8 @@
 en:
-  activemodel:
+  activemodel: &errors
     errors:
       messages:
         invalid_email_address: 'does not appear to be a valid e-mail address'
         email_address_not_routable: 'is not routable'
+  activerecord:
+    <<: *errors

data/config/locales/pl.yml

@@ -1,6 +1,8 @@
 pl:
-  activemodel:
+  activemodel: &errors
     errors:
       messages:
         invalid_email_address: 'nieprawidłowy adres e-mail'
         email_address_not_routable: 'jest nieosiągalny'
+  activerecord:
+    <<: *errors

data/lib/validates_email_format_of.rb

@@ -19,6 +19,15 @@ module ValidatesEmailFormatOf
     @mx.size > 0 ? true : false
   end
 
+  DEFAULT_MESSAGE = "does not appear to be valid"
+  DEFAULT_MX_MESSAGE = "is not routable"
+  ERROR_MESSAGE_I18N_KEY = :invalid_email_address
+  ERROR_MX_MESSAGE_I18N_KEY = :email_address_not_routable
+
+  def self.default_message
+    defined?(I18n) ? I18n.t(ERROR_MESSAGE_I18N_KEY, :scope => [:activemodel, :errors, :messages], :default => DEFAULT_MESSAGE) : DEFAULT_MESSAGE
+  end
+
   # Validates whether the specified value is a valid email address.  Returns nil if the value is valid, otherwise returns an array
   # containing one or more validation error messages.
   #
@@ -29,18 +38,14 @@ module ValidatesEmailFormatOf
   # * <tt>with</tt> The regex to use for validating the format of the email address (deprecated)
   # * <tt>local_length</tt> Maximum number of characters allowed in the local part (default is 64)
   # * <tt>domain_length</tt> Maximum number of characters allowed in the domain part (default is 255)
-  DEFAULT_MESSAGE = "does not appear to be valid"
-  DEFAULT_MX_MESSAGE = "is not routable"
-  def self.default_message
-    defined?(I18n) ? I18n.t(:invalid_email_address, :scope => [:activemodel, :errors, :messages], :default => DEFAULT_MESSAGE) : DEFAULT_MESSAGE
-  end
-
+  # * <tt>generate_message</tt> Return the I18n key of the error message instead of the error message itself (default is false)
   def self.validate_email_format(email, options={})
-      default_options = { :message => default_message,
+      default_options = { :message => options[:generate_message] ? ERROR_MESSAGE_I18N_KEY : default_message,
                           :check_mx => false,
-                          :mx_message => defined?(I18n) ? I18n.t(:email_address_not_routable, :scope => [:activemodel, :errors, :messages], :default => DEFAULT_MX_MESSAGE) : DEFAULT_MX_MESSAGE,
+                          :mx_message => options[:generate_message] ? ERROR_MX_MESSAGE_I18N_KEY : (defined?(I18n) ? I18n.t(ERROR_MX_MESSAGE_I18N_KEY, :scope => [:activemodel, :errors, :messages], :default => DEFAULT_MX_MESSAGE) : DEFAULT_MX_MESSAGE),
                           :domain_length => 255,
-                          :local_length => 64
+                          :local_length => 64,
+                          :generate_message => false
                           }
       opts = options.merge(default_options) {|key, old, new| old}  # merge the default options into the specified options, retaining all specified options
 

data/lib/validates_email_format_of/active_model.rb

@@ -9,7 +9,7 @@ module ActiveModel
   module Validations
     class EmailFormatValidator < EachValidator
       def validate_each(record, attribute, value)
-        (ValidatesEmailFormatOf::validate_email_format(value, options) || []).each do |error|
+        (ValidatesEmailFormatOf::validate_email_format(value, options.merge(:generate_message => true)) || []).each do |error|
           record.errors.add(attribute, error)
         end
       end

data/lib/validates_email_format_of/version.rb

@@ -1,3 +1,3 @@
 module ValidatesEmailFormatOf
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 end

data/spec/validates_email_format_of_spec.rb

@@ -205,17 +205,21 @@ describe ValidatesEmailFormatOf do
             end
           end
           describe "i18n" do
-            before(:each) { allow(I18n.config).to receive(:locale).and_return(locale) }
+            before(:each) do
+              allow(I18n.config).to receive(:locale).and_return(locale)
+            end
             describe "present locale" do
               let(:locale) { :pl }
               describe email do
                 it { should have_errors_on_email.because("jest nieosiągalny") }
               end
             end
-            describe email do
-              let(:locale) { :ir }
+            unless defined?(ActiveModel)
               describe email do
-                it { should have_errors_on_email.because("is not routable") }
+                let(:locale) { :ir }
+                describe email do
+                  it { should have_errors_on_email.because("is not routable") }
+                end
               end
             end
           end
@@ -262,17 +266,21 @@ describe ValidatesEmailFormatOf do
     end
 
     describe "i18n" do
-      before(:each) { allow(I18n.config).to receive(:locale).and_return(locale) }
+      before(:each) do
+        allow(I18n.config).to receive(:locale).and_return(locale)
+      end
       describe "present locale" do
         let(:locale) { :pl }
         describe "invalid@exmaple." do
           it { should have_errors_on_email.because("nieprawidłowy adres e-mail") }
         end
       end
-      describe "missing locale" do
-        let(:locale) { :ir }
-        describe "invalid@exmaple." do
-          it { should have_errors_on_email.because("does not appear to be valid") }
+      unless defined?(ActiveModel)
+        describe "missing locale" do
+          let(:locale) { :ir }
+          describe "invalid@exmaple." do
+            it { should have_errors_on_email.because("does not appear to be valid") }
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_email_format_of
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Alex Dunae
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -64,6 +64,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG
 - Gemfile
 - MIT-LICENSE
 - README.rdoc