mail_form 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d303b19e76c996f383cdd3cca96a6d1f5ebbf99
-  data.tar.gz: 37b37ccd2e0f7d3e534d9985dc79f04cfbc1d4d3
+  metadata.gz: b6518ae2061974f6752fb23da63807e6977b0f3c
+  data.tar.gz: 8ed10502f0cc6ba1a2fb546ff2032f88be2dec72
 SHA512:
-  metadata.gz: cef061942f687c6d82678d7258d8360093efc67f8ff93dcd0721ffe788e3ee64f1f8817930b22ef8ab463e1292e96eecf0aab5b10d03d64109c333f9af9eda05
-  data.tar.gz: aa04d2badd1f88698639de4ab99ccc7ce48d004a044662d29445a3341ee3aea0257a9c58f65affe72a9640b5ce274c8fe8e83bb2c6612ef85586db8cf20ec0b4
+  metadata.gz: f6e331507e760518207fbf072d43a6dbadde4d3bff14cc9eac32e314d54772a737023ff2e3dba6b9b73bef350b8da9484a55828db2b1c12e750d79167543ee3d
+  data.tar.gz: 4746bdd0ab9f965af5a220ad6fa962ab501269bbbccdafdf8a20e0e781a4719f78230aa5e32a96952aecd277367b03e9c9da086c42cf9d0dfd2132b88c9f30dc

data/lib/mail_form/delivery.rb

@@ -15,7 +15,12 @@ module MailForm
       class_attribute :mail_appendable
       self.mail_appendable = []
 
-      if respond_to?(:before_deliver) && respond_to?(:after_deliver)
+      # not_spam? simply returns false, but when used as a callback, we have to throw(:abort)
+      # to halt the callback chain, beginning with Rails 5.1.
+      if ActionPack.respond_to?(:version) && ActionPack.version >= Gem::Version.new('5.1')
+        before_deliver :check_not_spam
+        after_deliver  :deliver!
+      elsif respond_to?(:before_deliver) && respond_to?(:after_deliver)
         before_deliver :not_spam?
         after_deliver  :deliver!
       else # For ActiveRecord compatibility
@@ -146,6 +151,10 @@ module MailForm
       !spam?
     end
 
+    def check_not_spam
+      throw(:abort) if spam?
+    end
+
     # Deliver the resource without running any validation.
     def deliver!
       mailer = MailForm::Notifier.contact(self)

data/lib/mail_form/version.rb

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

data/test/mail_form_test.rb

@@ -7,9 +7,13 @@ 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
+    @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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail_form
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -20,7 +20,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         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
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mail_form
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Send e-mail straight from forms in Rails with I18n, validations, attachments
@@ -105,4 +105,3 @@ test_files:
 - test/test_file.txt
 - test/test_helper.rb
 - test/views/mail_form/custom_template.erb
-has_rdoc: