twilio 1.4.0 → 2.3.0

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

data/test/twilio/verb_test.rb

@@ -15,11 +15,29 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
     end
     
     should "say 'hi' three times" do
-      assert_equal verb_response(:say_hi_three_times), Twilio::Verb.say_3_times('hi')
+      assert_equal verb_response(:say_hi_three_times), Twilio::Verb.say('hi', :loop => 3)
     end
     
     should "say 'hi' three times with pause" do
-      assert_equal verb_response(:say_hi_three_times_with_pause), Twilio::Verb.say_3_times_with_pause('hi')
+      assert_equal verb_response(:say_hi_three_times_with_pause), Twilio::Verb.say('hi', :loop => 3, :pause => true)
+    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')
+      }
+      assert_equal verb_response(:say_hi_with_pause_and_say_bye), 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')
+      }
+      assert_equal verb_response(:say_hi_with_2_second_pause_and_say_bye), verb.response
     end
     
     should "play mp3 response" do
@@ -27,11 +45,11 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
     end
     
     should "play mp3 response two times" do
-      assert_equal verb_response(:play_mp3_two_times), Twilio::Verb.play_2_times('http://foo.com/cowbell.mp3')
+      assert_equal verb_response(:play_mp3_two_times), Twilio::Verb.play('http://foo.com/cowbell.mp3', :loop => 2)
     end
    
     should "play mp3 response two times with pause" do
-      assert_equal verb_response(:play_mp3_two_times_with_pause), Twilio::Verb.play_2_times_with_pause('http://foo.com/cowbell.mp3')
+      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
@@ -62,6 +80,26 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
       assert_equal verb_response(:gather_with_all_options_set), Twilio::Verb.gather(:action => 'http://foobar.com', :method => 'GET', :timeout => 10, :finishOnKey => '*', :numDigits => 5)
     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')
+        }
+        v.say("We didn't receive any input. Goodbye!")
+      }
+      assert_equal verb_response(:gather_and_say_instructions), 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')
+        }
+        v.say("We didn't receive any input. Goodbye!")
+      }
+      assert_equal verb_response(:gather_with_timeout_and_say_instructions), verb.response
+    end
+    
     should "record" do
       assert_equal verb_response(:record), Twilio::Verb.record
     end
@@ -121,6 +159,46 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
     should "dial with timeout and caller id" do
       assert_equal verb_response(:dial_with_timeout_and_caller_id), 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')
+      }
+      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')
+        }
+      }
+      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')
+        }
+      }
+      assert_equal verb_response(:dial_multiple_numbers), verb.response
+    end
+    
+    should "hangup" do
+      assert_equal verb_response(:hangup), Twilio::Verb.hangup
+    end
+    
+    should "say hi and hangup" do
+      verb = Twilio::Verb.new { |v|
+        v.say('hi')
+        v.hangup
+      }
+      assert_equal verb_response(:say_hi_and_hangup), verb.response
+    end
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twilio
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Phil Misiowiec
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-21 00:00:00 -07:00
+date: 2009-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,8 @@ files:
 - test/twilio/verb_test.rb
 has_rdoc: true
 homepage: http://github.com/webficient/twilio
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -108,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Twilio API Client