twilio-ruby 3.11.0 → 3.11.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c4463ad95b5c4cdd215f8c1ba739c94356598855
+  data.tar.gz: f7b531fa9490928e9ee8631e660c74068be58366
+SHA512:
+  metadata.gz: 414d7a39fe93d2159a6890f057aa54ea741d75e4d6ac5f9b167ea7c17c787ae0d5cd34b8cf029c497816dc8141d1af134c0487322a0fd0edd75e8d813ce8de5f
+  data.tar.gz: e914fd9c3a2c539c4360544338bb4f2808055f56c94dd4845ad0deed1a90ba5dcac850d6a7bcbeb221d864a677179f0f105b4b7637e3b555bb2df04a0545651b

data/README.md

@@ -1,6 +1,12 @@
 [![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)
 
+# 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]
+
 ## Install
 
 Via rubygems.org:
@@ -165,13 +171,11 @@ This will print the following (except for the whitespace):
 There are more detailed examples in the included [examples][examples]
 directory.
 
-Full [API documentation][documentation], as well as an [upgrade guide][upgrade]
-for users of the old twiliolib gem, is available in the
-[twilio-ruby github wiki][wiki].
+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]:https://github.com/twilio/twilio-ruby/wiki/Documentation
+[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

data/docs/_themes/kr/layout.html

@@ -12,7 +12,7 @@
     <div class="footer">
       &copy; Copyright {{ copyright }}.
     </div>
-    <a href="https://github.com/twilio/twilio-python">
+    <a href="https://github.com/twilio/twilio-ruby">
         <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" />
     </a>
     <script type="text/javascript">

data/docs/conf.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# twilio-python2 documentation build configuration file, created by
+# twilio-ruby documentation build configuration file, created by
 # sphinx-quickstart on Mon Dec 13 16:47:32 2010.
 #
 # This file is execfile()d with the current directory set to its containing dir.
@@ -47,7 +47,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'twilio-python'
+project = u'twilio-ruby'
 copyright = unicode(datetime.utcnow().year) + u', Twilio Inc'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -174,7 +174,7 @@ html_static_path = ['_static']
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'twilio-pythondoc'
+htmlhelp_basename = 'twilio-rubydoc'
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -188,7 +188,7 @@ htmlhelp_basename = 'twilio-pythondoc'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'twilio-python.tex', u'twilio-python Documentation',
+  ('index', 'twilio-ruby.tex', u'twilio-ruby Documentation',
    u'Twilio Inc.', 'manual'),
 ]
 
@@ -221,7 +221,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'twilio-python', u'twilio-python Documentation',
+    ('index', 'twilio-ruby', u'twilio-ruby Documentation',
      [u'Twilio Inc.'], 1)
 ]
 
@@ -229,7 +229,7 @@ man_pages = [
 # -- Options for Epub output ---------------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = u'twilio-python'
+epub_title = u'twilio-ruby'
 epub_author = u'kyle@twilio.com'
 epub_publisher = u'Twilio Inc.'
 epub_copyright = u'2010, Twilio Inc.'

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.calls.create({:to => "9991231234", :from => "9991231234",
+    @call = @client.account.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.messages.create({:to => "+12316851234",
+    @message = @client.account.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.messages.create({:to => "+15558676309",
+    @message = @client.account.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.applications.each do |app|
+    @client.account.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.applications.list({:friendly_name => 'FOO'})}.each do |app|
+    @client.account.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.applications.create({:friendly_name => "My New App"})
+    @application = @client.account.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.applications.get(app_sid)
+    @application = @client.account.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.applications.get(app_sid)
+    @client.account.applications.get(app_sid)
     @application.delete()
 

data/docs/usage/basics.rst

@@ -5,12 +5,12 @@ Accessing REST Resources
 =========================
 
 To access Twilio REST resources, you'll first need to instantiate a
-:class:`TwilioRestClient`.
+:class:`Twilio::REST::Client`.
 
 Authentication
 --------------------------
 
-The :class:`TwilioRestClient` needs your Twilio credentials. To get
+The :class:`Twilio::REST::Client` needs your Twilio credentials. To get
 your credentials, visit `your Twilio account portal
 <https://www.twilio.com/user/account>`_. If you don't have a Twilio account
 yet, go `here <https://www.twilio.com/try-twilio>`_ to get started.
@@ -43,12 +43,12 @@ The :class:`Client` gives you access to various list resources.
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @calls = client.calls.list()
+	@calls = @client.account.calls.list()
 
 :meth:`ListResource.list` accepts paging arguments.
 The following will return page 3 with page size of 25.
 
-.. code-block:: python
+.. code-block:: ruby
 
     require 'twilio-ruby'
 
@@ -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.calls.list(page=3, page_size=25)
+	@calls = @client.account.calls.list(:page=>3, :page_size=>25)
 
 
 Get an Individual Resource
@@ -76,6 +76,6 @@ Provide the :attr:`sid` of the resource you'd like to get.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @call = @client.calls.get("CA123")
+    @call = @client.account.calls.get("CA123")
     puts @call.to
 

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.caller_ids.create("+44 9876543212")
+    @response = @client.account.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.caller_ids.list(phone_number="+15555555555")
+    @response = @client.account.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.conferences.list()
+    @conferences = @client.account.conferences.list()
 
     @conferences.each do |conference|
         puts conference.sid
@@ -43,7 +43,7 @@ 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.conferences.list({:status => "in-progress"})
+    @conferences = @client.account.conferences.list({:status => "in-progress"})
     
     @conference.each do |conference|
         puts conference.friendly_name
@@ -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.conferences.get("CF123")
+    @conference = @client.account.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.conferences.get("CF123").participants.list()
+    @participants = @client.account.conferences.get("CF123").participants.list()
 
     if @participants.empty?
         return

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.messages.create({:to => "+13216851234",
+    @message = @client.account.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.messages.create({:to => "+15558676309",
+    @message = @client.account.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.messages.create({:to => "+15558676309",
+    @message = @client.account.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.messages.each do |message|
+    @client.account.messages.each do |message|
         puts message.body
 
 
@@ -101,8 +101,7 @@ The following will only show messages to "+5466758723" on January 1st, 2011.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @messages = client.messages.list({:to => "+5466758723",
-                                      :date_sent => date(2011,1,1)})
+    @messages = @client.account.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.notifications.list().each do |notification|:
+    @client.account.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.notifications.list(log=ERROR).each do |notification|:
+    @client.account.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.calls.create({:to => "9991231234",
+    @call = @client.account.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.calls.get(sid)
+    @call = @client.account.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.calls.get(sid)
+    @call = @client.account.calls.get(sid)
 
     puts @call.notifications.list()
     puts @call.recordings.list()
@@ -100,8 +100,6 @@ Modifying Live Calls
 The :class:`Call` resource makes it easy to find current live calls and
 redirect them as necessary
 
-.. code-block:: python
-
 .. code-block:: ruby
 
     require 'twilio-ruby'
@@ -111,7 +109,7 @@ redirect them as necessary
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @calls = @client.calls.list({:status => "in-progress")
+    @calls = @client.account.calls.list({:status => "in-progress"})
 
     @calls.each do |call|
         call.redirect_to("http://twimlets.com/holdmusic?Bucket=com.twilio.music.ambient")
@@ -129,7 +127,7 @@ Ending all live calls is also possible
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @calls = @client.calls.list({:status => "in-progress")
+    @calls = @client.account.calls.list({:status => "in-progress"})
 
     @calls.each do |call|
         call.hangup()
@@ -150,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.calls.get(sid).redirect_to("http://twimlets.com/holdmusic?Bucket=com.twilio.music.ambient")
+    @client.account.calls.get(sid).redirect_to("http://twimlets.com/holdmusic?Bucket=com.twilio.music.ambient")
 
 Hanging up the call also works.
 
@@ -164,5 +162,5 @@ Hanging up the call also works.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
     sid = "CA12341234"
-    @client.calls.get(sid).hangup()
+    @client.account.calls.get(sid).hangup()
 

data/docs/usage/phone-numbers.rst

@@ -18,16 +18,16 @@ Finding numbers to buy couldn't be easier.
 We first search for a number in area code 530.
 Once we find one, we'll purchase it for our account.
 
-.. code-block:: python
+.. code-block:: ruby
 
-    from twilio.rest import TwilioRestClient
+    require 'twilio-ruby'
 
     # To find these visit https://www.twilio.com/user/account
-    ACCOUNT_SID = "ACXXXXXXXXXXXXXXXXX"
-    AUTH_TOKEN = "YYYYYYYYYYYYYYYYYY"
+    account_sid = "ACXXXXXXXXXXXXXXXXX"
+    auth_token = "YYYYYYYYYYYYYYYYYY"
 
-    client = TwilioRestClient(ACCOUNT_SID, AUTH_TOKEN)
-    numbers = client.phone_numbers.search(area_code=530)
+    @client = Twilio::REST::Client.new account_sid, auth_token
+    numbers = @client.account.available_phone_numbers.list(:area_code=>"530")
 
     if numbers:
         numbers[0].purchase()
@@ -41,9 +41,9 @@ Toll Free Numbers
 By default, :meth:`PhoneNumbers.search` looks for local phone numbers. Add a
 :data:`type` : ``tollfree`` parameter to search toll-free numbers instead.
 
-.. code-block:: python
+.. code-block:: ruby
 
-    numbers = client.phone_numbers.search(type="tollfree")
+	numbers = @client.account.available_phone_numbers.list(:type=>"tollfree")
 
 
 Numbers Containing Words
@@ -52,15 +52,15 @@ Numbers Containing Words
 Phone number search also supports looking for words inside phone numbers.
 The following example will find any phone number with "FOO" in it.
 
-.. code-block:: python
+.. code-block:: ruby
 
-    numbers = client.phone_numbers.search(contains="FOO")
+	numbers = @client.account.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:: python
+.. code-block:: ruby
 
-    numbers = client.phone_numbers.search(contains="D*D")
+	numbers = @client.account.available_phone_numbers.list(:contains=>"D*D")
 
 
 International Numbers
@@ -70,9 +70,9 @@ By default, the client library will look for US numbers. Set the
 :data:`country` keyword to a country code of your choice to search for
 international numbers.
 
-.. code-block:: python
+.. code-block:: ruby
 
-    numbers = client.phone_numbers.search(country="FR")
+	numbers = @client.account.available_phone_numbers.list(:country=>"FR")
 
 
 :meth:`PhoneNumbers.search` method has plenty of other options to augment your search :
@@ -93,16 +93,16 @@ Buying a Number
 
 If you've found a phone number you want, you can purchase the number.
 
-.. code-block:: python
+.. code-block:: ruby
 
-    from twilio.rest import TwilioRestClient
+    require 'twilio-ruby'
 
     # To find these visit https://www.twilio.com/user/account
-    ACCOUNT_SID = "ACXXXXXXXXXXXXXXXXX"
-    AUTH_TOKEN = "YYYYYYYYYYYYYYYYYY"
+    account_sid = "ACXXXXXXXXXXXXXXXXX"
+    auth_token = "YYYYYYYYYYYYYYYYYY"
 
-    client = TwilioRestClient(ACCOUNT_SID, AUTH_TOKEN)
-    number = client.phone_numbers.purchase(phone_number="+15305431234")
+    @client = Twilio::REST::Client.new account_sid, auth_token
+    @number = @client.account.phone_numbers.purchase({:phone_number => "+15305431234"})
 
 However, it's easier to purchase numbers after finding them using search (as
 shown in the first example).
@@ -116,19 +116,19 @@ on the phone number object, with any of the parameters
 listed in the `IncomingPhoneNumbers Resource documentation
 <http://www.twilio.com/docs/api/rest/incoming-phone-numbers>`_
 
-.. code-block:: python
+.. code-block:: ruby
 
-    from twilio.rest import TwilioRestClient
+    require 'twilio-ruby'
 
     # To find these visit https://www.twilio.com/user/account
-    ACCOUNT_SID = "ACXXXXXXXXXXXXXXXXX"
-    AUTH_TOKEN = "YYYYYYYYYYYYYYYYYY"
+    account_sid = "ACXXXXXXXXXXXXXXXXX"
+    auth_token = "YYYYYYYYYYYYYYYYYY"
 
-    client = TwilioRestClient(ACCOUNT_SID, AUTH_TOKEN)
-    for number in client.phone_numbers.list(api_version="2010-04-01"):
-        number.update(voice_url="http://twimlets.com/holdmusic?" + 
+    @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", 
-            status_callback="http://example.com/callback")
+            :status_callback => "http://example.com/callback"})
 
 
 Changing Applications
@@ -136,18 +136,20 @@ Changing Applications
 
 An :class:`Application` encapsulates all necessary URLs for use with phone numbers. Update an application on a phone number using :meth:`update`.
 
-.. code-block:: python
+.. code-block:: ruby
 
-    from twilio.rest import TwilioRestClient
-
-    phone_sid = "PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+    require 'twilio-ruby'
 
     # To find these visit https://www.twilio.com/user/account
-    ACCOUNT_SID = "ACXXXXXXXXXXXXXXXXX"
-    AUTH_TOKEN = "YYYYYYYYYYYYYYYYYY"
+    account_sid = "ACXXXXXXXXXXXXXXXXX"
+    auth_token = "YYYYYYYYYYYYYYYYYY"
+
+    @client = Twilio::REST::Client.new account_sid, auth_token
+
+    phone_sid = "PNXXXXXXXXXXXXXXXXX"
 
-    client = TwilioRestClient(ACCOUNT_SID, AUTH_TOKEN)
-    number = client.phone_numbers.update(phone_sid, sms_application_sid="AP123")
+    @number = @client.account.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,7 +22,7 @@ Listing Queues
     auth_token = "YYYYYYYYYYYYYYYYYY"
 
     @client = Twilio::REST::Client.new account_sid, auth_token
-    @queues = client.queues.list()
+    @queues = @client.account.queues.list()
     
     @queues.each do |queue|
         puts queue.sid
@@ -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.queues.get("QU123")
+    @queue = @client.account.queues.get("QU123")
 
     @queue.members.list().each do |member|
         print member.call_sid
@@ -75,7 +75,7 @@ first call in the queue.
     queue_sid = "QUAAAAAAAAAAAAA"
     call_sid = "CAXXXXXXXXXXXXXX"
     
-    @members = @client.queues.get(queue_sid).members
+    @members = @client.account.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.queues.get(queue_sid).members
+    @members = @client.account.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

@@ -35,7 +35,7 @@ for each :class:`Recording`.
 
     @client = Twilio::REST::Client.new account_sid, auth_token
 
-    @client.recordings.list().each do |recording|
+    @client.account.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.recordings.list(before=date(2011,1,1)).each do |recording|:
+    @client.account.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.recordings.get("RC123").delete()
+    @client.account.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.recordings.get("RC123")
+    @recording = @client.account.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.sip.domains.create(
+    @domain = @client.account.sip.domains.create(
         {:friendly_name => "The Office Domain",
          :voice_url => "http://example.com/voice",
          :domain_name => "dunder-mifflin-scranton.sip.twilio.com",}
@@ -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.sip.ip_access_control_lists.create(
+    @ip_acl = @client.account.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.sip.ip_access_control_lists.get(
+    @ip_address = @client.account.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.sip.domains.get(
+    @ip_acl_mapping = @client.account.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.transcriptions.list().each do |transcription|
+    @client.account.transcriptions.list().each do |transcription|
         puts transcription.duration
 

data/docs/usage/twiml.rst

@@ -13,7 +13,7 @@ These methods return the verbs they create to ease creation of nested TwiML.
 To finish, call the :meth:`toxml` method on the :class:`Response`,
 which returns raw TwiML.
 
-.. code-block:: python
+.. code-block:: ruby
 
     require 'twilio-ruby'
 
@@ -30,7 +30,7 @@ The verb methods (outlined in the :doc:`complete reference </api/twiml>`)
 take the body (only text) of the verb as the first argument.
 All attributes are keyword arguments.
 
-.. code-block:: python
+.. code-block:: ruby
 
     require 'twilio-ruby'
 
@@ -45,10 +45,9 @@ All attributes are keyword arguments.
         <Play loop="3">https://api.twilio.com/cowbell.mp3</Play>
     <Response>
 
-Python 2.6+ added the :const:`with` statement for context management.
-Using :const:`with`, the module can *almost* emulate Ruby blocks.
+Any example of nesting nouns in verbs
 
-.. code-block:: python
+.. code-block:: ruby
 
     require 'twilio-ruby'
 

data/docs/usage/validation.rst

@@ -30,7 +30,7 @@ data as a dictionary and the url and X-Twilio-Signature as strings.
 The below example will print out a confirmation message if the request is
 actually from Twilio.
 
-.. code-block:: python
+.. code-block:: ruby
 
     require 'twilio-ruby'
 

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

@@ -1,6 +1,11 @@
 module Twilio
   module REST
-    class Messages < ListResource; end
+    class Messages < ListResource
+      def initialize(path, client)
+        path.gsub! '/SMS', ''
+        super
+      end
+    end
 
     class Message < InstanceResource
       def initialize(path, client, params={})

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-  VERSION = '3.11.0'
+  VERSION = '3.11.1'
 end

data/lib/twilio-ruby.rb

@@ -20,7 +20,6 @@ require 'twilio-ruby/rest/sandbox'
 require 'twilio-ruby/rest/accounts'
 require 'twilio-ruby/rest/calls'
 require 'twilio-ruby/rest/sms'
-require 'twilio-ruby/rest/sms/messages'
 require 'twilio-ruby/rest/sms/short_codes'
 require 'twilio-ruby/rest/sip'
 require 'twilio-ruby/rest/sip/domains'

data/spec/rest/message_spec.rb

@@ -9,4 +9,9 @@ describe Twilio::REST::Message do
     @message.should respond_to(:media)
     @message.media.instance_variable_get('@path').should == 'someUri/Media'
   end
+
+  it 'does not use the old endpoint' do
+    client = Twilio::REST::Client.new('someId', 'sometoken')
+    client.account.sms.messages.instance_variable_get('@path').include?('/SMS').should be_false
+  end
 end

metadata

@@ -1,68 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: twilio-ruby
 version: !ruby/object:Gem::Version
-  version: 3.11.0
-  prerelease: 
+  version: 3.11.1
 platform: ruby
 authors:
 - Andrew Benton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -213,7 +198,6 @@ files:
 - lib/twilio-ruby/rest/sip/ip_access_control_lists.rb
 - lib/twilio-ruby/rest/sip/ip_access_control_lists/ip_addresses.rb
 - lib/twilio-ruby/rest/sms.rb
-- lib/twilio-ruby/rest/sms/messages.rb
 - lib/twilio-ruby/rest/sms/short_codes.rb
 - lib/twilio-ruby/rest/transcriptions.rb
 - lib/twilio-ruby/rest/usage.rb
@@ -240,6 +224,7 @@ files:
 homepage: http://github.com/twilio/twilio-ruby
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -251,33 +236,31 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple library for communicating with the Twilio REST API, building TwiML,
   and generating Twilio Client Capability Tokens
 test_files:
-- spec/spec_helper.rb
-- spec/rest/conference_spec.rb
+- spec/rest/account_spec.rb
 - spec/rest/call_spec.rb
+- spec/rest/client_spec.rb
+- spec/rest/conference_spec.rb
 - spec/rest/instance_resource_spec.rb
-- spec/rest/recording_spec.rb
-- spec/rest/account_spec.rb
 - spec/rest/message_spec.rb
-- spec/rest/client_spec.rb
 - spec/rest/queue_spec.rb
+- spec/rest/recording_spec.rb
+- spec/spec_helper.rb
 - spec/util/capability_spec.rb
 - spec/util/request_validator_spec.rb

data/lib/twilio-ruby/rest/sms/messages.rb

@@ -1,13 +0,0 @@
-module Twilio
-  module REST
-    class Messages < ListResource
-      def initialize(path, client)
-        super
-        # hard-code the json key since 'messages' doesn't exist in the response
-        @list_key = 'sms_messages'
-      end
-    end
-
-    class Message < InstanceResource; end
-  end
-end