twilio 3.1.0 → 3.1.1

data/.gitignore

@@ -1,5 +1,6 @@
 *.sw?
 .DS_Store
+bin
 coverage
 rdoc
 *.gem

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = Twilio Gem Changelog
 
+== 3.1.1
+
+* Loosens dependency on httparty gem to address a potential vulnerability
+
 == 3.1.0
 
 * Better handling of Builder version for greater compat

data/Gemfile

@@ -1,4 +1,6 @@
 source "http://rubygems.org"
+gemspec
 
-# Specify your gem's dependencies in twilio.gemspec
-gemspec
+platforms :jruby do
+  gem 'jruby-openssl'
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2010 Phil Misiowiec, Webficient LLC
+Copyright Phil Misiowiec, Webficient LLC
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -9,21 +9,21 @@ See http://www.twilio.com/docs/index for Twilio's API documentation.
 First set your credentials by calling the connect method:
 
   Twilio.connect('my_twilio_sid', 'my_auth_token')
-  
+
 Now call any of the Twilio classes:
-  
+
   Twilio::Call.make('1234567890', '9876543210', 'http://mysite.com/connected_call')
   Twilio::Recording.list
-  
+
 == Responding to Twilio
 
-When Twilio calls your application URL, your response must use the Twilio Markup XML (http://www.twilio.com/docs/api_reference/TwiML/). The Twilio gem makes this very easy 
-by providing a Twilio Verb class. 
+When Twilio calls your application URL, your response must use the Twilio Markup XML (http://www.twilio.com/docs/api_reference/TwiML/). The Twilio gem makes this very easy
+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'
-  
+
 and you can nest multiple verbs inside a block:
 
   verb = Twilio::Verb.new { |v|
@@ -35,7 +35,7 @@ and you can nest multiple verbs inside a block:
 == Installation
 
   gem install twilio
-  
+
 == Contributing
 
 1. Run 'bundle' from the command line to install dependencies
@@ -47,11 +47,11 @@ Note: don't require 'rubygems' in any file (http://www.rubyinside.com/why-using-
 == Testing
 
 * Currently using RSpec
-* Tested with REE 1.8.7, MRI 1.9.2, and MRI 1.9.3
+* Tested with REE 1.8.7, MRI 1.9.2, MRI 1.9.3, and JRuby 1.6.5
 
 == Copyright
 
-Copyright (c) 2009-2011 Phil Misiowiec, Webficient LLC. See LICENSE for details.
+Copyright Phil Misiowiec, Webficient LLC. See LICENSE for details.
 
 == Contributors
 

data/lib/twilio.rb

@@ -22,7 +22,6 @@
 #++
 
 require 'httparty'
-require 'builder'
 
 require 'twilio/twilio_object'
 
@@ -37,11 +36,11 @@ require 'twilio/recording'
 require 'twilio/sms'
 require 'twilio/verb'
 
-module Twilio  
+module Twilio
   include HTTParty
   TWILIO_URL = "https://api.twilio.com/2010-04-01/Accounts"
   SSL_CA_PATH = "/etc/ssl/certs"
-  
+
   # The connect method caches your Twilio account id and authentication token
   # Example:
   #  Twilio.connect('AC309475e5fede1b49e100272a8640f438', '3a2630a909aadbf60266234756fb15a0')
@@ -49,5 +48,5 @@ module Twilio
     self.base_uri "#{TWILIO_URL}/#{account_sid}"
     self.basic_auth account_sid, auth_token
     self.default_options[:ssl_ca_path] ||= SSL_CA_PATH unless self.default_options[:ssl_ca_file]
-  end  
+  end
 end

data/lib/twilio/available_phone_numbers.rb

@@ -22,7 +22,9 @@ module Twilio
         :NearNumber => opts[:near_number],
         :InLata => opts[:in_lata],
         :InRateCenter => opts[:in_rate_center],
-        :Distance => opts[:distance]
+        :Distance => opts[:distance],
+        :Page => opts[:page],
+        :PageSize => opts[:page_size]
       }.reject {|k,v| v == nil} unless opts.empty?
       
       Twilio.get("/AvailablePhoneNumbers/#{iso_country_code}/#{resource}", :query => params)
@@ -39,6 +41,8 @@ module Twilio
     #   :in_lata
     #   :in_rate_center
     #   :distance
+    #   :page
+    #   :page_size
     def search_local(opts ={})
       opts = {:resource => 'Local'}.merge(opts)
       search(opts)
@@ -46,7 +50,10 @@ module Twilio
 
     # The search_toll_free method searches for available toll-free numbers
     # Search Options
+    #   :area_code
     #   :contains
+    #   :page
+    #   :page_size
     def search_toll_free(opts ={})
       opts = {:resource => 'TollFree'}.merge(opts)
       search(opts)

data/lib/twilio/incoming_phone_number.rb

@@ -23,6 +23,10 @@ module Twilio
       Twilio.post("/IncomingPhoneNumbers", :body => opts)
     end
     
+    def update(incoming_sid, opts)
+      Twilio.post("/IncomingPhoneNumbers/#{incoming_sid}", :body => opts)
+    end
+    
     def delete(incoming_sid)
       Twilio.delete("/IncomingPhoneNumbers/#{incoming_sid}")
     end

data/lib/twilio/verb.rb

@@ -1,3 +1,5 @@
+require 'builder'
+
 module Twilio
   # Twilio Verbs enable your application to respond to Twilio requests (to your app) with XML responses.
   # There are 5 primary verbs (say, play, gather, record, dial) and 3 secondary (hangup, pause, redirect).
@@ -363,7 +365,7 @@ module Twilio
     #   Twilio::Verb.reject
     #
     #   If reject is called with an argument:
-    # 
+    #
     #   Twilio::Verb.reject :reason => "busy"
     #
     def reject options = {}

data/lib/twilio/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

data/spec/fixtures/yml/verb_responses.yml

@@ -1,42 +1,42 @@
 play_mp3:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Play loop="1">http://foo.com/cowbell.mp3</Play></Response>
-  
+
 play_mp3_two_times:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Play loop="2">http://foo.com/cowbell.mp3</Play></Response>
 
 play_mp3_two_times_with_pause:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Play>http://foo.com/cowbell.mp3</Play><Pause/><Play>http://foo.com/cowbell.mp3</Play></Response>
-  
+
 gather:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Gather/></Response>
 
 gather_with_action:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Gather action="http://foobar.com"/></Response>
-      
+
 gather_with_get_method:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Gather method="GET"/></Response>
-  
+
 gather_with_timeout:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Gather timeout="10"/></Response>
-  
+
 gather_with_finish_key:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Gather finishOnKey="*"/></Response>
-  
+
 gather_with_num_digits:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Gather numDigits="5"/></Response>
-  
+
 record:
-  response: <?xml version="1.0" encoding="UTF-8"?><Response><Record></Record></Response>
-  
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Record/></Response>
+
 record_with_action:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Record action="http://foobar.com"/></Response>
-  
+
 record_with_get_method:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Record method="GET"/></Response>
-  
+
 record_with_timeout:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Record timeout="10"/></Response>
-  
+
 record_with_finish_key:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Record finishOnKey="*"/></Response>
 
@@ -45,30 +45,30 @@ record_with_max_length:
 
 dial:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial>415-123-4567</Dial></Response>
-  
+
 dial_with_action:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial action="http://foobar.com">415-123-4567</Dial></Response>
-  
+
 dial_with_get_method:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial method="GET">415-123-4567</Dial></Response>
-  
+
 dial_with_timeout:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial timeout="10">415-123-4567</Dial></Response>
-  
+
 dial_with_hangup_on_star:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial hangupOnStar="true">415-123-4567</Dial></Response>
-  
+
 dial_with_time_limit:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial timeLimit="3600">415-123-4567</Dial></Response>
-  
+
 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_redirect:
   response: <?xml version="1.0" encoding="UTF-8"?><Response><Dial>415-123-4567</Dial><Redirect>http://www.foo.com/nextInstructions</Redirect></Response>
 
 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>  
+  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>
@@ -78,9 +78,9 @@ dial_conference:
 
 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>  
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Hangup/></Response>
 
 reject:
-  response: <?xml version="1.0" encoding="UTF-8"?><Response><Reject/></Response>  
+  response: <?xml version="1.0" encoding="UTF-8"?><Response><Reject/></Response>

data/spec/support/twilio_helpers.rb

@@ -1,35 +1,35 @@
 module TwilioHelpers #:nodoc:
-  
-  def stub_http_request(http_method, fixture_name, *opts)    
+
+  def stub_http_request(http_method, fixture_name, *opts)
     if opts
       request_options = opts.pop if opts.last.is_a?(Hash)
       resource = opts.pop
     end
-    
-    fake_response = fixture(fixture_name)         
+
+    fake_response = fixture(fixture_name)
     url = twilio_url(resource)
-    
+
     if request_options
       stub_request(http_method, url).with(request_options).to_return(:body => fake_response)
     else
       stub_request(http_method, url).to_return(:body => fake_response)
     end
-    
+
     return fake_response, url
   end
-    
+
   def stub_get(fixture, *opts)
-    stub_http_request(:get, fixture, *opts)  
+    stub_http_request(:get, fixture, *opts)
   end
-  
+
   def stub_post(fixture, *opts)
     stub_http_request(:post, fixture, *opts)
   end
-  
+
   def stub_put(fixture, *opts)
     stub_http_request(:put, fixture, *opts)
   end
-  
+
   def stub_delete(fixture, *opts)
     stub_http_request(:delete, fixture, *opts)
   end
@@ -38,9 +38,9 @@ module TwilioHelpers #:nodoc:
     path = File.join(File.dirname(__FILE__), "../fixtures/yml/verb_responses.yml")
     YAML.load_file(path)[verb.to_s]['response']
   end
-      
+
   private
-  
+
     def twilio_url(url=nil)
       "https://mysid:mytoken@api.twilio.com:443/2010-04-01/Accounts/mysid#{'/' + url if url}"
     end

data/spec/twilio/account_spec.rb

@@ -1,21 +1,21 @@
 require 'spec_helper'
 
-describe 'Account' do  
+describe 'Account' do
   before(:all) do
     Twilio.connect('mysid', 'mytoken')
   end
-    
-  it "gets an account" do    
+
+  it "gets an account" do
     response, url = stub_get(:account)
-    
-    Twilio::Account.get.should == response
+
+    Twilio::Account.get.should eql response
     WebMock.should have_requested(:get, twilio_url)
   end
-  
+
   it "updates name" do
     response, url = stub_put(:account_renamed)
-    
-    Twilio::Account.update_name('Bubba').should == response
+
+    Twilio::Account.update_name('Bubba').should eql response
     WebMock.should have_requested(:put, twilio_url).with(:body => {:FriendlyName => 'Bubba'})
   end
 end

data/spec/twilio/available_phone_numbers_spec.rb

@@ -1,52 +1,52 @@
 require 'spec_helper'
 
-describe "Available Phone Numbers" do  
+describe "Available Phone Numbers" do
   before(:all) do
     Twilio.connect('mysid', 'mytoken')
   end
-    
+
   context "Local Number" do
-    it "is searchable" do      
+    it "is searchable" do
       response, url = stub_get(:available_phone_numbers_local, 'AvailablePhoneNumbers/US/Local')
-      
-      Twilio::AvailablePhoneNumbers.search_local.should == response
+
+      Twilio::AvailablePhoneNumbers.search_local.should eql response
       WebMock.should have_requested(:get, url)
     end
-    
-    it "is searchable by area code" do      
+
+    it "is searchable by area code" do
       response, url = stub_get(:available_phone_numbers_local_search, 'AvailablePhoneNumbers/US/Local?AreaCode=510')
-      
-      Twilio::AvailablePhoneNumbers.search_local(:area_code => 510).should == response
+
+      Twilio::AvailablePhoneNumbers.search_local(:area_code => 510).should eql response
       WebMock.should have_requested(:get, url)
     end
-    
-    it "is searchable by postal code" do      
+
+    it "is searchable by postal code" do
       response, url = stub_get(:available_phone_numbers_local_search, 'AvailablePhoneNumbers/US/Local?InPostalCode=94612')
-      
-      Twilio::AvailablePhoneNumbers.search_local(:postal_code => 94612).should == response
+
+      Twilio::AvailablePhoneNumbers.search_local(:postal_code => 94612).should eql response
       WebMock.should have_requested(:get, url)
     end
-    
-    it "is searchable using multiple parameters" do      
-      response, url = stub_get(:available_phone_numbers_local_search, 'AvailablePhoneNumbers/US/Local?NearLatLong=37.806940%2C-122.270360&InRateCenter=OKLD0349T&NearNumber=15105551213&Distance=50&InRegion=CA&InLata=722&Contains=510555****')
-      
-      Twilio::AvailablePhoneNumbers.search_local(:in_region => 'CA', :contains => '510555****', :near_lat_long => '37.806940,-122.270360', :near_number => '15105551213', :in_lata => 722, :in_rate_center => 'OKLD0349T', :distance => 50).should == response
+
+    it "is searchable using multiple parameters" do
+      response, url = stub_get(:available_phone_numbers_local_search, 'AvailablePhoneNumbers/US/Local?NearLatLong=37.806940%2C-122.270360&InRateCenter=OKLD0349T&NearNumber=15105551213&Distance=50&InRegion=CA&InLata=722&Contains=510555****&Page=2&PageSize=30')
+
+      Twilio::AvailablePhoneNumbers.search_local(:in_region => 'CA', :contains => '510555****', :near_lat_long => '37.806940,-122.270360', :near_number => '15105551213', :in_lata => 722, :in_rate_center => 'OKLD0349T', :distance => 50, :page => 2, :page_size => 30).should eql response
       WebMock.should have_requested(:get, url)
     end
   end
 
   context "Toll-free Number" do
-    it "is searchable" do      
+    it "is searchable" do
       response, url = stub_get(:available_phone_numbers_toll_free, 'AvailablePhoneNumbers/US/TollFree')
-      
-      Twilio::AvailablePhoneNumbers.search_toll_free.should == response
+
+      Twilio::AvailablePhoneNumbers.search_toll_free.should eql response
       WebMock.should have_requested(:get, url)
     end
-    
-    it "is searchable as a vanity number" do      
+
+    it "is searchable as a vanity number" do
       response, url = stub_get(:available_phone_numbers_toll_free_search, 'AvailablePhoneNumbers/US/TollFree?Contains=STORM')
-      
-      Twilio::AvailablePhoneNumbers.search_toll_free(:contains => 'STORM').should == response
+
+      Twilio::AvailablePhoneNumbers.search_toll_free(:contains => 'STORM').should eql response
       WebMock.should have_requested(:get, url)
     end
   end

data/spec/twilio/call_spec.rb

@@ -5,60 +5,60 @@ describe "Call" do
     Twilio.connect('mysid', 'mytoken')
     @call_sid = 'CA42ed11f93dc08b952027ffbc406d0868'
   end
-  
+
   it "can be made" do
     response, url = stub_post(:call_new, 'Calls')
-    
-    Twilio::Call.make('4158675309', '4155551212', 'http://localhost:3000/call_handler').should == response
+
+    Twilio::Call.make('4158675309', '4155551212', 'http://localhost:3000/call_handler').should eql response
     WebMock.should have_requested(:post, url)
   end
-  
+
   it "can be redirected" do
     response, url = stub_post(:call_redirected, "Calls/#{@call_sid}")
-    
-    Twilio::Call.redirect(@call_sid, 'http://localhost:3000/redirect_handler').should == response
+
+    Twilio::Call.redirect(@call_sid, 'http://localhost:3000/redirect_handler').should eql response
     WebMock.should have_requested(:post, url)
   end
-  
+
   it "gets a list of calls" do
     response, url = stub_get(:calls, 'Calls')
-    
-    Twilio::Call.list.should == response
+
+    Twilio::Call.list.should eql response
     WebMock.should have_requested(:get, url)
   end
-  
+
   it "gets a specific call" do
     response, url = stub_get(:calls, "Calls/#{@call_sid}")
-    
-    Twilio::Call.get(@call_sid).should == response
+
+    Twilio::Call.get(@call_sid).should eql response
     WebMock.should have_requested(:get, url)
   end
-    
+
   it "gets a list of call segments" do
     response, url = stub_get(:calls, "Calls/#{@call_sid}/Segments")
-    
-    Twilio::Call.segments(@call_sid).should == response
+
+    Twilio::Call.segments(@call_sid).should eql response
     WebMock.should have_requested(:get, url)
   end
-  
+
   it "gets a specific call segment" do
     response, url = stub_get(:calls, "Calls/#{@call_sid}/Segments/abc123")
-    
-    Twilio::Call.segments(@call_sid, 'abc123').should == response
+
+    Twilio::Call.segments(@call_sid, 'abc123').should eql response
     WebMock.should have_requested(:get, url)
   end
-  
+
   it "gets a list of call recordings" do
     response, url = stub_get(:recordings, "Calls/#{@call_sid}/Recordings")
-    
-    Twilio::Call.recordings(@call_sid).should == response
+
+    Twilio::Call.recordings(@call_sid).should eql response
     WebMock.should have_requested(:get, url)
   end
-  
+
   it "gets a list of call notifications" do
     response, url = stub_get(:notifications, "Calls/#{@call_sid}/Notifications")
-    
-    Twilio::Call.notifications(@call_sid).should == response
+
+    Twilio::Call.notifications(@call_sid).should eql response
     WebMock.should have_requested(:get, url)
   end
 end

data/spec/twilio/conference_spec.rb

@@ -6,53 +6,53 @@ describe "Conference" do
     @conference_sid = 'CF9f2ead1ae43cdabeab102fa30d938378'
     @call_sid = 'CA9ae8e040497c0598481c2031a154919e'
   end
-  
+
   it "gets a list of conferences" do
     response, url = stub_get(:conferences, 'Conferences')
-    
-    Twilio::Conference.list.should == response
+
+    Twilio::Conference.list.should eql response
     WebMock.should have_requested(:get, url)
   end
-  
+
   it "gets a specific conference" do
     response, url = stub_get(:conference, "Conferences/#{@conference_sid}")
-    
-    Twilio::Conference.get(@conference_sid).should == response
+
+    Twilio::Conference.get(@conference_sid).should eql response
     WebMock.should have_requested(:get, url)
   end
-  
+
   it "gets a list of participants" do
     response, url = stub_get(:conference_participants, "Conferences/#{@conference_sid}/Participants")
-    
-    Twilio::Conference.participants(@conference_sid).should == response
+
+    Twilio::Conference.participants(@conference_sid).should eql response
     WebMock.should have_requested(:get, url)
   end
 
   it "gets a specific participant" do
     response, url = stub_get(:conference_participant, "Conferences/#{@conference_sid}/Participants/#{@call_sid}")
-    
-    Twilio::Conference.participant(@conference_sid, @call_sid).should == response
+
+    Twilio::Conference.participant(@conference_sid, @call_sid).should eql response
     WebMock.should have_requested(:get, url)
   end
 
   it "can mute a particant" do
     response, url = stub_post(:conference_participant_muted, "Conferences/#{@conference_sid}/Participants/#{@call_sid}", :body => 'Muted=true')
-    
-    Twilio::Conference.mute_participant(@conference_sid, @call_sid).should == response
+
+    Twilio::Conference.mute_participant(@conference_sid, @call_sid).should eql response
     WebMock.should have_requested(:post, url)
   end
 
   it "can unmute a participant" do
     response, url = stub_post(:conference_participant, "Conferences/#{@conference_sid}/Participants/#{@call_sid}", :body => 'Muted=false')
-    
-    Twilio::Conference.unmute_participant(@conference_sid, @call_sid).should == response
+
+    Twilio::Conference.unmute_participant(@conference_sid, @call_sid).should eql response
     WebMock.should have_requested(:post, url)
   end
 
   it "can be kicked" do
     response, url = stub_delete(:conference_participant, "Conferences/#{@conference_sid}/Participants/#{@call_sid}")
-    
-    Twilio::Conference.kick_participant(@conference_sid, @call_sid).should == response
+
+    Twilio::Conference.kick_participant(@conference_sid, @call_sid).should eql response
     WebMock.should have_requested(:delete, url)
   end
 end

data/spec/twilio/incoming_phone_number_spec.rb

@@ -5,38 +5,38 @@ describe "Incoming Phone Number" do
     Twilio.connect('mysid', 'mytoken')
     @incoming_sid = 'PNe536dfda7c6184afab78d980cb8cdf43'
   end
-  
+
   it "gets a specific phone number" do
     response, url = stub_get(:incoming_phone_number, "IncomingPhoneNumbers/#{@incoming_sid}")
-    
-    Twilio::IncomingPhoneNumber.get(@incoming_sid).should == response
+
+    Twilio::IncomingPhoneNumber.get(@incoming_sid).should eql response
     WebMock.should have_requested(:get, url)
   end
-  
+
   it "gets a list of phone numbers" do
     response, url = stub_get(:incoming_phone_numbers, 'IncomingPhoneNumbers')
-    
-    Twilio::IncomingPhoneNumber.list.should == response
+
+    Twilio::IncomingPhoneNumber.list.should eql response
     WebMock.should have_requested(:get, url)
   end
-  
+
   context "creating" do
     it "is created" do
       response, url = stub_post(:incoming_phone_number, 'IncomingPhoneNumbers')
 
-      Twilio::IncomingPhoneNumber.create(:PhoneNumber => '8055551212').should == response
+      Twilio::IncomingPhoneNumber.create(:PhoneNumber => '8055551212').should eql response
       WebMock.should have_requested(:post, url)
     end
-    
+
     it "raises an exception if PhoneNumber or AreaCode are not set" do
       expect { Twilio::IncomingPhoneNumber.create(:FriendlyName => 'Booyah') }.to raise_exception
     end
   end
-  
+
   it "is deleted" do
     response, url = stub_delete(:incoming_phone_number, "IncomingPhoneNumbers/#{@incoming_sid}")
-    
-    Twilio::IncomingPhoneNumber.delete(@incoming_sid).should == response
+
+    Twilio::IncomingPhoneNumber.delete(@incoming_sid).should eql response
     WebMock.should have_requested(:delete, url)
   end
 end

data/spec/twilio/live_connection_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 # uncomment and add your own tests here
-=begin  
+=begin
 describe "testing with a live connection" do
   before(:all) do
     WebMock.allow_net_connect!
@@ -9,11 +9,11 @@ describe "testing with a live connection" do
     @token = '123'
     Twilio.connect(@sid, @token)
   end
-  
+
   after(:all) do
     WebMock.disable_net_connect!
   end
-    
+
   it "gets real account" do
     Twilio::Account.get.should include("TwilioResponse")
   end

data/spec/twilio/notification_spec.rb

@@ -8,22 +8,22 @@ describe "Notification" do
 
   it "gets a list of notifications" do
     response, url = stub_get(:notifications, 'Notifications')
-    
-    Twilio::Notification.list.should == response
+
+    Twilio::Notification.list.should eql response
     WebMock.should have_requested(:get, url)
   end
-  
+
   it "gets a specific notification" do
     response, url = stub_get(:notification, "Notifications/#{@notification_sid}")
-      
-    Twilio::Notification.get(@notification_sid).should == response
+
+    Twilio::Notification.get(@notification_sid).should eql response
     WebMock.should have_requested(:get, url)
   end
-  
+
   it "is deleted" do
     response, url = stub_delete(:notification, "Notifications/#{@notification_sid}")
-    
-    Twilio::Notification.delete(@notification_sid).should == response
+
+    Twilio::Notification.delete(@notification_sid).should eql response
     WebMock.should have_requested(:delete, url)
   end
 end

data/spec/twilio/outgoing_caller_id_spec.rb

@@ -5,39 +5,39 @@ describe "Outgoing Caller ID" do
     Twilio.connect('mysid', 'mytoken')
     @callerid_sid = 'PNe536dfda7c6184afab78d980cb8cdf43'
   end
-  
+
   it "gets a list of caller id's" do
     response, url = stub_get(:outgoing_caller_ids, 'OutgoingCallerIds')
-    
-    Twilio::OutgoingCallerId.list.should == response
+
+    Twilio::OutgoingCallerId.list.should eql response
     WebMock.should have_requested(:get, url)
   end
-  
+
   it "gets a specific caller id" do
     response, url = stub_get(:outgoing_caller_id, "OutgoingCallerIds/#{@callerid_sid}")
-    
-    Twilio::OutgoingCallerId.get(@callerid_sid).should == response
+
+    Twilio::OutgoingCallerId.get(@callerid_sid).should eql response
     WebMock.should have_requested(:get, url)
   end
-  
+
   it "is created" do
     response, url = stub_post(:outgoing_caller_id_new, 'OutgoingCallerIds')
-    
-    Twilio::OutgoingCallerId.create('4158675309', 'My Home Phone').should == response
+
+    Twilio::OutgoingCallerId.create('4158675309', 'My Home Phone').should eql response
     WebMock.should have_requested(:post, url)
   end
-    
+
   it "is deleted" do
     response, url = stub_delete(:outgoing_caller_id, "OutgoingCallerIds/#{@callerid_sid}")
-    
-    Twilio::OutgoingCallerId.delete(@callerid_sid).should == response
+
+    Twilio::OutgoingCallerId.delete(@callerid_sid).should eql response
     WebMock.should have_requested(:delete, url)
   end
-  
+
   it "updates name" do
     response, url = stub_put(:outgoing_caller_id, "OutgoingCallerIds/#{@callerid_sid}")
-    
-    Twilio::OutgoingCallerId.update_name(@callerid_sid, 'My office line').should == response
+
+    Twilio::OutgoingCallerId.update_name(@callerid_sid, 'My office line').should eql response
     WebMock.should have_requested(:put, url)
   end
 end

data/spec/twilio/recording_spec.rb

@@ -6,39 +6,39 @@ describe "Recording" do
     @recording_sid = 'RE41331862605f3d662488fdafda2e175f'
     @transcription_sid = 'TRbdece5b75f2cd8f6ef38e0a10f5c4447'
   end
-  
+
   it "gets a list of recordings" do
     response, url = stub_get(:recordings, 'Recordings')
-    
-    Twilio::Recording.list.should == response
+
+    Twilio::Recording.list.should eql response
     WebMock.should have_requested(:get, url)
   end
-    
+
   it "gets a specific recording" do
     response, url = stub_get(:recording, "Recordings/#{@recording_sid}")
-    
-    Twilio::Recording.get(@recording_sid).should == response
+
+    Twilio::Recording.get(@recording_sid).should eql response
     WebMock.should have_requested(:get, url)
   end
-  
+
   it "is deleted" do
     response, url = stub_delete(:recording, "Recordings/#{@recording_sid}")
-    
-    Twilio::Recording.delete(@recording_sid).should == response
+
+    Twilio::Recording.delete(@recording_sid).should eql response
     WebMock.should have_requested(:delete, url)
   end
-  
+
   it "gets a list of transcriptions" do
     response, url = stub_get(:transcriptions, "Recordings/#{@recording_sid}/Transcriptions")
-    
-    Twilio::Recording.transcriptions(@recording_sid).should == response
+
+    Twilio::Recording.transcriptions(@recording_sid).should eql response
     WebMock.should have_requested(:get, url)
   end
 
   it "gets a specific transcription" do
     response, url = stub_get(:transcriptions, "Recordings/#{@recording_sid}/Transcriptions/#{@transcription_sid}")
-    
-    Twilio::Recording.transcriptions(@recording_sid, @transcription_sid).should == response
+
+    Twilio::Recording.transcriptions(@recording_sid, @transcription_sid).should eql response
     WebMock.should have_requested(:get, url)
   end
 end

data/spec/twilio/sms_spec.rb

@@ -5,32 +5,32 @@ describe "SMS" do
     Twilio.connect('mysid', 'mytoken')
     @sms_sid = 'SM872fb94e3b358913777cdb313f25b46f'
   end
-  
+
   it "gets a list of SMS messages" do
     response, url = stub_get(:sms_messages, 'SMS/Messages')
-    
-    Twilio::Sms.list.should == response
+
+    Twilio::Sms.list.should eql response
     WebMock.should have_requested(:get, url)
   end
 
   it "gets a specific SMS message" do
     response, url = stub_get(:sms, "SMS/Messages/#{@sms_sid}")
-    
-    Twilio::Sms.get(@sms_sid).should == response
+
+    Twilio::Sms.get(@sms_sid).should eql response
     WebMock.should have_requested(:get, url)
   end
-  
+
   it "is created" do
     response, url = stub_post(:sms_new, "SMS/Messages")
-    
-    Twilio::Sms.message('4155551212', '5558675309', 'Hi Jenny! Want to grab dinner?').should == response
+
+    Twilio::Sms.message('4155551212', '5558675309', 'Hi Jenny! Want to grab dinner?').should eql response
     WebMock.should have_requested(:post, url)
   end
-  
+
   it "is created with a callback URL" do
     response, url = stub_post(:sms_new_with_callback, "SMS/Messages")
-    
-    Twilio::Sms.message('4155551212', '5558675309', 'Hi Jenny! Want to grab dinner?', 'http://example.com/callback').should == response
+
+    Twilio::Sms.message('4155551212', '5558675309', 'Hi Jenny! Want to grab dinner?', 'http://example.com/callback').should eql response
     WebMock.should have_requested(:post, url)
   end
 end

data/spec/twilio/verb_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Verb" do
-  
+
   context "Say" do
     it "says 'hi'" do
       Twilio::Verb.say('hi').should match %r{<Say( loop="1"| language="en"| voice="man"){3}>hi</Say>}
@@ -28,7 +28,7 @@ describe "Verb" do
         v.say 'hi', :loop => 1
         v.pause
         v.say 'bye'
-      }.response.should match %r{<Say( loop="1"| language="en"| voice="man"){3}>hi</Say><Pause></Pause><Say( loop="1"| language="en"| voice="man"){3}>bye</Say>}
+      }.response.should match %r{<Say( loop="1"| language="en"| voice="man"){3}>hi</Say><Pause/><Say( loop="1"| language="en"| voice="man"){3}>bye</Say>}
     end
 
     it "says 'hi' with 2 second pause and say 'bye'" do
@@ -37,9 +37,9 @@ describe "Verb" do
         v.pause :length => 2
         v.say 'bye'
       }.response.should 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>}
-    end    
+    end
   end
-  
+
   context "Play" do
     it "plays mp3 response" do
       Twilio::Verb.play('http://foo.com/cowbell.mp3').should == verb_response(:play_mp3)
@@ -53,7 +53,7 @@ describe "Verb" do
       Twilio::Verb.play('http://foo.com/cowbell.mp3', :loop => 2, :pause => true).should == verb_response(:play_mp3_two_times_with_pause)
     end
   end
-  
+
   context "Gather" do
     it "gathers" do
       Twilio::Verb.gather.should == verb_response(:gather)
@@ -210,7 +210,7 @@ describe "Verb" do
       }.response.should == verb_response(:dial_muted_conference)
     end
   end
-  
+
   context "Hang Up" do
     it "hangs up" do
       Twilio::Verb.hangup.should == verb_response(:hangup)
@@ -223,7 +223,7 @@ describe "Verb" do
       }.response.should match %r{<Say( loop="1"| language="en"| voice="man"){3}>hi</Say><Hangup/>}
     end
   end
-  
+
   context "Reject" do
     it "rejects" do
       Twilio::Verb.reject.should == verb_response(:reject)
@@ -241,7 +241,7 @@ describe "Verb" do
       }.response.should match %r{<Reject reason="busy"/>}
     end
   end
-  
+
   context "SMS" do
     it "sends a simple SMS message" do
       verb = Twilio::Verb.new { |v|

data/twilio.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "builder", ">= 2.1.2"
-  s.add_dependency "httparty", "~> 0.8"
+  s.add_dependency "httparty", ">= 0.8"
 
   {
     'rake'    => '~> 0.8.7',
-    'rspec'   => '~> 2.5.0',
+    'rspec'   => '~> 2.12',
     'webmock' => '~> 1.6.2'
   }.each { |l, v| s. add_development_dependency l, v }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twilio
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -15,11 +15,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70110448346600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -27,21 +27,31 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70110448346600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70110448345880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70110448345880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70110448345060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,21 +59,31 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70110448345060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70110448344600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70110448344600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70110448344160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,7 +91,12 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70110448344160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.2
 description: Twilio API wrapper
 email:
 - github@webficient.com
@@ -157,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1539534090918622271
+      hash: 2539554735793806744
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -166,10 +191,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1539534090918622271
+      hash: 2539554735793806744
 requirements: []
 rubyforge_project: twilio
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Twilio API Client