webficient-twilio 2.2.0 → 2.3.0

data/README.rdoc

@@ -8,17 +8,14 @@ For an overview of the Twilio Gem and a sample use case, check out http://www.we
 
 == Calling the Twilio REST API
 
-First create a connection object:
+First set your credentials by calling the connect method:
 
-  c = Twilio::Connection.new('my_twilio_sid', 'my_auth_token')
+  Twilio.connect('my_twilio_sid', 'my_auth_token')
   
-Now instantiate other objects by passing in the connection:
+Now call any of the Twilio classes:
   
-  call = Twilio::Call.new(c)
-  call.make('1234567890', '9876543210', 'http://mysite.com/connected_call')
-  
-  recording = Twilio::Recording.new(c)
-  recording.list
+  Twilio::Call.make('1234567890', '9876543210', 'http://mysite.com/connected_call')
+  Twilio::Recording.list
   
 == Responding to Twilio
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :patch: 0
 :major: 2
-:minor: 2
+:minor: 3

data/lib/twilio/account.rb

@@ -2,11 +2,11 @@ module Twilio
   # The Account resource represents your Twilio Account. 
   class Account < TwilioObject
     def get
-      self.connection.class.get('')
+      Twilio.get('') 
     end
     
     def update_name(name)
-      self.connection.class.put('', :body => {:FriendlyName => name})
+      Twilio.put('', :body => {:FriendlyName => name}) 
     end
   end
 end

data/lib/twilio/call.rb

@@ -4,31 +4,30 @@ module Twilio
     # initiates the call, either via the REST API, or during a call via the Dial Verb. 
   class Call < TwilioObject
     #  Example:
-    #  c = Twilio::Connection.new('my_twilio_sid', 'my_auth_token')
-    #  call = Twilio::Call.new(c)
-    #  response = call.make(CALLER_ID, user_number, 'http://myapp.com/twilio_response_handler')
+    #  Twilio.connect('my_twilio_sid', 'my_auth_token')
+    #  Twilio::Call.make(CALLER_ID, user_number, 'http://myapp.com/twilio_response_handler')
     def make(caller, called, url, optional = {})
-      self.connection.class.post("/Calls", :body => {:Caller => caller, :Called => called, :Url => url}.merge(optional))
+      Twilio.post("/Calls", :body => {:Caller => caller, :Called => called, :Url => url}.merge(optional))
     end
 
     def list(optional = {})
-      self.connection.class.get("/Calls", :query => optional)  
+      Twilio.get("/Calls", :query => optional)  
     end
         
     def get(call_sid)
-      self.connection.class.get("/Calls/#{call_sid}")  
+      Twilio.get("/Calls/#{call_sid}")
     end
     
     def segments(call_sid, call_segment_sid = nil)
-      self.connection.class.get("/Calls/#{call_sid}/Segments#{ '/' + call_segment_sid if call_segment_sid }")
+      Twilio.get("/Calls/#{call_sid}/Segments#{ '/' + call_segment_sid if call_segment_sid }")
     end
     
     def recordings(call_sid)
-      self.connection.class.get("/Calls/#{call_sid}/Recordings")
+      Twilio.get("/Calls/#{call_sid}/Recordings")
     end
     
     def notifications(call_sid)
-      self.connection.class.get("/Calls/#{call_sid}/Notifications")
+      Twilio.get("/Calls/#{call_sid}/Notifications")
     end
   end
 end

data/lib/twilio/connection.rb

@@ -1,10 +1,16 @@
 module Twilio
-  # The Connection class caches the Twilio API base path and authentication credentials.
-  # It is passed into the constructor of other TwilioObject's, avoiding the need to 
-  # explicitly set credentials with each API call.
-  #
-  #  Example:
-  #  c = Twilio::Connection.new('my_twilio_sid', 'my_auth_token')
+  include HTTParty
+  TWILIO_URL = "https://api.twilio.com/2008-08-01/Accounts"
+    
+  # The connect method caches your Twilio account id and authentication token
+  # Example:
+  #  Twilio.connect('AC309475e5fede1b49e100272a8640f438', '3a2630a909aadbf60266234756fb15a0')
+  def self.connect(account_sid, auth_token)
+    self.base_uri "#{TWILIO_URL}/#{account_sid}"
+    self.basic_auth account_sid, auth_token
+  end
+  
+  # DEPRECATED - use Twilio.connect
   class Connection
     include HTTParty
     TWILIO_URL = "https://api.twilio.com/2008-08-01/Accounts"
@@ -14,4 +20,5 @@ module Twilio
       self.class.basic_auth account_sid, auth_token     
     end
   end
+  
 end

data/lib/twilio/incoming_phone_number.rb

@@ -1,13 +1,16 @@
 module Twilio
   # An IncomingPhoneNumber resource represents a phone number given to you by 
   # Twilio to receive incoming phone calls. 
+  # Example:
+  #   Twilio.connect('my_twilio_sid', 'my_auth_token')
+  #   Twilio::IncomingPhoneNumber.list
   class IncomingPhoneNumber < TwilioObject
     def list(optional = {})
-      self.connection.class.get("/IncomingPhoneNumbers", :query => optional) 
+      Twilio.get("/IncomingPhoneNumbers", :query => optional) 
     end
     
     def get(incoming_sid)
-      self.connection.class.get("/IncomingPhoneNumbers/#{incoming_sid}") 
+      Twilio.get("/IncomingPhoneNumbers/#{incoming_sid}") 
     end
   end
 end

data/lib/twilio/local_phone_number.rb

@@ -1,9 +1,12 @@
 module Twilio
   # This sub-resource represents only Local phone numbers, or in other words, not toll-free numbers. 
-  # Also allows you to request a new local phone number be added to your account. 
+  # Also allows you to request a new local phone number be added to your account.
+  # Example:
+  #   Twilio.connect('my_twilio_sid', 'my_auth_token')
+  #   Twilio::LocalPhoneNumber.list
   class LocalPhoneNumber < TwilioObject
     def create(url, area_code = nil, method = 'POST', friendly_name = nil)
-      self.connection.class.post("/IncomingPhoneNumbers/Local", :body => {
+      Twilio.post("/IncomingPhoneNumbers/Local", :body => {
         :Url => url, 
         :AreaCode => area_code, 
         :Method => method,
@@ -12,7 +15,7 @@ module Twilio
     end
     
     def list
-      self.connection.class.get("/IncomingPhoneNumbers/Local")
+      Twilio.get("/IncomingPhoneNumbers/Local")
     end
   end
 end

data/lib/twilio/notification.rb

@@ -1,17 +1,20 @@
 module Twilio
   # A Notification represenents a log entry made by Twilio in the course of handling 
   # your calls or using the REST API.
+  # Example:
+  #   Twilio.connect('my_twilio_sid', 'my_auth_token')
+  #   Twilio::Notification.list
   class Notification < TwilioObject
     def list(optional = {})
-      self.connection.class.get('/Notifications', :query => optional)
+      Twilio.get('/Notifications', :query => optional)
     end
     
     def get(notification_sid)
-      self.connection.class.get("/Notifications/#{notification_sid}")
+      Twilio.get("/Notifications/#{notification_sid}")
     end
     
     def delete(notification_sid)
-      self.connection.class.delete("/Notifications/#{notification_sid}")
+      Twilio.delete("/Notifications/#{notification_sid}")
     end
   end
 end

data/lib/twilio/outgoing_caller_id.rb

@@ -1,9 +1,12 @@
 module Twilio
   # An OutgoingCallerId resource represents an outgoing Caller ID that you have 
-  # registered with Twilio for use when making an outgoing call or using the Dial Verb. 
+  # registered with Twilio for use when making an outgoing call or using the Dial Verb.
+  # Example:
+  #   Twilio.connect('my_twilio_sid', 'my_auth_token')
+  #   Twilio::OutgoingCallerId.list
   class OutgoingCallerId < TwilioObject
     def create(phone_number, friendly_name = phone_number, call_delay = 0)
-      self.connection.class.post("/OutgoingCallerIds", :body => {
+      Twilio.post("/OutgoingCallerIds", :body => {
         :PhoneNumber => phone_number, 
         :FriendlyName => friendly_name, 
         :CallDelay => call_delay 
@@ -11,19 +14,19 @@ module Twilio
     end
 
     def list(optional = {})
-      self.connection.class.get("/OutgoingCallerIds", :query => optional) 
+      Twilio.get("/OutgoingCallerIds", :query => optional) 
     end
         
     def get(callerid_sid)
-      self.connection.class.get("/OutgoingCallerIds/#{callerid_sid}") 
+      Twilio.get("/OutgoingCallerIds/#{callerid_sid}") 
     end
     
     def update_name(callerid_sid, name)
-      self.connection.class.put("/OutgoingCallerIds/#{callerid_sid}", :body => {:FriendlyName => name})
+      Twilio.put("/OutgoingCallerIds/#{callerid_sid}", :body => {:FriendlyName => name})
     end
     
     def delete(callerid_sid)
-      self.connection.class.delete("/OutgoingCallerIds/#{callerid_sid}")
+      Twilio.delete("/OutgoingCallerIds/#{callerid_sid}")
     end
   end
 end

data/lib/twilio/recording.rb

@@ -1,21 +1,24 @@
 module Twilio
   # Recordings are generated when you use the Record Verb. Those recordings are 
   # hosted on Twilio's REST API for you to access. 
+  # Example:
+  #   Twilio.connect('my_twilio_sid', 'my_auth_token')
+  #   Twilio::Recording.list
   class Recording < TwilioObject    
     def list(optional = {})
-      self.connection.class.get("/Recordings", :query => optional)  
+      Twilio.get("/Recordings", :query => optional)  
     end
     
     def get(recording_sid)
-      self.connection.class.get("/Recordings/#{recording_sid}")  
+      Twilio.get("/Recordings/#{recording_sid}")  
     end
     
     def delete(recording_sid)
-      self.connection.class.delete("/Recordings/#{recording_sid}")
+      Twilio.delete("/Recordings/#{recording_sid}")
     end
     
     def transcriptions(recording_sid, transcription_sid = nil)
-      self.connection.class.get("/Recordings/#{recording_sid}/Transcriptions#{ '/' + transcription_sid if transcription_sid }") 
+      Twilio.get("/Recordings/#{recording_sid}/Transcriptions#{ '/' + transcription_sid if transcription_sid }") 
     end
   end
 end

data/lib/twilio/toll_free_phone_number.rb

@@ -1,9 +1,12 @@
 module Twilio
   # This sub-resource represents only Toll Free phone numbers, or in other words, not local numbers. 
   # Also allows you to request a new toll free phone number be added to your account. 
+  # Example:
+  #   Twilio.connect('my_twilio_sid', 'my_auth_token')
+  #   Twilio::TollFreePhoneNumber.list
   class TollFreePhoneNumber < TwilioObject
     def create(url, area_code = nil, method = 'POST', friendly_name = nil)
-      self.connection.class.post("/IncomingPhoneNumbers/TollFree", :body => {
+      Twilio.post("/IncomingPhoneNumbers/TollFree", :body => {
         :Url => url, 
         :AreaCode => area_code, 
         :Method => method,
@@ -12,7 +15,7 @@ module Twilio
     end
     
     def list
-      self.connection.class.get("/IncomingPhoneNumbers/TollFree")
+      Twilio.get("/IncomingPhoneNumbers/TollFree")
     end
   end
 end

data/lib/twilio/twilio_object.rb

@@ -1,11 +1,16 @@
 module Twilio
-  class TwilioObject  #:nodoc: all
-    include HTTParty
-    
+  class TwilioObject  #:nodoc: all    
     attr_reader :connection
     
-    def initialize(connection)
+    def initialize(connection = nil)
       @connection = connection
     end
+    
+    class << self
+      def method_missing(method_id, *args) #:nodoc:
+        o = self.new
+        o.send(method_id, *args)
+      end
+    end
   end
 end

data/test/fixtures/yml/verb_responses.yml

@@ -53,7 +53,7 @@ gather_with_num_digits:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Gather numDigits="5"/></Response>
   
 gather_with_all_options_set:
-  response: <?xml version="1.0" encoding="UTF-8"?><Response><Gather action="http://foobar.com" numDigits="5" method="GET" timeout="10" finishOnKey="*"/></Response>
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Gather finishOnKey="*" action="http://foobar.com" method="GET" numDigits="5" timeout="10"/></Response>  
   
 gather_and_say_instructions:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Gather><Say loop="1" language="en" voice="man">Please enter your account number followed by the pound sign</Say></Gather><Say loop="1" language="en" voice="man">We didn't receive any input. Goodbye!</Say></Response>

data/test/twilio/account_test.rb

@@ -3,21 +3,33 @@ require File.dirname(__FILE__) + '/../test_helper'
 class AccountTest < Test::Unit::TestCase #:nodoc: all
   context "An account" do
     setup do
-      @connection = Twilio::Connection.new('mysid', 'mytoken')
-      @account = Twilio::Account.new(@connection)
+      Twilio.connect('mysid', 'mytoken')
     end
 
     should "be retrievable" do
       fake_response = fixture(:account)
       FakeWeb.register_uri(:get, twilio_url, :string => fake_response)
-      assert_equal @account.get, fake_response
+      assert_equal Twilio::Account.get, fake_response
     end
     
     should "be able to update name" do
       fake_response = fixture(:account_renamed)
       FakeWeb.register_uri(:put, twilio_url, :string => fake_response)
-      response = @account.update_name('Bubba')
-      assert_equal response, fake_response
+      assert_equal Twilio::Account.update_name('Bubba'), fake_response
     end 
+    
+    context "using deprecated API" do
+      setup do
+        @connection = Twilio::Connection.new('mysid', 'mytoken')
+        @account = Twilio::Account.new(@connection)
+      end
+
+      should "be retrievable" do
+        fake_response = fixture(:account)
+        FakeWeb.register_uri(:get, twilio_url, :string => fake_response)
+        assert_equal @account.get, fake_response
+      end
+    end
+    
   end
 end

data/test/twilio/call_test.rb

@@ -3,26 +3,25 @@ require File.dirname(__FILE__) + '/../test_helper'
 class CallTest < Test::Unit::TestCase #:nodoc: all
   context "A call" do
     setup do
-      @connection = Twilio::Connection.new('mysid', 'mytoken')
-      @call = Twilio::Call.new(@connection)
+      Twilio.connect('mysid', 'mytoken')
     end
 
     should "be retrievable as a list" do
       fake_response = fixture(:calls)
       FakeWeb.register_uri(:get, twilio_url('Calls'), :string => fake_response)
-      assert_equal @call.list, fake_response
+      assert_equal Twilio::Call.list, fake_response
     end
     
     should "be retrievable individually" do
       fake_response = fixture(:call)
       FakeWeb.register_uri(:get, twilio_url('Calls/CA42ed11f93dc08b952027ffbc406d0868'), :string => fake_response)
-      assert_equal @call.get('CA42ed11f93dc08b952027ffbc406d0868'), fake_response
+      assert_equal Twilio::Call.get('CA42ed11f93dc08b952027ffbc406d0868'), fake_response
     end
     
     should "be made" do
       fake_response = fixture(:call_new)
       FakeWeb.register_uri(:post, twilio_url('Calls'), :string => fake_response)
-      response = @call.make('4158675309', '4155551212', 'http://test.local/call_handler')
+      response = Twilio::Call.make('4158675309', '4155551212', 'http://test.local/call_handler')
       assert_equal response, fake_response
     end
     
@@ -30,13 +29,13 @@ class CallTest < Test::Unit::TestCase #:nodoc: all
       should "returns a list of Call resources that were segments created in the same call" do
         fake_response = fixture(:calls)
         FakeWeb.register_uri(:get, twilio_url('Calls/CA42ed11f93dc08b952027ffbc406d0868/Segments'), :string => fake_response)
-        assert_equal @call.segments('CA42ed11f93dc08b952027ffbc406d0868'), fake_response
+        assert_equal Twilio::Call.segments('CA42ed11f93dc08b952027ffbc406d0868'), fake_response
       end
       
       should "returns a single Call resource for the CallSid and CallSegmentSid provided" do
         fake_response = fixture(:calls)
         FakeWeb.register_uri(:get, twilio_url('Calls/CA42ed11f93dc08b952027ffbc406d0868/Segments/abc123'), :string => fake_response)
-        assert_equal @call.segments('CA42ed11f93dc08b952027ffbc406d0868', 'abc123'), fake_response
+        assert_equal Twilio::Call.segments('CA42ed11f93dc08b952027ffbc406d0868', 'abc123'), fake_response
       end
     end
     
@@ -44,7 +43,7 @@ class CallTest < Test::Unit::TestCase #:nodoc: all
       should "returns a list of recordings that were generated during the call" do
         fake_response = fixture(:recordings)
         FakeWeb.register_uri(:get, twilio_url('Calls/CA42ed11f93dc08b952027ffbc406d0868/Recordings'), :string => fake_response)
-        assert_equal @call.recordings('CA42ed11f93dc08b952027ffbc406d0868'), fake_response
+        assert_equal Twilio::Call.recordings('CA42ed11f93dc08b952027ffbc406d0868'), fake_response
       end
     end
     
@@ -52,8 +51,22 @@ class CallTest < Test::Unit::TestCase #:nodoc: all
       should "description" do
         fake_response = fixture(:notifications)
         FakeWeb.register_uri(:get, twilio_url('Calls/CA42ed11f93dc08b952027ffbc406d0868/Notifications'), :string => fake_response)
-        assert_equal @call.notifications('CA42ed11f93dc08b952027ffbc406d0868'), fake_response
+        assert_equal Twilio::Call.notifications('CA42ed11f93dc08b952027ffbc406d0868'), fake_response
       end
     end
+    
+    context "using deprecated API" do
+      setup do
+        @connection = Twilio::Connection.new('mysid', 'mytoken')
+        @call = Twilio::Call.new(@connection)
+      end
+
+      should "be made" do
+        fake_response = fixture(:call_new)
+        FakeWeb.register_uri(:post, twilio_url('Calls'), :string => fake_response)
+        assert_equal @call.make('4158675309', '4155551212', 'http://test.local/call_handler'), fake_response
+      end
+    end
+    
   end
 end

data/test/twilio/connection_test.rb

@@ -11,5 +11,16 @@ class ConnectionTest < Test::Unit::TestCase #:nodoc: all
         assert_equal "#{Twilio::Connection::TWILIO_URL}/mysid", @connection.class.base_uri
       end
     end
+    
+    context "when invoked as class method" do
+      setup do
+        Twilio.connect('mysid', 'mytoken')
+      end
+      
+      should "have correct url" do
+        assert_equal "#{Twilio::TWILIO_URL}/mysid", Twilio.base_uri
+      end
+    end
+
   end
 end

data/test/twilio/incoming_phone_number_test.rb

@@ -3,20 +3,33 @@ require File.dirname(__FILE__) + '/../test_helper'
 class IncomingPhoneNumberTest < Test::Unit::TestCase #:nodoc: all
   context "An incoming phone number" do
     setup do
-      @connection = Twilio::Connection.new('mysid', 'mytoken')
-      @incoming = Twilio::IncomingPhoneNumber.new(@connection)
+      Twilio.connect('mysid', 'mytoken')
     end
 
+    should "be retrievable individually" do
+      fake_response = fixture(:incoming_phone_number)
+      FakeWeb.register_uri(:get, twilio_url('IncomingPhoneNumbers/PNe536dfda7c6184afab78d980cb8cdf43'), :string => fake_response)
+      assert_equal Twilio::IncomingPhoneNumber.get('PNe536dfda7c6184afab78d980cb8cdf43'), fake_response
+    end
+    
     should "be retrievable as a list" do
       fake_response = fixture(:incoming_phone_numbers)
       FakeWeb.register_uri(:get, twilio_url('IncomingPhoneNumbers'), :string => fake_response)
-      assert_equal @incoming.list, fake_response
+      assert_equal Twilio::IncomingPhoneNumber.list, fake_response
     end
     
-    should "be retrievable individually" do
-      fake_response = fixture(:incoming_phone_number)
-      FakeWeb.register_uri(:get, twilio_url('IncomingPhoneNumbers/PNe536dfda7c6184afab78d980cb8cdf43'), :string => fake_response)
-      assert_equal @incoming.get('PNe536dfda7c6184afab78d980cb8cdf43'), fake_response
+    context "using deprecated API" do
+      setup do
+        @connection = Twilio::Connection.new('mysid', 'mytoken')
+        @incoming = Twilio::IncomingPhoneNumber.new(@connection)
+      end
+
+      should "be retrievable individually" do
+        fake_response = fixture(:incoming_phone_number)
+        FakeWeb.register_uri(:get, twilio_url('IncomingPhoneNumbers/PNe536dfda7c6184afab78d980cb8cdf43'), :string => fake_response)
+        assert_equal @incoming.get('PNe536dfda7c6184afab78d980cb8cdf43'), fake_response
+      end
     end
+    
   end
 end

data/test/twilio/local_phone_number_test.rb

@@ -3,21 +3,33 @@ require File.dirname(__FILE__) + '/../test_helper'
 class LocalPhoneNumberTest < Test::Unit::TestCase #:nodoc: all
   context "A local phone number" do
     setup do
-      @connection = Twilio::Connection.new('mysid', 'mytoken')
-      @local = Twilio::LocalPhoneNumber.new(@connection)
+      Twilio.connect('mysid', 'mytoken')
     end
 
     should "be retrievable as a list" do
       fake_response = fixture(:incoming_phone_numbers)
       FakeWeb.register_uri(:get, twilio_url('IncomingPhoneNumbers/Local'), :string => fake_response)
-      assert_equal @local.list, fake_response
+      assert_equal Twilio::LocalPhoneNumber.list, fake_response
     end
     
     should "be created" do
       fake_response = fixture(:incoming_phone_number)
       FakeWeb.register_uri(:post, twilio_url('IncomingPhoneNumbers/Local'), :string => fake_response)
-      response = @local.create('http://test.local/call_handler')
-      assert_equal response, fake_response
+      assert_equal Twilio::LocalPhoneNumber.create('http://test.local/call_handler'), fake_response
     end
+    
+    context "using deprecated API" do
+      setup do
+        @connection = Twilio::Connection.new('mysid', 'mytoken')
+        @local = Twilio::LocalPhoneNumber.new(@connection)
+      end
+
+      should "be retrievable as a list" do
+        fake_response = fixture(:incoming_phone_numbers)
+        FakeWeb.register_uri(:get, twilio_url('IncomingPhoneNumbers/Local'), :string => fake_response)
+        assert_equal @local.list, fake_response
+      end
+    end
+    
   end
 end

data/test/twilio/notification_test.rb

@@ -3,26 +3,38 @@ require File.dirname(__FILE__) + '/../test_helper'
 class NotificationTest < Test::Unit::TestCase #:nodoc: all
   context "A recording" do
     setup do
-      @connection = Twilio::Connection.new('mysid', 'mytoken')
-      @notification = Twilio::Notification.new(@connection)
+      Twilio.connect('mysid', 'mytoken')
     end
 
     should "be retrievable as a list" do
       fake_response = fixture(:notifications)
       FakeWeb.register_uri(:get, twilio_url('Notifications'), :string => fake_response)
-      assert_equal @notification.list, fake_response
+      assert_equal Twilio::Notification.list, fake_response
     end
     
     should "be retrievable individually" do
       fake_response = fixture(:notification)
       FakeWeb.register_uri(:get, twilio_url('Notifications/NO1fb7086ceb85caed2265f17d7bf7981c'), :string => fake_response)
-      assert_equal @notification.get('NO1fb7086ceb85caed2265f17d7bf7981c'), fake_response
+      assert_equal Twilio::Notification.get('NO1fb7086ceb85caed2265f17d7bf7981c'), fake_response
     end
     
     should "be deleted" do
       FakeWeb.register_uri(:delete, twilio_url('Notifications/NO1fb7086ceb85caed2265f17d7bf7981c'), :status => [ 204, "HTTPNoContent" ])
-      response = @notification.delete('NO1fb7086ceb85caed2265f17d7bf7981c')
-      assert response
-    end    
+      assert Twilio::Notification.delete('NO1fb7086ceb85caed2265f17d7bf7981c')
+    end
+    
+    context "using deprecated API" do
+      setup do
+        @connection = Twilio::Connection.new('mysid', 'mytoken')
+        @notification = Twilio::Notification.new(@connection)
+      end
+
+      should "be retrievable as a list" do
+        fake_response = fixture(:notifications)
+        FakeWeb.register_uri(:get, twilio_url('Notifications'), :string => fake_response)
+        assert_equal @notification.list, fake_response
+      end
+    end
+    
   end
 end

data/test/twilio/outgoing_caller_id_test.rb

@@ -3,40 +3,49 @@ require File.dirname(__FILE__) + '/../test_helper'
 class OutgoingCallerIdTest < Test::Unit::TestCase #:nodoc: all
   context "An outgoing caller id" do
     setup do
-      @connection = Twilio::Connection.new('mysid', 'mytoken')
-      @caller_id = Twilio::OutgoingCallerId.new(@connection)
+      Twilio.connect('mysid', 'mytoken')
     end
 
     should "be retrievable as a list" do
       fake_response = fixture(:outgoing_caller_ids)
       FakeWeb.register_uri(:get, twilio_url('OutgoingCallerIds'), :string => fake_response)
-      assert_equal @caller_id.list, fake_response
+      assert_equal Twilio::OutgoingCallerId.list, fake_response
     end
     
     should "be retrievable individually" do
       fake_response = fixture(:outgoing_caller_id)
       FakeWeb.register_uri(:get, twilio_url('OutgoingCallerIds/PNe536dfda7c6184afab78d980cb8cdf43'), :string => fake_response)
-      assert_equal @caller_id.get('PNe536dfda7c6184afab78d980cb8cdf43'), fake_response
+      assert_equal Twilio::OutgoingCallerId.get('PNe536dfda7c6184afab78d980cb8cdf43'), fake_response
     end
     
     should "be created" do
       fake_response = fixture(:outgoing_caller_id_new)
       FakeWeb.register_uri(:post, twilio_url('OutgoingCallerIds'), :string => fake_response)
-      response = @caller_id.create('4158675309', 'My Home Phone')
-      assert_equal response, fake_response
+      assert_equal Twilio::OutgoingCallerId.create('4158675309', 'My Home Phone'), fake_response
     end
     
     should "be able to update name" do
       fake_response = fixture(:outgoing_caller_id)
       FakeWeb.register_uri(:put, twilio_url('OutgoingCallerIds/PNe536dfda7c6184afab78d980cb8cdf43'), :string => fake_response)
-      response = @caller_id.update_name('PNe536dfda7c6184afab78d980cb8cdf43', 'My office line')
-      assert_equal response, fake_response
+      assert_equal Twilio::OutgoingCallerId.update_name('PNe536dfda7c6184afab78d980cb8cdf43', 'My office line'), fake_response
     end
     
     should "be deleted" do
       FakeWeb.register_uri(:delete, twilio_url('OutgoingCallerIds/PNe536dfda7c6184afab78d980cb8cdf43'), :status => [ 204, "HTTPNoContent" ])
-      response = @caller_id.delete('PNe536dfda7c6184afab78d980cb8cdf43')
-      assert response
+      assert Twilio::OutgoingCallerId.delete('PNe536dfda7c6184afab78d980cb8cdf43')
+    end
+    
+    context "using deprecated API" do
+      setup do
+        @connection = Twilio::Connection.new('mysid', 'mytoken')
+        @caller_id = Twilio::OutgoingCallerId.new(@connection)
+      end
+
+      should "be retrievable as a list" do
+        fake_response = fixture(:outgoing_caller_ids)
+        FakeWeb.register_uri(:get, twilio_url('OutgoingCallerIds'), :string => fake_response)
+        assert_equal @caller_id.list, fake_response
+      end
     end
   end
 end

data/test/twilio/recording_test.rb

@@ -3,39 +3,50 @@ require File.dirname(__FILE__) + '/../test_helper'
 class RecordingTest < Test::Unit::TestCase #:nodoc: all
   context "A recording" do
     setup do
-      @connection = Twilio::Connection.new('mysid', 'mytoken')
-      @recording = Twilio::Recording.new(@connection)
+      Twilio.connect('mysid', 'mytoken')
     end
 
     should "be retrievable as a list" do
       fake_response = fixture(:recordings)
       FakeWeb.register_uri(:get, twilio_url('Recordings'), :string => fake_response)
-      assert_equal @recording.list, fake_response
+      assert_equal Twilio::Recording.list, fake_response
     end
     
     should "be retrievable individually" do
       fake_response = fixture(:recording)
       FakeWeb.register_uri(:get, twilio_url('Recordings/RE41331862605f3d662488fdafda2e175f'), :string => fake_response)
-      assert_equal @recording.get('RE41331862605f3d662488fdafda2e175f'), fake_response
+      assert_equal Twilio::Recording.get('RE41331862605f3d662488fdafda2e175f'), fake_response
     end
     
     should "be deleted" do
       FakeWeb.register_uri(:delete, twilio_url('Recordings/RE41331862605f3d662488fdafda2e175f'), :status => [ 204, "HTTPNoContent" ])
-      response = @recording.delete('RE41331862605f3d662488fdafda2e175f')
-      assert response
+      assert Twilio::Recording.delete('RE41331862605f3d662488fdafda2e175f')
     end
     
     context "with transcriptions" do
       should "be retrievable as a list" do
         fake_response = fixture(:transcriptions)
         FakeWeb.register_uri(:get, twilio_url('Recordings/RE41331862605f3d662488fdafda2e175f/Transcriptions'), :string => fake_response)
-        assert_equal @recording.transcriptions('RE41331862605f3d662488fdafda2e175f'), fake_response
+        assert_equal Twilio::Recording.transcriptions('RE41331862605f3d662488fdafda2e175f'), fake_response
       end
 
       should "be retrievable individually" do
         fake_response = fixture(:transcription)
         FakeWeb.register_uri(:get, twilio_url('Recordings/RE41331862605f3d662488fdafda2e175f/Transcriptions/TRbdece5b75f2cd8f6ef38e0a10f5c4447'), :string => fake_response)
-        assert_equal @recording.transcriptions('RE41331862605f3d662488fdafda2e175f', 'TRbdece5b75f2cd8f6ef38e0a10f5c4447'), fake_response
+        assert_equal Twilio::Recording.transcriptions('RE41331862605f3d662488fdafda2e175f', 'TRbdece5b75f2cd8f6ef38e0a10f5c4447'), fake_response
+      end
+    end
+  
+    context "using deprecated API" do
+      setup do
+        @connection = Twilio::Connection.new('mysid', 'mytoken')
+        @recording = Twilio::Recording.new(@connection)
+      end
+
+      should "be retrievable as a list" do
+        fake_response = fixture(:recordings)
+        FakeWeb.register_uri(:get, twilio_url('Recordings'), :string => fake_response)
+        assert_equal @recording.list, fake_response
       end
     end
   end

data/test/twilio/toll_free_phone_number_test.rb

@@ -3,21 +3,33 @@ require File.dirname(__FILE__) + '/../test_helper'
 class TollFreePhoneNumberTest < Test::Unit::TestCase #:nodoc: all
   context "A toll free phone number" do
     setup do
-      @connection = Twilio::Connection.new('mysid', 'mytoken')
-      @toll_free = Twilio::TollFreePhoneNumber.new(@connection)
+      Twilio.connect('mysid', 'mytoken')
     end
 
     should "be retrievable as a list" do
       fake_response = fixture(:incoming_phone_numbers)
       FakeWeb.register_uri(:get, twilio_url('IncomingPhoneNumbers/TollFree'), :string => fake_response)
-      assert_equal @toll_free.list, fake_response
+      assert_equal Twilio::TollFreePhoneNumber.list, fake_response
     end
     
     should "be created" do
       fake_response = fixture(:incoming_phone_number)
       FakeWeb.register_uri(:post, twilio_url('IncomingPhoneNumbers/TollFree'), :string => fake_response)
-      response = @toll_free.create('http://test.local/call_handler')
-      assert_equal response, fake_response
+      assert_equal Twilio::TollFreePhoneNumber.create('http://test.local/call_handler'), fake_response
     end
+    
+    context "using deprecated API" do
+      setup do
+        @connection = Twilio::Connection.new('mysid', 'mytoken')
+        @toll_free = Twilio::TollFreePhoneNumber.new(@connection)
+      end
+
+      should "be retrievable as a list" do
+        fake_response = fixture(:incoming_phone_numbers)
+        FakeWeb.register_uri(:get, twilio_url('IncomingPhoneNumbers/TollFree'), :string => fake_response)
+        assert_equal @toll_free.list, fake_response
+      end
+    end
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webficient-twilio
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Phil Misiowiec