twilio 2.4.0 → 2.4.1

data/README.rdoc

@@ -24,13 +24,13 @@ by providing a Twilio Verb class.
 
 For example, in a Ruby on Rails application, you could do the following inside a controller class:
 
-  Twilio::Verb.dial('415-123-4567')
+  Twilio::Verb.dial '415-123-4567'
   
 and you can nest multiple verbs inside a block:
 
-  verb = Twilio::Verb.new { |v|
-    v.say("The time is #{Time.now}")
-    v.hangup
+  verb = Twilio::Verb.new {
+    say "The time is #{Time.now}"
+    hangup
   }
   verb.response
 

data/VERSION.yml

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

data/lib/twilio/verb.rb

@@ -5,13 +5,13 @@ module Twilio
   #
   # If your response consists of a single verb, you can call a Verb class method:
   #
-  #   Twilio::Verb.say('The time is 9:35 PM.')
+  #   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 = Twilio::Verb.new {
+  #     dial '415-123-4567'
+  #     redirect 'http://www.foo.com/nextInstructions'
   #   }
   #   verb.response
   class Verb
@@ -31,32 +31,32 @@ module Twilio
       
       if block_given?
         @chain = true
-        @response = @xml.Response { block.call(self) }
+        @response = @xml.Response { instance_eval(&block) }
       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)
+    #   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)
+    #   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)
+    #   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'})
+    #   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|
@@ -83,13 +83,13 @@ module Twilio
     
     # 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)
+    #   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)
+    #   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.
@@ -125,17 +125,17 @@ module Twilio
     #
     # Examples:
     #   Twilio::Verb.gather
-    #   Twilio::Verb.gather(:action => 'http://foobar.com')
-    #   Twilio::Verb.gather(:finishOnKey => '*') 
-    #   Twilio::Verb.gather(:action => 'http://foobar.com', :finishOnKey => '*') 
+    #   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')
+    #   verb = Twilio::Verb.new {
+    #     gather(:action => '/process_gather', :method => 'GET) {
+    #       say 'Please enter your account number followed by the pound sign'
     #     }
-    #     v.say("We didn't receive any input. Goodbye!")
+    #     say "We didn't receive any input. Goodbye!"
     #   }
     #   verb.response # represents the final xml output
     def gather(*args, &block)
@@ -158,9 +158,9 @@ module Twilio
     #
     # Examples:
     #   Twilio::Verb.record
-    #   Twilio::Verb.record(:action => 'http://foobar.com')
-    #   Twilio::Verb.record(:finishOnKey => '*') 
-    #   Twilio::Verb.record(:transcribe => true, :transcribeCallback => '/handle_transcribe')
+    #   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) }
@@ -179,17 +179,17 @@ module Twilio
     # 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::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 = Twilio::Verb.new {
+    #     dial {
+    #       number '415-123-4567'
+    #       number '415-123-4568'
+    #       number '415-123-4569'
     #     }
     #   }
     #   verb.response # represents the final xml output
@@ -222,10 +222,10 @@ module Twilio
     # 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 = Twilio::Verb.new {
+    #     say 'greetings'
+    #     pause :length => 2
+    #     say 'have a nice day'
     #   }
     #   verb.response
     def pause(*args)
@@ -239,9 +239,9 @@ module Twilio
     # 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 = Twilio::Verb.new {
+    #     dial '415-123-4567'
+    #     redirect 'http://www.foo.com/nextInstructions'
     #   }
     #   verb.response
     def redirect(*args)
@@ -270,9 +270,9 @@ module Twilio
     #
     #   If your response is chained:
     #
-    #   verb = Twilio::Verb.new { |v|
-    #     v.say("The time is #{Time.now}")
-    #     v.hangup
+    #   verb = Twilio::Verb.new {
+    #     say "The time is #{Time.now}"
+    #     hangup
     #   }
     #   verb.response
     def hangup
@@ -303,7 +303,7 @@ module Twilio
       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|

data/test/test_helper.rb

@@ -14,6 +14,15 @@ def fixture(filename) #:nodoc:
   File.read path
 end
 
+def stub_response(verb, fixture_name, options = {}) #:nodoc:
+  fake_response = fixture(fixture_name)
+  resource = options.delete(:resource)
+  options = { :body => fake_response }.merge(options)
+  FakeWeb.register_uri(verb, twilio_url(resource), options)
+  
+  fake_response
+end
+
 def twilio_url(url=nil) #:nodoc:
   "https://mysid:mytoken@api.twilio.com:443/2008-08-01/Accounts/mysid#{'/' + url if url}"
 end

data/test/twilio/account_test.rb

@@ -7,15 +7,11 @@ class AccountTest < Test::Unit::TestCase #:nodoc: all
     end
 
     should "be retrievable" do
-      fake_response = fixture(:account)
-      FakeWeb.register_uri(:get, twilio_url, :string => fake_response)
-      assert_equal Twilio::Account.get, fake_response
+      assert_equal stub_response(:get, :account), Twilio::Account.get
     end
     
     should "be able to update name" do
-      fake_response = fixture(:account_renamed)
-      FakeWeb.register_uri(:put, twilio_url, :string => fake_response)
-      assert_equal Twilio::Account.update_name('Bubba'), fake_response
+      assert_equal stub_response(:put, :account_renamed), Twilio::Account.update_name('Bubba')
     end 
     
     context "using deprecated API" do
@@ -25,11 +21,8 @@ class AccountTest < Test::Unit::TestCase #:nodoc: all
       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 stub_response(:get, :account), @account.get
       end
     end
-    
   end
 end

data/test/twilio/call_test.rb

@@ -7,51 +7,42 @@ class CallTest < Test::Unit::TestCase #:nodoc: all
     end
 
     should "be retrievable as a list" do
-      fake_response = fixture(:calls)
-      FakeWeb.register_uri(:get, twilio_url('Calls'), :string => fake_response)
-      assert_equal Twilio::Call.list, fake_response
+      assert_equal stub_response(:get, :calls, :resource => 'Calls'), Twilio::Call.list
     end
     
     should "be retrievable individually" do
-      fake_response = fixture(:call)
-      FakeWeb.register_uri(:get, twilio_url('Calls/CA42ed11f93dc08b952027ffbc406d0868'), :string => fake_response)
-      assert_equal Twilio::Call.get('CA42ed11f93dc08b952027ffbc406d0868'), fake_response
+      assert_equal stub_response(:get, :call, :resource => 'Calls/CA42ed11f93dc08b952027ffbc406d0868'), 
+        Twilio::Call.get('CA42ed11f93dc08b952027ffbc406d0868')
     end
     
     should "be made" do
-      fake_response = fixture(:call_new)
-      FakeWeb.register_uri(:post, twilio_url('Calls'), :string => fake_response)
-      response = Twilio::Call.make('4158675309', '4155551212', 'http://test.local/call_handler')
-      assert_equal response, fake_response
+      assert_equal stub_response(:post, :call_new, :resource => 'Calls'),
+        Twilio::Call.make('4158675309', '4155551212', 'http://test.local/call_handler')
     end
     
     context "with segments" do
       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 Twilio::Call.segments('CA42ed11f93dc08b952027ffbc406d0868'), fake_response
+        assert_equal stub_response(:get, :calls, :resource => 'Calls/CA42ed11f93dc08b952027ffbc406d0868/Segments'),
+          Twilio::Call.segments('CA42ed11f93dc08b952027ffbc406d0868')
       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 Twilio::Call.segments('CA42ed11f93dc08b952027ffbc406d0868', 'abc123'), fake_response
+        assert_equal stub_response(:get, :calls, :resource => 'Calls/CA42ed11f93dc08b952027ffbc406d0868/Segments/abc123'),
+          Twilio::Call.segments('CA42ed11f93dc08b952027ffbc406d0868', 'abc123')
       end
     end
     
     context "with recordings" do
       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 Twilio::Call.recordings('CA42ed11f93dc08b952027ffbc406d0868'), fake_response
+        assert_equal stub_response(:get, :recordings, :resource => 'Calls/CA42ed11f93dc08b952027ffbc406d0868/Recordings'),
+          Twilio::Call.recordings('CA42ed11f93dc08b952027ffbc406d0868')
       end
     end
     
     context "with notifications" do
       should "description" do
-        fake_response = fixture(:notifications)
-        FakeWeb.register_uri(:get, twilio_url('Calls/CA42ed11f93dc08b952027ffbc406d0868/Notifications'), :string => fake_response)
-        assert_equal Twilio::Call.notifications('CA42ed11f93dc08b952027ffbc406d0868'), fake_response
+        assert_equal stub_response(:get, :notifications, :resource => 'Calls/CA42ed11f93dc08b952027ffbc406d0868/Notifications'),
+          Twilio::Call.notifications('CA42ed11f93dc08b952027ffbc406d0868')
       end
     end
     
@@ -62,11 +53,9 @@ class CallTest < Test::Unit::TestCase #:nodoc: all
       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
+        assert_equal stub_response(:post, :call_new, :resource => 'Calls'),
+          @call.make('4158675309', '4155551212', 'http://test.local/call_handler')
       end
     end
-    
   end
 end

data/test/twilio/connection_test.rb

@@ -21,6 +21,5 @@ class ConnectionTest < Test::Unit::TestCase #:nodoc: all
         assert_equal "#{Twilio::TWILIO_URL}/mysid", Twilio.base_uri
       end
     end
-
   end
 end

data/test/twilio/incoming_phone_number_test.rb

@@ -7,15 +7,13 @@ class IncomingPhoneNumberTest < Test::Unit::TestCase #:nodoc: all
     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
+      assert_equal  stub_response(:get, :incoming_phone_number, :resource => 'IncomingPhoneNumbers/PNe536dfda7c6184afab78d980cb8cdf43'),
+        Twilio::IncomingPhoneNumber.get('PNe536dfda7c6184afab78d980cb8cdf43')
     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 Twilio::IncomingPhoneNumber.list, fake_response
+      assert_equal stub_response(:get, :incoming_phone_numbers, :resource => 'IncomingPhoneNumbers'),
+        Twilio::IncomingPhoneNumber.list
     end
     
     context "using deprecated API" do
@@ -25,11 +23,9 @@ class IncomingPhoneNumberTest < Test::Unit::TestCase #:nodoc: all
       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
+        assert_equal stub_response(:get, :incoming_phone_number, :resource => 'IncomingPhoneNumbers/PNe536dfda7c6184afab78d980cb8cdf43'), 
+          @incoming.get('PNe536dfda7c6184afab78d980cb8cdf43')
       end
     end
-    
   end
 end

data/test/twilio/local_phone_number_test.rb

@@ -7,15 +7,13 @@ class LocalPhoneNumberTest < Test::Unit::TestCase #:nodoc: all
     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 Twilio::LocalPhoneNumber.list, fake_response
+      assert_equal stub_response(:get, :incoming_phone_numbers, :resource => 'IncomingPhoneNumbers/Local'), 
+        Twilio::LocalPhoneNumber.list
     end
     
     should "be created" do
-      fake_response = fixture(:incoming_phone_number)
-      FakeWeb.register_uri(:post, twilio_url('IncomingPhoneNumbers/Local'), :string => fake_response)
-      assert_equal Twilio::LocalPhoneNumber.create('http://test.local/call_handler'), fake_response
+      assert_equal stub_response(:post, :incoming_phone_number, :resource => 'IncomingPhoneNumbers/Local'), 
+        Twilio::LocalPhoneNumber.create('http://test.local/call_handler')
     end
     
     context "using deprecated API" do
@@ -25,11 +23,9 @@ class LocalPhoneNumberTest < Test::Unit::TestCase #:nodoc: all
       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 stub_response(:get, :incoming_phone_numbers, :resource => 'IncomingPhoneNumbers/Local'),
+          @local.list
       end
     end
-    
   end
 end

data/test/twilio/notification_test.rb

@@ -7,19 +7,17 @@ class NotificationTest < Test::Unit::TestCase #:nodoc: all
     end
 
     should "be retrievable as a list" do
-      fake_response = fixture(:notifications)
-      FakeWeb.register_uri(:get, twilio_url('Notifications'), :string => fake_response)
-      assert_equal Twilio::Notification.list, fake_response
+      assert_equal stub_response(:get, :notifications, :resource => 'Notifications'), Twilio::Notification.list
     end
     
     should "be retrievable individually" do
-      fake_response = fixture(:notification)
-      FakeWeb.register_uri(:get, twilio_url('Notifications/NO1fb7086ceb85caed2265f17d7bf7981c'), :string => fake_response)
-      assert_equal Twilio::Notification.get('NO1fb7086ceb85caed2265f17d7bf7981c'), fake_response
+      assert_equal stub_response(:get, :notification, :resource => 'Notifications/NO1fb7086ceb85caed2265f17d7bf7981c'), 
+        Twilio::Notification.get('NO1fb7086ceb85caed2265f17d7bf7981c')
     end
     
     should "be deleted" do
-      FakeWeb.register_uri(:delete, twilio_url('Notifications/NO1fb7086ceb85caed2265f17d7bf7981c'), :status => [ 204, "HTTPNoContent" ])
+      stub_response(:delete, :notification, { :resource => 'Notifications/NO1fb7086ceb85caed2265f17d7bf7981c', 
+                                              :status   => [ 204, "HTTPNoContent" ] })
       assert Twilio::Notification.delete('NO1fb7086ceb85caed2265f17d7bf7981c')
     end
     
@@ -30,11 +28,8 @@ class NotificationTest < Test::Unit::TestCase #:nodoc: all
       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 stub_response(:get, :notifications, :resource => 'Notifications'), @notification.list
       end
     end
-    
   end
 end

data/test/twilio/outgoing_caller_id_test.rb

@@ -7,31 +7,27 @@ class OutgoingCallerIdTest < Test::Unit::TestCase #:nodoc: all
     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 Twilio::OutgoingCallerId.list, fake_response
+      assert_equal stub_response(:get, :outgoing_caller_ids, :resource => 'OutgoingCallerIds'), Twilio::OutgoingCallerId.list
     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 Twilio::OutgoingCallerId.get('PNe536dfda7c6184afab78d980cb8cdf43'), fake_response
+      assert_equal stub_response(:get, :outgoing_caller_id, :resource => 'OutgoingCallerIds/PNe536dfda7c6184afab78d980cb8cdf43'),
+        Twilio::OutgoingCallerId.get('PNe536dfda7c6184afab78d980cb8cdf43')
     end
     
     should "be created" do
-      fake_response = fixture(:outgoing_caller_id_new)
-      FakeWeb.register_uri(:post, twilio_url('OutgoingCallerIds'), :string => fake_response)
-      assert_equal Twilio::OutgoingCallerId.create('4158675309', 'My Home Phone'), fake_response
+      assert_equal stub_response(:post, :outgoing_caller_id_new, :resource => 'OutgoingCallerIds'),
+        Twilio::OutgoingCallerId.create('4158675309', 'My Home Phone')
     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)
-      assert_equal Twilio::OutgoingCallerId.update_name('PNe536dfda7c6184afab78d980cb8cdf43', 'My office line'), fake_response
+      assert_equal stub_response(:put, :outgoing_caller_id, :resource => 'OutgoingCallerIds/PNe536dfda7c6184afab78d980cb8cdf43'),
+        Twilio::OutgoingCallerId.update_name('PNe536dfda7c6184afab78d980cb8cdf43', 'My office line')
     end
     
     should "be deleted" do
-      FakeWeb.register_uri(:delete, twilio_url('OutgoingCallerIds/PNe536dfda7c6184afab78d980cb8cdf43'), :status => [ 204, "HTTPNoContent" ])
+      stub_response(:delete, :outgoing_caller_id, :resource => 'OutgoingCallerIds/PNe536dfda7c6184afab78d980cb8cdf43', 
+                                                  :status   => [ 204, "HTTPNoContent" ])
       assert Twilio::OutgoingCallerId.delete('PNe536dfda7c6184afab78d980cb8cdf43')
     end
     
@@ -42,9 +38,7 @@ class OutgoingCallerIdTest < Test::Unit::TestCase #:nodoc: all
       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 stub_response(:get, :outgoing_caller_ids, :resource => 'OutgoingCallerIds'), @caller_id.list
       end
     end
   end

data/test/twilio/recording_test.rb

@@ -7,33 +7,29 @@ class RecordingTest < Test::Unit::TestCase #:nodoc: all
     end
 
     should "be retrievable as a list" do
-      fake_response = fixture(:recordings)
-      FakeWeb.register_uri(:get, twilio_url('Recordings'), :string => fake_response)
-      assert_equal Twilio::Recording.list, fake_response
+      assert_equal stub_response(:get, :recordings, :resource => 'Recordings'), Twilio::Recording.list
     end
     
     should "be retrievable individually" do
-      fake_response = fixture(:recording)
-      FakeWeb.register_uri(:get, twilio_url('Recordings/RE41331862605f3d662488fdafda2e175f'), :string => fake_response)
-      assert_equal Twilio::Recording.get('RE41331862605f3d662488fdafda2e175f'), fake_response
+      assert_equal stub_response(:get, :recording, :resource => 'Recordings/RE41331862605f3d662488fdafda2e175f'),
+        Twilio::Recording.get('RE41331862605f3d662488fdafda2e175f')
     end
     
     should "be deleted" do
-      FakeWeb.register_uri(:delete, twilio_url('Recordings/RE41331862605f3d662488fdafda2e175f'), :status => [ 204, "HTTPNoContent" ])
+      stub_response(:delete, :recording, :resource => 'Recordings/RE41331862605f3d662488fdafda2e175f',
+                                         :status   => [ 204, "HTTPNoContent" ])
       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 Twilio::Recording.transcriptions('RE41331862605f3d662488fdafda2e175f'), fake_response
+        assert_equal stub_response(:get, :transcriptions, :resource => 'Recordings/RE41331862605f3d662488fdafda2e175f/Transcriptions'),
+          Twilio::Recording.transcriptions('RE41331862605f3d662488fdafda2e175f')
       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 Twilio::Recording.transcriptions('RE41331862605f3d662488fdafda2e175f', 'TRbdece5b75f2cd8f6ef38e0a10f5c4447'), fake_response
+        assert_equal stub_response(:get, :transcription, :resource => 'Recordings/RE41331862605f3d662488fdafda2e175f/Transcriptions/TRbdece5b75f2cd8f6ef38e0a10f5c4447'),
+          Twilio::Recording.transcriptions('RE41331862605f3d662488fdafda2e175f', 'TRbdece5b75f2cd8f6ef38e0a10f5c4447')
       end
     end
   
@@ -44,9 +40,7 @@ class RecordingTest < Test::Unit::TestCase #:nodoc: all
       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 stub_response(:get, :recordings, :resource => 'Recordings'), @recording.list
       end
     end
   end

data/test/twilio/toll_free_phone_number_test.rb

@@ -7,15 +7,13 @@ class TollFreePhoneNumberTest < Test::Unit::TestCase #:nodoc: all
     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 Twilio::TollFreePhoneNumber.list, fake_response
+      assert_equal stub_response(:get, :incoming_phone_numbers, :resource => 'IncomingPhoneNumbers/TollFree'),
+        Twilio::TollFreePhoneNumber.list
     end
     
     should "be created" do
-      fake_response = fixture(:incoming_phone_number)
-      FakeWeb.register_uri(:post, twilio_url('IncomingPhoneNumbers/TollFree'), :string => fake_response)
-      assert_equal Twilio::TollFreePhoneNumber.create('http://test.local/call_handler'), fake_response
+      assert_equal stub_response(:post, :incoming_phone_number, :resource => 'IncomingPhoneNumbers/TollFree'),
+        Twilio::TollFreePhoneNumber.create('http://test.local/call_handler')
     end
     
     context "using deprecated API" do
@@ -25,11 +23,9 @@ class TollFreePhoneNumberTest < Test::Unit::TestCase #:nodoc: all
       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 stub_response(:get, :incoming_phone_numbers, :resource => 'IncomingPhoneNumbers/TollFree'),
+          @toll_free.list
       end
     end
-    
   end
 end

data/test/twilio/verb_test.rb

@@ -14,7 +14,7 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
         
     should "say 'hola' in Spanish with female voice" do
       assert_match %r{<Say( loop="1"| language="es"| voice="woman"){3}>hola</Say>},
-        Twilio::Verb.say('hola', {:voice => 'woman', :language => 'es'})
+        Twilio::Verb.say('hola', :voice => 'woman', :language => 'es')
     end
     
     should "say 'hi' three times" do
@@ -28,19 +28,19 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
     end
     
     should "say 'hi' with pause and say 'bye'" do
-      verb = Twilio::Verb.new { |v|
-        v.say('hi', :loop => 1)
-        v.pause
-        v.say('bye')
+      verb = Twilio::Verb.new {
+        say 'hi', :loop => 1
+        pause
+        say 'bye'
       }
       assert_match %r{<Say( loop="1"| language="en"| voice="man"){3}>hi</Say><Pause></Pause><Say( loop="1"| language="en"| voice="man"){3}>bye</Say>}, verb.response
     end
     
     should "say 'hi' with 2 second pause and say 'bye'" do
-      verb = Twilio::Verb.new { |v|
-        v.say('hi')
-        v.pause(:length => 2)
-        v.say('bye')
+      verb = Twilio::Verb.new {
+        say 'hi'
+        pause :length => 2
+        say 'bye'
       }
       assert_match %r{<Say( loop="1"| language="en"| voice="man"){3}>hi</Say><Pause length="2"/><Say( loop="1"| language="en"| voice="man"){3}>bye</Say>}, verb.response
     end
@@ -54,7 +54,8 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
     end
    
     should "play mp3 response two times with pause" do
-      assert_equal verb_response(:play_mp3_two_times_with_pause), Twilio::Verb.play('http://foo.com/cowbell.mp3', :loop => 2, :pause => true)
+      assert_equal verb_response(:play_mp3_two_times_with_pause), 
+        Twilio::Verb.play('http://foo.com/cowbell.mp3', :loop => 2, :pause => true)
     end
      
     should "gather" do
@@ -91,21 +92,21 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
     end
     
     should "gather and say instructions" do
-      verb = Twilio::Verb.new { |v|
-        v.gather {
-          v.say('Please enter your account number followed by the pound sign')
+      verb = Twilio::Verb.new {
+        gather {
+          say 'Please enter your account number followed by the pound sign'
         }
-        v.say("We didn't receive any input. Goodbye!")
+        say "We didn't receive any input. Goodbye!"
       }
       assert_match %r{<Gather><Say( loop="1"| language="en"| voice="man"){3}>Please enter your account number followed by the pound sign</Say></Gather><Say( loop="1"| language="en"| voice="man"){3}>We didn't receive any input. Goodbye!</Say>}, verb.response
     end
     
     should "gather with timeout and say instructions" do
-      verb = Twilio::Verb.new { |v|
-        v.gather(:timeout => 10) {
-          v.say('Please enter your account number followed by the pound sign')
+      verb = Twilio::Verb.new {
+        gather(:timeout => 10) {
+          say 'Please enter your account number followed by the pound sign'
         }
-        v.say("We didn't receive any input. Goodbye!")
+        say "We didn't receive any input. Goodbye!"
       }
       assert_match %r{<Gather timeout="10"><Say( loop="1"| language="en"| voice="man"){3}>Please enter your account number followed by the pound sign</Say></Gather><Say( loop="1"| language="en"| voice="man"){3}>We didn't receive any input. Goodbye!</Say>}, verb.response
     end
@@ -169,35 +170,32 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
     
     should "dial with timeout and caller id" do
       assert_match %r{<Dial( timeout="10"| callerId="858-987-6543"){2}>415-123-4567</Dial>},
-        Twilio::Verb.dial('415-123-4567', { 
-          :timeout  => 10, 
-          :callerId => '858-987-6543' }
-        )
+        Twilio::Verb.dial('415-123-4567', :timeout  => 10, :callerId => '858-987-6543')
     end
     
     should "dial with redirect" do
-      verb = Twilio::Verb.new { |v|
-        v.dial('415-123-4567')
-        v.redirect('http://www.foo.com/nextInstructions')
+      verb = Twilio::Verb.new {
+        dial '415-123-4567'
+        redirect 'http://www.foo.com/nextInstructions'
       }
       assert_equal verb_response(:dial_with_redirect), verb.response
     end
     
     should "dial with number and send digits" do
-      verb = Twilio::Verb.new { |v|
-        v.dial {
-          v.number('415-123-4567', :sendDigits => 'wwww1928')
+      verb = Twilio::Verb.new {
+        dial {
+          number('415-123-4567', :sendDigits => 'wwww1928')
         }
       }
       assert_equal verb_response(:dial_with_number_and_send_digits), verb.response
     end
     
     should "dial multiple numbers" do
-      verb = Twilio::Verb.new { |v|
-        v.dial {
-          v.number('415-123-4567')
-          v.number('415-123-4568')
-          v.number('415-123-4569')
+      verb = Twilio::Verb.new {
+        dial {
+          number '415-123-4567'
+          number '415-123-4568'
+          number '415-123-4569'
         }
       }
       assert_equal verb_response(:dial_multiple_numbers), verb.response
@@ -208,13 +206,12 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
     end
     
     should "say hi and hangup" do
-      verb = Twilio::Verb.new { |v|
-        v.say('hi')
-        v.hangup
+      verb = Twilio::Verb.new {
+        say 'hi'
+        hangup
       }
       assert_match %r{<Say( loop="1"| language="en"| voice="man"){3}>hi</Say><Hangup/>},
         verb.response
     end
   end
-  
 end

data/twilio.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{twilio}
-  s.version = "2.4.0"
+  s.version = "2.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Misiowiec"]
-  s.date = %q{2009-09-03}
+  s.date = %q{2009-11-03}
   s.email = %q{github@webficient.com}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twilio
 version: !ruby/object:Gem::Version 
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors: 
 - Phil Misiowiec
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-03 00:00:00 -07:00
+date: 2009-11-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency