twilio-ruby 3.11.5 → 3.11.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 7ab94258630ce056a2ec9062bcead79026e6ace5
-  data.tar.gz: dee171b3ef56e709b2a83e9266ec0afd4ea49ba2
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGUxMzc0ZmMwMjk0ZDY5MTU4ZDY0NGY3MGM3MmI1NmZlODBmODM5Nw==
+  data.tar.gz: !binary |-
+    MGFhNTM3Nzg4YzVlOGYxYmExMTQyNjQyMjQ3M2Q1YmM1NTY1Nzk5NA==
 SHA512:
-  metadata.gz: 51e94cefd327185a93ae3fadf1151a13affae35f4d7af2bd0fbc418d25a82ac800ca79974b719edf6e572f3649db87364c5794f56597db3fdcc2452823173372
-  data.tar.gz: 921bede6c840a2dcb37495e1778982c322c6d04406466b56964f003f0ffcb0263a9cccf71b4b5564e1a64033f8f9e8cd62219e4cc8616dff5f09c29140f37793
+  metadata.gz: !binary |-
+    MTVlZDc3MzFlOGRjYTk4N2FkYzg5MGRmZDZjZTg0MzUwYmRhODNhNmFjMDli
+    N2ZhNGQ1MWQ3N2FiN2QyNDcyODFmNWY5MTE0Njk1NzZkYjZmZjBmNzQ2NTg0
+    YjVlMTI0M2I4ZDg0Y2Q1OWE3MmM3OTFlMTcwMDJjZmNlNTEzZGE=
+  data.tar.gz: !binary |-
+    YjE1ODY5NTEzNTI2ZTYwZGJlNGY2NGMyYTVkZDY2MDEwOGQ0OTk3ZDYwMjI2
+    YzI5Y2JiNmQ2ZWYzNjQwODI5ODA3YzVjYjUxMTgyZjgyOWExMmU2MGRiZGI0
+    N2EzMTFjMzA5MDRiNmViN2MzZWE1MThiY2MzZDNmZGNlNDZlODE=

data/AUTHORS.md

@@ -4,28 +4,32 @@ Authors
 A huge thanks to all of our contributors:
 
 
-- Adam Ballai 
-- Alexander Murmann & Ryan Spore 
-- Andrew Benton 
-- Brian Levine 
-- Caley Woods 
-- Carlos Diaz-Padron 
-- Connor Montgomery 
-- Doug Black 
-- Elaine Tsai 
-- Fiona Tay & Will Read 
-- Geoff Petrie 
-- Guille Carlos 
-- Josh Hull 
-- Joël Franusic 
-- K Gautam Pai 
-- Kevin Burke 
-- Kyle Conroy 
-- Oscar 
-- Oscar Sanchez 
-- Rafael Chacon 
-- Ryan Spore 
-- Sam Kimbrel 
-- Torey Heinz 
-- Vipul A M 
-- vfrride 
+- Adam Ballai
+- Alexander Murmann & Ryan Spore
+- Andrew Benton
+- Brian Levine
+- Caley Woods
+- Carlos Diaz-Padron
+- Connor Montgomery
+- Doug Black
+- Elaine Tsai
+- Fiona Tay & Will Read
+- Geoff Petrie
+- Guille Carlos
+- Jeremy Franz
+- Josh Hull
+- Joël Franusic
+- K Gautam Pai
+- Karl Freeman
+- Kevin Burke
+- Kyle Conroy
+- Leo Adamek
+- Oscar
+- Oscar Sanchez
+- Phil Nash
+- Rafael Chacon
+- Ryan Spore
+- Sam Kimbrel
+- Torey Heinz
+- Vipul A M
+- vfrride

data/{CHANGES → CHANGES.md}

@@ -1,6 +1,14 @@
 twilio-ruby changelog
 =====================
 
+Version 3.11.6
+
+Released July 25, 2014
+
+- Add #to_xml to TwiML Responses.
+- Updated test / development dependencies.
+- Updated to RSpec 3 syntax.
+
 Version 3.11.5
 
 Released February 4

data/Gemfile

@@ -1,3 +1,10 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'rake', '~> 10.1'
+  gem 'rspec', '~> 2.6'
+  gem 'fakeweb', '~> 1.3'
+  gem 'rack', '~> 1.3'
+end

data/{LICENSE → LICENSE.md}

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 Andrew Benton.
+Copyright (c) 2010-2014 Andrew Benton.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Makefile

@@ -1,6 +1,5 @@
 install:
-	gem build twilio-ruby.gemspec
-	gem install twilio-ruby-*.gem
+	bundle exec rake install
 
 test-install:
 	bundle install

data/README.md

@@ -1,15 +1,20 @@
-[![Build Status](https://travis-ci.org/twilio/twilio-ruby.png?branch=master)](https://travis-ci.org/twilio/twilio-ruby)
-[![Gem Version](https://badge.fury.io/rb/twilio-ruby.png)](http://badge.fury.io/rb/twilio-ruby)
+[![Gem Version](http://img.shields.io/gem/v/twilio-ruby.svg)][gem]
+[![Build Status](http://img.shields.io/travis/twilio/twilio-ruby.svg)][travis]
+[![Code Quality](http://img.shields.io/codeclimate/github/twilio/twilio-ruby.svg)][codeclimate]
 
 # twilio-ruby
 
-A module for using the Twilio REST API and generating valid
-[TwiML](http://www.twilio.com/docs/api/twiml/ "TwiML - Twilio Markup Language").
-[Click here to read the full documentation.][documentation]
+A module for using the Twilio REST API and generating valid [TwiML](http://www.twilio.com/docs/api/twiml/ "TwiML - Twilio Markup Language"). [Click here to read the full documentation.][documentation]
 
-## Install
+## Installation
 
-Via rubygems.org:
+To install using [Bundler][bundler] grab the latest stable version:
+
+```ruby
+gem 'twilio-ruby', '~> 3.11'
+```
+
+To manually install `twilio-ruby` via [Rubygems][rubygems] simply gem install:
 
 ```bash
 gem install twilio-ruby
@@ -135,7 +140,7 @@ section of the wiki.
 
 ## Getting Started With TwiML
 
-TwiML support is based on the [builder][builder] library. You can construct a
+TwiML support is based on the [Builder][builder] library. You can construct a
 TwiML response like this:
 
 ``` ruby
@@ -156,7 +161,7 @@ puts response.text
 
 This will print the following (except for the whitespace):
 
-```
+``` xml
 <?xml version="1.0" encoding="UTF-8"?>
 <Response>
   <Say voice="alice">hello there</Say>
@@ -166,16 +171,33 @@ This will print the following (except for the whitespace):
 </Response>
 ```
 
-## More Information
+## Supported Ruby Versions
 
-There are more detailed examples in the included [examples][examples]
-directory.
+This library supports and is [tested against][travis] the following Ruby
+implementations:
+
+- Ruby 2.1.0
+- Ruby 2.0.0
+- Ruby 1.9.3
+- Ruby 1.8.7
+- [JRuby][jruby]
+- [Rubinius][rubinius]
 
-The [upgrade guide][upgrade] is available in the [twilio-ruby github wiki][wiki].
+## More Information
 
-[capability]:https://github.com/twilio/twilio-ruby/wiki/Capability
-[builder]:http://builder.rubyforge.org/
-[examples]:https://github.com/twilio/twilio-ruby/blob/master/examples
-[documentation]:http://twilio-ruby.readthedocs.org/en/latest
-[upgrade]:https://github.com/twilio/twilio-ruby/wiki/UpgradeGuide
-[wiki]:https://github.com/twilio/twilio-ruby/wiki
+There are more detailed examples in the included [examples][examples]
+directory. Also for thoose upgrading, the [upgrade guide][upgrade] is available in the [twilio-ruby github wiki][wiki].
+
+[capability]: https://github.com/twilio/twilio-ruby/wiki/Capability
+[builder]: http://builder.rubyforge.org/
+[examples]: https://github.com/twilio/twilio-ruby/blob/master/examples
+[documentation]: http://twilio-ruby.readthedocs.org/en/latest
+[upgrade]: https://github.com/twilio/twilio-ruby/wiki/UpgradeGuide
+[wiki]: https://github.com/twilio/twilio-ruby/wiki
+[bundler]: http://bundler.io
+[rubygems]: http://rubygems.org
+[gem]: https://rubygems.org/gems/twilio
+[travis]: http://travis-ci.org/twilio/twilio-ruby
+[codeclimate]: https://codeclimate.com/github/twilio/twilio-ruby
+[jruby]: http://www.jruby.org
+[rubinius]: http://rubini.us

data/Rakefile

@@ -1,12 +1,10 @@
-require 'rubygems'
-require 'rubygems/package_task'
-require 'rspec/core/rake_task'
-
-spec = eval(File.read('twilio-ruby.gemspec'))
+require 'bundler'
+Bundler.setup
+Bundler::GemHelper.install_tasks
 
-Gem::PackageTask.new(spec) do |p|
-  p.gem_spec = spec
-end
+require 'rspec/core/rake_task'
+desc 'Run all specs'
+RSpec::Core::RakeTask.new(:spec)
 
-RSpec::Core::RakeTask.new
-task :default => :spec
+task :default => :spec
+task :test => :spec

data/docs/usage/twiml.rst

@@ -53,7 +53,7 @@ Any example of nesting nouns in verbs
 
     Twilio::TwiML::Response.new do |r|
         r.Say "hello"
-        r.Gather :finish_on_key => 4 do |g|
+        r.Gather :finishOnKey => 4 do |g|
             g.Say "world"
         end
     end.text

data/lib/twilio-ruby/rest/client.rb

@@ -48,7 +48,11 @@ module Twilio
       API_VERSION = '2010-04-01'
 
       # 1.8.7 doesn't have the RUBY_ENGINE constant.
-      engine = !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
+      if defined?(RUBY_ENGINE) 
+        engine = RUBY_ENGINE 
+      else
+        engine = 'ruby'
+      end
 
       HTTP_HEADERS = {
         'Accept' => 'application/json',

data/lib/twilio-ruby/twiml/response.rb

@@ -3,6 +3,7 @@ module Twilio
     class Response
 
       attr_reader :text
+      alias_method :to_xml , :text
 
       def initialize(&block)
         xml = Builder::XmlMarkup.new

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-  VERSION = '3.11.5'
+  VERSION = '3.11.6'
 end

data/spec/rest/account_spec.rb

@@ -7,52 +7,52 @@ describe Twilio::REST::Account do
   end
 
   it 'sets up incoming phone numbers resources object' do
-    @account.should respond_to(:incoming_phone_numbers)
-    @account.incoming_phone_numbers.instance_variable_get('@path').should == 'someUri/IncomingPhoneNumbers'
+    expect(@account).to respond_to(:incoming_phone_numbers)
+    expect(@account.incoming_phone_numbers.instance_variable_get('@path')).to eq('someUri/IncomingPhoneNumbers')
   end
 
   it 'sets up an available phone numbers resources object' do
-    @account.should respond_to(:available_phone_numbers)
-    @account.available_phone_numbers.instance_variable_get('@path').should == 'someUri/AvailablePhoneNumbers'
+    expect(@account).to respond_to(:available_phone_numbers)
+    expect(@account.available_phone_numbers.instance_variable_get('@path')).to eq('someUri/AvailablePhoneNumbers')
   end
 
   it 'sets up an outgoing caller ids resources object' do
-    @account.should respond_to(:outgoing_caller_ids)
-    @account.outgoing_caller_ids.instance_variable_get('@path').should == 'someUri/OutgoingCallerIds'
+    expect(@account).to respond_to(:outgoing_caller_ids)
+    expect(@account.outgoing_caller_ids.instance_variable_get('@path')).to eq('someUri/OutgoingCallerIds')
   end
 
   it 'sets up a calls resources object' do
-    @account.should respond_to(:calls)
-    @account.calls.instance_variable_get('@path').should == 'someUri/Calls'
+    expect(@account).to respond_to(:calls)
+    expect(@account.calls.instance_variable_get('@path')).to eq('someUri/Calls')
   end
 
   it 'sets up a conferences resources object' do
-    @account.should respond_to(:conferences)
-    @account.conferences.instance_variable_get('@path').should == 'someUri/Conferences'
+    expect(@account).to respond_to(:conferences)
+    expect(@account.conferences.instance_variable_get('@path')).to eq('someUri/Conferences')
   end
 
   it 'sets up a queues resources object' do
-    @account.should respond_to(:queues)
-    @account.queues.instance_variable_get('@path').should == 'someUri/Queues'
+    expect(@account).to respond_to(:queues)
+    expect(@account.queues.instance_variable_get('@path')).to eq('someUri/Queues')
   end
 
   it 'sets up a sms resource object' do
-    @account.should respond_to(:sms)
-    @account.sms.instance_variable_get('@path').should == 'someUri/SMS'
+    expect(@account).to respond_to(:sms)
+    expect(@account.sms.instance_variable_get('@path')).to eq('someUri/SMS')
   end
 
   it 'sets up a recordings resources object' do
-    @account.should respond_to(:recordings)
-    @account.recordings.instance_variable_get('@path').should == 'someUri/Recordings'
+    expect(@account).to respond_to(:recordings)
+    expect(@account.recordings.instance_variable_get('@path')).to eq('someUri/Recordings')
   end
 
   it 'sets up a transcriptions resources object' do
-    @account.should respond_to(:transcriptions)
-    @account.transcriptions.instance_variable_get('@path').should == 'someUri/Transcriptions'
+    expect(@account).to respond_to(:transcriptions)
+    expect(@account.transcriptions.instance_variable_get('@path')).to eq('someUri/Transcriptions')
   end
 
   it 'sets up a notifications resources object' do
-    @account.should respond_to(:notifications)
-    @account.notifications.instance_variable_get('@path').should == 'someUri/Notifications'
+    expect(@account).to respond_to(:notifications)
+    expect(@account.notifications.instance_variable_get('@path')).to eq('someUri/Notifications')
   end
 end

data/spec/rest/call_spec.rb

@@ -7,12 +7,12 @@ describe Twilio::REST::Call do
   end
 
   it 'sets up a recordings resources object' do
-    @call.should respond_to(:recordings)
-    @call.recordings.instance_variable_get('@path').should == 'someUri/Recordings'
+    expect(@call).to respond_to(:recordings)
+    expect(@call.recordings.instance_variable_get('@path')).to eq('someUri/Recordings')
   end
 
   it 'sets up a notifications resources object' do
-    @call.should respond_to(:notifications)
-    @call.notifications.instance_variable_get('@path').should == 'someUri/Notifications'
+    expect(@call).to respond_to(:notifications)
+    expect(@call.notifications.instance_variable_get('@path')).to eq('someUri/Notifications')
   end
 end

data/spec/rest/client_spec.rb

@@ -17,84 +17,88 @@ describe Twilio::REST::Client do
 
   it 'should set up a new client instance with the given sid and token' do
     twilio = Twilio::REST::Client.new('someSid', 'someToken')
-    twilio.account_sid.should == 'someSid'
-    twilio.instance_variable_get('@auth_token').should == 'someToken'
+    expect(twilio.account_sid).to eq('someSid')
+    expect(twilio.instance_variable_get('@auth_token')).to eq('someToken')
   end
   
   it 'should set up the proper default http ssl connection' do
     twilio = Twilio::REST::Client.new('someSid', 'someToken')
     connection = twilio.instance_variable_get('@connection')
-    connection.address.should == 'api.twilio.com'
-    connection.port.should == 443
-    connection.use_ssl?.should == true
+    expect(connection.address).to eq('api.twilio.com')
+    expect(connection.port).to eq(443)
+    expect(connection.use_ssl?).to eq(true)
   end
   
   it 'should set up the requested ssl verification ca_file if provided' do
     twilio = Twilio::REST::Client.new('someSid', 'someToken', :ssl_ca_file => '/path/to/ca/file')
     connection = twilio.instance_variable_get('@connection')
-    connection.ca_file.should == '/path/to/ca/file'
+    expect(connection.ca_file).to eq('/path/to/ca/file')
   end
 
   it 'should set up the proper http ssl connection when a different domain is given' do
     twilio = Twilio::REST::Client.new('someSid', 'someToken', :host => 'api.faketwilio.com')
     connection = twilio.instance_variable_get('@connection')
-    connection.address.should == 'api.faketwilio.com'
-    connection.port.should == 443
-    connection.use_ssl?.should == true
+    expect(connection.address).to eq('api.faketwilio.com')
+    expect(connection.port).to eq(443)
+    expect(connection.use_ssl?).to eq(true)
   end
 
   it 'should adjust the open and read timeouts on the underlying Net::HTTP object when asked' do
     timeout = rand(30)
     twilio = Twilio::REST::Client.new('someSid', 'someToken', :timeout => timeout)
     connection = twilio.instance_variable_get('@connection')
-    connection.port.should == 443
-    connection.use_ssl?.should == true
-    connection.open_timeout.should == timeout
-    connection.read_timeout.should == timeout
+    expect(connection.port).to eq(443)
+    expect(connection.use_ssl?).to eq(true)
+    expect(connection.open_timeout).to eq(timeout)
+    expect(connection.read_timeout).to eq(timeout)
   end
 
   it 'should set up the proper http ssl connection when a proxy_host is given' do
     twilio = Twilio::REST::Client.new('someSid', 'someToken', :host => 'api.faketwilio.com', :proxy_addr => 'localhost')
     connection = twilio.instance_variable_get('@connection')
-    connection.proxy?.should == true
-    connection.proxy_address.should == 'localhost'
-    connection.proxy_port.should == 80
-    connection.address.should == 'api.faketwilio.com'
-    connection.port.should == 443
-    connection.use_ssl?.should == true
+    expect(connection.proxy?).to eq(true)
+    expect(connection.proxy_address).to eq('localhost')
+    expect(connection.proxy_port).to eq(80)
+    expect(connection.address).to eq('api.faketwilio.com')
+    expect(connection.port).to eq(443)
+    expect(connection.use_ssl?).to eq(true)
   end
 
   it 'should set up the proper http ssl connection when a proxy_host and proxy_port are given' do
     twilio = Twilio::REST::Client.new('someSid', 'someToken', :host => 'api.faketwilio.com', :proxy_addr => 'localhost', :proxy_port => 13128)
     connection = twilio.instance_variable_get('@connection')
-    connection.proxy?.should == true
-    connection.proxy_address.should == 'localhost'
-    connection.proxy_port.should == 13128
-    connection.address.should == 'api.faketwilio.com'
-    connection.port.should == 443
-    connection.use_ssl?.should == true
+    expect(connection.proxy?).to eq(true)
+    expect(connection.proxy_address).to eq('localhost')
+    expect(connection.proxy_port).to eq(13128)
+    expect(connection.address).to eq('api.faketwilio.com')
+    expect(connection.port).to eq(443)
+    expect(connection.use_ssl?).to eq(true)
   end
 
   it 'should set up an accounts resources object' do
     twilio = Twilio::REST::Client.new('someSid', 'someToken')
-    twilio.should respond_to(:accounts)
-    twilio.accounts.instance_variable_get('@path').should == '/2010-04-01/Accounts'
+    expect(twilio).to respond_to(:accounts)
+    expect(twilio.accounts.instance_variable_get('@path')).to eq('/2010-04-01/Accounts')
   end
 
   it 'should set up an account object with the given sid' do
     twilio = Twilio::REST::Client.new('someSid', 'someToken')
-    twilio.should respond_to(:account)
-    twilio.account.instance_variable_get('@path').should == '/2010-04-01/Accounts/someSid'
+    expect(twilio).to respond_to(:account)
+    expect(twilio.account.instance_variable_get('@path')).to eq('/2010-04-01/Accounts/someSid')
   end
 
   it 'should convert all parameter names to Twilio-style names' do
     twilio = Twilio::REST::Client.new('someSid', 'someToken')
-    untwilified = {:sms_url => 'someUrl', 'voiceFallbackUrl' => 'anotherUrl',
-      'Status_callback' => 'yetAnotherUrl'}
-    twilified = {:SmsUrl => 'someUrl', :VoiceFallbackUrl => 'anotherUrl',
-      :StatusCallback => 'yetAnotherUrl'}
-    twilio.instance_eval do
-      twilify(untwilified).should == twilified
-    end
+    untwilified = {
+      :sms_url => 'someUrl',
+      'voiceFallbackUrl' => 'anotherUrl',
+      'Status_callback' => 'yetAnotherUrl'
+    }
+    twilified = {
+      :SmsUrl => 'someUrl',
+      :VoiceFallbackUrl => 'anotherUrl',
+      :StatusCallback => 'yetAnotherUrl'
+    }
+    expect(twilio.twilify(untwilified)).to eq(twilified)
   end
 end

data/spec/rest/conference_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Twilio::REST::Conference do
   it 'should set up a participants resources object' do
     conference = Twilio::REST::Conference.new('someUri', 'someClient')
-    conference.should respond_to(:participants)
-    conference.participants.instance_variable_get('@path').should == 'someUri/Participants'
+    expect(conference).to respond_to(:participants)
+    expect(conference.participants.instance_variable_get('@path')).to eq('someUri/Participants')
   end
 end

data/spec/rest/instance_resource_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 describe Twilio::REST::InstanceResource do
   it 'should set up an internal reference to the uri and client' do
     resource = Twilio::REST::InstanceResource.new('some/uri', 'someClient')
-    resource.instance_variable_get('@path').should == 'some/uri'
-    resource.instance_variable_get('@client').should == 'someClient'
+    expect(resource.instance_variable_get('@path')).to eq('some/uri')
+    expect(resource.instance_variable_get('@client')).to eq('someClient')
   end
 
   it 'should set up object properties if passed' do
     params = {'SomeKey' => 'someValue'}
     resource = Twilio::REST::InstanceResource.new('uri', 'client', params)
-    resource.some_key.should == 'someValue'
+    expect(resource.some_key).to eq('someValue')
   end
 end

data/spec/rest/message_spec.rb

@@ -6,7 +6,7 @@ describe Twilio::REST::Message do
   end
 
   it 'sets up a media resources object' do
-    @message.should respond_to(:media)
-    @message.media.instance_variable_get('@path').should == 'someUri/Media'
+    expect(@message).to respond_to(:media)
+    expect(@message.media.instance_variable_get('@path')).to eq('someUri/Media')
   end
 end

data/spec/rest/numbers_spec.rb

@@ -7,18 +7,18 @@ describe Twilio::REST::Country do
   end
 
   it 'sets up a local resources object' do
-    @country.should respond_to(:local)
-    @country.local.instance_variable_get('@path').should == 'someUri/Local'
+    expect(@country).to respond_to(:local)
+    expect(@country.local.instance_variable_get('@path')).to eq('someUri/Local')
   end
 
   it 'sets up a toll_free resources object' do
-    @country.should respond_to(:toll_free)
-    @country.toll_free.instance_variable_get('@path').should == 'someUri/TollFree'
+    expect(@country).to respond_to(:toll_free)
+    expect(@country.toll_free.instance_variable_get('@path')).to eq('someUri/TollFree')
   end
 
   it 'sets up a mobile resources object' do
-    @country.should respond_to(:mobile)
-    @country.mobile.instance_variable_get('@path').should == 'someUri/Mobile'
+    expect(@country).to respond_to(:mobile)
+    expect(@country.mobile.instance_variable_get('@path')).to eq('someUri/Mobile')
   end
 
 end
@@ -30,17 +30,17 @@ describe Twilio::REST::NumberType do
   end
 
   it 'sets up a local resources object' do
-    @incoming_phone_numbers.should respond_to(:local)
-    @incoming_phone_numbers.local.instance_variable_get('@path').should == 'someUri/Local'
+    expect(@incoming_phone_numbers).to respond_to(:local)
+    expect(@incoming_phone_numbers.local.instance_variable_get('@path')).to eq('someUri/Local')
   end
 
   it 'sets up a toll_free resources object' do
-    @incoming_phone_numbers.should respond_to(:toll_free)
-    @incoming_phone_numbers.toll_free.instance_variable_get('@path').should == 'someUri/TollFree'
+    expect(@incoming_phone_numbers).to respond_to(:toll_free)
+    expect(@incoming_phone_numbers.toll_free.instance_variable_get('@path')).to eq('someUri/TollFree')
   end
 
   it 'sets up a mobile resources object' do
-    @incoming_phone_numbers.should respond_to(:mobile)
-    @incoming_phone_numbers.mobile.instance_variable_get('@path').should == 'someUri/Mobile'
+    expect(@incoming_phone_numbers).to respond_to(:mobile)
+    expect(@incoming_phone_numbers.mobile.instance_variable_get('@path')).to eq('someUri/Mobile')
   end
 end

data/spec/rest/queue_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Twilio::REST::Queue do
   it 'should set up a members resources object' do
     queue = Twilio::REST::Queue.new('someUri', 'someClient')
-    queue.should respond_to(:members)
-    queue.members.instance_variable_get('@path').should == 'someUri/Members'
+    expect(queue).to respond_to(:members)
+    expect(queue.members.instance_variable_get('@path')).to eq('someUri/Members')
   end
 end

data/spec/rest/recording_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Twilio::REST::Recording do
   it 'should set up a transcriptions resources object' do
     call = Twilio::REST::Recording.new('someUri', 'someClient')
-    call.should respond_to(:transcriptions)
-    call.transcriptions.instance_variable_get('@path').should == 'someUri/Transcriptions'
+    expect(call).to respond_to(:transcriptions)
+    expect(call.transcriptions.instance_variable_get('@path')).to eq('someUri/Transcriptions')
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,15 @@
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'bundler'
+Bundler.setup
+
+Dir.glob(File.expand_path("../support/**/*.rb", __FILE__), &method(:require))
+
 require 'twilio-ruby'
-require 'fakeweb'
 require 'rack'
 
-FakeWeb.allow_net_connect = false
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

data/spec/support/fakeweb.rb

@@ -0,0 +1,2 @@
+require 'fakeweb'
+FakeWeb.allow_net_connect = false

data/spec/util/capability_spec.rb

@@ -11,56 +11,56 @@ describe Twilio::Util::Capability do
 
   it 'should return a valid jwt when #generate is called' do
     token = @capability.generate
-    decoded = JWT.decode token, 'myAuthToken'
-    decoded['scope'].should_not be_nil
-    decoded['iss'].should_not be_nil
-    decoded['exp'].should_not be_nil
+    decoded, header = JWT.decode token, 'myAuthToken'
+    expect(decoded['scope']).not_to be_nil
+    expect(decoded['iss']).not_to be_nil
+    expect(decoded['exp']).not_to be_nil
   end
 
   it 'should properly set the iss key in the payload' do
     token = @capability.generate
-    decoded = JWT.decode token, 'myAuthToken'
-    decoded['iss'].should == 'myAccountSid'
+    decoded, header = JWT.decode token, 'myAuthToken'
+    expect(decoded['iss']).to eq('myAccountSid')
   end
 
   it 'should properly set the exp key based on the default hour ttl' do
     seconds = Time.now.to_i
     token = @capability.generate
-    decoded = JWT.decode token, 'myAuthToken'
-    decoded['exp'].should == seconds + 3600
+    decoded, header = JWT.decode token, 'myAuthToken'
+    expect(decoded['exp']).to eq(seconds + 3600)
   end
 
   it 'should properly set the exp key based on the ttl passed to #generate' do
     ttl = rand 10000
     seconds = Time.now.to_i
     token = @capability.generate ttl
-    decoded = JWT.decode token, 'myAuthToken'
-    decoded['exp'].should == seconds + ttl
+    decoded, header = JWT.decode token, 'myAuthToken'
+    expect(decoded['exp']).to eq(seconds + ttl)
   end
 
   it 'should generate a proper incoming client scope string' do
     @capability.allow_client_incoming 'andrew'
     token = @capability.generate
-    decoded = JWT.decode token, 'myAuthToken'
-    queries(decoded['scope']).should == [['incoming', {'clientName' => 'andrew'}]]
+    decoded, header = JWT.decode token, 'myAuthToken'
+    expect(queries(decoded['scope'])).to eq([['incoming', {'clientName' => 'andrew'}]])
   end
 
   it 'should generate multiple proper incoming client scope strings' do
     @capability.allow_client_incoming 'andrew'
     @capability.allow_client_incoming 'bridget'
     token = @capability.generate
-    decoded = JWT.decode token, 'myAuthToken'
-    queries(decoded['scope']).should == [
+    decoded, header = JWT.decode token, 'myAuthToken'
+    expect(queries(decoded['scope'])).to eq([
       ['incoming', {'clientName' => 'andrew'}],
       ['incoming', {'clientName' => 'bridget'}]
-    ]
+    ])
   end
 
   it 'should generate a proper outgoing client scope string' do
     @capability.allow_client_outgoing 'myAppSid'
     token = @capability.generate
-    decoded = JWT.decode token, 'myAuthToken'
-    queries(decoded['scope']).should == [['outgoing', {'appSid' => 'myAppSid'}]]
+    decoded, header = JWT.decode token, 'myAuthToken'
+    expect(queries(decoded['scope'])).to eq([['outgoing', {'appSid' => 'myAppSid'}]])
   end
 
   it 'should generate a proper outgoing client scope string with parameters' do
@@ -70,8 +70,8 @@ describe Twilio::Util::Capability do
     params_hash = {'appSid' => 'myAppSid', 'appParams' => app_params}
     @capability.instance_eval {url_encode(params_hash)}
     token = @capability.generate
-    decoded = JWT.decode token, 'myAuthToken'
-    queries(decoded['scope']).should == [['outgoing', params_hash]]
+    decoded, header= JWT.decode token, 'myAuthToken'
+    expect(queries(decoded['scope'])).to eq([['outgoing', params_hash]])
   end
 
   it 'should generate a proper outgoing client scope string based on the ' +
@@ -79,11 +79,11 @@ describe Twilio::Util::Capability do
     @capability.allow_client_incoming 'andrew'
     @capability.allow_client_outgoing 'myAppSid'
     token = @capability.generate
-    decoded = JWT.decode token, 'myAuthToken'
-    queries(decoded['scope']).should == [
+    decoded, header = JWT.decode token, 'myAuthToken'
+    expect(queries(decoded['scope'])).to eq([
       ['incoming', {'clientName' => 'andrew'}],
       ['outgoing', {'clientName' => 'andrew', 'appSid' => 'myAppSid'}]
-    ]
+    ])
   end
 
   it 'should generate a proper outgoing client scope string based on the ' +
@@ -91,8 +91,8 @@ describe Twilio::Util::Capability do
     @capability.allow_client_outgoing 'myAppSid'
     @capability.allow_client_incoming 'andrew'
     token = @capability.generate
-    decoded = JWT.decode token, 'myAuthToken'
-    queries(decoded['scope']).should == [["incoming", {"clientName"=>"andrew"}], ["outgoing", {"clientName"=>"andrew", "appSid"=>"myAppSid"}]]
+    decoded, header = JWT.decode token, 'myAuthToken'
+    expect(queries(decoded['scope'])).to eq([["incoming", {"clientName"=>"andrew"}], ["outgoing", {"clientName"=>"andrew", "appSid"=>"myAppSid"}]])
   end
 
   it 'should generate a proper outgoing client scope string with parameters ' +
@@ -104,15 +104,15 @@ describe Twilio::Util::Capability do
     params_hash = {'appSid' => 'myAppSid', 'appParams' => app_params, 'clientName' => 'andrew'}
     @capability.instance_eval {url_encode(params_hash)}
     token = @capability.generate
-    decoded = JWT.decode token, 'myAuthToken'
+    decoded, header = JWT.decode token, 'myAuthToken'
     scopes = queries(decoded['scope'])
-    scopes.shift.should == ["incoming", {"clientName"=>"andrew"}]
+    expect(scopes.shift).to eq(["incoming", {"clientName"=>"andrew"}])
     scope = scopes.shift
-    scope.first.should == 'outgoing'
-    Rack::Utils.parse_query(scope.last['appParams']).should == {'key' => 'a value', 'foo' => 'bar/baz'}
-    scope.last["clientName"].should == "andrew"
-    scope.last["appSid"].should == "myAppSid"
-    scopes.should be_empty
+    expect(scope.first).to eq('outgoing')
+    expect(Rack::Utils.parse_query(scope.last['appParams'])).to eq({'key' => 'a value', 'foo' => 'bar/baz'})
+    expect(scope.last["clientName"]).to eq("andrew")
+    expect(scope.last["appSid"]).to eq("myAppSid")
+    expect(scopes).to be_empty
   end
 
   it 'should generate a proper outgoing client scope string with parameters ' +
@@ -124,14 +124,14 @@ describe Twilio::Util::Capability do
     params_hash = {'appSid' => 'myAppSid', 'appParams' => app_params, 'clientName' => 'andrew'}
     @capability.instance_eval {url_encode(params_hash)}
     token = @capability.generate
-    decoded = JWT.decode token, 'myAuthToken'
+    decoded, header = JWT.decode token, 'myAuthToken'
     scopes = queries(decoded['scope'])
-    scopes.shift.should == ["incoming", {"clientName"=>"andrew"}]
+    expect(scopes.shift).to eq(["incoming", {"clientName"=>"andrew"}])
     scope = scopes.shift
-    scope.first.should == 'outgoing'
-    Rack::Utils.parse_query(scope.last['appParams']).should == {'key' => 'a value', 'foo' => 'bar/baz'}
-    scope.last["clientName"].should == "andrew"
-    scope.last["appSid"].should == "myAppSid"
-    scopes.should be_empty
+    expect(scope.first).to eq('outgoing')
+    expect(Rack::Utils.parse_query(scope.last['appParams'])).to eq({'key' => 'a value', 'foo' => 'bar/baz'})
+    expect(scope.last["clientName"]).to eq("andrew")
+    expect(scope.last["appSid"]).to eq("myAppSid")
+    expect(scopes).to be_empty
   end
 end

data/spec/util/request_validator_spec.rb

@@ -34,7 +34,7 @@ describe Twilio::Util::RequestValidator do
       'ApplicationSid' => 'AP44efecad51364e80b133bb7c07eb8204'
     }
     signature = 'oVb2kXoVy8GEfwBDjR8bk/ZZ6eA='
-    validator.validate(url, params, signature).should == true
+    expect(validator.validate(url, params, signature)).to eq(true)
   end
 
   it 'should properly validate a Twilio SMS request' do
@@ -60,6 +60,6 @@ describe Twilio::Util::RequestValidator do
       'SmsSid' => 'SM2003cbd5e6a3701999aa3e5f20ff2787'
     }
     signature = 'mxeiv65lEe0b8L6LdVw2jgJi8yw='
-    validator.validate(url, params, signature).should == true
+    expect(validator.validate(url, params, signature)).to eq(true)
   end
 end

data/spec/util/url_encode_spec.rb

@@ -7,6 +7,6 @@ describe Twilio::Util do
     today = Time.now
     url = url_encode({'DateSent>' => today})
 
-    url.should == "DateSent%3E=#{today.strftime('%Y-%m-%d')}"
+    expect(url).to eq("DateSent%3E=#{today.strftime('%Y-%m-%d')}")
   end
 end

data/twilio-ruby.gemspec

@@ -1,33 +1,35 @@
-require './lib/twilio-ruby/version'
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'twilio-ruby/version'
 
-Gem::Specification.new do |s|
-  s.name = 'twilio-ruby'
-  s.version = Twilio::VERSION
-  s.author = 'Andrew Benton'
-  s.email = 'andrew@twilio.com'
+Gem::Specification.new do |spec|
+  spec.name          = 'twilio-ruby'
+  spec.version       = Twilio::VERSION
+  spec.authors       = ['Andrew Benton']
+  spec.email         = ['andrew@twilio.com']
+  spec.summary       = 'A simple library for communicating with the Twilio REST API, building TwiML, and generating Twilio Client Capability Tokens'
+  spec.description   = 'A simple library for communicating with the Twilio REST API, building TwiML, and generating Twilio Client Capability Tokens'
+  spec.homepage      = 'http://github.com/twilio/twilio-ruby'
+  spec.license       = 'MIT'
 
-  s.description = 'A simple library for communicating with the Twilio REST API, building TwiML, and generating Twilio Client Capability Tokens'
-  s.summary = 'A simple library for communicating with the Twilio REST API, building TwiML, and generating Twilio Client Capability Tokens'
-  s.homepage = 'http://github.com/twilio/twilio-ruby'
-  s.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.require_paths = ['lib']
+  spec.required_ruby_version = '>= 1.8.7'
+  spec.extra_rdoc_files = ['README.md', 'LICENSE.md']
+  spec.rdoc_options = ['--line-numbers', '--inline-source', '--title', 'twilio-ruby', '--main', 'README.md']
 
-  s.platform = Gem::Platform::RUBY
-  s.require_paths = %w[lib]
-  s.files = `git ls-files`.split("\n")
-  s.test_files = Dir['spec/**/*.rb']
-
-  s.add_dependency('multi_json', '>= 1.3.0')
-  s.add_dependency('builder', '>= 2.1.2')
-  s.add_dependency('jwt', '>= 0.1.2')
-  s.add_dependency('jruby-openssl') if RUBY_PLATFORM == 'java'
+  spec.add_dependency('multi_json', '>= 1.3.0')
+  spec.add_dependency('builder', '>= 2.1.2')
+  spec.add_dependency('jwt', '>= 0.1.2')
+  spec.add_dependency('jruby-openssl') if RUBY_PLATFORM == 'java'
   # Workaround for RBX <= 2.2.1, should be fixed in next version
-  s.add_dependency('rubysl') if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-
-  s.add_development_dependency 'rake',    '~> 0.9.0'
-  s.add_development_dependency 'rspec',   '~> 2.6.0'
-  s.add_development_dependency 'fakeweb', '~> 1.3.0'
-  s.add_development_dependency 'rack',    '~> 1.3.0'
+  spec.add_dependency('rubysl') if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
 
-  s.extra_rdoc_files = ['README.md', 'LICENSE']
-  s.rdoc_options = ['--line-numbers', '--inline-source', '--title', 'twilio-ruby', '--main', 'README.md']
+  spec.add_development_dependency 'rspec',   '~> 2.14'
+  spec.add_development_dependency 'fakeweb', '~> 1.3.0'
+  spec.add_development_dependency 'rack',    '~> 1.3.0'
+  spec.add_development_dependency 'bundler', '~> 1.5'
 end

metadata

@@ -1,128 +1,129 @@
 --- !ruby/object:Gem::Specification
 name: twilio-ruby
 version: !ruby/object:Gem::Version
-  version: 3.11.5
+  version: 3.11.6
 platform: ruby
 authors:
 - Andrew Benton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.5'
 description: A simple library for communicating with the Twilio REST API, building
   TwiML, and generating Twilio Client Capability Tokens
-email: andrew@twilio.com
+email:
+- andrew@twilio.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
-- LICENSE
+- LICENSE.md
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - AUTHORS.md
-- CHANGES
+- CHANGES.md
 - Gemfile
-- LICENSE
+- LICENSE.md
 - Makefile
 - README.md
 - Rakefile
@@ -225,6 +226,7 @@ files:
 - spec/rest/queue_spec.rb
 - spec/rest/recording_spec.rb
 - spec/spec_helper.rb
+- spec/support/fakeweb.rb
 - spec/util/capability_spec.rb
 - spec/util/request_validator_spec.rb
 - spec/util/url_encode_spec.rb
@@ -235,27 +237,27 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--line-numbers"
-- "--inline-source"
-- "--title"
+- --line-numbers
+- --inline-source
+- --title
 - twilio-ruby
-- "--main"
+- --main
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A simple library for communicating with the Twilio REST API, building TwiML,
@@ -271,6 +273,7 @@ test_files:
 - spec/rest/queue_spec.rb
 - spec/rest/recording_spec.rb
 - spec/spec_helper.rb
+- spec/support/fakeweb.rb
 - spec/util/capability_spec.rb
 - spec/util/request_validator_spec.rb
 - spec/util/url_encode_spec.rb