outbox-twilio 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f76b2573c58081b5482e6d6c6cb737a7a7b6e61c
-  data.tar.gz: d189ed5b419e0c30d3a59f69e07d67022fe1732a
+  metadata.gz: 14dc66d7833ccfa8b95e0b0f8f3e3dbf12e84dcc
+  data.tar.gz: 362d71f7b1d22a30b60153bc5a4dc5017935a7f5
 SHA512:
-  metadata.gz: c75f9d19ae1d5163a7d7f0b09fa328d7c0b013077d06e7cf676846eaee24d271b04a8d16afa12ea86e8053c2e9388bf87a99af03d0f07b953466ab814f92fcb9
-  data.tar.gz: d463c686af3d5be49db8d514fd0eda925405fedebb15b625ec6e9de459c38cfff57880da303c4cbf5414bfd4be566005a04084dbd8cf7790f02776202f42ec18
+  metadata.gz: 73f2a43fff7c9eff6ef7b82b2ed7a0b9dade02725ece0e38d84e023edb564ba4d053296553f316263a952a4e5128ad3a141f411039a217783a6c225858e4b793
+  data.tar.gz: eb5fa6efe3150e50b5c18d35ed20cf57879c1ea0931c577ae0dc70bb9d0b83e3064d998fd06c69e8a274d27fbc0ae5a9b32f2b4479c9d935359aebfc9d5a2947

data/.rubocop.yml

@@ -0,0 +1,16 @@
+AllCops:
+  Exclude:
+    - "vendor/**/*"
+  DisplayCopNames: true
+  DisplayStyleGuide: true
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - "spec/**/*"
+
+Metrics/LineLength:
+  IgnoreCopDirectives: true
+  Max: 100

data/lib/outbox-twilio.rb

@@ -1 +1,2 @@
+# rubocop:disable Style/FileName
 require 'outbox/twilio'

data/lib/outbox/twilio/client.rb

@@ -23,9 +23,9 @@ module Outbox
 
         options = @settings.dup
         @api_client = ::Twilio::REST::Client.new(
-          options.delete(:account_sid),
-          options.delete(:auth_token),
-          options
+          options[:username] || options[:account_sid],
+          options[:password] || options[:auth_token],
+          options[:account_sid],
         )
       end
 
@@ -39,7 +39,7 @@ module Outbox
           application_sid: sms[:application_sid]
         }
         params.delete_if { |_, value| value.nil? }
-        @api_client.account.messages.create(params)
+        @api_client.account.messages.create(params).fetch
       end
     end
   end

data/lib/outbox/twilio/version.rb

@@ -1,5 +1,5 @@
 module Outbox
   module Twilio
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'.freeze
   end
 end

data/outbox-twilio.gemspec

@@ -4,22 +4,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'outbox/twilio/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'outbox-twilio'
-  spec.version       = Outbox::Twilio::VERSION
-  spec.authors       = ['Pete Browne']
-  spec.email         = ['pete.browne@localmed.com']
-  spec.summary       = %q{Outbox SMS client for Twilio.}
-  spec.description   = %q{Twilio API wrapper for Outbox, a generic interface for sending notificatons.}
-  spec.homepage      = 'https://github.com/localmed/outbox-twilio'
-  spec.license       = 'MIT'
+  spec.name = 'outbox-twilio'
+  spec.version = Outbox::Twilio::VERSION
+  spec.authors = ['Pete Browne']
+  spec.email = ['pete.browne@localmed.com']
+  spec.summary = 'Outbox SMS client for Twilio.'
+  spec.description = 'Twilio API wrapper for Outbox, a generic interface for sending notificatons.'
+  spec.homepage = 'https://github.com/localmed/outbox-twilio'
+  spec.license = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'outbox', '~> 0.2'
-  spec.add_runtime_dependency 'twilio-ruby', '~> 3.11'
+  spec.add_runtime_dependency 'twilio-ruby', '~> 5.0.0.rc17'
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'

data/spec/outbox/twilio/client_spec.rb

@@ -7,17 +7,33 @@ describe Outbox::Twilio::Client do
       expect(::Twilio::REST::Client).to receive(:new).with(
         'AC1',
         'abcdef',
-        timeout: 5,
-        retry_limit: 2
+        'AC1',
+        nil
       ).and_return(api_client)
       client = Outbox::Twilio::Client.new(
         account_sid: 'AC1',
-        auth_token: 'abcdef',
-        timeout: 5,
-        retry_limit: 2
+        auth_token: 'abcdef'
       )
       expect(client.api_client).to be(api_client)
     end
+
+    context 'with username and password' do
+      it 'configures the Twilio API client' do
+        api_client = double(:api_client)
+        expect(::Twilio::REST::Client).to receive(:new).with(
+          'username',
+          'abcdef',
+          'AC1',
+          nil
+        ).and_return(api_client)
+        client = Outbox::Twilio::Client.new(
+          username: 'username',
+          password: 'abcdef',
+          account_sid: 'AC1'
+        )
+        expect(client.api_client).to be(api_client)
+      end
+    end
   end
 
   describe '#deliver' do
@@ -37,6 +53,8 @@ describe Outbox::Twilio::Client do
     end
 
     it 'delivers the SMS' do
+      message_context = double(:message_context)
+      expect(message_context).to receive(:fetch)
       expect(@client.api_client.account.messages).to receive(:create).with(
         to: '+14155551212',
         from: 'Company Name',
@@ -44,7 +62,7 @@ describe Outbox::Twilio::Client do
         media_url: 'http://www.example.com/hearts.png',
         status_callback: 'http://www.example.com/callback',
         application_sid: '1234'
-      )
+      ).and_return(message_context)
       @client.deliver(@sms)
     end
   end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: outbox-twilio
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Pete Browne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: outbox
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: twilio-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: 5.0.0.rc17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: 5.0.0.rc17
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Twilio API wrapper for Outbox, a generic interface for sending notificatons.
@@ -87,8 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -111,17 +112,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Outbox SMS client for Twilio.