twilio 1.4.0 → 2.3.0

data/lib/twilio/verb.rb

@@ -1,186 +1,315 @@
 module Twilio
   # Twilio Verbs enable your application to respond to Twilio requests (to your app) with XML responses.
+  # There are 5 primary verbs (say, play, gather, record, dial) and 3 secondary (hangup, pause, redirect).
+  # Verbs can be chained and, in some cases, nested.
   #
-  # In addition to the 5 verbs supported by Twilio (say, play, gather, record, dial),
-  # this class also implements dynamic interfaces that allow you to combine useful
-  # operations into a single call. See below methods for examples.
+  # If your response consists of a single verb, you can call a Verb class method:
+  #
+  #   Twilio::Verb.say('The time is 9:35 PM.')
+  #
+  # But if you need to chain several verbs together, just wrap them in an instance block and call the 'response' attribute:
+  #
+  #   verb = Twilio::Verb.new { |v|
+  #     v.dial('415-123-4567')
+  #     v.redirect('http://www.foo.com/nextInstructions')
+  #   }
+  #   verb.response
   class Verb
+    
+    attr_reader :response
+    
     class << self
-      # The Say verb converts text to speech that is read back to the caller. 
-      # Say is useful for dynamic text that is difficult to prerecord. 
-      #
-      # Examples:
-      #   Twilio::Verb.say('The time is 9:35 PM.')
-      #   Twilio::Verb.say_3_times('The time is 9:35 PM.')
-      #
-      # With numbers, 12345 will be spoken as "twelve thousand three hundred forty five" while
-      # 1 2 3 4 5 will be spoken as "one two three four five."
-      #
-      #   Twilio::Verb.say_4_times('Your PIN is 1234')
-      #   Twilio::Verb.say_4_times('Your PIN is 1 2 3 4')
-      # 
-      # If you need a longer pause between each loop, use the pause form:
-      #
-      #   Twilio::Verb.say_4_times_with_pause('Your PIN is 1 2 3 4')
-      #
-      # Options (see http://www.twilio.com/docs/api_reference/TwiML/say) are passed in as a hash:
-      #
-      #   Twilio::Verb.say('The time is 9:35 PM.', :voice => 'woman')
-      #   Twilio::Verb.say('The time is 9:35 PM.', {:voice => 'woman', :language => 'es'})
-      def say(*args, &block)
-        options = {:voice => 'man', :language => 'en', :loop => 1}
-        args.each do |arg|
-          case arg
-          when String
-            options[:text_to_speak] = arg
-          when Hash
-            options.merge!(arg)
-          else
-            raise ArgumentError, 'say expects String or Hash argument'
-          end
-        end
-        
-        xml = Builder::XmlMarkup.new
-        xml.instruct!
-        xml.Response {
-          if options[:pause]
-            loop_with_pause(options[:loop], xml) do
-              xml.Say(options[:text_to_speak], :voice => options[:voice], :language => options[:language])
-            end
-          else
-            xml.Say(options[:text_to_speak], :voice => options[:voice], :language => options[:language], :loop => options[:loop])
-          end
-        }
+      def method_missing(method_id, *args) #:nodoc:
+        v = Verb.new
+        v.send(method_id, *args)
       end
+    end
+        
+    def initialize(&block)
+      @xml = Builder::XmlMarkup.new
+      @xml.instruct!
       
-      # The Play verb plays an audio URL back to the caller. 
-      # Examples:
-      #   Twilio::Verb.play('http://foo.com/cowbell.mp3')
-      #   Twilio::Verb.play_3_times('http://foo.com/cowbell.mp3')
-      #
-      # If you need a longer pause between each loop, use the pause form:
-      #
-      #   Twilio::Verb.play_3_times_with_pause('http://foo.com/cowbell.mp3')
-      #
-      # Options (see http://www.twilio.com/docs/api_reference/TwiML/play) are passed in as a hash,
-      # however, since the Play verb only supports 'loop' as the current option, you can instead use the
-      # above form to keep things concise. 
-      def play(*args, &block)
-        options = {:loop => 1}
-        args.each do |arg|
-          case arg
-          when String
-            options[:audio_url] = arg
-          when Hash
-            options.merge!(arg)
-          else
-            raise ArgumentError, 'play expects String or Hash argument'
-          end
+      if block_given?
+        @chain = true
+        @response = @xml.Response { block.call(self) }
+      end
+    end
+        
+    # The Say verb converts text to speech that is read back to the caller. 
+    # Say is useful for dynamic text that is difficult to prerecord. 
+    #
+    # Examples:
+    #   Twilio::Verb.say('The time is 9:35 PM.')
+    #   Twilio::Verb.say('The time is 9:35 PM.', :loop => 3)
+    #
+    # With numbers, 12345 will be spoken as "twelve thousand three hundred forty five" while
+    # 1 2 3 4 5 will be spoken as "one two three four five."
+    #
+    #   Twilio::Verb.say('Your PIN is 1234', :loop => 4)
+    #   Twilio::Verb.say('Your PIN is 1 2 3 4', :loop => 4)
+    # 
+    # If you need a longer pause between each loop, instead of explicitly calling the Pause
+    # verb within a block, you can set the convenient pause option:
+    #
+    #   Twilio::Verb.say('Your PIN is 1 2 3 4', :loop => 4, :pause => true)
+    #
+    # Options (see http://www.twilio.com/docs/api_reference/TwiML/say) are passed in as a hash:
+    #
+    #   Twilio::Verb.say('The time is 9:35 PM.', :voice => 'woman')
+    #   Twilio::Verb.say('The time is 9:35 PM.', {:voice => 'woman', :language => 'es'})
+    def say(*args)
+      options = {:voice => 'man', :language => 'en', :loop => 1}
+      args.each do |arg|
+        case arg
+        when String
+          options[:text_to_speak] = arg
+        when Hash
+          options.merge!(arg)
+        else
+          raise ArgumentError, 'say expects String or Hash argument'
         end
-
-        xml = Builder::XmlMarkup.new
-        xml.instruct!
-        xml.Response {
-          if options[:pause]
-            loop_with_pause(options[:loop], xml) do
-              xml.Play(options[:audio_url])
-            end
-          else
-            xml.Play(options[:audio_url], :loop => options[:loop])
-          end          
-        }
       end
       
-      # The Gather verb collects digits entered by a caller into their telephone keypad. 
-      # When the caller is done entering data, Twilio submits that data to a provided URL, 
-      # as either a HTTP GET or POST request, just like a web browser submits data from an HTML form. 
-      #
-      # Options (see http://www.twilio.com/docs/api_reference/TwiML/gather) are passed in as a hash
-      #
-      # Examples:
-      #   Twilio::Verb.gather
-      #   Twilio::Verb.gather(:action => 'http://foobar.com')
-      #   Twilio::Verb.gather(:finishOnKey => '*') 
-      #   Twilio::Verb.gather(:action => 'http://foobar.com', :finishOnKey => '*') 
-      def gather(*args, &block)
-        options = args.shift
-        xml = Builder::XmlMarkup.new
-        xml.instruct!
-        xml.Response { xml.Gather(options) }
+      output {
+        if options[:pause]
+          loop_with_pause(options[:loop], @xml) do
+            @xml.Say(options[:text_to_speak], :voice => options[:voice], :language => options[:language])
+          end
+        else
+          @xml.Say(options[:text_to_speak], :voice => options[:voice], :language => options[:language], :loop => options[:loop])
+        end
+      }
+    end
+    
+    # The Play verb plays an audio URL back to the caller. 
+    # Examples:
+    #   Twilio::Verb.play('http://foo.com/cowbell.mp3')
+    #   Twilio::Verb.play('http://foo.com/cowbell.mp3', :loop => 3)
+    #
+    # If you need a longer pause between each loop, instead of explicitly calling the Pause
+    # verb within a block, you can set the convenient pause option:
+    #
+    #   Twilio::Verb.play('http://foo.com/cowbell.mp3', :loop => 3, :pause => true)
+    #
+    # Options (see http://www.twilio.com/docs/api_reference/TwiML/play) are passed in as a hash,
+    # but only 'loop' is currently supported.
+    def play(*args)
+      options = {:loop => 1}
+      args.each do |arg|
+        case arg
+        when String
+          options[:audio_url] = arg
+        when Hash
+          options.merge!(arg)
+        else
+          raise ArgumentError, 'play expects String or Hash argument'
+        end
       end
-      
-      # The Record verb records the caller's voice and returns a URL that links to a file 
-      # containing the audio recording.
-      #
-      # Options (see http://www.twilio.com/docs/api_reference/TwiML/record) are passed in as a hash
-      #
-      # Examples:
-      #   Twilio::Verb.record
-      #   Twilio::Verb.record(:action => 'http://foobar.com')
-      #   Twilio::Verb.record(:finishOnKey => '*') 
-      #   Twilio::Verb.record(:transcribe => true, :transcribeCallback => '/handle_transcribe')
-      def record(*args, &block)
-        options = args.shift
-        xml = Builder::XmlMarkup.new
-        xml.instruct!
-        xml.Response { xml.Record(options) }
+
+      output {
+        if options[:pause]
+          loop_with_pause(options[:loop], @xml) do
+            @xml.Play(options[:audio_url])
+          end
+        else
+          @xml.Play(options[:audio_url], :loop => options[:loop])
+        end          
+      }
+    end
+    
+    # The Gather verb collects digits entered by a caller into their telephone keypad. 
+    # When the caller is done entering data, Twilio submits that data to a provided URL, 
+    # as either a HTTP GET or POST request, just like a web browser submits data from an HTML form. 
+    #
+    # Options (see http://www.twilio.com/docs/api_reference/TwiML/gather) are passed in as a hash
+    #
+    # Examples:
+    #   Twilio::Verb.gather
+    #   Twilio::Verb.gather(:action => 'http://foobar.com')
+    #   Twilio::Verb.gather(:finishOnKey => '*') 
+    #   Twilio::Verb.gather(:action => 'http://foobar.com', :finishOnKey => '*') 
+    #
+    # Gather also lets you nest the Play, Say, and Pause verbs:
+    #
+    #   verb = Twilio::Verb.new { |v|
+    #     v.gather(:action => '/process_gather', :method => 'GET) {
+    #       v.say('Please enter your account number followed by the pound sign')
+    #     }
+    #     v.say("We didn't receive any input. Goodbye!")
+    #   }
+    #   verb.response # represents the final xml output
+    def gather(*args, &block)
+      options = args.shift || {}
+      output { 
+        if block_given?
+          @xml.Gather(options) { block.call }
+        else
+          @xml.Gather(options)          
+        end
+      }
+    end
+    
+    #play, say, pause
+    
+    # The Record verb records the caller's voice and returns a URL that links to a file 
+    # containing the audio recording.
+    #
+    # Options (see http://www.twilio.com/docs/api_reference/TwiML/record) are passed in as a hash
+    #
+    # Examples:
+    #   Twilio::Verb.record
+    #   Twilio::Verb.record(:action => 'http://foobar.com')
+    #   Twilio::Verb.record(:finishOnKey => '*') 
+    #   Twilio::Verb.record(:transcribe => true, :transcribeCallback => '/handle_transcribe')
+    def record(*args)
+      options = args.shift
+      output { @xml.Record(options) }
+    end
+    
+    # The Dial verb connects the current caller to an another phone. If the called party picks up, 
+    # the two parties are connected and can communicate until one hangs up. If the called party does 
+    # not pick up, if a busy signal is received, or the number doesn't exist, the dial verb will finish.
+    #
+    # If an action verb is provided, Twilio will submit the outcome of the call attempt to the action URL. 
+    # If no action is provided, Dial will fall through to the next verb in the document.
+    #
+    # Note: this is different than the behavior of Record and Gather. Dial does not submit back to the 
+    # current document URL if no action is provided.
+    #
+    # Options (see http://www.twilio.com/docs/api_reference/TwiML/dial) are passed in as a hash
+    #
+    # Examples:
+    #   Twilio::Verb.dial('415-123-4567')
+    #   Twilio::Verb.dial('415-123-4567', :action => 'http://foobar.com')
+    #   Twilio::Verb.dial('415-123-4567', {:timeout => 10, :callerId => '858-987-6543'}) 
+    #
+    # Twilio also supports an alternate form in which a Number object is nested inside Dial:
+    #
+    #   verb = Twilio::Verb.new { |v|
+    #     v.dial {
+    #       v.number('415-123-4567')
+    #       v.number('415-123-4568')
+    #       v.number('415-123-4569')
+    #     }
+    #   }
+    #   verb.response # represents the final xml output
+    def dial(*args, &block)
+      number_to_dial = ''
+      options = {}
+      args.each do |arg|
+        case arg
+        when String
+          number_to_dial = arg
+        when Hash
+          options.merge!(arg)
+        else
+          raise ArgumentError, 'dial expects String or Hash argument'
+        end
       end
       
-      # The Dial verb connects the current caller to an another phone. If the called party picks up, 
-      # the two parties are connected and can communicate until one hangs up. If the called party does 
-      # not pick up, if a busy signal is received, or the number doesn't exist, the dial verb will finish.
-      #
-      # If an action verb is provided, Twilio will submit the outcome of the call attempt to the action URL. 
-      # If no action is provided, Dial will fall through to the next verb in the document.
-      #
-      # Note: this is different than the behavior of Record and Gather. Dial does not submit back to the 
-      # current document URL if no action is provided.
-      #
-      # Options (see http://www.twilio.com/docs/api_reference/TwiML/dial) are passed in as a hash
-      #
-      # Examples:
-      #   Twilio::Verb.dial('415-123-4567')
-      #   Twilio::Verb.dial('415-123-4567', :action => 'http://foobar.com')
-      #   Twilio::Verb.dial('415-123-4567', {:timeout => 10, :callerId => '858-987-6543'}) 
-      def dial(*args, &block)
-        number_to_dial = ''
-        options = {}
-        args.each do |arg|
-          case arg
-          when String
-            number_to_dial = arg
-          when Hash
-            options.merge!(arg)
-          else
-            raise ArgumentError, 'dial expects String or Hash argument'
-          end
+      output { 
+        if block_given?
+          @xml.Dial(options) { block.call }
+        else
+          @xml.Dial(number_to_dial, options)           
         end
+      }
+    end
         
-        xml = Builder::XmlMarkup.new
-        xml.instruct!
-        xml.Response { xml.Dial(number_to_dial, options) }
-      end
-
-      def method_missing(method_id, *args) #:nodoc:
-        if match = /(say|play|gather|record|dial)(_(\d+)_)times(_with_pause$*)/.match(method_id.to_s)
-          verb = match.captures.first 
-          how_many_times = match.captures[1]
-          pause = match.captures[2] == '_with_pause'
-          self.send(verb, args.first, { :loop => Integer(how_many_times), :pause =>  pause})
+    # The Pause (secondary) verb waits silently for a number of seconds. 
+    # It is normally chained with other verbs. 
+    #
+    # Options (see http://www.twilio.com/docs/api_reference/TwiML/pause) are passed in as a hash
+    #
+    # Examples:
+    #   verb = Twilio::Verb.new { |v|
+    #     v.say('greetings')
+    #     v.pause(:length => 2)
+    #     v.say('have a nice day')
+    #   }
+    #   verb.response
+    def pause(*args)
+      options = args.shift
+      output { @xml.Pause(options) }
+    end
+    
+    # The Redirect (secondary) verb transfers control to a different URL.
+    # It is normally chained with other verbs.
+    #
+    # Options (see http://www.twilio.com/docs/api_reference/TwiML/redirect) are passed in as a hash
+    #
+    # Examples:
+    #   verb = Twilio::Verb.new { |v|
+    #     v.dial('415-123-4567')
+    #     v.redirect('http://www.foo.com/nextInstructions')
+    #   }
+    #   verb.response
+    def redirect(*args)
+      redirect_to_url = ''
+      options = {}
+      args.each do |arg|
+        case arg
+        when String
+          redirect_to_url = arg
+        when Hash
+          options.merge!(arg)
         else
-          raise NoMethodError.new("Method --- #{method_id} --- not found")
+          raise ArgumentError, 'dial expects String or Hash argument'
         end
       end
-            
-      private 
       
-        def loop_with_pause(loop_count, xml, &verb_action)
-          last_iteration = loop_count-1                               
-          loop_count.times do |i|
-            yield verb_action
-            xml.Pause unless i == last_iteration
-          end
+      output { @xml.Redirect(redirect_to_url, options) }
+    end
+    
+    # The Hangup (secondary) verb ends the call. 
+    # 
+    # Examples:
+    #   If your response is only a hangup:
+    #
+    #   Twilio::Verb.hangup
+    #
+    #   If your response is chained:
+    #
+    #   verb = Twilio::Verb.new { |v|
+    #     v.say("The time is #{Time.now}")
+    #     v.hangup
+    #   }
+    #   verb.response
+    def hangup
+      output { @xml.Hangup }
+    end
+    
+    # The Number element specifies a phone number. The number element has two optional attributes: sendDigits and url.
+    # Number elements can only be nested in Dial verbs
+    def number(*args)
+      number_to_dial = ''
+      options = {}
+      args.each do |arg|
+        case arg
+        when String
+          number_to_dial = arg
+        when Hash
+          options.merge!(arg)
+        else
+          raise ArgumentError, 'dial expects String or Hash argument'
         end
+      end
+      
+      output { @xml.Number(number_to_dial, options) }
     end
+          
+    private
+    
+      def output
+        @chain ? yield : @xml.Response { yield }
+      end 
+    
+      def loop_with_pause(loop_count, xml, &verb_action)
+        last_iteration = loop_count-1                               
+        loop_count.times do |i|
+          yield verb_action
+          xml.Pause unless i == last_iteration
+        end
+      end
   end
 end

data/test/fixtures/yml/verb_responses.yml

@@ -13,6 +13,18 @@ say_hi_three_times:
 say_hi_three_times_with_pause:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Say language="en" voice="man">hi</Say><Pause/><Say language="en" voice="man">hi</Say><Pause/><Say language="en" voice="man">hi</Say></Response>
   
+say_hi_with_pause:
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Say loop="1" language="en" voice="man">hi</Say><Pause/></Response>
+
+say_hi_with_pause_and_say_bye:
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Say loop="1" language="en" voice="man">hi</Say><Pause></Pause><Say loop="1" language="en" voice="man">bye</Say></Response>
+  
+say_hi_with_2_second_pause_and_say_bye:
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Say loop="1" language="en" voice="man">hi</Say><Pause length="2"/><Say loop="1" language="en" voice="man">bye</Say></Response>
+  
+say_hi_and_hangup:
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Say loop="1" language="en" voice="man">hi</Say><Hangup/></Response>  
+  
 play_mp3:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Play loop="1">http://foo.com/cowbell.mp3</Play></Response>
   
@@ -23,7 +35,7 @@ play_mp3_two_times_with_pause:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Play>http://foo.com/cowbell.mp3</Play><Pause/><Play>http://foo.com/cowbell.mp3</Play></Response>
   
 gather:
-  response: <?xml version="1.0" encoding="UTF-8"?><Response><Gather></Gather></Response>
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Gather/></Response>
 
 gather_with_action:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Gather action="http://foobar.com"/></Response>
@@ -41,8 +53,14 @@ 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 finishOnKey="*" method="GET" action="http://foobar.com" numDigits="5" timeout="10"/></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>
   
+gather_with_timeout_and_say_instructions:
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Gather timeout="10"><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>
+      
 record:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Record></Record></Response>
   
@@ -86,4 +104,16 @@ dial_with_caller_id:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial callerId="858-987-6543">415-123-4567</Dial></Response>
   
 dial_with_timeout_and_caller_id:
-  response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial callerId="858-987-6543" timeout="10">415-123-4567</Dial></Response>
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial callerId="858-987-6543" timeout="10">415-123-4567</Dial></Response>
+  
+dial_with_redirect:
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial>415-123-4567</Dial><Redirect>http://www.foo.com/nextInstructions</Redirect></Response>
+
+dial_with_number_and_send_digits:
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial><Number sendDigits="wwww1928">415-123-4567</Number></Dial></Response>  
+
+dial_multiple_numbers:
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial><Number>415-123-4567</Number><Number>415-123-4568</Number><Number>415-123-4569</Number></Dial></Response> 
+      
+hangup:
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Hangup/></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