smailer 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 882d4145d4e47583284e40abbea61a4904131776
-  data.tar.gz: b411a56313daeaaf2fcf7d6dd48727ab692747ee
+  metadata.gz: c07a27e4bbea2f0bc95cde59fe7201647fb4a9ae
+  data.tar.gz: 6924a18b1447a50f47eaf08fa20295ae4ba4a530
 SHA512:
-  metadata.gz: 91baf3610b97979df6157b8420ef4e60288d2d786b878d0f2677342dda4f8deb54864be4186b0ca14eef5287233c9435536d04e01af3598a2751b0fdac7b4734
-  data.tar.gz: 5527e195641bfdde27c9e5843905fa35d0760f55fe6ae3b7a56c2968b4f7af8c37dcced95a8083e2bb0722f2ea341ac6aad23806e896ea6dbb75c067433c7683
+  metadata.gz: 23a2ae77e2d6416ae35f54277262238982627bf9d095ac1b1f0495c65144c128a593c6f29c31e654c3019e4ecee250b736c1c5422e685a40efe1ca57103f5d26
+  data.tar.gz: 4de9d3bbd461f9509cadac9699227428cc983dd7b6b07dccc5ab7d0b27ecf53b3af2df11350b49f383b17df3c0c842b6d039f6e074257511f59a1f7b4eb1ff82

data/lib/smailer/tasks/send.rb

@@ -11,15 +11,9 @@ module Smailer
           raise "VERP is enabled, but a :return_path_domain option has not been specified or is blank."
         end
 
-        rails_delivery_method = if Smailer::Compatibility.rails_3_or_4?
-          method = Rails.configuration.action_mailer.delivery_method
-          [method, Rails.configuration.action_mailer.send("#{method}_settings")]
-        else
-          [ActionMailer::Base.delivery_method]
-        end
-
         Mail.defaults do
-          delivery_method *rails_delivery_method
+          method = Rails.configuration.action_mailer.delivery_method
+          delivery_method method, Rails.configuration.action_mailer.send("#{method}_settings")
         end
 
         batch_size   = (Smailer::Models::Property.get('queue.batch_size') || 100).to_i
@@ -70,7 +64,7 @@ module Smailer
           # compute the VERP'd return_path if requested
           # or fall-back to a global return-path if not
           item_return_path = if options[:verp]
-             "#{Smailer::BOUNCES_PREFIX}#{queue_item.key}@#{options[:return_path_domain]}"
+            "#{Smailer::BOUNCES_PREFIX}#{queue_item.key}@#{options[:return_path_domain]}"
           else
             options[:return_path]
           end

data/lib/smailer/version.rb

@@ -1,7 +1,7 @@
 module Smailer
   MAJOR = 0
   MINOR = 7
-  PATCH = 3
+  PATCH = 4
 
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smailer
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Dimitar Dimitrov