mote_sms 1.3.0.rc1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7750e3f3a9303ab306187ab9e35755f7a7fa5abe
-  data.tar.gz: 1108d8459f1672a55f189cadcb1df22aea9ecb04
+  metadata.gz: 1284a153ac39d7eb140b1c735ca4762ab3a80cce
+  data.tar.gz: 4067f946a3ea39defa735deb9ed18a0c9840dddb
 SHA512:
-  metadata.gz: 4c6133b43af1691dd57eca6043c81419b77021b4dd83e7c1b39324e21f42cb8efeb4e05f3a0ebe34719ac755b79a72b87982c98d3177d1d32bb3d82e5dbd8b67
-  data.tar.gz: bdba91cfc834a07026afba68f9ad6bdb7bc046a7093db9300e4a3f01be93e474789892c67df9aa89cdf00cf51f01f9137ef51175b0fd332f054807cb0b826064
+  metadata.gz: 2a0e5cf3ede57059c8c623593b4a5a430043a3a66051506c6394d0cb674029964d3dcc6da8cef0ddf4c88207b240fb9334e501006b38f1d00ca261733432f101
+  data.tar.gz: 060de67ac2c10da73dc52aa78181d7d29e62b8e0a9ca0fd3063aef9ca45ea8a751186bb00519a6e144f6e0e84ba4ca544b29b33e53bd1dfb4ba6515a93c00d8c

data/README.md

@@ -33,6 +33,14 @@ end
 sms.deliver_now # OR: deliver_later
 ```
 
+## TwilioTransport
+Include the gem 'twilio-ruby in your Gemfile'
+
+```ruby
+# Transport configuration
+MoteSMS.transport = MoteSMS::TwilioTransport.new 'twilio sid', 'twilio token', 'from number'
+```
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,6 +1,6 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-task :default => :spec
+task default: :spec
 RSpec::Core::RakeTask.new(:spec)

data/lib/mote_sms/message.rb

@@ -2,13 +2,11 @@ require 'mote_sms/number'
 require 'mote_sms/number_list'
 
 module MoteSMS
-
   # Represents an SMS message, currently only provides the
   # tools to build new messages, not parse incoming messages or
   # similar stuff.
   #
   class Message
-
     # The transport instance to use, if not defined
     # falls back to use global MoteSMS.transport instance.
     attr_accessor :transport
@@ -76,14 +74,14 @@ module MoteSMS
     #
     # Returns nothing.
     def to=(*args)
-      @to = MoteSMS::NumberList.new.push(*args)
+      @to = MoteSMS::NumberList.new.push(args)
     end
 
     # Public: Returns NumberList for this message.
     #
     # Returns NumberList instance.
     def to(*numbers)
-      @to.push(*numbers) unless numbers.empty?
+      @to.push(numbers) unless numbers.empty?
       @to
     end
 
@@ -112,8 +110,8 @@ module MoteSMS
     end
 
     def deliver_later(options = {})
-      return Kernel.warn 'options[:transport] is not supported in Message#deliveer_later' if options.delete(:transport)
-      DeliveryJob.set(options).perform_later @from.to_s, @to.normalized_numbers, @body, options
+      Kernel.warn 'options[:transport] is not supported in Message#deliveer_later' if options.delete(:transport)
+      DeliveryJob.set(options).perform_later @from.to_s.presence, @to.normalized_numbers, @body, options
     end
   end
 end

data/lib/mote_sms/number.rb

@@ -1,17 +1,19 @@
 require 'phony'
 
 module MoteSMS
-
   # MoteSMS::Number handles all the number parsing and formatting
   # issues, also a number is immutable.
   class Number
-
     # Support both Phony 1.7 and 2.x
-    PhonyError = Phony::NormalizationError rescue Class.new(ArgumentError)
+    PhonyError = begin
+                   Phony::NormalizationError
+                 rescue
+                   Class.new(ArgumentError)
+                 end
 
     # Access the E164 normalized value of the number.
     attr_reader :number
-    alias :to_number :number
+    alias to_number number
 
     def initialize(value, options = {})
       @options = options || {}
@@ -40,7 +42,10 @@ module MoteSMS
     # adds the country code if missing.
     #
     def parse_raw_number
-      unless vanity?
+      if vanity?
+        @number = @raw_number.gsub(/[^A-Z0-9]/i, '').upcase.strip
+        raise ArgumentError, "Invalid vanity number #{@raw_number}" if @number.length.zero? || @number.length > 11
+      else
         raise ArgumentError, "Unable to parse #{@raw_number} as number" unless @raw_number.to_s =~ /\A[\d\.\/\-\s\(\)\+]+\z/
         cc = @options[:cc]
         normalized = Phony.normalize(@raw_number)
@@ -48,9 +53,6 @@ module MoteSMS
         raise ArgumentError, "Wrong national destination code #{@raw_number}" unless Phony.plausible?(normalized, @options)
 
         @number = Phony.normalize normalized
-      else
-        @number = @raw_number.gsub(/[^A-Z0-9]/i, '').upcase.strip
-        raise ArgumentError, "Invalid vanity number #{@raw_number}" if @number.length == 0 || @number.length > 11
       end
     rescue PhonyError => e
       raise ArgumentError, "Phony: #{e}"

data/lib/mote_sms/number_list.rb

@@ -1,7 +1,6 @@
 require 'mote_sms/number'
 
 module MoteSMS
-
   # List of Number instances, which transparantly is able to add
   # new Number instances from strings, or whatever.
   #
@@ -16,7 +15,6 @@ module MoteSMS
   #    # => ['41791231212', '41441231212', '08001231212']
   #
   class NumberList
-
     # Load ruby enumerable support.
     include ::Enumerable
 
@@ -32,13 +30,13 @@ module MoteSMS
     def length
       numbers.length
     end
-    alias :size :length
+    alias size length
 
     # Public: Conform to arrayish behavior.
     def empty?
       numbers.empty?
     end
-    alias :blank? :empty?
+    alias blank? empty?
 
     # Public: Add number to internal list, use duck typing to detect if
     # it appears to be a number instance or not. So everything which does
@@ -48,7 +46,7 @@ module MoteSMS
     #
     # Returns nothing.
     def <<(number)
-      self.push(number)
+      push(number)
     end
 
     # Public: Add multiple numbers, with optional options hash which can

data/lib/mote_sms/transports/action_mailer_transport.rb

@@ -1,7 +1,6 @@
 require 'action_mailer'
 
 module MoteSMS
-
   # Internal: ActionMailer class to forward SMS to recipient.
   class ActionMailerSMSMailer < ::ActionMailer::Base
     def forward_sms(recipient, sms)
@@ -23,7 +22,6 @@ module MoteSMS
   #    MoteSMS.transport = MoteSMS::ActionMailerTransport.new ->(msg) { "#{msg.from}@example.com" }
   #
   class ActionMailerTransport
-
     # Public: Read/change the recipient used when delivering the message.
     # Also accepts a Proc.
     attr_accessor :recipient
@@ -40,9 +38,11 @@ module MoteSMS
     #           currently ignored.
     #
     # Returns nothing.
-    def deliver(message, options = {})
-      to = self.recipient.respond_to?(:call) ? self.recipient.call(message) : self.recipient
+    def deliver(message, _options = {})
+      to = recipient.respond_to?(:call) ? recipient.call(message) : recipient
       ActionMailerSMSMailer.forward_sms(to, message).deliver_now
+
+      message.to
     end
   end
 end

data/lib/mote_sms/transports/http_client.rb

@@ -12,11 +12,11 @@ module Transports
     CERTS_PATH = File.expand_path File.join(File.dirname(__FILE__), '..', 'ssl_certs')
 
     def self.ssl_options
-      @ssl_options ||= ->(http) {
+      @ssl_options ||= lambda do |http|
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
         http.verify_depth = 9
-        http.cert_store = self.default_cert_store
-      }
+        http.cert_store = default_cert_store
+      end
     end
 
     def self.default_cert_store
@@ -48,7 +48,8 @@ module Transports
       if enable_fingerprint
         @fingerprint = ENV.fetch(
           "MOTE_SMS_#{@endpoint.host.to_s.upcase.gsub(/[\.-]/, '_')}_FINGERPRINT",
-          self.class.fingerprint_host(@endpoint.host))
+          self.class.fingerprint_host(@endpoint.host)
+        )
       end
     end
 
@@ -79,7 +80,8 @@ module Transports
 
       logger.error(
         format('[Transports::HttpClient] failed to verify %s fingerprint (ACTUAL: %s, EXPECTED: %s)',
-               endpoint, digest, fingerprint))
+               endpoint, digest, fingerprint)
+      )
       false
     end
 

data/lib/mote_sms/transports/mobile_technics_transport.rb

@@ -6,7 +6,6 @@ require 'logger'
 require 'mote_sms/transports/http_client'
 
 module MoteSMS
-
   # MoteSMS::MobileTechnicsTransport provides the implementation to
   # send messages using nth.ch bulk SMS HTTP/S API. Each customer has
   # custom endpoint (with port) and username/password.
@@ -56,8 +55,8 @@ module MoteSMS
     # logger - The Logger instance, should at least respond to #debug, #error.
     #
     # Returns nothing.
-    def self.logger=(logger)
-      @logger = logger
+    class << self
+      attr_writer :logger
     end
 
     # Public: Create a new instance using specified endpoint, username
@@ -78,9 +77,9 @@ module MoteSMS
       @options = self.class.defaults.merge(options)
 
       @http_client = Transports::HttpClient.new(endpoint,
-        proxy_address: @options[:proxy_address],
-        proxy_port: @options[:proxy_port],
-        ssl: @options[:ssl])
+                                                proxy_address: @options[:proxy_address],
+                                                proxy_port: @options[:proxy_port],
+                                                ssl: @options[:ssl])
     end
 
     # Public: Delivers message using mobile technics HTTP/S API.
@@ -105,6 +104,8 @@ module MoteSMS
       raise ServiceError, "unable to deliver message to all recipients (CAUSE: #{resp.body.strip})" unless resp.body.split("\n").all? { |l| l =~ /Result_code: 00/ }
 
       resp['X-Nth-SmsId'].split(',')
+
+      message.to
     end
 
     private
@@ -117,9 +118,9 @@ module MoteSMS
     #
     # Returns Array with params.
     def post_params(message, options)
-      params = options.reject { |key, v| [:proxy_address, :proxy_port, :ssl].include?(key) }
-      params.merge! username: self.username,
-                    password: self.password,
+      params = options.reject { |key, _v| [:proxy_address, :proxy_port, :ssl].include?(key) }
+      params.merge! username: username,
+                    password: password,
                     origin: message.from ? message.from.to_number : params[:origin],
                     text: message.body,
                     :'call-number' => prepare_numbers(message.to)

data/lib/mote_sms/transports/swisscom_transport.rb

@@ -1,10 +1,10 @@
 require 'phony'
 require 'logger'
+require 'json'
 
 require 'mote_sms/transports/http_client'
 
 module MoteSMS
-
   # MoteSMS::MobileTechnicsTransport provides the implementation to
   # send messages using nth.ch bulk SMS HTTP/S API. Each customer has
   # custom endpoint (with port) and username/password.
@@ -60,9 +60,9 @@ module MoteSMS
       @options = options
 
       @http_client = Transports::HttpClient.new(endpoint,
-        proxy_address: options[:proxy_address],
-        proxy_port: options[:proxy_port],
-        ssl: options[:ssl])
+                                                proxy_address: options[:proxy_address],
+                                                proxy_port: options[:proxy_port],
+                                                ssl: options[:ssl])
     end
 
     # Public: Delivers message using mobile technics HTTP/S API.
@@ -71,11 +71,11 @@ module MoteSMS
     # options - The Hash with service specific options.
     #
     # Returns Array with sender ids.
-    def deliver(message, options = {})
-      raise ArgumentError, "too many recipients, max. is #{MAX_RECIPIENT} (current: #{message.to.length})" if message.to.length > MAX_RECIPIENT
+    def deliver(message, _options = {})
+      raise ServiceError, "too many recipients, max. is #{MAX_RECIPIENT} (current: #{message.to.length})" if message.to.length > MAX_RECIPIENT
 
       # Prepare request
-      request = Net::HTTP::Post.new("/messaging/v1/sms").tap do |request|
+      request = Net::HTTP::Post.new('/messaging/v1/sms').tap do |request|
         request.body = post_params(message)
         request.content_type = 'application/json; charset=utf-8'
         request['Accept'] = 'application/json; charset=utf-8'
@@ -86,17 +86,20 @@ module MoteSMS
       self.class.logger.debug "curl -X#{request.method} '#{endpoint}' -d '#{request.body}'"
 
       # Perform request
-      resp = http.request(request)
+      resp = http_client.request(request)
 
       # Handle errors
       raise ServiceError, "endpoint did respond with #{resp.code} and #{resp.body}" unless resp.code.to_i == 201
       self.class.logger.debug resp.body
+
+      # Return numbers message send to
+      message.to
     end
 
     private
 
     def post_params(message)
-      { to: prepare_numbers(message.to), text: message.body }
+      { to: prepare_numbers(message.to), text: message.body }.to_json
     end
 
     def prepare_numbers(number_list)

data/lib/mote_sms/transports/test_transport.rb

@@ -1,5 +1,4 @@
 module MoteSMS
-
   # Public: Provide access to global array of delivered
   # messages, this can be used in testing to assert sent
   # SMS messages, test their contents, recipients etc.
@@ -26,14 +25,13 @@ module MoteSMS
   #    end
   #
   module TestTransport
-
     # Public: Appends supplied message to global deliveries array.
     #
     # message - The MoteSMS::Message instance to deliver.
     # options - The Hash with additional, transport specific options.
     #
     # Returns nothing.
-    def self.deliver(message, options = {})
+    def self.deliver(message, _options = {})
       MoteSMS.deliveries << message
     end
   end

data/lib/mote_sms/transports/twilio_transport.rb

@@ -0,0 +1,78 @@
+require 'phony'
+require 'logger'
+require 'twilio-ruby'
+
+module MoteSMS
+  # MoteSMS::TwilioTransport provides the implementation to
+  # send messages using the Twilio Api https://github.com/twilio/twilio-ruby
+  #
+  # Examples:
+  #
+  #    MoteSMS.transport = MoteSMS::TwilioTransport.new 'sid', 'token', 'from_number'
+  #    sms = MoteSMS::Message.new do
+  #      to 'to_number'
+  #      body 'my cool text'
+  #    end
+  #    sms.deliver_now
+  #    # => <Twilio::REST::Message>
+  #
+  class TwilioTransport
+    # Maximum recipients allowed by API
+    MAX_RECIPIENT = 1
+
+    # Custom exception subclass.
+    ServiceError = Class.new(::Exception)
+
+    attr_reader :from_number, :client
+
+    # Public: Create a new instance using specified endpoint, api_key
+    # and password.
+    #
+    # account_sid - The twilio account sid
+    # auth_token - The twilio api token
+    # from_number - The phone number to send from (mandatory on initialize or send message)
+    #
+    # Returns a new instance.
+    def initialize(account_sid, auth_token, from_number = nil)
+      @from_number = from_number
+
+      @client = Twilio::REST::Client.new account_sid, auth_token
+    end
+
+    # Public: Delivers message using mobile technics HTTP/S API.
+    #
+    # message - The MoteSMS::Message instance to send.
+    # options - The Hash with service specific options.
+    #
+    # Returns Array with sender ids.
+    def deliver(message, _options = {})
+      raise ArgumentError, "too many recipients, max. is #{MAX_RECIPIENT}" if message.to.length > MAX_RECIPIENT
+
+      from = message.from.present? ? message.from.to_s : from_number
+
+      raise ArgumentError, 'no from number given on new message or the transport given' if from.empty?
+
+      from = Phony.format(Phony.normalize(from), format: :international_absolute, spaces: '')
+
+      messages = prepare_numbers(message.to).map do |n|
+        @client.messages.create(
+          from: from,
+          to: n,
+          body: message.body
+        )
+      end
+      numbers = messages.map do |result|
+        result.try(:to)
+      end
+      NumberList.new.push numbers.compact
+    end
+
+    private
+
+    def prepare_numbers(number_list)
+      number_list.normalized_numbers.map do |n|
+        Phony.format(Phony.normalize(n), format: :international_absolute, spaces: '')
+      end
+    end
+  end
+end

data/lib/mote_sms/transports.rb

@@ -1,5 +1,4 @@
 module MoteSMS
-
   # All transports live within mote_sms/transports, though should be
   # available in ruby as `MoteSMS::<Some>Transport`.
   autoload :SslTransport, 'mote_sms/transports/concerns/ssl_transport'
@@ -7,4 +6,5 @@ module MoteSMS
   autoload :MobileTechnicsTransport, 'mote_sms/transports/mobile_technics_transport'
   autoload :ActionMailerTransport, 'mote_sms/transports/action_mailer_transport'
   autoload :SwisscomTransport, 'mote_sms/transports/swisscom_transport'
+  autoload :TwilioTransport, 'mote_sms/transports/twilio_transport'
 end

data/lib/mote_sms/version.rb

@@ -1,3 +1,3 @@
 module MoteSMS
-  VERSION = "1.3.0.rc1"
+  VERSION = '1.3.0'.freeze
 end

data/lib/mote_sms.rb

@@ -6,7 +6,7 @@ module MoteSMS
   autoload :Message,     'mote_sms/message'
   autoload :DeliveryJob, 'mote_sms/delivery_job'
 
-  autoload :VERSION,    'mote_sms/version'
+  autoload :VERSION, 'mote_sms/version'
 
   # No default transport.
   @@transport = nil

data/mote_sms.gemspec

@@ -5,17 +5,17 @@ Gem::Specification.new do |gem|
   gem.name          = 'mote_sms'
   gem.authors       = ['Lukas Westermann', 'Loris Gavillet']
   gem.email         = ['lukas.westermann@at-point.ch', 'loris@at-point.ch']
-  gem.summary       = %q{Deliver SMS using Swisscom / MobileTechnics REST API.}
-  gem.description   = %q{Unofficial ruby adapter for Swisscom and MobileTechnics Bulk SMS APIs.
+  gem.summary       = 'Deliver SMS using Swisscom / MobileTechnics REST API.'
+  gem.description   = 'Unofficial ruby adapter for Swisscom and MobileTechnics Bulk SMS APIs.
                          Tries to mimick mail API, so users can switch e.g. ActionMailer
-                         with this SMS provider.}
+                         with this SMS provider.'
   gem.homepage      = 'https://github.com/at-point/mote_sms'
 
-  gem.files         = %w{.gitignore Gemfile Rakefile README.md mote_sms.gemspec} + Dir['**/*.{rb,pem}']
+  gem.files         = %w(.gitignore Gemfile Rakefile README.md mote_sms.gemspec) + Dir['**/*.{rb,pem}']
   gem.bindir        = 'exe'
   gem.executables   = gem.files.grep(%r{^exe/}) { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = %w{lib}
+  gem.require_paths = %w(lib)
   gem.version       = MoteSMS::VERSION
 
   gem.required_ruby_version = '>= 2.0'
@@ -28,4 +28,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'webmock', ['~> 1.8.0']
   gem.add_development_dependency 'actionmailer', ['>= 4.2', '< 6']
   gem.add_development_dependency 'activejob', ['>= 4.2', '< 6']
+  gem.add_development_dependency 'twilio-ruby', ['>= 4.11.0']
 end

data/spec/mote_sms/message_spec.rb

@@ -10,62 +10,62 @@ describe MoteSMS::Message do
       body 'This is the SMS content'
     end
     expect(msg.from.number).to be == 'SENDER'
-    expect(msg.to.normalized_numbers).to be == %w{41791231212}
+    expect(msg.to.normalized_numbers).to be == %w(41791231212)
     expect(msg.body).to be == 'This is the SMS content'
   end
 
   context '#to' do
     it 'behaves as accessor' do
       subject.to = '41791231212'
-      expect(subject.to.normalized_numbers).to be == %w{41791231212}
+      expect(subject.to.normalized_numbers).to be == %w(41791231212)
     end
 
     it 'behaves as array' do
       subject.to << '41791231212'
       subject.to << '41797775544'
-      expect(subject.to.normalized_numbers).to be == %w{41791231212 41797775544}
+      expect(subject.to.normalized_numbers).to be == %w(41791231212 41797775544)
     end
 
     it 'normalizes numbers' do
       subject.to = '+41 79 123 12 12'
-      expect(subject.to.normalized_numbers).to be == %w{41791231212}
+      expect(subject.to.normalized_numbers).to be == %w(41791231212)
     end
   end
 
-  context "#deliver" do
+  context '#deliver' do
     subject { described_class.new }
 
-    it "delegates to deliver_now and deprecates it" do
+    it 'delegates to deliver_now and deprecates it' do
       expect(subject).to receive(:deliver_now)
       expect(Kernel).to receive(:warn).with('Message#deliver is deprecated and will be removed from MoteSMS. Please use #deliver_now')
       subject.deliver
     end
   end
 
-  context "#deliver_now" do
-    let(:transport) { double("Some Transport") }
-    subject {
+  context '#deliver_now' do
+    let(:transport) { double('Some Transport') }
+    subject do
       expect(Kernel).to receive(:warn).with('Message#new(transport) is deprecated and will be removed from MoteSMS')
       described_class.new(transport)
-    }
+    end
 
-    it "sends messages to transport" do
+    it 'sends messages to transport' do
       expect(transport).to receive(:deliver).with(subject, {})
       subject.deliver_now
     end
 
-    it "can pass additional attributes to transport" do
-      expect(transport).to receive(:deliver).with(subject, serviceid: "myapplication")
-      subject.deliver_now serviceid: "myapplication"
+    it 'can pass additional attributes to transport' do
+      expect(transport).to receive(:deliver).with(subject, serviceid: 'myapplication')
+      subject.deliver_now serviceid: 'myapplication'
     end
 
-    it "can override per message transport using :transport option and it deprecates it" do
+    it 'can override per message transport using :transport option and it deprecates it' do
       expect(transport).to_not receive(:deliver)
       expect(Kernel).to receive(:warn).with('options[:transport] in Message#deliver_now is deprecated and will be removed from MoteSMS')
       subject.deliver_now transport: double(deliver: true)
     end
 
-    it "uses global MoteSMS.transport if no per message transport defined" do
+    it 'uses global MoteSMS.transport if no per message transport defined' do
       message = described_class.new
       expect(transport).to receive(:deliver).with(message, {})
       expect(MoteSMS).to receive(:transport) { transport }
@@ -73,7 +73,7 @@ describe MoteSMS::Message do
     end
   end
 
-  context "#deliver_later" do
+  context '#deliver_later' do
     before { MoteSMS.transport = MoteSMS::TestTransport }
     after { MoteSMS.transport = nil }
 
@@ -85,13 +85,13 @@ describe MoteSMS::Message do
       end
     end
 
-    it "can not override per message transport using :transport option and it deprecates it" do
+    it 'can not override per message transport using :transport option and it deprecates it' do
       expect(Kernel).to receive(:warn).with('options[:transport] is not supported in Message#deliveer_later')
-      expect(MoteSMS::DeliveryJob).to_not receive(:perform_later)
       subject.deliver_later transport: double(deliver: true)
+      expect(ActiveJob::Base.queue_adapter.enqueued_jobs.size).to eq 1
     end
 
-    it "queues the delivery in the DeliveryJob" do
+    it 'queues the delivery in the DeliveryJob' do
       subject.deliver_later
       job = ActiveJob::Base.queue_adapter.enqueued_jobs.first
       expect(job[:job]).to eq MoteSMS::DeliveryJob

data/spec/mote_sms/number_list_spec.rb

@@ -18,16 +18,16 @@ describe MoteSMS::NumberList do
 
   it 'can add numbers by string' do
     subject << '+41 79 111 22 33'
-    expect(subject.normalized_numbers).to be == %w{41791112233}
+    expect(subject.normalized_numbers).to be == %w(41791112233)
   end
 
   it 'can multiple numbers using push' do
     subject.push '+41 79 111 22 33', '+41 44 111 22 33'
-    expect(subject.normalized_numbers).to be == %w{41791112233 41441112233}
+    expect(subject.normalized_numbers).to be == %w(41791112233 41441112233)
   end
 
   it 'can push multiple numbers with adding country codes' do
     subject.push '079 111 22 33', '0041 44 111 22 33', cc: '41', ndc: /(44|79)/
-    expect(subject.normalized_numbers).to be == %w{41791112233 41441112233}
+    expect(subject.normalized_numbers).to be == %w(41791112233 41441112233)
   end
 end

data/spec/mote_sms/transports/action_mailer_transport_spec.rb

@@ -3,13 +3,14 @@ require 'mote_sms/message'
 require 'mote_sms/transports/action_mailer_transport'
 
 describe MoteSMS::ActionMailerTransport do
-  subject { described_class.new "sms@example.com" }
-  let(:message) { MoteSMS::Message.new do
+  subject { described_class.new 'sms@example.com' }
+  let(:message) do
+    MoteSMS::Message.new do
       from 'Sender'
       to '+41 79 123 12 12'
       body 'This is the SMS content'
     end
-  }
+  end
   let(:email) { ActionMailer::Base.deliveries.last }
 
   before do
@@ -19,9 +20,9 @@ describe MoteSMS::ActionMailerTransport do
 
   it 'sends SMS as e-mail' do
     subject.deliver message
-    expect(email.to).to be == ["sms@example.com"]
-    expect(email.from).to be == ["sms@example.com"]
-    expect(email.subject).to be == "SMS to +41 79 123 12 12"
-    expect(email.body).to be == "This is the SMS content"
+    expect(email.to).to be == ['sms@example.com']
+    expect(email.from).to be == ['sms@example.com']
+    expect(email.subject).to be == 'SMS to +41 79 123 12 12'
+    expect(email.body).to be == 'This is the SMS content'
   end
 end

data/spec/mote_sms/transports/http_client_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'mote_sms/version'
 require 'mote_sms/transports/http_client'
 
 describe Transports::HttpClient do
@@ -73,11 +74,11 @@ describe Transports::HttpClient do
   context '#request' do
     let(:request) { Net::HTTP::Get.new('/') }
 
-    before {
-      stub_request(:get, "https://example.org/").
-        with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent' => 'Ruby/mote_sms 1.2.0' }).
-        to_return(status: 200, body: "", headers: {})
-    }
+    before(:each) do
+      stub_request(:get, 'https://example.org/')
+        .with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent' => "Ruby/mote_sms #{MoteSMS::VERSION}" })
+        .to_return(status: 200, body: '', headers: {})
+    end
 
     it 'submits a request and overrides the UA' do
       response = subject.request(request)

data/spec/mote_sms/transports/mobile_technics_transport_spec.rb

@@ -7,34 +7,34 @@ require 'mote_sms/transports/mobile_technics_transport'
 describe MoteSMS::MobileTechnicsTransport do
   before do
     @logger = described_class.logger
-    described_class.logger = double("logger", debug: true, info: true, error: true)
+    described_class.logger = double('logger', debug: true, info: true, error: true)
   end
 
   after do
     described_class.logger = @logger
   end
 
-  subject { described_class.new(endpoint, "example", "123456") }
+  subject { described_class.new(endpoint, 'example', '123456') }
 
-  let(:endpoint) { "http://test.nth.ch" }
-  let(:message) {
+  let(:endpoint) { 'http://test.nth.ch' }
+  let(:message) do
     MoteSMS::Message.new do
       to '0041 079 123 12 12'
       from 'SENDER'
       body 'Hello World, with äöü.'
     end
-  }
+  end
 
-  let(:success) {
-    { body: "Result_code: 00, Message OK", status: 200, headers: { 'X-Nth-SmsId' => '43797917' } }
-  }
+  let(:success) do
+    { body: 'Result_code: 00, Message OK', status: 200, headers: { 'X-Nth-SmsId' => '43797917' } }
+  end
 
-  context "#deliver" do
-    it "sends POST to endpoint with URL encoded body" do
+  context '#deliver' do
+    it 'sends POST to endpoint with URL encoded body' do
       stub_request(:post, endpoint).with do |req|
         params = CGI.parse(req.body)
-        expect(params['username']).to be == %w{example}
-        expect(params['password']).to be == %w{123456}
+        expect(params['username']).to be == %w(example)
+        expect(params['password']).to be == %w(123456)
         expect(params['text']).to be == ['Hello World, with äöü.']
         expect(params['call-number']).to be == ['0041791231212']
       end.to_return(success)
@@ -51,17 +51,17 @@ describe MoteSMS::MobileTechnicsTransport do
 
     it 'raises exception if required parameter is missing' do
       stub_request(:post, endpoint).to_return(body: 'Result_code: 02, call-number')
-      expect { subject.deliver message }.to raise_error(MoteSMS::MobileTechnicsTransport::ServiceError)
+      expect { subject.deliver message }.to raise_error(described_class::ServiceError)
     end
 
     it 'raises exception if status code is not 200' do
       stub_request(:post, endpoint).to_return(status: 500)
-      expect { subject.deliver message }.to raise_error(MoteSMS::MobileTechnicsTransport::ServiceError)
+      expect { subject.deliver message }.to raise_error(described_class::ServiceError)
     end
 
-    it 'returns message id' do
+    it 'returns message delivered numbers' do
       stub_request(:post, endpoint).to_return(success)
-      expect(subject.deliver(message)).to be == %w{43797917}
+      expect(subject.deliver(message).normalized_numbers).to eq(['41791231212'])
     end
 
     it 'logs curl compatible output' do
@@ -74,7 +74,7 @@ describe MoteSMS::MobileTechnicsTransport do
     end
   end
 
-  context "#options" do
+  context '#options' do
     it 'can be passed in as last item in the constructor' do
       transport = described_class.new endpoint, 'user', 'pass', allow_adaption: false, validity: 30
       expect(transport.options[:allow_adaption]).to be_falsey
@@ -83,8 +83,8 @@ describe MoteSMS::MobileTechnicsTransport do
     end
 
     it 'should be exposed as hash' do
-      subject.options[:messageid] = "test"
-      expect(subject.options[:messageid]).to be == "test"
+      subject.options[:messageid] = 'test'
+      expect(subject.options[:messageid]).to be == 'test'
     end
 
     it 'overrides settings from #defaults' do
@@ -103,7 +103,7 @@ describe MoteSMS::MobileTechnicsTransport do
     end
 
     it 'evaluates Procs & lambdas' do
-      subject.options[:messageid] = Proc.new { "test" }
+      subject.options[:messageid] = proc { 'test' }
 
       stub_request(:post, endpoint).with(body: hash_including('messageid' => 'test')).to_return(success)
       subject.deliver message

data/spec/mote_sms/transports/swisscom_transport_spec.rb

@@ -0,0 +1,68 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'cgi'
+require 'mote_sms/message'
+require 'mote_sms/transports/swisscom_transport'
+
+describe MoteSMS::SwisscomTransport do
+  before do
+    @logger = described_class.logger
+    described_class.logger = double('logger', debug: true, info: true, error: true)
+  end
+
+  after do
+    described_class.logger = @logger
+  end
+
+  subject { described_class.new(endpoint, 'example', '123456') }
+
+  let(:endpoint) { 'https://api.example.com' }
+  let(:message) do
+    MoteSMS::Message.new do
+      to '0041 079 123 12 12'
+      from 'SENDER'
+      body 'Hello World, with äöü.'
+    end
+  end
+
+  let(:success) do
+    { body: 'OK', status: 201 }
+  end
+
+  context '#deliver' do
+    it 'sends POST to endpoint with JSON body and Client ID' do
+      stub_request(:post, "#{endpoint}/messaging/v1/sms").with do |req|
+        params = JSON.load(req.body)
+        expect(params['text']).to eq 'Hello World, with äöü.'
+        expect(params['to']).to eq '+41791231212'
+      end.to_return(success)
+      expect(subject.deliver(message).normalized_numbers).to eq(['41791231212'])
+    end
+
+    it 'raises error when trying to send to multiple recipients' do
+      message.to << '+41 79 333 44 55'
+      message.to << '+41 78 111 22 33'
+
+      expect { subject.deliver message }.to raise_error(described_class::ServiceError, /too many recipients/)
+    end
+
+    it 'raises exception if status code is not 201' do
+      stub_request(:post, "#{endpoint}/messaging/v1/sms").to_return(status: 500)
+      expect { subject.deliver message }.to raise_error(described_class::ServiceError)
+    end
+
+    it 'returns truthy on success' do
+      stub_request(:post, "#{endpoint}/messaging/v1/sms").to_return(success)
+      expect(subject.deliver(message)).to be_truthy
+    end
+
+    it 'logs curl compatible output' do
+      io = StringIO.new
+      described_class.logger = Logger.new(io)
+      stub_request(:post, "#{endpoint}/messaging/v1/sms").to_return(success)
+      subject.deliver message
+      io.rewind
+      expect(io.read).to include('curl -XPOST \'https://api.example.com\' -d \'{')
+    end
+  end
+end

data/spec/mote_sms/transports/test_transport_spec.rb

@@ -10,8 +10,8 @@ describe MoteSMS::TestTransport do
   end
 
   it 'appends deliveries' do
-    subject.deliver "firstMessage"
-    subject.deliver "secondMessage"
-    expect(MoteSMS.deliveries).to be == %w{firstMessage secondMessage}
+    subject.deliver 'firstMessage'
+    subject.deliver 'secondMessage'
+    expect(MoteSMS.deliveries).to be == %w(firstMessage secondMessage)
   end
 end

data/spec/mote_sms/transports/twilio_transport_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+require 'twilio-ruby'
+require 'mote_sms/transports/twilio_transport'
+require 'mote_sms/message'
+
+describe MoteSMS::TwilioTransport do
+  subject do
+    client = double(Twilio::REST::Client)
+    expect(client).to receive(:messages).at_least(:once) { results }
+    expect(Twilio::REST::Client).to receive(:new).with('account', '123456') { client }
+    described_class.new('account', '123456', '41791110011')
+  end
+
+  let(:message) do
+    MoteSMS::Message.new do
+      to '+41790001122'
+      body 'Hello World'
+    end
+  end
+
+  let(:result) do
+    Twilio::REST::Message.new('/SMS', subject.client, from: '+41791110011', to: '41790001122', body: 'Hello World')
+  end
+  let(:results) do
+    Twilio::REST::Messages.new('/SMS', subject.client)
+  end
+
+  let(:message) do
+    MoteSMS::Message.new do
+      to '+41790001122'
+      body 'Hello World'
+    end
+  end
+
+  context '#deliver' do
+    it 'send message' do
+      expect(subject.client.messages).to receive(:create).with(
+        from: '+41791110011',
+        to: '+41790001122',
+        body: 'Hello World'
+      ).at_least(:once) { result }
+
+      expect(subject.deliver(message).normalized_numbers).to eq(['41790001122'])
+    end
+
+    it 'uses the number from the message' do
+      message.from = '41791110033'
+      expect(subject.client.messages).to receive(:create).with(
+        from: '+41791110033',
+        to: '+41790001122',
+        body: 'Hello World'
+      ).at_least(:once) { result }
+
+      expect(subject.deliver(message).normalized_numbers).to eq(['41790001122'])
+    end
+  end
+end

data/spec/mote_sms_spec.rb

@@ -8,21 +8,21 @@ describe MoteSMS do
     expect(subject::VERSION).to match /\d/
   end
 
-  context "transport" do
+  context 'transport' do
     before { @current_transport = subject.transport }
     after { subject.transport = @current_transport }
-    let(:transport) { double("transport") }
+    let(:transport) { double('transport') }
 
-    it "has no default transport" do
+    it 'has no default transport' do
       expect(subject.transport).to be_nil
     end
 
-    it "can change global transport" do
+    it 'can change global transport' do
       subject.transport = transport
       expect(subject.transport).to be == transport
     end
 
-    context "#deliver" do
+    context '#deliver' do
       it 'delivers quick and dirty using global transport' do
         expect(transport).to receive(:deliver).with(kind_of(MoteSMS::Message), {})
         subject.transport = transport

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mote_sms
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc1
+  version: 1.3.0
 platform: ruby
 authors:
 - Lukas Westermann
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony
@@ -133,6 +133,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: twilio-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.11.0
 description: |-
   Unofficial ruby adapter for Swisscom and MobileTechnics Bulk SMS APIs.
                            Tries to mimick mail API, so users can switch e.g. ActionMailer
@@ -164,6 +178,7 @@ files:
 - lib/mote_sms/transports/mobile_technics_transport.rb
 - lib/mote_sms/transports/swisscom_transport.rb
 - lib/mote_sms/transports/test_transport.rb
+- lib/mote_sms/transports/twilio_transport.rb
 - lib/mote_sms/version.rb
 - mote_sms.gemspec
 - spec/mote_sms/delivery_job_spec.rb
@@ -173,7 +188,9 @@ files:
 - spec/mote_sms/transports/action_mailer_transport_spec.rb
 - spec/mote_sms/transports/http_client_spec.rb
 - spec/mote_sms/transports/mobile_technics_transport_spec.rb
+- spec/mote_sms/transports/swisscom_transport_spec.rb
 - spec/mote_sms/transports/test_transport_spec.rb
+- spec/mote_sms/transports/twilio_transport_spec.rb
 - spec/mote_sms_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/at-point/mote_sms
@@ -190,9 +207,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -207,6 +224,9 @@ test_files:
 - spec/mote_sms/transports/action_mailer_transport_spec.rb
 - spec/mote_sms/transports/http_client_spec.rb
 - spec/mote_sms/transports/mobile_technics_transport_spec.rb
+- spec/mote_sms/transports/swisscom_transport_spec.rb
 - spec/mote_sms/transports/test_transport_spec.rb
+- spec/mote_sms/transports/twilio_transport_spec.rb
 - spec/mote_sms_spec.rb
 - spec/spec_helper.rb
+has_rdoc: