twilio 2.5.0 → 2.6.0

data/README.rdoc

@@ -28,9 +28,9 @@ For example, in a Ruby on Rails application, you could do the following inside a
   
 and you can nest multiple verbs inside a block:
 
-  verb = Twilio::Verb.new {
-    say "The time is #{Time.now}"
-    hangup
+  verb = Twilio::Verb.new { |v|
+    v.say "The time is #{Time.now}"
+    v.hangup
   }
   verb.response
 
@@ -46,4 +46,5 @@ Copyright (c) 2009 Phil Misiowiec, Webficient LLC. See LICENSE for details.
 
 == Contributors
 
+Alex K Wolfe
 Jonathan Rudenberg

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gem.summary = %Q{Twilio API Client}
     gem.email = "github@webficient.com"
     gem.homepage = "http://github.com/webficient/twilio"
-    gem.authors = ["Phil Misiowiec"]
+    gem.authors = ["Phil Misiowiec", "Alex K Wolfe"]
     gem.add_dependency 'builder', '>= 2.1.2'
     gem.add_dependency 'httparty', '>= 0.4.3'
   end

data/VERSION.yml

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

data/lib/twilio/verb.rb

@@ -9,9 +9,9 @@ module Twilio
   #
   # 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 {
-  #     dial '415-123-4567'
-  #     redirect 'http://www.foo.com/nextInstructions'
+  #   verb = Twilio::Verb.new { |v|
+  #     v.dial '415-123-4567'
+  #     v.redirect 'http://www.foo.com/nextInstructions'
   #   }
   #   verb.response
   class Verb
@@ -31,7 +31,7 @@ module Twilio
       
       if block_given?
         @chain = true
-        @response = @xml.Response { instance_eval(&block) }
+        @response = @xml.Response { block.call(self) }
       end
     end
             
@@ -131,18 +131,18 @@ module Twilio
     #
     # Gather also lets you nest the Play, Say, and Pause verbs:
     #
-    #   verb = Twilio::Verb.new {
-    #     gather(:action => '/process_gather', :method => 'GET) {
-    #       say 'Please enter your account number followed by the pound sign'
+    #   verb = Twilio::Verb.new { |v|
+    #     v.gather(:action => '/process_gather', :method => 'GET) {
+    #       v.say 'Please enter your account number followed by the pound sign'
     #     }
-    #     say "We didn't receive any input. Goodbye!"
+    #     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 }
+          @xml.Gather(options) { block.call}
         else
           @xml.Gather(options)          
         end
@@ -185,11 +185,11 @@ module Twilio
     #
     # Twilio also supports an alternate form in which a Number object is nested inside Dial:
     #
-    #   verb = Twilio::Verb.new {
-    #     dial {
-    #       number '415-123-4567'
-    #       number '415-123-4568'
-    #       number '415-123-4569'
+    #   verb = Twilio::Verb.new { |v|
+    #     v.dial { |v|
+    #       v.number '415-123-4567'
+    #       v.number '415-123-4568'
+    #       v.number '415-123-4569'
     #     }
     #   }
     #   verb.response # represents the final xml output
@@ -224,9 +224,9 @@ module Twilio
     # 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 = Twilio::Verb.new { |v|
+    #     v.dial {
+    #       v.conference 'MyRoom', :muted => true
     #     }
     #   }
     #   verb.response
@@ -253,10 +253,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 {
-    #     say 'greetings'
-    #     pause :length => 2
-    #     say 'have a nice day'
+    #   verb = Twilio::Verb.new { |v|
+    #     v.say 'greetings'
+    #     v.pause :length => 2
+    #     v.say 'have a nice day'
     #   }
     #   verb.response
     def pause(*args)
@@ -270,9 +270,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 {
-    #     dial '415-123-4567'
-    #     redirect 'http://www.foo.com/nextInstructions'
+    #   verb = Twilio::Verb.new { |v|
+    #     v.dial '415-123-4567'
+    #     v.redirect 'http://www.foo.com/nextInstructions'
     #   }
     #   verb.response
     def redirect(*args)
@@ -301,9 +301,9 @@ module Twilio
     #
     #   If your response is chained:
     #
-    #   verb = Twilio::Verb.new {
-    #     say "The time is #{Time.now}"
-    #     hangup
+    #   verb = Twilio::Verb.new { |v|
+    #     v.say "The time is #{Time.now}"
+    #     v.hangup
     #   }
     #   verb.response
     def hangup

data/test/twilio/verb_test.rb

@@ -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 {
-        say 'hi', :loop => 1
-        pause
-        say 'bye'
+      verb = Twilio::Verb.new { |v|
+        v.say 'hi', :loop => 1
+        v.pause
+        v.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 {
-        say 'hi'
-        pause :length => 2
-        say 'bye'
+      verb = Twilio::Verb.new { |v|
+        v.say 'hi'
+        v.pause :length => 2
+        v.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
@@ -92,21 +92,21 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
     end
     
     should "gather and say instructions" do
-      verb = Twilio::Verb.new {
-        gather {
-          say 'Please enter your account number followed by the pound sign'
+      verb = Twilio::Verb.new { |v|
+        v.gather {
+          v.say 'Please enter your account number followed by the pound sign'
         }
-        say "We didn't receive any input. Goodbye!"
+        v.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 {
-        gather(:timeout => 10) {
-          say 'Please enter your account number followed by the pound sign'
+      verb = Twilio::Verb.new { |v|
+        v.gather(:timeout => 10) {
+          v.say 'Please enter your account number followed by the pound sign'
         }
-        say "We didn't receive any input. Goodbye!"
+        v.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
@@ -174,46 +174,46 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
     end
     
     should "dial with redirect" do
-      verb = Twilio::Verb.new {
-        dial '415-123-4567'
-        redirect 'http://www.foo.com/nextInstructions'
+      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 {
-        dial {
-          number('415-123-4567', :sendDigits => 'wwww1928')
+      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 {
-        dial {
-          number '415-123-4567'
-          number '415-123-4568'
-          number '415-123-4569'
+      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 "dial a conference" do
-      verb = Twilio::Verb.new {
-        dial {
-          conference 'MyRoom'
+      verb = Twilio::Verb.new { |v|
+        v.dial {
+          v.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
+      verb = Twilio::Verb.new { |v|
+        v.dial {
+          v.conference 'MyRoom', :mute => :true
         }
       }
       assert_equal verb_response(:dial_muted_conference), verb.response
@@ -224,9 +224,9 @@ class VerbTest < Test::Unit::TestCase #:nodoc: all
     end
     
     should "say hi and hangup" do
-      verb = Twilio::Verb.new {
-        say 'hi'
-        hangup
+      verb = Twilio::Verb.new { |v|
+        v.say 'hi'
+        v.hangup
       }
       assert_match %r{<Say( loop="1"| language="en"| voice="man"){3}>hi</Say><Hangup/>},
         verb.response

data/twilio.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{twilio}
-  s.version = "2.5.0"
+  s.version = "2.6.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-28}
+  s.authors = ["Phil Misiowiec", "Alex K Wolfe"]
+  s.date = %q{2010-02-11}
   s.email = %q{github@webficient.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -107,3 +107,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<httparty>, [">= 0.4.3"])
   end
 end
+

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: twilio
 version: !ruby/object:Gem::Version 
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors: 
 - Phil Misiowiec
+- Alex K Wolfe
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-28 00:00:00 -08:00
+date: 2010-02-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency