mail_form 1.6.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1d303b19e76c996f383cdd3cca96a6d1f5ebbf99
-  data.tar.gz: 37b37ccd2e0f7d3e534d9985dc79f04cfbc1d4d3
+SHA256:
+  metadata.gz: c29692d7133535b027bee364610e17dfa471a119d0970c327879ecf9c68a4196
+  data.tar.gz: 3305eaa30e4e23797a8f0f77cb1c8f429c23348be3c03cfdad22d22e744bea76
 SHA512:
-  metadata.gz: cef061942f687c6d82678d7258d8360093efc67f8ff93dcd0721ffe788e3ee64f1f8817930b22ef8ab463e1292e96eecf0aab5b10d03d64109c333f9af9eda05
-  data.tar.gz: aa04d2badd1f88698639de4ab99ccc7ce48d004a044662d29445a3341ee3aea0257a9c58f65affe72a9640b5ce274c8fe8e83bb2c6612ef85586db8cf20ec0b4
+  metadata.gz: e9fd29a8f0e1718418d20432be4c79b6b26f4bf006c55dc6648bda4611d317f2908d28c9a9f3c1658a291c91c51cf53735bd197c0797eaf76a1670b0a889378b
+  data.tar.gz: b0d94c74629678aa29830abb2b5b15f4ecf47fc9f4d6446e0ec71e3624ade342b4ee1e0a0a9977ee4ef8eba9ab230eac0a078fcafc0c2f647ac04bc507e5837f

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2015 Plataformatec http://plataformatec.com.br/
+Copyright (c) 2009-2019 Plataformatec http://plataformatec.com.br/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,15 +1,14 @@
 ## MailForm
 
-[![Gem Version](https://fury-badge.herokuapp.com/rb/mail_form.png)](http://badge.fury.io/rb/mail_form)
-[![Build Status](https://api.travis-ci.org/plataformatec/mail_form.png?branch=master)](http://travis-ci.org/plataformatec/mail_form)
-[![Code Climate](https://codeclimate.com/github/plataformatec/mail_form.png)](https://codeclimate.com/github/plataformatec/mail_form)
+[![Gem Version](https://fury-badge.herokuapp.com/rb/mail_form.svg)](http://badge.fury.io/rb/mail_form)
+[![Code Climate](https://codeclimate.com/github/heartcombo/mail_form.svg)](https://codeclimate.com/github/heartcombo/mail_form)
 
-### Rails 3
+### Rails 5
 
 This gem was built on top of `ActiveModel` to showcase how you can pull in validations, naming
 and `i18n` from Rails to your models without the need to implement it all by yourself.
 
-This README refers to the **MailForm** gem to be used in Rails 3.2 or 4+. For instructions
+This README refers to the **MailForm** gem to be used in Rails 5+. For instructions
 on how to use MailForm in older versions of Rails, please refer to the available branches.
 
 ### Description
@@ -19,20 +18,20 @@ if you want to make a contact form just the following lines are needed (includin
 
 ```ruby
 class ContactForm < MailForm::Base
-  attribute :name,      :validate => true
-  attribute :email,     :validate => /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
-  attribute :file,      :attachment => true
+  attribute :name, validate: true
+  attribute :email, validate: /\A[^@\s]+@[^@\s]+\z/i
+  attribute :file, attachment: true
 
   attribute :message
-  attribute :nickname,  :captcha  => true
+  attribute :nickname, captcha: true
 
   # Declare the e-mail headers. It accepts anything the mail method
   # in ActionMailer accepts.
   def headers
     {
-      :subject => "My Contact Form",
-      :to => "your.email@your.domain.com",
-      :from => %("#{name}" <#{email}>)
+      subject: "My Contact Form",
+      to: "your.email@your.domain.com",
+      from: %("#{name}" <#{email}>)
     }
   end
 end
@@ -41,7 +40,7 @@ end
 Then you start a console with `rails console` and type:
 
 ```ruby
->> c = ContactForm.new(:name => 'José', :email => 'jose@email.com', :message => 'Cool!')
+>> c = ContactForm.new(name: 'José', email: 'jose@email.com', message: 'Cool!')
 >> c.deliver
 ```
 
@@ -57,14 +56,14 @@ This brings `I18n`, error messages, validations and attributes handling like in
 `ActiveRecord` to **MailForm**, so **MailForm** can be used in your controllers and form builders without extra tweaks. This also means that instead of the following:
 
 ```ruby
-attribute :email, :validate => /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
+attribute :email, validate: /\A[^@\s]+@[^@\s]+\z/i
 ```
 
 You could actually do this:
 
 ```ruby
 attribute :email
-validates_format_of :email, :with => /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
+validates_format_of :email, with: /\A[^@\s]+@[^@\s]+\z/i
 ```
 
 Choose the one which pleases you the most. For more information on the API, please
@@ -84,8 +83,8 @@ class User < ActiveRecord::Base
 
   def headers
     {
-      :to => "your.email@your.domain.com",
-      :subject => "User created an account"
+      to: "your.email@your.domain.com",
+      subject: "User created an account"
     }
   end
 end
@@ -100,11 +99,11 @@ Install **MailForm** is very easy. Just edit your Gemfile adding the following:
 ```ruby
 gem 'mail_form'
 ```
-Then run `bundle install` to install **MailForm**.
 
-If you want it as plugin, just do:
+Then run `bundle install` to install **MailForm**.
 
-`script/plugin install git://github.com/plataformatec/mail_form.git`
+You can run `rails generate mail_form` to view help information on how to generate
+a basic form to get you started.
 
 ## API Overview
 
@@ -115,32 +114,32 @@ to the e-mail, except the ones :captcha is true.
 
 Options:
 
-* :validate - A hook to validates_*_of. When true is given, validates the
+* `:validate` - A hook to `validates_*_of`. When `true` is given, validates the
   presence of the attribute. When a regexp, validates format. When array,
   validates the inclusion of the attribute in the array.
 
-  Whenever :validate is given, the presence is automatically checked. Give
-  :allow_blank => true to override.
+  Whenever `:validate` is given, the presence is automatically checked. Give
+  `allow_blank: true` to override.
 
-  Finally, when :validate is a symbol, the method given as symbol will be
-  called. Then you can add validations as you do in ActiveRecord (errors.add).
+  Finally, when `:validate` is a symbol, the method given as symbol will be
+  called. Then you can add validations as you do in Active Record (`errors.add`).
 
-* :attachment - When given, expects a file to be sent and attaches
+* `:attachment` - When given, expects a file to be sent and attaches
   it to the e-mail. Don't forget to set your form to multitype.
 
-* :captcha - When true, validates the attributes must be blank.
+* `:captcha` - When true, validates the attributes must be blank.
   This is a simple way to avoid spam and the input should be hidden with CSS.
 
 Examples:
 
 ```ruby
 class ContactForm < MailForm::Base
-  attributes :name,  :validate => true
-  attributes :email, :validate => /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
-  attributes :type,  :validate => ["General", "Interface bug"]
+  attributes :name, validate: true
+  attributes :email, validate: /\A[^@\s]+@[^@\s]+\z/i
+  attributes :type, validate: ["General", "Interface bug"]
   attributes :message
-  attributes :screenshot, :attachment => true, :validate => :interface_bug?
-  attributes :nickname,   :captcha => true
+  attributes :screenshot, attachment: true, validate: :interface_bug?
+  attributes :nickname, captcha: true
 
   def interface_bug?
     if type == 'Interface bug' && screenshot.nil?
@@ -149,17 +148,17 @@ class ContactForm < MailForm::Base
   end
 end
 
-c = ContactForm.new(:nickname => 'not_blank', :email => 'your@email.com', :name => 'José')
-c.valid?  #=> true
-c.spam?   #=> true  (raises an error in development, to remember you to hide it)
+c = ContactForm.new(nickname: 'not_blank', email: 'your@email.com', name: 'José')
+c.valid?   #=> true
+c.spam?    #=> true  (raises an error in development, to remember you to hide it)
 c.deliver  #=> false (just delivers if is not a spam and is valid, raises an error in development)
 
-c = ContactForm.new(:email => 'invalid')
+c = ContactForm.new(email: 'invalid')
 c.valid?               #=> false
-c.errors.inspect       #=> { :name => :blank, :email => :invalid }
+c.errors.inspect       #=> { name: :blank, email: :invalid }
 c.errors.full_messages #=> [ "Name can't be blank", "Email is invalid" ]
 
-c = ContactForm.new(:name => 'José', :email => 'your@email.com')
+c = ContactForm.new(name: 'José', email: 'your@email.com')
 c.deliver
 ```
 
@@ -208,8 +207,8 @@ mail_form:
 
 ## Custom e-mail template
 
-To customize the e-mail template that is used create a file called contact.erb in app/views/mail_form.
-Take a look at lib/mail_form/views/mail_form/contact.erb in this repo to see how the default template works.
+To customize the e-mail template that is used create a file called `contact.erb` in `app/views/mail_form`.
+Take a look at `lib/mail_form/views/mail_form/contact.erb` in this repo to see how the default template works.
 
 ## Maintainers
 
@@ -220,8 +219,15 @@ Take a look at lib/mail_form/views/mail_form/contact.erb in this repo to see how
 
 * Andrew Timberlake - http://github.com/andrewtimberlake
 
+## Supported Ruby / Rails versions
+
+We intend to maintain support for all Ruby / Rails versions that haven't reached end-of-life.
+
+For more information about specific versions please check [Ruby](https://www.ruby-lang.org/en/downloads/branches/)
+and [Rails](https://guides.rubyonrails.org/maintenance_policy.html) maintenance policies, and our test matrix.
+
 ## Bugs and Feedback
 
 If you discover any bug, please use github issues tracker.
 
-Copyright (c) 2009-2016 Plataformatec http://plataformatec.com.br/
+Copyright (c) 2009-2019 Plataformatec http://plataformatec.com.br/

data/lib/generators/rails/mail_form_generator.rb

@@ -5,7 +5,7 @@ module Rails
         @_mail_form_source_root ||= File.expand_path("../templates", __FILE__)
       end
 
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       check_class_collision
 

data/lib/generators/rails/templates/model.rb

@@ -4,6 +4,6 @@ class <%= class_name %> < MailForm::Base
 <% end -%>
 
   def headers
-    { :to => "PLEASE-CHANGE-ME@example.org" }
+    { to: "PLEASE-CHANGE-ME@example.org" }
   end
-end
+end

data/lib/mail_form/delivery.rb

@@ -16,10 +16,10 @@ module MailForm
       self.mail_appendable = []
 
       if respond_to?(:before_deliver) && respond_to?(:after_deliver)
-        before_deliver :not_spam?
+        before_deliver :check_not_spam
         after_deliver  :deliver!
       else # For ActiveRecord compatibility
-        before_create :not_spam?
+        before_create :check_not_spam
         after_create  :deliver!
         alias :deliver :save
       end
@@ -38,7 +38,7 @@ module MailForm
       #       validates the inclusion of the attribute in the array.
       #
       #       Whenever :validate is given, the presence is automatically checked. Give
-      #       :allow_blank => true to override.
+      #       allow_blank: true to override.
       #
       #       Finally, when :validate is a symbol, the method given as symbol will be
       #       called. Then you can add validations as you do in ActiveRecord (errors.add).
@@ -52,12 +52,12 @@ module MailForm
       # == Examples
       #
       #   class ContactForm < MailForm
-      #     attributes :name,  :validate => true
-      #     attributes :email, :validate => /^([^@]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
-      #     attributes :type,  :validate => ["General", "Interface bug"]
+      #     attributes :name, validate: true
+      #     attributes :email, validate: /\A[^@\s]+@[^@\s]+\z/i
+      #     attributes :type, validate: ["General", "Interface bug"]
       #     attributes :message
-      #     attributes :screenshot, :attachment => true, :validate => :interface_bug?
-      #     attributes :nickname, :captcha => true
+      #     attributes :screenshot, attachment: true, validate: :interface_bug?
+      #     attributes :nickname, captcha: true
       #
       #     def interface_bug?
       #       if type == 'Interface bug' && screenshot.nil?
@@ -90,11 +90,11 @@ module MailForm
             validate validation
             break
           when Regexp
-            validates_format_of accessor, :with => validation, :allow_blank => true
+            validates_format_of accessor, with: validation, allow_blank: true
           when Array
-            validates_inclusion_of accessor, :in => validation, :allow_blank => true
+            validates_inclusion_of accessor, in: validation, allow_blank: true
           when Range
-            validates_length_of accessor, :within => validation, :allow_blank => true
+            validates_length_of accessor, within: validation, allow_blank: true
           end
 
           validates_presence_of accessor unless options[:allow_blank] == true
@@ -146,6 +146,11 @@ module MailForm
       !spam?
     end
 
+    def check_not_spam
+      throw(:abort) if spam?
+    end
+    private :check_not_spam
+
     # Deliver the resource without running any validation.
     def deliver!
       mailer = MailForm::Notifier.contact(self)

data/lib/mail_form/shim.rb

@@ -23,7 +23,7 @@ module MailForm
     end
 
     # Initialize assigning the parameters given as hash.
-    def initialize(params={})
+    def initialize(params = {})
       params.each_pair do |attr, value|
         send("#{attr}=", value) if respond_to?("#{attr}=", true)
       end unless params.blank?

data/lib/mail_form/version.rb

@@ -1,3 +1,3 @@
 module MailForm
-  VERSION = "1.6.0".freeze
+  VERSION = "1.9.0".freeze
 end

data/lib/mail_form/views/mail_form/contact.erb

@@ -16,14 +16,14 @@
 <% end %>
 
 <% unless @resource.class.mail_appendable.blank? %>
-  <br /><h4 style="text-decoration:underline"><%= I18n.t :title, :scope => [ :mail_form, :request ], :default => 'Request information' %></h4>
+  <br /><h4 style="text-decoration:underline"><%= I18n.t :title, scope: [ :mail_form, :request ], default: 'Request information' %></h4>
 
   <% @resource.class.mail_appendable.each do |attribute|
     value = @resource.request.send(attribute)
 
     value = if value.is_a?(Hash) && !value.empty?
       list = value.to_a.map{ |k,v| content_tag(:li, h("#{k}: #{v.inspect}")) }.join("\n")
-      content_tag(:ul, raw(list), :style => "list-style:none;")
+      content_tag(:ul, raw(list), style: "list-style:none;")
     elsif value.is_a?(String)
       value
     else
@@ -31,7 +31,7 @@
     end
   %>
 
-    <p><b><%= I18n.t attribute, :scope => [ :mail_form, :request ], :default => attribute.to_s.humanize %>:</b>
+    <p><b><%= I18n.t attribute, scope: [ :mail_form, :request ], default: attribute.to_s.humanize %>:</b>
     <%= value.include?("\n") ? simple_format(value) : value %></p>
   <% end %>
   <br />

data/test/active_record_test.rb

@@ -0,0 +1,33 @@
+# coding: utf-8
+
+require 'test_helper'
+
+class ActiveRecordTest < ActiveSupport::TestCase
+  def setup
+    ActionMailer::Base.deliveries = []
+  end
+
+  def test_save_is_false_when_is_a_spam
+    form = ActiveRecordForm.new(name: 'Carlos', email: 'is.valid@email.com', nickname: 'not_blank')
+    assert form.valid?
+    assert form.spam?
+    assert !form.save
+    assert_empty ActionMailer::Base.deliveries
+  end
+
+  def test_save_is_false_when_is_invalid
+    form = ActiveRecordForm.new(name: 'Carlos', email: 'is.com')
+    assert form.invalid?
+    assert form.not_spam?
+    assert !form.save
+    assert_empty ActionMailer::Base.deliveries
+  end
+
+  def test_save_is_true_when_is_not_spam_and_valid
+    form = ActiveRecordForm.new(name: 'Carlos', email: 'is.valid@email.com')
+    assert form.valid?
+    assert form.not_spam?
+    assert form.save
+    assert_equal 1, ActionMailer::Base.deliveries.size
+  end
+end

data/test/mail_form_test.rb

@@ -5,17 +5,21 @@ require 'test_helper'
 class MailFormNotifierTest < ActiveSupport::TestCase
 
   def setup
-    @form = ContactForm.new(:name => 'José', :email => 'my.email@my.domain.com', :message => 'Cool')
-
-    ActionController::TestRequest.respond_to?(:create) ?
-        @request = ActionController::TestRequest.create :
-        @request = ActionController::TestRequest.new
-    @valid_attributes = { :name => 'José', :email => 'my.email@my.domain.com', :message => "Cool\nno?" }
+    @form = ContactForm.new(name: 'José', email: 'my.email@my.domain.com', message: 'Cool')
+
+    @request = if ActionPack.respond_to?(:version) && ActionPack.version >= Gem::Version.new('5.1')
+                 ActionController::TestRequest.create(Class.new) # Rails 5.1
+               elsif ActionPack.respond_to?(:version) && ActionPack.version >= Gem::Version.new('5.0')
+                 ActionController::TestRequest.create # Rails 5
+               else
+                 ActionController::TestRequest.new
+               end
+    @valid_attributes = { name: 'José', email: 'my.email@my.domain.com', message: "Cool\nno?" }
     @advanced         = AdvancedForm.new(@valid_attributes)
     @advanced.request = @request
 
     test_file  = Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__), 'test_file.txt'))
-    @with_file = FileForm.new(:name => 'José', :email => 'my.email@my.domain.com', :message => "Cool", :file => test_file)
+    @with_file = FileForm.new(name: 'José', email: 'my.email@my.domain.com', message: "Cool", file: test_file)
 
     ActionMailer::Base.deliveries = []
   end
@@ -50,7 +54,7 @@ class MailFormNotifierTest < ActiveSupport::TestCase
   end
 
   def test_body_contains_localized_attributes_names
-    I18n.backend.store_translations(:en, :mail_form => { :attributes => { :contact_form => { :message => 'Sent message' } } })
+    I18n.backend.store_translations(:en, mail_form: { attributes: { contact_form: { message: 'Sent message' } } })
     @form.deliver
     assert_match %r[Sent message:], first_delivery.body.to_s
     assert_no_match %r[Message:], first_delivery.body.to_s
@@ -80,7 +84,7 @@ class MailFormNotifierTest < ActiveSupport::TestCase
   end
 
   def test_request_title_is_localized
-    I18n.backend.store_translations(:en, :mail_form => { :request => { :title => 'Information about the request' } })
+    I18n.backend.store_translations(:en, mail_form: { request: { title: 'Information about the request' } })
     @advanced.deliver
     assert_no_match %r[Request information], last_delivery.body.to_s
     assert_match %r[Information about the request], last_delivery.body.to_s
@@ -93,7 +97,7 @@ class MailFormNotifierTest < ActiveSupport::TestCase
   end
 
   def test_request_info_attributes_are_localized
-    I18n.backend.store_translations(:en, :mail_form => { :request => { :remote_ip => 'IP Address' } })
+    I18n.backend.store_translations(:en, mail_form: { request: { remote_ip: 'IP Address' } })
     @advanced.deliver
     assert_match %r[IP Address], last_delivery.body.to_s
     assert_no_match %r[Remote ip], last_delivery.body.to_s
@@ -106,7 +110,7 @@ class MailFormNotifierTest < ActiveSupport::TestCase
   end
 
   def test_request_info_hashes_are_print_inside_lists
-    @request.session = { :my => :session, :user => "data" }
+    @request.session = { my: :session, user: "data" }
     @advanced.deliver
     assert_match %r[<ul], last_delivery.body.to_s
     assert_match %r[<li>my: :session<\/li>], last_delivery.body.to_s

data/test/resource_test.rb

@@ -9,7 +9,7 @@ class MailFormBaseTest < ActiveSupport::TestCase
   end
 
   def test_id_is_nil
-    assert_equal nil, ContactForm.new.id
+    assert_nil ContactForm.new.id
   end
 
   def test_is_always_a_new_record
@@ -17,13 +17,13 @@ class MailFormBaseTest < ActiveSupport::TestCase
   end
 
   def test_initialize_with_options
-    form = ContactForm.new(:name => 'José', :email => 'jose@my.email.com')
+    form = ContactForm.new(name: 'José', email: 'jose@my.email.com')
     assert_equal 'José', form.name
     assert_equal 'jose@my.email.com', form.email
   end
 
   def test_spam_is_true_when_captcha_field_is_set
-    form = ContactForm.new(:nickname => 'not_blank')
+    form = ContactForm.new(nickname: 'not_blank')
     assert form.spam?
     assert !form.not_spam?
   end
@@ -45,7 +45,7 @@ class MailFormBaseTest < ActiveSupport::TestCase
   end
 
   def test_is_not_valid_when_validatable_regexp_does_not_match
-    form = ContactForm.new(:name => 'Jose', :email => 'not_valid')
+    form = ContactForm.new(name: 'Jose', email: 'not_valid')
     assert !form.valid?
     assert form.invalid?
 
@@ -54,7 +54,7 @@ class MailFormBaseTest < ActiveSupport::TestCase
   end
 
   def test_is_valid_when_validatable_attributes_are_valid
-    form = ContactForm.new(:name => 'Jose', :email => 'is.valid@email.com')
+    form = ContactForm.new(name: 'Jose', email: 'is.valid@email.com')
     assert form.valid?
     assert !form.invalid?
   end
@@ -67,21 +67,23 @@ class MailFormBaseTest < ActiveSupport::TestCase
   end
 
   def test_deliver_is_false_when_is_a_spam
-    form = ContactForm.new(:name => 'Jose', :email => 'is.valid@email.com', :nickname => 'not_blank')
+    form = ContactForm.new(name: 'Jose', email: 'is.valid@email.com', nickname: 'not_blank')
     assert form.valid?
     assert form.spam?
     assert !form.deliver
+    assert_empty ActionMailer::Base.deliveries
   end
 
   def test_deliver_is_false_when_is_invalid
-    form = ContactForm.new(:name => 'Jose', :email => 'is.com')
+    form = ContactForm.new(name: 'Jose', email: 'is.com')
     assert form.invalid?
     assert form.not_spam?
     assert !form.deliver
+    assert_empty ActionMailer::Base.deliveries
   end
 
   def test_deliver_is_true_when_is_not_spam_and_valid
-    form = ContactForm.new(:name => 'Jose', :email => 'is.valid@email.com')
+    form = ContactForm.new(name: 'Jose', email: 'is.valid@email.com')
     assert form.valid?
     assert form.not_spam?
     assert form.deliver
@@ -93,7 +95,7 @@ class MailFormBaseTest < ActiveSupport::TestCase
   end
 
   def test_human_name_can_be_localized
-    I18n.backend.store_translations(:en, :mail_form => { :models => { :contact_form => 'Formulário de contato' } })
+    I18n.backend.store_translations(:en, mail_form: { models: { contact_form: 'Formulário de contato' } })
     assert_equal 'Formulário de contato', ContactForm.model_name.human
   end
 
@@ -102,12 +104,12 @@ class MailFormBaseTest < ActiveSupport::TestCase
   end
 
   def test_human_attribute_name_can_be_localized
-    I18n.backend.store_translations(:en, :mail_form => { :attributes => { :contact_form => { :message => 'Mensagem' } } })
+    I18n.backend.store_translations(:en, mail_form: { attributes: { contact_form: { message: 'Mensagem' } } })
     assert_equal 'Mensagem', ContactForm.human_attribute_name(:message)
   end
 
   def test_activemodel_linked_errors
-    form = ContactForm.new(:email => 'not_valid', :category => "invalid")
+    form = ContactForm.new(email: 'not_valid', category: "invalid")
     form.valid?
     assert_equal ["can't be blank"],              form.errors[:name]
     assert_equal ["is invalid"],                  form.errors[:email]
@@ -116,13 +118,11 @@ class MailFormBaseTest < ActiveSupport::TestCase
   end
 
   def test_activemodel_errors_lookups_model_keys
-    I18n.backend.store_translations(:en, :mail_form => { :errors => { :models => { :contact_form =>
-      { :attributes => { :email => { :invalid => 'fill in the email' },
-                         :name => { :blank => 'fill in the name' } }
-      }
+    I18n.backend.store_translations(:en, mail_form: { errors: { models: { contact_form:
+      { attributes: { email: { invalid: 'fill in the email' }, name: { blank: 'fill in the name' } } }
     }}})
 
-    form = ContactForm.new(:email => 'not_valid')
+    form = ContactForm.new(email: 'not_valid')
     form.valid?
 
     assert_equal ["fill in the name"],  form.errors[:name]

data/test/test_helper.rb

@@ -26,15 +26,15 @@ module Rails
 end
 
 class ContactForm < MailForm::Base
-  attribute :name,     :validate => true
-  attribute :email,    :validate => /[^@]+@[^\.]+\.[\w\.\-]+/
-  attribute :category, :validate => ["Interface bug", "General"], :allow_blank => true
-  attribute :nickname, :captcha => true
+  attribute :name,     validate: true
+  attribute :email,    validate: /\A[^@\s]+@[^@\s]+\z/i
+  attribute :category, validate: ["Interface bug", "General"], allow_blank: true
+  attribute :nickname, captcha: true
 
-  attributes :created_at, :message, :validate => :callback
+  attributes :created_at, :message, validate: :callback
 
   def headers
-    { :to => 'my.email@my.domain.com' }
+    { to: 'my.email@my.domain.com' }
   end
 
   def initialize(*)
@@ -55,16 +55,16 @@ class AdvancedForm < ContactForm
   append :remote_ip, :user_agent, :session
 
   def headers
-    { :to => [ 'my.first@email.com', 'my.second@email.com' ],
-      :subject => "My Advanced Form",
-      :from => %{"#{name}" <#{email}>},
+    { to: [ 'my.first@email.com', 'my.second@email.com' ],
+      subject: "My Advanced Form",
+      from: %{"#{name}" <#{email}>},
       "return-path" => "mypath"
     }
   end
 end
 
 class FileForm < ContactForm
-  attribute :file, :attachment => true, :validate => true
+  attribute :file, attachment: true, validate: true
 
   def headers
     to = if file
@@ -72,7 +72,36 @@ class FileForm < ContactForm
     else
       "contact@my.domain.com"
     end
-    { :to => to }
+    { to: to }
+  end
+end
+
+class ActiveRecordForm
+  include ActiveModel::Model
+
+  # Simulate Active Record `*_create` callbacks.
+  extend ActiveModel::Callbacks
+  define_model_callbacks :create
+
+  def save
+    if valid?
+      run_callbacks(:create) { true }
+    else
+      false
+    end
+  end
+
+  include MailForm::Delivery
+
+  attribute :name, validate: true
+  attribute :email, validate: /\A[^@\s]+@[^@\s]+\z/i
+  attribute :nickname, captcha: true
+
+  def headers
+    {
+      to: "your.email@your.domain.com",
+      subject: "User created an account"
+    }
   end
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mail_form
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.9.0
 platform: ruby
 authors:
 - José Valim
 - Carlos Antônio
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -17,40 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 description: Send e-mail straight from forms in Rails with I18n, validations, attachments
   and request information.
 email: contact@plataformatec.com.br
@@ -69,6 +57,7 @@ files:
 - lib/mail_form/shim.rb
 - lib/mail_form/version.rb
 - lib/mail_form/views/mail_form/contact.erb
+- test/active_record_test.rb
 - test/mail_form_test.rb
 - test/resource_test.rb
 - test/test_file.txt
@@ -78,7 +67,7 @@ homepage: https://github.com/plataformatec/mail_form
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,23 +75,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: mail_form
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.6
+signing_key:
 specification_version: 4
 summary: Send e-mail straight from forms in Rails with I18n, validations, attachments
   and request information.
 test_files:
 - test/mail_form_test.rb
+- test/active_record_test.rb
 - test/resource_test.rb
 - test/test_file.txt
 - test/test_helper.rb
 - test/views/mail_form/custom_template.erb
-has_rdoc: