twilio 2.3.0 → 2.4.0

data/.gitignore

@@ -0,0 +1,5 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg

data/Rakefile

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'rake'
 
 begin
@@ -9,8 +8,8 @@ begin
     gem.email = "github@webficient.com"
     gem.homepage = "http://github.com/webficient/twilio"
     gem.authors = ["Phil Misiowiec"]
-    gem.add_dependency 'builder'
-    gem.add_dependency 'httparty'
+    gem.add_dependency 'builder', '>= 2.1.2'
+    gem.add_dependency 'httparty', '>= 0.4.3'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

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

data/lib/twilio.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.dirname(__FILE__))
-
 #--
 # Copyright (c) 2009 Phil Misiowiec, phil@webficient.com
 #
@@ -23,12 +21,8 @@ $:.unshift(File.dirname(__FILE__))
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require 'rubygems'
-gem 'httparty', '>= 0.4.3'
 require 'httparty'
-gem 'builder', '>= 2.1.2'
 require 'builder'
-
 require 'twilio/twilio_object'
 require 'twilio/account'
 require 'twilio/call'

data/test/fixtures/yml/verb_responses.yml

@@ -1,30 +1,3 @@
-say_hi:
-  response: <?xml version="1.0" encoding="UTF-8"?><Response><Say loop="1" language="en" voice="man">hi</Say></Response>
-
-say_hi_with_female_voice:
-  response: <?xml version="1.0" encoding="UTF-8"?><Response><Say loop="1" language="en" voice="woman">hi</Say></Response>
-    
-say_hi_in_spanish_with_female_voice:
-  response: <?xml version="1.0" encoding="UTF-8"?><Response><Say loop="1" language="es" voice="woman">hola</Say></Response>
-      
-say_hi_three_times:
-  response: <?xml version="1.0" encoding="UTF-8"?><Response><Say loop="3" language="en" voice="man">hi</Say></Response>
-  
-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>
   
@@ -52,15 +25,6 @@ gather_with_finish_key:
 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="*" 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>
   
@@ -78,9 +42,6 @@ record_with_finish_key:
 
 record_with_max_length:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Record maxLength="1800"/></Response>
-  
-record_with_transcribe:
-  response: <?xml version="1.0" encoding="UTF-8"?><Response><Record transcribe="true" transcribeCallback="/handle_transcribe"/></Response>
 
 dial:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial>415-123-4567</Dial></Response>
@@ -103,9 +64,6 @@ dial_with_time_limit:
 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>
-  
 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>
 

data/test/test_helper.rb

@@ -1,16 +1,11 @@
-require 'rubygems'
 require 'test/unit'
 require 'fakeweb'
 require 'shoulda'
-require 'matchy'
 require 'yaml'
+require 'twilio'
 
 FakeWeb.allow_net_connect = false
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'twilio'
-
 class Test::Unit::TestCase #:nodoc: all
 end
 

data/test/twilio/verb_test.rb

@@ -3,23 +3,28 @@ require File.dirname(__FILE__) + '/../test_helper'
 class VerbTest < Test::Unit::TestCase #:nodoc: all
   context "A Twilio Verb" do
     should "say 'hi'" do
-      assert_equal verb_response(:say_hi), Twilio::Verb.say('hi')
+      assert_match %r{<Say( loop="1"| language="en"| voice="man"){3}>hi</Say>}, 
+        Twilio::Verb.say('hi')
     end
 
     should "say 'hi' with female voice" do
-      assert_equal verb_response(:say_hi_with_female_voice), Twilio::Verb.say('hi', :voice => 'woman')
+      assert_match %r{<Say( loop="1"| language="en"| voice="woman"){3}>hi</Say>}, 
+        Twilio::Verb.say('hi', :voice => 'woman')
     end
         
     should "say 'hola' in Spanish with female voice" do
-      assert_equal verb_response(:say_hi_in_spanish_with_female_voice), Twilio::Verb.say('hola', {:voice => 'woman', :language => 'es'})
+      assert_match %r{<Say( loop="1"| language="es"| voice="woman"){3}>hola</Say>},
+        Twilio::Verb.say('hola', {:voice => 'woman', :language => 'es'})
     end
     
     should "say 'hi' three times" do
-      assert_equal verb_response(:say_hi_three_times), Twilio::Verb.say('hi', :loop => 3)
+      assert_match %r{<Say( loop="3"| language="en"| voice="man"){3}>hi</Say>}, 
+        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('hi', :loop => 3, :pause => true)
+      assert_match %r{<Say( language="en"| voice="man"){2}>hi</Say><Pause/><Say( language="en"| voice="man"){2}>hi</Say><Pause/><Say( language="en"| voice="man"){2}>hi</Say>},
+        Twilio::Verb.say('hi', :loop => 3, :pause => true)
     end
     
     should "say 'hi' with pause and say 'bye'" do
@@ -28,7 +33,7 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
         v.pause
         v.say('bye')
       }
-      assert_equal verb_response(:say_hi_with_pause_and_say_bye), verb.response
+      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
@@ -37,7 +42,7 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
         v.pause(:length => 2)
         v.say('bye')
       }
-      assert_equal verb_response(:say_hi_with_2_second_pause_and_say_bye), verb.response
+      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
     
     should "play mp3 response" do
@@ -77,7 +82,12 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
     end
     
     should "gather with all options set" do
-      assert_equal verb_response(:gather_with_all_options_set), Twilio::Verb.gather(:action => 'http://foobar.com', :method => 'GET', :timeout => 10, :finishOnKey => '*', :numDigits => 5)
+      verb_response = Twilio::Verb.gather :action      => 'http://foobar.com', 
+                                          :finishOnKey => '*', 
+                                          :method      => 'GET', 
+                                          :numDigits   => 5,
+                                          :timeout     => 10      
+      assert_match %r{<Gather( finishOnKey="\*"| action="http://foobar.com"| method="GET"| numDigits="5"| timeout="10"){5}/>}, verb_response
     end
     
     should "gather and say instructions" do
@@ -87,7 +97,7 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
         }
         v.say("We didn't receive any input. Goodbye!")
       }
-      assert_equal verb_response(:gather_and_say_instructions), verb.response
+      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
@@ -97,7 +107,7 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
         }
         v.say("We didn't receive any input. Goodbye!")
       }
-      assert_equal verb_response(:gather_with_timeout_and_say_instructions), verb.response
+      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
     
     should "record" do
@@ -125,7 +135,8 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
     end
     
     should "record with transcribe" do
-      assert_equal verb_response(:record_with_transcribe), Twilio::Verb.record(:transcribe => true, :transcribeCallback => '/handle_transcribe')            
+      assert_match %r{<Record( transcribe="true"| transcribeCallback="/handle_transcribe"){2}/>},
+        Twilio::Verb.record(:transcribe => true, :transcribeCallback => '/handle_transcribe')
     end
     
     should "dial" do
@@ -157,7 +168,11 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
     end
     
     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'})
+      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' }
+        )
     end
     
     should "dial with redirect" do
@@ -197,7 +212,8 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
         v.say('hi')
         v.hangup
       }
-      assert_equal verb_response(:say_hi_and_hangup), verb.response
+      assert_match %r{<Say( loop="1"| language="en"| voice="man"){3}>hi</Say><Hangup/>},
+        verb.response
     end
   end
   

data/twilio.gemspec

@@ -0,0 +1,100 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{twilio}
+  s.version = "2.4.0"
+
+  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.email = %q{github@webficient.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "lib/twilio.rb",
+     "lib/twilio/account.rb",
+     "lib/twilio/call.rb",
+     "lib/twilio/connection.rb",
+     "lib/twilio/incoming_phone_number.rb",
+     "lib/twilio/local_phone_number.rb",
+     "lib/twilio/notification.rb",
+     "lib/twilio/outgoing_caller_id.rb",
+     "lib/twilio/recording.rb",
+     "lib/twilio/toll_free_phone_number.rb",
+     "lib/twilio/twilio_object.rb",
+     "lib/twilio/verb.rb",
+     "test/fixtures/xml/account.xml",
+     "test/fixtures/xml/account_renamed.xml",
+     "test/fixtures/xml/call.xml",
+     "test/fixtures/xml/call_new.xml",
+     "test/fixtures/xml/calls.xml",
+     "test/fixtures/xml/incoming_phone_number.xml",
+     "test/fixtures/xml/incoming_phone_numbers.xml",
+     "test/fixtures/xml/notification.xml",
+     "test/fixtures/xml/notifications.xml",
+     "test/fixtures/xml/outgoing_caller_id.xml",
+     "test/fixtures/xml/outgoing_caller_id_new.xml",
+     "test/fixtures/xml/outgoing_caller_ids.xml",
+     "test/fixtures/xml/recording.xml",
+     "test/fixtures/xml/recordings.xml",
+     "test/fixtures/xml/transcription.xml",
+     "test/fixtures/xml/transcriptions.xml",
+     "test/fixtures/yml/verb_responses.yml",
+     "test/test_helper.rb",
+     "test/twilio/account_test.rb",
+     "test/twilio/call_test.rb",
+     "test/twilio/connection_test.rb",
+     "test/twilio/incoming_phone_number_test.rb",
+     "test/twilio/local_phone_number_test.rb",
+     "test/twilio/notification_test.rb",
+     "test/twilio/outgoing_caller_id_test.rb",
+     "test/twilio/recording_test.rb",
+     "test/twilio/toll_free_phone_number_test.rb",
+     "test/twilio/verb_test.rb",
+     "twilio.gemspec"
+  ]
+  s.homepage = %q{http://github.com/webficient/twilio}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Twilio API Client}
+  s.test_files = [
+    "test/test_helper.rb",
+     "test/twilio/account_test.rb",
+     "test/twilio/call_test.rb",
+     "test/twilio/connection_test.rb",
+     "test/twilio/incoming_phone_number_test.rb",
+     "test/twilio/local_phone_number_test.rb",
+     "test/twilio/notification_test.rb",
+     "test/twilio/outgoing_caller_id_test.rb",
+     "test/twilio/recording_test.rb",
+     "test/twilio/toll_free_phone_number_test.rb",
+     "test/twilio/verb_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0.4.3"])
+    else
+      s.add_dependency(%q<builder>, [">= 2.1.2"])
+      s.add_dependency(%q<httparty>, [">= 0.4.3"])
+    end
+  else
+    s.add_dependency(%q<builder>, [">= 2.1.2"])
+    s.add_dependency(%q<httparty>, [">= 0.4.3"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twilio
 version: !ruby/object:Gem::Version 
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors: 
 - Phil Misiowiec
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-22 00:00:00 -07:00
+date: 2009-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: httparty
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.4.3
     version: 
 description: 
 email: github@webficient.com
@@ -42,6 +42,7 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -86,6 +87,7 @@ files:
 - test/twilio/recording_test.rb
 - test/twilio/toll_free_phone_number_test.rb
 - test/twilio/verb_test.rb
+- twilio.gemspec
 has_rdoc: true
 homepage: http://github.com/webficient/twilio
 licenses: []
@@ -112,7 +114,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Twilio API Client
 test_files: 
 - test/test_helper.rb