twilio-ruby 3.12.1 → 3.12.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWU0YjUzYzFjNmY0YTc4NzM1MDMyZjAyZjQwZmJkNzM5ZDM3MGVjZg==
+    OWM4YzFhOGQ2NjI1N2Q3NmQ1YjE0YzNlNDkxNjg5NTUzMzYzNzI4Mg==
   data.tar.gz: !binary |-
-    MzY4NWQwNjRhMTZhODRhNzViZDdmYmQ4MmYxNDZhNmE4YTY3YWY2ZQ==
+    NGZjMjdmZTFjMWE4YzhlYWJjNGQ4NTkzMTkzMjY2NDgyMDIwYWRjMw==
 SHA512:
   metadata.gz: !binary |-
-    ZWVmMzJjZjEwMjFhNTI1MDY4ZGJkZTgyMTQ0OWNlYWI3YmNjOTRmMzUxNTFl
-    YmYxYzQyMWQzMjY2ZGM2NTc5ZjUwYzhiOGFkZDM0OWY0MjFhNDRiY2FiNmY4
-    ZTkxNDVjYTkzN2NmZDMyZjNmYTJlMTkzMzk0ZjA4MTY5MjgzMjg=
+    MTQ2NDhjZDVhOTc0NTJlYjRkY2FlZTEzMDc1ZmQ5NzM1M2QxNWM0YmU2OThm
+    NzRiNzQzNTA1NWU4YzlhMmE3ZDkxNDJlMzJlOWEwYzcyZmVlYTdhODZlY2Mz
+    Mzc1ZDk5MzQxODQzNzY5MTY1ZTE0NzkyNGRkZmU3YjcyNGRhOGM=
   data.tar.gz: !binary |-
-    NmY3NGI1NzljMTY0MDA4NjM5YTg3NTFkZjQxYTcwZGUyYWYwMWJiNmFjMTdh
-    MDNmNTZhOGMwNGM5NDhhNmY4NTU3MDJhNThhMTBkYjBjYmM0YmQzZDk3OWJm
-    YTk3NjUyNGI2MGIxMTZmNGUzZGM1MmRiMTk0YWJjNGI2YmU5YmE=
+    NWM5NTE2Y2U0ZmUwNWFjOWQ2MmRjYWUzMWNjYmIxMDc5ZmM0YmQ4ZTQxZjQz
+    MWU2NTU3YjM4OWI5OWNiMjM1MTkzY2VlNmU4Y2I4NDMwZmM3NjA4MWEwNDQx
+    ZDdmMzcxYzU5YTA1MTI2NTIxZTViYTgzYmNlMjY4MzQ1ZGJhZTQ=

data/CHANGES.md

@@ -1,13 +1,33 @@
 twilio-ruby changelog
 =====================
 
+Version 3.12.2
+--------------
+
+Released August 29, 2014
+
+- `client.account.{resource}` can now be accessed with `client.{resource}`
+- Many doc updates
+
+Version 3.12.1
+--------------
+
+Released August 26, 2014
+
+- Add support for new call feedback endpoints
+
 Version 3.12.0
+--------------
+
+Released August 18, 2014
+
 - Add Rack middleware for Twilio request-signature validation
 - Upgrade dependencies and clean up project files
 - Documentation fixes
 - Add `text` alias for `to_xml` method on TwiML generator objects
 
 Version 3.11.6
+--------------
 
 Released July 25, 2014
 
@@ -16,14 +36,16 @@ Released July 25, 2014
 - Updated to RSpec 3 syntax.
 
 Version 3.11.5
+--------------
 
-Released February 4
+Released February 4, 2014
 
 - Add bangs for twilify to indicate it's a dangerous operation.
 - Remove reference to deprecated OpenSSL Digest parameter.
 - Encode dates properly before passing them to the Twilio API.
 
 Version 3.11.4
+--------------
 
 Released October 21, 2013
 
@@ -32,6 +54,7 @@ Released October 21, 2013
 both IncomingPhoneNumbers and AvailablePhoneNumbers.
 
 Version 3.11.3
+--------------
 
 Released October 15, 2013
 

data/README.md

@@ -11,7 +11,7 @@ A module for using the Twilio REST API and generating valid [TwiML](http://www.t
 To install using [Bundler][bundler] grab the latest stable version:
 
 ```ruby
-gem 'twilio-ruby', '~> 3.11'
+gem 'twilio-ruby', '~> 3.12'
 ```
 
 To manually install `twilio-ruby` via [Rubygems][rubygems] simply gem install:
@@ -47,7 +47,7 @@ auth_token = 'yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy'
 ### Send an SMS
 
 ``` ruby
-@client.account.messages.create(
+@client.messages.create(
   :from => '+14159341234',
   :to => '+16105557069',
   :body => 'Hey there!'
@@ -57,7 +57,7 @@ auth_token = 'yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy'
 ### Send an MMS
 
 ``` ruby
-@client.account.messages.create(
+@client.messages.create(
   :from => '+14159341234',
   :to => '+16105557069',
   :body => 'Hey there!',
@@ -69,7 +69,7 @@ auth_token = 'yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy'
 
 ``` ruby
 # make a new outgoing call
-@call = @client.account.calls.create(
+@call = @client.calls.create(
   :from => '+14159341234',
   :to => '+18004567890',
   :url => 'http://example.com/call-handler',
@@ -79,7 +79,7 @@ auth_token = 'yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy'
 @call.cancel
 
 # if you have the call sid, you can fetch a call object via:
-@call = @client.account.calls.get('CA386025c9bf5d6052a1d1ea42b4d16662')
+@call = @client.calls.get('CA386025c9bf5d6052a1d1ea42b4d16662')
 
 # redirect an in-progress call
 @call.redirect_to('http://example.com/call-redirect')
@@ -92,21 +92,21 @@ auth_token = 'yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy'
 
 ``` ruby
 # list calls made or received on or after May 13, 2013
-@client.account.calls.list("start_time>" => "2013-05-13") # Notice we omit the "=" in the "start_time>=" parameter because it is automatically added
+@client.calls.list("start_time>" => "2013-05-13") # Notice we omit the "=" in the "start_time>=" parameter because it is automatically added
 ```
 
 ### Buy a Phone Number
 
 ``` ruby
 # print some available numbers
-@numbers = @client.account.available_phone_numbers.get('US').local.list(
+@numbers = @client.available_phone_numbers.get('US').local.list(
   :contains => 'AWESOME'
 )
 @numbers.each {|num| puts num.phone_number}
 
 # buy the first one
 @number = @numbers[0].phone_number
-@client.account.incoming_phone_numbers.create(:phone_number => @number)
+@client.incoming_phone_numbers.create(:phone_number => @number)
 ```
 
 ## Getting Started With Client Capability Tokens
@@ -200,4 +200,4 @@ directory. Also for thoose upgrading, the [upgrade guide][upgrade] is available
 [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
+[rubinius]: http://rubini.us

data/docs/getting-started.rst

@@ -19,7 +19,7 @@ Make a Call
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @call = @client.account.calls.create({:to => "9991231234", :from => "9991231234",
+    @call = @client.calls.create({:to => "9991231234", :from => "9991231234",
         :url => "http://twimlets.com/holdmusic?Bucket=com.twilio.music.ambient"})
     puts @call.length
     puts @call.sid
@@ -38,7 +38,7 @@ Send an SMS
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @message = @client.account.messages.create({:to => "+12316851234",
+    @message = @client.messages.create({:to => "+12316851234",
                                        :from => "+15555555555",
                                        :body => "Hello there!"})
 
@@ -56,7 +56,7 @@ Send an MMS
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @message = @client.account.messages.create({:to => "+15558676309",
+    @message = @client.messages.create({:to => "+15558676309",
                                        :from => "+15555555555",
                                        :body => "Jenny I need you!",
                                        :media_url => "http://twilio.com/heart.jpg"})

data/docs/usage/applications.rst

@@ -26,7 +26,7 @@ The following code will print out the :attr:`friendly_name` for each :class:`App
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @client.account.applications.each do |app|
+    @client.applications.each do |app|
         puts app.friendly_name
     end
 
@@ -45,7 +45,7 @@ You can filter applications by FriendlyName
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @client.account.applications.list({:friendly_name => 'FOO'})}.each do |app|
+    @client.applications.list({:friendly_name => 'FOO'})}.each do |app|
         puts app.sid
     end
 
@@ -66,7 +66,7 @@ accepts many other arguments for url configuration.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @application = @client.account.applications.create({:friendly_name => "My New App"})
+    @application = @client.applications.create({:friendly_name => "My New App"})
 
 
 Updating an Application
@@ -85,7 +85,7 @@ Updating an Application
     url = "http://twimlets.com/holdmusic?Bucket=com.twilio.music.ambient"
     app_sid = 'AP123' # the app you'd like to update
 
-    @application = @client.account.applications.get(app_sid)
+    @application = @client.applications.get(app_sid)
     @application.update({:voice_url => url})
 
 
@@ -103,6 +103,6 @@ Deleting an Application
     @client = Twilio::REST::Client.new account_sid, auth_token
 
     app_sid = 'AP123' # the app you'd like to delete
-    @client.account.applications.get(app_sid)
+    @client.applications.get(app_sid)
     @application.delete()
 

data/docs/usage/basics.rst

@@ -43,7 +43,7 @@ The :class:`Client` gives you access to various list resources.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-	@calls = @client.account.calls.list()
+	@calls = @client.calls.list()
 
 :meth:`ListResource.list` accepts paging arguments.
 The following will return page 3 with page size of 25.
@@ -57,7 +57,7 @@ The following will return page 3 with page size of 25.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-	@calls = @client.account.calls.list(:page=>3, :page_size=>25)
+	@calls = @client.calls.list(:page=>3, :page_size=>25)
 
 
 Get an Individual Resource
@@ -76,7 +76,7 @@ Provide the :attr:`sid` of the resource you'd like to get.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @call = @client.account.calls.get("CA123")
+    @call = @client.calls.get("CA123")
     puts @call.to
 
 
@@ -97,6 +97,6 @@ and then call :meth:`delete` on it.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @recording = @client.account.recordings.get("RC123")
+    @recording = @client.recordings.get("RC123")
     @recording.delete()
 

data/docs/usage/caller-ids.rst

@@ -19,7 +19,7 @@ Validating a phone number is quick and easy.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @response = @client.account.outgoing_caller_ids.create(:phone_number => "+44 9876543212")
+    @response = @client.outgoing_caller_ids.create(:phone_number => "+44 9876543212")
     puts @response.validation_code
 
 Twilio will call the provided number and wait for the validation code to be
@@ -40,6 +40,6 @@ Deleting a phone number is quick and easy.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @response = @client.account.outgoing_caller_ids.list(:phone_number => "+15555555555")
+    @response = @client.outgoing_caller_ids.list(:phone_number => "+15555555555")
     @callerid = response[0]
     @callerid.delete()

data/docs/usage/conferences.rst

@@ -20,7 +20,7 @@ Listing Conferences
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @conferences = @client.account.conferences.list()
+    @conferences = @client.conferences.list()
 
     @conferences.each do |conference|
         puts conference.sid
@@ -43,8 +43,8 @@ will return a list of all in-progress conferences and print their friendly name.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @conferences = @client.account.conferences.list({:status => "in-progress"})
-    
+    @conferences = @client.conferences.list({:status => "in-progress"})
+
     @conference.each do |conference|
         puts conference.friendly_name
     end
@@ -64,7 +64,7 @@ Each :class:`Conference` has a :attr:`participants` instance which represents al
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @conference = @client.account.conferences.get("CF123")
+    @conference = @client.conferences.get("CF123")
 
     @conference.participants.list.each.do |paricipant|
         puts participant.sid
@@ -94,7 +94,7 @@ code kicks out the first participant and mutes the rest.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @participants = @client.account.conferences.get("CF123").participants.list()
+    @participants = @client.conferences.get("CF123").participants.list()
 
     if @participants.empty?
         return

data/docs/usage/errors.rst

@@ -19,7 +19,7 @@ handled appropriately.
 
     begin
         @client = Twilio::REST::Client.new account_sid, auth_token
-        client.account.messages.create({
+        client.messages.create({
             :from => '+1234567890',
             :to => '+1234567890',
             :body => 'Hello world'

data/docs/usage/messages.rst

@@ -24,7 +24,7 @@ Send a text message in only a few lines of code.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @message = @client.account.messages.create({:to => "+13216851234",
+    @message = @client.messages.create({:to => "+13216851234",
                                        :from => "+15555555555",
                                        :body => "Hello!"})
 
@@ -48,7 +48,7 @@ To send a picture, set :attr:`media_url` to the url of the picture you wish to s
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @message = @client.account.messages.create({:to => "+15558676309",
+    @message = @client.messages.create({:to => "+15558676309",
                                        :from => "+15555555555",
                                        :body => "Jenny I need you!",
                                        :media_url => "http://twilio.com/heart.jpg"})
@@ -58,7 +58,7 @@ an array of urls.
 
 .. code-block:: ruby
 
-    @message = @client.account.messages.create({:to => "+15558676309",
+    @message = @client.messages.create({:to => "+15558676309",
                                        :from => "+15555555555",
                                        :body => "Jenny I need you!",
                                        :media_url => [
@@ -80,7 +80,7 @@ Retrieving Sent Messages
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @client.account.messages.list.each do |message|
+    @client.messages.list.each do |message|
         puts message.body
 
 
@@ -101,9 +101,9 @@ The following will only show messages to "+5466758723" on January 1st, 2011.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @messages = @client.account.messages.list({:to => "+5466758723", :date_sent => "2011-01-01"})
+    @messages = @client.messages.list({:to => "+5466758723", :date_sent => "2011-01-01"})
 
     @messages.each do |message|
         puts message.body
-    
+
 

data/docs/usage/notifications.rst

@@ -24,7 +24,7 @@ current :class:`Notification` resources.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @client.account.notifications.list().each do |notification|:
+    @client.notifications.list().each do |notification|:
         puts notification.more_info
 
 You can filter transcriptions by :attr:`log` and :attr:`message_date`.
@@ -42,7 +42,7 @@ The :attr:`log` value is 0 for `ERROR` and 1 for `WARNING`.
 
     ERROR = 0
 
-    @client.account.notifications.list(log=ERROR).each do |notification|:
+    @client.notifications.list(log=ERROR).each do |notification|:
         puts notification.error_code
 
 .. note:: Due to the potentially voluminous amount of data in a notification,

data/docs/usage/phone-calls.rst

@@ -25,7 +25,7 @@ outputs valid `TwiML <http://www.twilio.com/docs/api/twiml/>`_.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @call = @client.account.calls.create({:to => "9991231234",
+    @call = @client.calls.create({:to => "9991231234",
                                   :from => "9991231234",
                                   :url => "http://foo.com/call.xml"})
     puts @call.length
@@ -48,7 +48,7 @@ you can use the client to retrieve that record.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
     sid = "CA12341234"
-    @call = @client.account.calls.get(sid)
+    @call = @client.calls.get(sid)
 
 
 Accessing Specific Call Resources
@@ -69,7 +69,7 @@ just like the :class:`Calls` resource itself.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
     sid = "CA12341234"
-    @call = @client.account.calls.get(sid)
+    @call = @client.calls.get(sid)
 
     puts @call.notifications.list()
     puts @call.recordings.list()
@@ -109,7 +109,7 @@ redirect them as necessary
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @calls = @client.account.calls.list({:status => "in-progress"})
+    @calls = @client.calls.list({:status => "in-progress"})
 
     @calls.each do |call|
         call.redirect_to("http://twimlets.com/holdmusic?Bucket=com.twilio.music.ambient")
@@ -127,7 +127,7 @@ Ending all live calls is also possible
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @calls = @client.account.calls.list({:status => "in-progress"})
+    @calls = @client.calls.list({:status => "in-progress"})
 
     @calls.each do |call|
         call.hangup()
@@ -148,7 +148,7 @@ resource to update the record without having to use :meth:`get` first.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
     sid = "CA12341234"
-    @client.account.calls.get(sid).redirect_to("http://twimlets.com/holdmusic?Bucket=com.twilio.music.ambient")
+    @client.calls.get(sid).redirect_to("http://twimlets.com/holdmusic?Bucket=com.twilio.music.ambient")
 
 Hanging up the call also works.
 
@@ -162,5 +162,5 @@ Hanging up the call also works.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
     sid = "CA12341234"
-    @client.account.calls.get(sid).hangup()
+    @client.calls.get(sid).hangup()
 

data/docs/usage/phone-numbers.rst

@@ -27,7 +27,7 @@ Once we find one, we'll purchase it for our account.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    numbers = @client.account.available_phone_numbers.list(:area_code=>"530")
+    numbers = @client.available_phone_numbers.list(:area_code=>"530")
 
     if numbers:
         numbers[0].purchase()
@@ -51,13 +51,13 @@ You can search for numbers for a given type.
 .. code-block:: ruby
 
     # local
-	numbers = @client.account.available_phone_numbers.local.list()
+	numbers = @client.available_phone_numbers.local.list()
 
     # toll free
-	numbers = @client.account.available_phone_numbers.toll_free.list()
+	numbers = @client.available_phone_numbers.toll_free.list()
 
     # mobile
-	numbers = @client.account.available_phone_numbers.mobile.list()
+	numbers = @client.available_phone_numbers.mobile.list()
 
 Numbers Containing Words
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -67,13 +67,13 @@ The following example will find any phone number with "FOO" in it.
 
 .. code-block:: ruby
 
-	numbers = @client.account.available_phone_numbers.list(:contains=>"FOO")
+	numbers = @client.available_phone_numbers.list(:contains=>"FOO")
 
 You can use the ''*'' wildcard to match any character. The following example finds any phone number that matches the pattern ''D*D''.
 
 .. code-block:: ruby
 
-	numbers = @client.account.available_phone_numbers.list(:contains=>"D*D")
+	numbers = @client.available_phone_numbers.list(:contains=>"D*D")
 
 
 International Numbers
@@ -85,7 +85,7 @@ international numbers.
 
 .. code-block:: ruby
 
-	numbers = @client.account.available_phone_numbers.list(:country=>"FR")
+	numbers = @client.available_phone_numbers.list(:country=>"FR")
 
 
 :meth:`PhoneNumbers.search` method has plenty of other options to augment your search :
@@ -115,7 +115,7 @@ If you've found a phone number you want, you can purchase the number.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @number = @client.account.phone_numbers.purchase({:phone_number => "+15305431234"})
+    @number = @client.available_phone_numbers.purchase({:phone_number => "+15305431234"})
 
 However, it's easier to purchase numbers after finding them using search (as
 shown in the first example).
@@ -138,9 +138,9 @@ listed in the `IncomingPhoneNumbers Resource documentation
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @client.account.phone_numbers.list(api_version="2010-04-01").each do |number|
-        number.update({:voice_url => "http://twimlets.com/holdmusic?" + 
-            "Bucket=com.twilio.music.ambient", 
+    @client.available_phone_numbers.list(api_version="2010-04-01").each do |number|
+        number.update({:voice_url => "http://twimlets.com/holdmusic?" +
+            "Bucket=com.twilio.music.ambient",
             :status_callback => "http://example.com/callback"})
 
 
@@ -161,7 +161,7 @@ An :class:`Application` encapsulates all necessary URLs for use with phone numbe
 
     phone_sid = "PNXXXXXXXXXXXXXXXXX"
 
-    @number = @client.account.phone_numbers.get(phone_sid)
+    @number = @client.available_phone_numbers.get(phone_sid)
     @number.update(:sms_application_sid => "APXXXXXXXXXXXXXXXXXX")
 
 See :doc:`/usage/applications` for instructions on updating and maintaining Applications.

data/docs/usage/queues.rst

@@ -22,8 +22,8 @@ Listing Queues
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @queues = @client.account.queues.list()
-    
+    @queues = @client.queues.list()
+
     @queues.each do |queue|
         puts queue.sid
     end
@@ -44,7 +44,7 @@ represents all current calls in the queue.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @queue = @client.account.queues.get("QU123")
+    @queue = @client.queues.get("QU123")
 
     @queue.members.list().each do |member|
         print member.call_sid
@@ -74,8 +74,8 @@ first call in the queue.
 
     queue_sid = "QUAAAAAAAAAAAAA"
     call_sid = "CAXXXXXXXXXXXXXX"
-    
-    @members = @client.account.queues.get(queue_sid).members
+
+    @members = @client.queues.get(queue_sid).members
 
     # Get the first call in the queue
     puts members.front.date_enqueued
@@ -106,7 +106,7 @@ default values are 'Front' and 'GET'
 
     queue_sid = "QUAAAAAAAAAAAAA"
 
-    @members = @client.account.queues.get(queue_sid).members
+    @members = @client.queues.get(queue_sid).members
 
     # Dequeue the first call in the queue
     puts @members.dequeue('http://www.twilio.com/welcome/call')

data/docs/usage/recordings.rst

@@ -14,7 +14,7 @@ Audio Formats
 
 Each :class:`Recording` has a few special methods. To get the url
 for the wav format of this recording, use :meth:`Recording.wav`. For the
-mp3 format, use :meth:`Recording.mp3`. To make requests for either of 
+mp3 format, use :meth:`Recording.mp3`. To make requests for either of
 these formats use the same method with a '!' appended. These methods
 both take a block to be executed as soon as the response returns.
 
@@ -35,7 +35,7 @@ for each :class:`Recording`.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @client.account.recordings.list().each do |recording|
+    @client.recordings.list().each do |recording|
         puts recording.duration
 
 You can filter recordings by CallSid by passing the Sid as :attr:`call`.
@@ -52,7 +52,7 @@ The following will only show recordings made before January 1, 2011.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @client.account.recordings.list(before=date(2011,1,1)).each do |recording|:
+    @client.recordings.list(before=date(2011,1,1)).each do |recording|:
         puts recording.duration
 
 
@@ -70,7 +70,7 @@ The :class:`Recordings` resource allows you to delete unnecessary recordings.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @client.account.recordings.get("RC123").delete()
+    @client.recordings.get("RC123").delete()
 
 
 Accessing Related Transcptions
@@ -89,7 +89,7 @@ with this recording.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @recording = @client.account.recordings.get("RC123")
+    @recording = @client.recordings.get("RC123")
 
     @recording.transcriptions.list().each do |transcription|
         puts transcription.transcription_text

data/docs/usage/sip.rst

@@ -26,7 +26,7 @@ under sip.twilio.com.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @domain = @client.account.sip.domains.create(
+    @domain = @client.sip.domains.create(
         {:friendly_name => "The Office Domain",
          :voice_url => "http://example.com/voice",
          :domain_name => "dunder-mifflin-scranton.sip.twilio.com",}
@@ -38,7 +38,7 @@ Creating a new IpAccessControlList
 
 To control access to your new domain, you'll need to explicitly grant access
 to individual ip addresses. To do this, you'll first need to create an
-:class:`IpAccessControlList` to hold the ip addresses you wish to allow. 
+:class:`IpAccessControlList` to hold the ip addresses you wish to allow.
 
 .. code-block:: ruby
 
@@ -50,7 +50,7 @@ to individual ip addresses. To do this, you'll first need to create an
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @ip_acl = @client.account.sip.ip_access_control_lists.create(
+    @ip_acl = @client.sip.ip_access_control_lists.create(
         {:friendly_name => "The Office IpAccessControlList",}
     )
     puts @ip_acl.sid
@@ -70,7 +70,7 @@ Now it's time to add an :class:`IpAddress` to your new :class:`IpAccessControlLi
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @ip_address = @client.account.sip.ip_access_control_lists.get(
+    @ip_address = @client.sip.ip_access_control_lists.get(
         "AL456",  # IpAccessControlList sid
     ).ip_addresses.create(
         {:friendly_name => "Dwights's Computer",
@@ -94,7 +94,7 @@ associate them. To do this, create an :class:`IpAccessControlListMapping`.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @ip_acl_mapping = @client.account.sip.domains.get(
+    @ip_acl_mapping = @client.sip.domains.get(
         "SD456",  # SIP Domain sid
     ).ip_access_control_list_mappings.create(
         {:ip_access_control_list_sid => "AL789"})

data/docs/usage/transcriptions.rst

@@ -26,6 +26,6 @@ The following code will print out the length of each :class:`Transcription`.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @client.account.transcriptions.list().each do |transcription|
+    @client.transcriptions.list().each do |transcription|
         puts transcription.duration
 

data/examples/print-call-log.rb

@@ -13,7 +13,7 @@ auth_token = '62ea81de3a5b414154eb263595357c69'
 # set up a client
 client = Twilio::REST::Client.new(account_sid, auth_token)
 
-calls = client.account.calls.list
+calls = client.calls.list
 
 begin
   calls.each do |call|

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

@@ -28,6 +28,12 @@ module Twilio
     #
     #   @client.account.calls
     #
+    # For convenience, the resources of the default account are also available
+    # on the client object. So the following call is equivalent to the example
+    # above
+    #
+    #   @client.calls
+    #
     # represents an account's call list.
     #
     # ==== @client.accounts
@@ -48,8 +54,8 @@ module Twilio
       API_VERSION = '2010-04-01'
 
       # 1.8.7 doesn't have the RUBY_ENGINE constant.
-      if defined?(RUBY_ENGINE) 
-        engine = RUBY_ENGINE 
+      if defined?(RUBY_ENGINE)
+        engine = RUBY_ENGINE
       else
         engine = 'ruby'
       end
@@ -173,6 +179,26 @@ module Twilio
         end
       end
 
+      ##
+      # Delegate account methods from the client. This saves having to call
+      # <tt>client.account</tt> every time for resources on the default
+      # account.
+      def method_missing(method_name, *args, &block)
+        if account.respond_to?(method_name)
+          account.send(method_name, *args, &block)
+        else
+          super
+        end
+      end
+
+      def respond_to?(method_name, include_private=false)
+        if account.respond_to?(method_name, include_private)
+          true
+        else
+          super
+        end
+      end
+
       private
 
       ##
@@ -186,7 +212,7 @@ module Twilio
         @connection.open_timeout = @config[:timeout]
         @connection.read_timeout = @config[:timeout]
       end
- 
+
       ##
       # Set up the ssl properties of the <tt>@connection</tt> Net::HTTP object.
       # This is a private method documented for completeness.

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-  VERSION = '3.12.1'
+  VERSION = '3.12.2'
 end

data/spec/rest/call_feedback_spec.rb

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

data/spec/rest/call_feedback_summary_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Twilio::REST::FeedbackSummary do
   it 'creates a feedback summary object' do
     calls = Twilio::REST::Calls.new('someUri', 'someClient')
-    calls.should respond_to(:feedback_summary)
-    calls.feedback_summary.instance_variable_get('@path').should == 'someUri/FeedbackSummary'
+    expect(calls).to respond_to(:feedback_summary)
+    expect(calls.feedback_summary.instance_variable_get('@path')).to eq('someUri/FeedbackSummary')
   end
-end
+end

data/spec/rest/client_spec.rb

@@ -20,7 +20,7 @@ describe Twilio::REST::Client do
     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')
@@ -28,7 +28,7 @@ describe Twilio::REST::Client do
     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')
@@ -87,6 +87,19 @@ describe Twilio::REST::Client do
     expect(twilio.account.instance_variable_get('@path')).to eq('/2010-04-01/Accounts/someSid')
   end
 
+  [
+      :sandbox, :available_phone_numbers, :incoming_phone_numbers,
+      :calls, :outgoing_caller_ids, :conferences, :sms, :recordings,
+      :transcriptions, :notifications, :applications, :connect_apps,
+      :authorized_connect_apps, :queues, :usage, :messages, :media, :sip
+  ].each do |method|
+    it "should delegate the client method #{method} to the account object" do
+      client = Twilio::REST::Client.new('someSid', 'someToken')
+      expect(client).to respond_to(method)
+      expect(client.send(method)).to eq(client.account.send(method))
+    end
+  end
+
   it 'should convert all parameter names to Twilio-style names' do
     twilio = Twilio::REST::Client.new('someSid', 'someToken')
     untwilified = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twilio-ruby
 version: !ruby/object:Gem::Version
-  version: 3.12.1
+  version: 3.12.2
 platform: ruby
 authors:
 - Andrew Benton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json