mote_sms 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e86ec351273a2ac1c0b5d3357fe2160847583bbd
-  data.tar.gz: dc6470925b64bd33c026f8335bbca0661c2fa5e0
+  metadata.gz: 72362b424d8076956877d7ea054c7915476eafb6
+  data.tar.gz: 9e0a1d768e4b2e4bf3023bfb86d0d65443a74103
 SHA512:
-  metadata.gz: 5e8889d19b128540b2df04afee8ac633c6ac04bbef6cae0564b00e438e3864db3e23c73dc548cedf404e201087e1220a626891a6f3ca34e220b139492160faa4
-  data.tar.gz: d23331cc227890fe6c5413496d7f265f483dd07c51b4b077feffa0102e94443ff90c00aadef294c9cdbadc27366bee8902beced1805fcf2a60481fc123791ed9
+  metadata.gz: c72514b0dfc18d48a14c6bc40727e845ed90ad23d2a13f0c0bf989299b0dd1d715bd4153c1ca64e13dfa374b0e985e7539566cd5af96ca9580f3c3fad4fb54c4
+  data.tar.gz: a35f0a8fd3ccbe65d1b606b57468ba3b0a4eadcdaa8c877bd6c4612445eeeadac5de55df600b5565f4f16575bcb5b9e792b0ac40a30b119052a9f98312f08577

data/lib/mote_sms/transports/action_mailer_transport.rb

@@ -3,10 +3,9 @@ require 'action_mailer'
 module MoteSMS
   # Internal: ActionMailer class to forward SMS to recipient.
   class ActionMailerSMSMailer < ::ActionMailer::Base
-    def forward_sms(recipient, from, sms, subject = nil)
+    def forward_sms(recipient, sms, subject = nil)
       subject ||= "SMS to #{sms.to.map(&:to_s).join(', ')}"
-      from ||= "#{sms.from} <#{recipient}>"
-      mail to: recipient, from: from, subject: subject, body: sms.body
+      mail to: recipient, from: "#{sms.from} <#{recipient}>", subject: subject, body: sms.body
     end
   end
 
@@ -26,12 +25,12 @@ module MoteSMS
     # Public: Read/change the recipient used when delivering the message.
     #         Read/change the from field used when delivering the message.
     # Also accepts a Proc.
-    attr_accessor :recipient, :from
+    attr_accessor :recipient, :default_options
 
     # Public: Create a new ActionMailerTransport instance
-    def initialize(recipient, from = nil)
+    def initialize(recipient, default_options = {})
       self.recipient = recipient
-      self.from = from
+      self.default_options = default_options
     end
 
     # Public: Sends message using ActionMailer to recipient.
@@ -41,8 +40,9 @@ module MoteSMS
     #
     # Returns nothing.
     def deliver(message, options = {})
+      options = options.reverse_merge default_options
       to = recipient.respond_to?(:call) ? recipient.call(message) : recipient
-      ActionMailerSMSMailer.forward_sms(to, from, message, options[:subject].presence).deliver_now
+      ActionMailerSMSMailer.forward_sms(to, message, options[:subject].presence).deliver_now
 
       message.to
     end

data/lib/mote_sms/version.rb

@@ -1,3 +1,3 @@
 module MoteSMS
-  VERSION = '1.3.4'.freeze
+  VERSION = '1.3.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mote_sms
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Lukas Westermann