textris 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd28b9ac3a423603ff04fe56ed5551b98e0ee25efb567c2e9bebf0e40607a547
-  data.tar.gz: 303d52aac458a7cf0b7e779261b3356bf331229fafe0030802c06c760d692682
+  metadata.gz: b3b346e56a0f337f7bc490ece9137743617baf7f739c0c1029317602651b852d
+  data.tar.gz: a5125b59502e41ab9c2d94edbb68cc21aee52bcd4e6f95b05cf934c6668a80c6
 SHA512:
-  metadata.gz: 8b90c45135057231f6b3689599628d9d3e2264938eb1f1d4526764e6e4ce198eeb500c367833e5d4ea581b81603b24f7b79a8794b687dd3015b613082228e830
-  data.tar.gz: 1d19bfb9156bf45962134c08d6e96f8516fa65b8ae8fc7f17b8f3fbc4846a947c2c429f64655494831cd3127ae93f35849c67e49b19e785f394ee17613a7de71
+  metadata.gz: 00e3ac83e238ec56fe070f32efb04c72327d660301d42c0f1adaf8fa3d088e62215459ebdbc84860a9b78cb4777abe58faaae394e756ce161fcbe1dd56caeded
+  data.tar.gz: e2f655d43ecb4e2aa73a83635358cbc54832e05f0beadbe6e65f4855b891f270a2954a7282233a0a8c5a8ffefd0aa4098689ff2839cd5ccda4070da9a49b4519

data/README.md

@@ -204,6 +204,8 @@ Twilio.configure do |config|
 end
 ```
 
+To use Twilio's Copilot use `twilio_messaging_service_sid` in place of `from` when sending a text or setting defaults.
+
 #### Nexmo
 
 In order to use Nexmo with **textris**, you need to include the `nexmo` gem in your `Gemfile`:

data/lib/textris/delivery/log.rb

@@ -8,7 +8,7 @@ module Textris
         log :debug, "Texter: #{message.texter || 'UnknownTexter'}" + "#" +
           "#{message.action || 'unknown_action'}"
         log :debug, "Date: #{Time.now}"
-        log :debug, "From: #{message.from || 'unknown'}"
+        log :debug, "From: #{message.from || message.twilio_messaging_service_sid || 'unknown'}"
         log :debug, "To: #{message.to.map { |i| Phony.format(to) }.join(', ')}"
         log :debug, "Content: #{message.content}"
         (message.media_urls || []).each_with_index do |media_url, index|

data/lib/textris/delivery/mail.rb

@@ -23,7 +23,15 @@ module Textris
 
       def from_template
         Rails.application.config.try(:textris_mail_from_template) ||
-          "%{from_name:d}-%{from_phone}@%{env:d}.%{app:d}.com"
+          "#{from_format}@%{env:d}.%{app:d}.com"
+      end
+
+      def from_format
+        if message.twilio_messaging_service_sid
+          '%{twilio_messaging_service_sid}'
+        else
+          '%{from_name:d}-%{from_phone}'
+        end
       end
 
       def to_template
@@ -59,7 +67,7 @@ module Textris
         case key
         when 'app', 'env'
           get_rails_variable(key)
-        when 'texter', 'action', 'from_name', 'from_phone', 'content'
+        when 'texter', 'action', 'from_name', 'from_phone', 'content', 'twilio_messaging_service_sid'
           message.send(key)
         when 'media_urls'
           message.media_urls.join(', ')

data/lib/textris/delivery/twilio.rb

@@ -3,13 +3,20 @@ module Textris
     class Twilio < Textris::Delivery::Base
       def deliver(to)
         options = {
-          :from => PhoneFormatter.format(message.from_phone),
           :to   => PhoneFormatter.format(to),
           :body => message.content
         }
+
+        if message.twilio_messaging_service_sid
+          options[:messaging_service_sid] = message.twilio_messaging_service_sid
+        else
+          options[:from] = PhoneFormatter.format(message.from_phone)
+        end
+
         if message.media_urls.is_a?(Array)
           options[:media_url] = message.media_urls
         end
+
         client.messages.create(options)
       end
 

data/lib/textris/message.rb

@@ -1,7 +1,7 @@
 module Textris
   class Message
     attr_reader :content, :from_name, :from_phone, :to, :texter, :action, :args,
-      :media_urls
+      :media_urls, :twilio_messaging_service_sid
 
     def initialize(options = {})
       initialize_content(options)
@@ -68,7 +68,9 @@ module Textris
     end
 
     def initialize_author(options)
-      if options.has_key?(:from)
+      if options.has_key?(:twilio_messaging_service_sid)
+        @twilio_messaging_service_sid = options[:twilio_messaging_service_sid]
+      elsif options.has_key?(:from)
         @from_name, @from_phone = parse_from options[:from]
       else
         @from_name  = options[:from_name]

data/lib/textris/version.rb

@@ -1,3 +1,3 @@
 module Textris
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textris
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Visuality
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler