twilio 2.4.1 → 2.5.0

data/README.rdoc

@@ -34,6 +34,16 @@ and you can nest multiple verbs inside a block:
   }
   verb.response
 
+== Installation
+
+  sudo gem install twilio -s http://gemcutter.org
+  
+If you need to tweak the source code, clone this repository and do a rake build and rake install.
+
 == Copyright
 
 Copyright (c) 2009 Phil Misiowiec, Webficient LLC. See LICENSE for details.
+
+== Contributors
+
+Jonathan Rudenberg

data/VERSION.yml

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

data/lib/twilio.rb

@@ -33,4 +33,5 @@ require 'twilio/notification'
 require 'twilio/outgoing_caller_id'
 require 'twilio/recording'
 require 'twilio/toll_free_phone_number'
+require 'twilio/conference'
 require 'twilio/verb'

data/lib/twilio/call.rb

@@ -18,6 +18,10 @@ module Twilio
       Twilio.get("/Calls/#{call_sid}")
     end
     
+    def redirect(call_sid, new_url, url_action = 'POST')
+      Twilio.post("/Calls/#{call_sid}", :body => {:CurrentUrl => new_url, :CurrentMethod => url_action})
+    end
+    
     def segments(call_sid, call_segment_sid = nil)
       Twilio.get("/Calls/#{call_sid}/Segments#{ '/' + call_segment_sid if call_segment_sid }")
     end

data/lib/twilio/conference.rb

@@ -0,0 +1,35 @@
+module Twilio
+    # The Conference REST resource allows you to query and manage the state of conferences.
+    # When a caller joins a conference via the Dial verb and Conference noun,
+    # a Conference Instance Resource is created to represent the conference room
+    # and a Participant Instance Resource is created to represent the caller who joined.
+  class Conference < TwilioObject
+    def list(optional = {})
+      Twilio.get("/Conferences", :query => optional)  
+    end
+    
+    def get(conference_sid)
+      Twilio.get("/Conferences/#{conference_sid}")  
+    end
+    
+    def participants(conference_sid, optional = {})
+      Twilio.get("/Conferences/#{conference_sid}/Participants", :query => optional) 
+    end
+    
+    def participant(conference_sid, call_sid)
+      Twilio.get("/Conferences/#{conference_sid}/Participants/#{call_sid}") 
+    end
+    
+    def mute_participant(conference_sid, call_sid)
+      Twilio.post("/Conferences/#{conference_sid}/Participants/#{call_sid}", :body => {:Muted => true})
+    end
+    
+    def unmute_participant(conference_sid, call_sid)
+      Twilio.post("/Conferences/#{conference_sid}/Participants/#{call_sid}", :body => {:Muted => false})
+    end
+    
+    def kick_participant(conference_sid, call_sid)
+      Twilio.delete("/Conferences/#{conference_sid}/Participants/#{call_sid}")
+    end
+  end
+end

data/lib/twilio/verb.rb

@@ -215,6 +215,37 @@ module Twilio
         end
       }
     end
+    
+    # The <Dial> verb's <Conference> noun allows you to connect to a conference room.
+    # Much like how the <Number> noun allows you to connect to another phone number,
+    # the <Conference> noun allows you to connect to a named conference room and talk
+    # with the other callers who have also connected to that room.
+    #
+    # Options (see http://www.twilio.com/docs/api_reference/TwiML/conference) are passed in as a hash
+    #
+    # Examples:
+    #   verb = Twilio::Verb.new {
+    #     dial {
+    #       conference 'MyRoom', :muted => true
+    #     }
+    #   }
+    #   verb.response
+    def conference(*args)
+      conference_name = ''
+      options = {}
+      args.each do |arg|
+        case arg
+        when String
+          conference_name = arg
+        when Hash
+          options.merge!(arg)
+        else
+          raise ArgumentError, 'conference expects String or Hash argument'
+        end
+      end
+      
+      output { @xml.Conference(conference_name, options)}
+    end
         
     # The Pause (secondary) verb waits silently for a number of seconds. 
     # It is normally chained with other verbs. 

data/test/fixtures/xml/call_redirected.xml

@@ -0,0 +1,15 @@
+<TwilioResponse>
+  <Call> 
+    <Sid>CA42ed11f93dc08b952027ffbc406d0868</Sid> 
+    <CallSegmentSid/> 
+    <AccountSid>AC309475e5fede1b49e100272a8640f438</AccountSid> 
+    <Called>4155551234</Called> 
+    <Caller>4158675309</Caller> 
+    <PhoneNumberSid>PN01234567890123456789012345678900</PhoneNumberSid> 
+    <Status>1</Status> 
+    <StartTime>Thu, 03 Apr 2008 04:36:33 -0400</StartTime> 
+    <EndTime/> 
+    <Price/> 
+    <Flags>1</Flags> 
+  </Call> 
+</TwilioResponse>

data/test/fixtures/xml/conference.xml

@@ -0,0 +1,10 @@
+<TwilioResponse>
+  <Conference>
+    <Sid>CFd0a50bbe038c437e87f6c82db8f37f21</Sid>
+    <AccountSid>mysid</AccountSid>
+    <FriendlyName>1234</FriendlyName>
+    <Status>2</Status>
+    <DateCreated>Thu, 03 Sep 2009 23:37:53 -0700</DateCreated>
+    <DateUpdated>Fri, 04 Sep 2009 00:35:02 -0700</DateUpdated>
+  </Conference>
+</TwilioResponse>

data/test/fixtures/xml/conference_participant.xml

@@ -0,0 +1,12 @@
+<TwilioResponse>
+  <Participant>
+    <ConferenceSid>CF9f2ead1ae43cdabeab102fa30d938378</ConferenceSid>
+    <AccountSid>mysid</AccountSid>
+    <CallSid>CA9ae8e040497c0598481c2031a154919e</CallSid>
+    <Muted>false</Muted>
+    <StartConferenceOnEnter>true</StartConferenceOnEnter>
+    <EndConferenceOnExit>false</EndConferenceOnExit>
+    <DateCreated>Wed, 31 Dec 1969 16:33:29 -0800</DateCreated>
+    <DateUpdated>Wed, 31 Dec 1969 16:33:29 -0800</DateUpdated>
+  </Participant>
+</TwilioResponse>

data/test/fixtures/xml/conference_participant_muted.xml

@@ -0,0 +1,12 @@
+<TwilioResponse>
+  <Participant>
+    <ConferenceSid>CF9f2ead1ae43cdabeab102fa30d938378</ConferenceSid>
+    <AccountSid>mysid</AccountSid>
+    <CallSid>CA9ae8e040497c0598481c2031a154919e</CallSid>
+    <Muted>true</Muted>
+    <StartConferenceOnEnter>true</StartConferenceOnEnter>
+    <EndConferenceOnExit>false</EndConferenceOnExit>
+    <DateCreated>Wed, 31 Dec 1969 16:33:29 -0800</DateCreated>
+    <DateUpdated>Wed, 31 Dec 1969 16:33:29 -0800</DateUpdated>
+  </Participant>
+</TwilioResponse>

data/test/fixtures/xml/conference_participants.xml

@@ -0,0 +1,24 @@
+<TwilioResponse>
+  <Participants page="0" numpages="1" pagesize="50" total="2" start="0" end="1">
+    <Participant>
+      <ConferenceSid>CF9f2ead1ae43cdabeab102fa30d938378</ConferenceSid>
+      <AccountSid>mysid</AccountSid>
+      <CallSid>CA9ae8e040497c0598481c2031a154919e</CallSid>
+      <Muted>false</Muted>
+      <StartConferenceOnEnter>true</StartConferenceOnEnter>
+      <EndConferenceOnExit>false</EndConferenceOnExit>
+      <DateCreated>Wed, 31 Dec 1969 16:33:29 -0800</DateCreated>
+      <DateUpdated>Wed, 31 Dec 1969 16:33:29 -0800</DateUpdated>
+    </Participant>
+    <Participant>
+      <ConferenceSid>CF9f2ead1ae43cdabeab102fa30d938378</ConferenceSid>
+      <AccountSid>mysid</AccountSid>
+      <CallSid>CA3c3c002e06c4cdaa5367e814ade05c76</CallSid>
+      <Muted>false</Muted>
+      <StartConferenceOnEnter>true</StartConferenceOnEnter>
+      <EndConferenceOnExit>false</EndConferenceOnExit>
+      <DateCreated>Wed, 31 Dec 1969 16:33:29 -0800</DateCreated>
+      <DateUpdated>Wed, 31 Dec 1969 16:33:29 -0800</DateUpdated>
+    </Participant>
+  </Participants>
+</TwilioResponse>

data/test/fixtures/xml/conferences.xml

@@ -0,0 +1,12 @@
+<TwilioResponse>
+  <Conferences page="0" numpages="1" pagesize="50" total="1" start="0" end="0">
+    <Conference>
+      <Sid>CFd0a50bbe038c437e87f6c82db8f37f21</Sid>
+      <AccountSid>mysid</AccountSid>
+      <FriendlyName>1234</FriendlyName>
+      <Status>2</Status>
+      <DateCreated>Thu, 03 Sep 2009 23:37:53 -0700</DateCreated>
+      <DateUpdated>Fri, 04 Sep 2009 00:35:02 -0700</DateUpdated>
+    </Conference>
+  </Conferences>
+</TwilioResponse> 

data/test/fixtures/yml/verb_responses.yml

@@ -71,7 +71,13 @@ 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> 
+  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>
+
+dial_conference:
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial><Conference>MyRoom</Conference></Dial></Response>
+
+dial_muted_conference:
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial><Conference mute="true">MyRoom</Conference></Dial></Response>
       
 hangup:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Hangup/></Response>  

data/test/twilio/call_test.rb

@@ -20,6 +20,11 @@ class CallTest < Test::Unit::TestCase #:nodoc: all
         Twilio::Call.make('4158675309', '4155551212', 'http://test.local/call_handler')
     end
     
+    should "be redirected" do
+      assert_equal stub_response(:post, :call_redirected, :resource => 'Calls/CA42ed11f93dc08b952027ffbc406d0868'),
+        Twilio::Call.redirect('CA42ed11f93dc08b952027ffbc406d0868', 'http://www.myapp.com/myhandler.php')
+    end
+    
     context "with segments" do
       should "returns a list of Call resources that were segments created in the same call" do
         assert_equal stub_response(:get, :calls, :resource => 'Calls/CA42ed11f93dc08b952027ffbc406d0868/Segments'),

data/test/twilio/conference_test.rb

@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ConferenceTest < Test::Unit::TestCase #:nodoc: all
+  context "A conference" do
+    setup do
+      Twilio.connect('mysid', 'mytoken')
+    end
+    
+    should "be retrievable as a list" do
+      assert_equal stub_response(:get, :conferences, :resource => 'Conferences'), Twilio::Conference.list
+    end
+    
+    should "be retrievable individually" do
+      assert_equal stub_response(:get, :conference, :resource => 'Conferences/CFd0a50bbe038c437e87f6c82db8f37f21'), 
+        Twilio::Conference.get('CFd0a50bbe038c437e87f6c82db8f37f21')
+    end
+    
+    context "participant" do
+      should "be retrievable as a list" do
+        assert_equal stub_response(:get, :conference_participants, :resource => 'Conferences/CF9f2ead1ae43cdabeab102fa30d938378/Participants'),
+          Twilio::Conference.participants('CF9f2ead1ae43cdabeab102fa30d938378')
+      end
+      
+      should "be retrievable individually" do
+          assert_equal stub_response(:get, :conference_participant, :resource => 'Conferences/CF9f2ead1ae43cdabeab102fa30d938378/Participants/CA9ae8e040497c0598481c2031a154919e'),
+            Twilio::Conference.participant('CF9f2ead1ae43cdabeab102fa30d938378', 'CA9ae8e040497c0598481c2031a154919e')
+      end
+      
+      should "be muted" do
+        assert_equal stub_response(:post, :conference_participant_muted, :resource => 'Conferences/CF9f2ead1ae43cdabeab102fa30d938378/Participants/CA9ae8e040497c0598481c2031a154919e'),
+          Twilio::Conference.mute_participant('CF9f2ead1ae43cdabeab102fa30d938378', 'CA9ae8e040497c0598481c2031a154919e')
+      end
+      
+      should "be unmuted" do
+        assert_equal stub_response(:post, :conference_participant, :resource => 'Conferences/CF9f2ead1ae43cdabeab102fa30d938378/Participants/CA9ae8e040497c0598481c2031a154919e'),
+          Twilio::Conference.unmute_participant('CF9f2ead1ae43cdabeab102fa30d938378', 'CA9ae8e040497c0598481c2031a154919e')
+      end
+      
+      should "be kicked" do
+        stub_response(:delete, :conference_participant, :resource => 'Conferences/CF9f2ead1ae43cdabeab102fa30d938378/Participants/CA9ae8e040497c0598481c2031a154919e',
+                      :status => [ 204, "HTTPNoContent" ])
+        assert Twilio::Conference.kick_participant('CF9f2ead1ae43cdabeab102fa30d938378', 'CA9ae8e040497c0598481c2031a154919e')
+      end
+    end
+  end
+end

data/test/twilio/verb_test.rb

@@ -201,6 +201,24 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
       assert_equal verb_response(:dial_multiple_numbers), verb.response
     end
     
+    should "dial a conference" do
+      verb = Twilio::Verb.new {
+        dial {
+          conference 'MyRoom'
+        }
+      }
+      assert_equal verb_response(:dial_conference), verb.response
+    end
+    
+    should "dial a muted conference" do
+      verb = Twilio::Verb.new {
+        dial {
+          conference 'MyRoom', :mute => :true
+        }
+      }
+      assert_equal verb_response(:dial_muted_conference), verb.response
+    end
+    
     should "hangup" do
       assert_equal verb_response(:hangup), Twilio::Verb.hangup
     end

data/twilio.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{twilio}
-  s.version = "2.4.1"
+  s.version = "2.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Misiowiec"]
-  s.date = %q{2009-11-03}
+  s.date = %q{2009-11-28}
   s.email = %q{github@webficient.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "lib/twilio.rb",
      "lib/twilio/account.rb",
      "lib/twilio/call.rb",
+     "lib/twilio/conference.rb",
      "lib/twilio/connection.rb",
      "lib/twilio/incoming_phone_number.rb",
      "lib/twilio/local_phone_number.rb",
@@ -37,7 +38,13 @@ Gem::Specification.new do |s|
      "test/fixtures/xml/account_renamed.xml",
      "test/fixtures/xml/call.xml",
      "test/fixtures/xml/call_new.xml",
+     "test/fixtures/xml/call_redirected.xml",
      "test/fixtures/xml/calls.xml",
+     "test/fixtures/xml/conference.xml",
+     "test/fixtures/xml/conference_participant.xml",
+     "test/fixtures/xml/conference_participant_muted.xml",
+     "test/fixtures/xml/conference_participants.xml",
+     "test/fixtures/xml/conferences.xml",
      "test/fixtures/xml/incoming_phone_number.xml",
      "test/fixtures/xml/incoming_phone_numbers.xml",
      "test/fixtures/xml/notification.xml",
@@ -53,6 +60,7 @@ Gem::Specification.new do |s|
      "test/test_helper.rb",
      "test/twilio/account_test.rb",
      "test/twilio/call_test.rb",
+     "test/twilio/conference_test.rb",
      "test/twilio/connection_test.rb",
      "test/twilio/incoming_phone_number_test.rb",
      "test/twilio/local_phone_number_test.rb",
@@ -72,6 +80,7 @@ Gem::Specification.new do |s|
     "test/test_helper.rb",
      "test/twilio/account_test.rb",
      "test/twilio/call_test.rb",
+     "test/twilio/conference_test.rb",
      "test/twilio/connection_test.rb",
      "test/twilio/incoming_phone_number_test.rb",
      "test/twilio/local_phone_number_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twilio
 version: !ruby/object:Gem::Version 
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors: 
 - Phil Misiowiec
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 -08:00
+date: 2009-11-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,7 @@ files:
 - lib/twilio.rb
 - lib/twilio/account.rb
 - lib/twilio/call.rb
+- lib/twilio/conference.rb
 - lib/twilio/connection.rb
 - lib/twilio/incoming_phone_number.rb
 - lib/twilio/local_phone_number.rb
@@ -63,7 +64,13 @@ files:
 - test/fixtures/xml/account_renamed.xml
 - test/fixtures/xml/call.xml
 - test/fixtures/xml/call_new.xml
+- test/fixtures/xml/call_redirected.xml
 - test/fixtures/xml/calls.xml
+- test/fixtures/xml/conference.xml
+- test/fixtures/xml/conference_participant.xml
+- test/fixtures/xml/conference_participant_muted.xml
+- test/fixtures/xml/conference_participants.xml
+- test/fixtures/xml/conferences.xml
 - test/fixtures/xml/incoming_phone_number.xml
 - test/fixtures/xml/incoming_phone_numbers.xml
 - test/fixtures/xml/notification.xml
@@ -79,6 +86,7 @@ files:
 - test/test_helper.rb
 - test/twilio/account_test.rb
 - test/twilio/call_test.rb
+- test/twilio/conference_test.rb
 - test/twilio/connection_test.rb
 - test/twilio/incoming_phone_number_test.rb
 - test/twilio/local_phone_number_test.rb
@@ -120,6 +128,7 @@ test_files:
 - test/test_helper.rb
 - test/twilio/account_test.rb
 - test/twilio/call_test.rb
+- test/twilio/conference_test.rb
 - test/twilio/connection_test.rb
 - test/twilio/incoming_phone_number_test.rb
 - test/twilio/local_phone_number_test.rb