mail_form 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c29692d7133535b027bee364610e17dfa471a119d0970c327879ecf9c68a4196
-  data.tar.gz: 3305eaa30e4e23797a8f0f77cb1c8f429c23348be3c03cfdad22d22e744bea76
+  metadata.gz: 307522dc8d5fd4174ec71c9f4c26dea05e1483aa701c3eb5f0a23f0509eb532a
+  data.tar.gz: 97d76bee24038cdb4e2348de76e3ebf5a9b0fc649ddb9152e29ebe100a92b428
 SHA512:
-  metadata.gz: e9fd29a8f0e1718418d20432be4c79b6b26f4bf006c55dc6648bda4611d317f2908d28c9a9f3c1658a291c91c51cf53735bd197c0797eaf76a1670b0a889378b
-  data.tar.gz: b0d94c74629678aa29830abb2b5b15f4ecf47fc9f4d6446e0ec71e3624ade342b4ee1e0a0a9977ee4ef8eba9ab230eac0a078fcafc0c2f647ac04bc507e5837f
+  metadata.gz: 78139f234a229baed7ca68c7265efcfb84464d8b10e1b302e1408bf10fcc0dcc9f7703d5e04e57255bc3dda5a0324281edfa4a48d17df727aab1ff101de31b6b
+  data.tar.gz: e455b3eabe1350b302e48810a857d86b28e7b4944af551271e163e12c75dfa0cb86f0fd15d22990ab4efe58168daa5fc5eb6c7406164d2c7cfa6cd0a506d61a8

data/README.md

@@ -1,7 +1,6 @@
 ## MailForm
 
 [![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 5
 
@@ -126,6 +125,8 @@ Options:
 
 * `: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.
+  It also accepts multiple files through a single attachment attribute,
+  and will attach them individually to the e-mail.
 
 * `: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.

data/lib/mail_form/notifier.rb

@@ -12,8 +12,11 @@ module MailForm
 
       resource.class.mail_attachments.each do |attribute|
         value = resource.send(attribute)
-        next unless value.respond_to?(:read)
-        attachments[value.original_filename] = value.read
+        if value.is_a?(Array)
+          value.each { |attachment_file| add_attachment(attachment_file) }
+        else
+          add_attachment(value)
+        end
       end
 
       headers = resource.headers
@@ -21,5 +24,12 @@ module MailForm
       headers[:subject] ||= resource.class.model_name.human
       mail(headers)
     end
+
+    private
+
+      def add_attachment(attachment_file)
+        return unless attachment_file.respond_to?(:read)
+        attachments[attachment_file.original_filename] = attachment_file.read
+      end
   end
-end
+end

data/lib/mail_form/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail_form
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2023-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -57,16 +57,15 @@ 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
-- test/test_helper.rb
-- test/views/mail_form/custom_template.erb
 homepage: https://github.com/plataformatec/mail_form
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/heartcombo/mail_form
+  changelog_uri: https://github.com/heartcombo/mail_form/blob/main/CHANGELOG.md
+  source_code_uri: https://github.com/heartcombo/mail_form
+  bug_tracker_uri: https://github.com/heartcombo/mail_form/issues
+  wiki_uri: https://github.com/heartcombo/mail_form/wiki
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -82,15 +81,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.6
+rubygems_version: 3.4.5
 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
+test_files: []

data/test/active_record_test.rb

@@ -1,33 +0,0 @@
-# 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

@@ -1,150 +0,0 @@
-# coding: utf-8
-
-require 'test_helper'
-
-class MailFormNotifierTest < ActiveSupport::TestCase
-
-  def setup
-    @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)
-
-    ActionMailer::Base.deliveries = []
-  end
-
-  def test_email_is_sent
-    @form.deliver
-    assert_equal 1, ActionMailer::Base.deliveries.size
-  end
-
-  def test_subject_defaults_to_human_class_name
-    @form.deliver
-    assert_equal 'Contact form', first_delivery.subject
-  end
-
-  def test_body_contains_subject
-    @form.deliver
-    assert_match %r[Contact form], first_delivery.body.to_s
-  end
-
-  def test_body_contains_attributes_values
-    @form.deliver
-    assert_match %r[José], first_delivery.body.to_s
-    assert_match %r[my.email@my.domain.com], first_delivery.body.to_s
-    assert_match %r[Cool], first_delivery.body.to_s
-  end
-
-  def test_body_contains_attributes_names
-    @form.deliver
-    assert_match %r[Name:], first_delivery.body.to_s
-    assert_match %r[Email:], first_delivery.body.to_s
-    assert_match %r[Message:], first_delivery.body.to_s
-  end
-
-  def test_body_contains_localized_attributes_names
-    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
-  end
-
-  def test_body_mail_format_messages_with_break_line
-    @form.deliver
-    assert_no_match %r[<p>Cool], first_delivery.body.to_s
-
-    @advanced.deliver
-    assert_match %r[<p>Cool], last_delivery.body.to_s
-  end
-
-  def test_body_mail_format_dates_with_i18n
-    @form.deliver
-    assert_no_match %r[I18n.l(Date.today)], first_delivery.body.to_s
-  end
-
-  def test_body_does_not_append_request_if_append_is_not_called
-    @form.deliver
-    assert_no_match %r[Request information], first_delivery.body.to_s
-  end
-
-  def test_body_does_append_request_if_append_is_called
-    @advanced.deliver
-    assert_match %r[Request information], last_delivery.body.to_s
-  end
-
-  def test_request_title_is_localized
-    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
-  end
-
-  def test_request_info_attributes_are_printed
-    @advanced.deliver
-    assert_match %r[Remote ip], last_delivery.body.to_s
-    assert_match %r[User agent], last_delivery.body.to_s
-  end
-
-  def test_request_info_attributes_are_localized
-    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
-  end
-
-  def test_request_info_values_are_printed
-    @advanced.deliver
-    assert_match %r[0\.0\.0\.0], last_delivery.body.to_s
-    assert_match %r[Rails Testing], last_delivery.body.to_s
-  end
-
-  def test_request_info_hashes_are_print_inside_lists
-    @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
-    assert_match %r[<li>user: \S+data\S+<\/li>], last_delivery.body.to_s
-  end
-
-  def test_error_is_raised_when_append_is_given_but_no_request_is_given
-    assert_raise ScriptError do
-      @advanced.request = nil
-      @advanced.deliver
-    end
-  end
-
-  def test_form_with_file_includes_an_attachment
-    @with_file.deliver
-    assert_equal 1, first_delivery.attachments.size
-  end
-
-  def test_form_with_file_does_not_output_attachment_as_attribute
-    @with_file.deliver
-    assert_no_match %r[File:], first_delivery.body.to_s
-  end
-
-  protected
-
-    def first_delivery
-      ActionMailer::Base.deliveries.first
-    end
-
-    def last_delivery
-      ActionMailer::Base.deliveries.last
-    end
-
-    def teardown
-      I18n.reload!
-    end
-end

data/test/resource_test.rb

@@ -1,136 +0,0 @@
-# coding: utf-8
-
-require 'test_helper'
-
-class MailFormBaseTest < ActiveSupport::TestCase
-
-  def setup
-    ActionMailer::Base.deliveries = []
-  end
-
-  def test_id_is_nil
-    assert_nil ContactForm.new.id
-  end
-
-  def test_is_always_a_new_record
-    assert ContactForm.new.new_record?
-  end
-
-  def test_initialize_with_options
-    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')
-    assert form.spam?
-    assert !form.not_spam?
-  end
-
-  def test_spam_is_false_when_captcha_field_is_not_set
-    form = ContactForm.new
-    assert !form.spam?
-    assert form.not_spam?
-  end
-
-  def test_is_not_valid_when_validatable_attributes_are_blank
-    form = ContactForm.new
-    assert !form.valid?
-    assert form.invalid?
-
-    assert_equal 2, form.errors.count
-    assert_equal ["can't be blank"], form.errors[:email]
-    assert_equal ["can't be blank"], form.errors[:name]
-  end
-
-  def test_is_not_valid_when_validatable_regexp_does_not_match
-    form = ContactForm.new(name: 'Jose', email: 'not_valid')
-    assert !form.valid?
-    assert form.invalid?
-
-    assert_equal(1, form.errors.count)
-    assert_equal ["is invalid"], form.errors[:email]
-  end
-
-  def test_is_valid_when_validatable_attributes_are_valid
-    form = ContactForm.new(name: 'Jose', email: 'is.valid@email.com')
-    assert form.valid?
-    assert !form.invalid?
-  end
-
-  def test_symbols_given_to_validate_are_called
-    form = ContactForm.new
-    assert !form.callback_run?
-    form.valid?
-    assert form.callback_run?
-  end
-
-  def test_deliver_is_false_when_is_a_spam
-    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')
-    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')
-    assert form.valid?
-    assert form.not_spam?
-    assert form.deliver
-    assert_equal 1, ActionMailer::Base.deliveries.size
-  end
-
-  def test_human_name_returns_a_humanized_name
-    assert_equal 'Contact form', ContactForm.model_name.human
-  end
-
-  def test_human_name_can_be_localized
-    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
-
-  def test_human_attribute_name_returns_a_humanized_attribute
-    assert_equal 'Message', ContactForm.human_attribute_name(:message)
-  end
-
-  def test_human_attribute_name_can_be_localized
-    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.valid?
-    assert_equal ["can't be blank"],              form.errors[:name]
-    assert_equal ["is invalid"],                  form.errors[:email]
-    assert_equal ["is not included in the list"], form.errors[:category]
-    assert_equal [],                              form.errors[:message]
-  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' } } }
-    }}})
-
-    form = ContactForm.new(email: 'not_valid')
-    form.valid?
-
-    assert_equal ["fill in the name"],  form.errors[:name]
-    assert_equal ["fill in the email"], form.errors[:email]
-  end
-
-  def teardown
-    I18n.reload!
-  end
-
-end

data/test/test_file.txt

@@ -1 +0,0 @@
-A test file

data/test/test_helper.rb

@@ -1,113 +0,0 @@
-require 'minitest/autorun'
-
-RAILS_ENV = ENV["RAILS_ENV"] = "test"
-
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require 'mail_form'
-
-require 'active_support'
-require 'active_support/test_case'
-require 'active_support/string_inquirer'
-require 'action_controller'
-require 'action_controller/test_case'
-require 'action_mailer'
-
-if ActiveSupport::TestCase.respond_to?(:test_order=)
-  ActiveSupport::TestCase.test_order = :random
-end
-
-ActionMailer::Base.delivery_method = :test
-I18n.enforce_available_locales = false
-
-module Rails
-  def self.env
-    @env ||= ActiveSupport::StringInquirer.new('test')
-  end
-end
-
-class ContactForm < MailForm::Base
-  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
-
-  def headers
-    { to: 'my.email@my.domain.com' }
-  end
-
-  def initialize(*)
-    super
-    @_callback_run = false
-  end
-
-  def callback
-    @_callback_run = true
-  end
-
-  def callback_run?
-    @_callback_run
-  end
-end
-
-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}>},
-      "return-path" => "mypath"
-    }
-  end
-end
-
-class FileForm < ContactForm
-  attribute :file, attachment: true, validate: true
-
-  def headers
-    to = if file
-      "contact_file@my.domain.com"
-    else
-      "contact@my.domain.com"
-    end
-    { 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
-
-# Needed to correctly test an uploaded file
-class Rack::Test::UploadedFile
-  def read
-    @tempfile.read
-  end
-end

data/test/views/mail_form/custom_template.erb

@@ -1 +0,0 @@
-Hello from my custom template!