twilio-ruby 0.4.0 → 3.0.0

data/README.md

@@ -1,13 +1,87 @@
 ## Get Started
 
-Review [examples.rb](twilio-ruby/blob/master/examples.rb) to see how to get started using twilio-ruby.
-
 To install:
 
+Via rubygems.org:
+
+```
 $ sudo gem install twilio-ruby
+```
 
 To build and install yourself from the latest source:
 
-1) git clone this repo
-2) $ cd twilio-ruby; gem build .gemspec
-3) sudo gem install twilio-ruby-{version}
+```
+$ git clone git@github.com:andrewmbenton/twilio-ruby.git
+$ cd twilio-ruby; rake gem
+$ sudo gem install pkg/twilio-ruby-{version}
+```
+
+## Some Code To Get You Started
+
+### Setup Work
+
+``` ruby
+require 'rubygems'
+require 'twilio-ruby'
+
+# put your own credentials here
+@account_sid = 'AC043dcf9844e04758bc3a36a84c29761'
+@auth_token = '62ea81de3a5b414154eb263595357c69'
+
+# set up a client to talk to the Twilio REST API
+@client = Twilio::REST::Client.new(@account_sid, @auth_token)
+```
+
+### Send an SMS
+
+``` ruby
+# send an sms
+@client.account.sms.messages.create(
+  :from => '+14159341234',
+  :to => '+16105557069',
+  :body => 'Hey there!'
+)
+```
+
+### Do Some Stuff With Calls
+
+``` ruby
+# make a new outgoing call
+@call = @client.account.calls.create(
+  :from => '+14159341234',
+  :to => '+18004567890',
+  :url => 'http://myapp.com/call-handler'
+)
+
+# hangup a ringing call, but don't touch it if it's connected
+@call.cancel
+
+# if you have the call sid, you can fetch a call object via:
+@call = @client.account.calls.get('CA386025c9bf5d6052a1d1ea42b4d16662')
+
+# redirect an in-progress call
+@call.redirect_to('http://myapp.com/call-redirect')
+
+# hangup a call, no matter whether it is ringing or connected
+@call.hangup
+```
+
+### Buy a Phone Number
+
+``` ruby
+# print some available numbers
+@numbers = @client.account.available_phone_numbers.get('US').local.list(
+  :contains => 'AWESOME'
+)
+@numbers.each {|num| puts num.phone_number}
+
+# buy the first one
+@number = @numbers[0].phone_number
+@account.incoming_phone_numbers.create(:phone_number => @number)
+```
+
+## More Information
+
+There are more detailed examples in the included [examples.rb](twilio-ruby/blob/master/examples.rb).
+
+Full [API documentation](twilio-ruby/wiki/Documentation), as well as an [upgrade guide](twilio-ruby/wiki/UpgradeGuide) for users of the old twiliolib gem, is available in the [twilio-ruby github wiki](twilio-ruby/wiki).

data/examples.rb

@@ -58,8 +58,6 @@ puts @account.sms.messages.get('SMXXXXXXXX').body
 
 # send an sms
 @account.sms.messages.create(:from => '+14159341234', :to => '+16105557069', :body => 'Hey there!')
-# or, an alias
-@account.sms.messages.send('+14159341234', '+16105557069', 'Hey there!')
 
 ################ PHONE NUMBERS ################
 

data/lib/twilio-ruby.rb

@@ -1,3 +1,5 @@
+TWILIO_RUBY_ROOT = File.expand_path(File.dirname(__FILE__))
+
 require 'net/http'
 require 'net/https'
 require 'builder'
@@ -7,37 +9,42 @@ require 'openssl'
 require 'base64'
 
 
-require 'twilio-ruby/rest/utils'
-require 'twilio-ruby/rest/list_resource'
-require 'twilio-ruby/rest/instance_resource'
-require 'twilio-ruby/rest/sandbox/sandbox'
-require 'twilio-ruby/rest/accounts/account'
-require 'twilio-ruby/rest/accounts/accounts'
-require 'twilio-ruby/rest/calls/call'
-require 'twilio-ruby/rest/calls/calls'
-require 'twilio-ruby/rest/sms/sms'
-require 'twilio-ruby/rest/sms/message'
-require 'twilio-ruby/rest/sms/messages'
-require 'twilio-ruby/rest/applications/application'
-require 'twilio-ruby/rest/applications/applications'
-require 'twilio-ruby/rest/outgoing_caller_ids/outgoing_caller_id'
-require 'twilio-ruby/rest/outgoing_caller_ids/outgoing_caller_ids'
-require 'twilio-ruby/rest/incoming_phone_numbers/incoming_phone_number'
-require 'twilio-ruby/rest/incoming_phone_numbers/incoming_phone_numbers'
-require 'twilio-ruby/rest/available_phone_numbers/available_phone_number'
-require 'twilio-ruby/rest/available_phone_numbers/available_phone_numbers'
-require 'twilio-ruby/rest/available_phone_numbers/country'
-require 'twilio-ruby/rest/available_phone_numbers/local'
-require 'twilio-ruby/rest/available_phone_numbers/toll_free'
-require 'twilio-ruby/rest/conferences/conference'
-require 'twilio-ruby/rest/conferences/conferences'
-require 'twilio-ruby/rest/conferences/participant'
-require 'twilio-ruby/rest/conferences/participants'
-require 'twilio-ruby/rest/recordings/recording'
-require 'twilio-ruby/rest/recordings/recordings'
-require 'twilio-ruby/rest/transcriptions/transcription'
-require 'twilio-ruby/rest/transcriptions/transcriptions'
-require 'twilio-ruby/rest/notifications/notification'
-require 'twilio-ruby/rest/notifications/notifications'
-require 'twilio-ruby/rest/client'
-require 'twilio-ruby/twiml/response'
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/util"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/util/request_validator"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/errors"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/utils"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/list_resource"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/instance_resource"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/sandbox/sandbox"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/accounts/account"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/accounts/accounts"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/calls/call"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/calls/calls"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/sms/sms"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/sms/message"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/sms/messages"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/sms/short_code"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/sms/short_codes"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/applications/application"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/applications/applications"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/outgoing_caller_ids/outgoing_caller_id"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/outgoing_caller_ids/outgoing_caller_ids"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/incoming_phone_numbers/incoming_phone_number"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/incoming_phone_numbers/incoming_phone_numbers"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/available_phone_numbers/available_phone_number"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/available_phone_numbers/available_phone_numbers"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/available_phone_numbers/country"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/available_phone_numbers/local"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/available_phone_numbers/toll_free"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/conferences/conference"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/conferences/conferences"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/conferences/participant"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/conferences/participants"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/recordings/recording"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/recordings/recordings"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/transcriptions/transcription"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/transcriptions/transcriptions"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/notifications/notification"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/notifications/notifications"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/client"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/twiml/response"

data/lib/twilio-ruby/rest/client.rb

@@ -1,16 +1,17 @@
 module Twilio
   module REST
     class Client
-      include Utils
 
-      attr_reader :api_version, :domain, :account_sid, :account, :accounts
+      include Twilio::Util
+      include Twilio::REST::Utils
+
+      attr_reader :account_sid, :account, :accounts
     
-      def initialize(account_sid, auth_token, api_version='2010-04-01',
-                     domain='api.twilio.com', proxy=nil)
+      def initialize(account_sid, auth_token, domain = 'api.twilio.com',
+                     proxy_host = nil, proxy_port = nil)
         @account_sid = account_sid
         @auth_token = auth_token
-        @api_version = api_version
-        set_up_connection_to domain, proxy
+        set_up_connection_to domain, proxy_host, proxy_port
         set_up_subresources
       end
     
@@ -19,43 +20,73 @@ module Twilio
         method_class = Net::HTTP.const_get method.to_s.capitalize
         define_method method do |uri, *args|
           uri += '.json'
-          params = (args[0] && args[0] != {}) ? twilify(args[0]) : nil
-          uri += "?#{url_encode(params)}" if params && method == :get
-          request = method_class.new uri, 'User-Agent' => 'twilio-ruby/0.4.0'
+          params = twilify(args[0]); params = {} if params.empty?
+          uri += "?#{url_encode(params)}" if !params.empty? && method == :get
+          headers = {
+            'Accept' => 'application/json',
+            'User-Agent' => 'twilio-ruby/3.0.0'
+          }
+          request = method_class.new uri, headers
           request.basic_auth @account_sid, @auth_token
-          request.form_data = params if params && [:post, :put].include?(method)
+          request.form_data = params if [:post, :put].include? method
           http_response = @connection.request request
           object = Crack::JSON.parse http_response.body if http_response.body
-          raise object['message'] unless http_response.kind_of? Net::HTTPSuccess
+          if http_response.kind_of? Net::HTTPClientError
+            raise Twilio::REST::RequestError, object['message']
+          elsif http_response.kind_of? Net::HTTPServerError
+            raise Twilio::REST::ServerError, object['message']
+          end
           object
         end
       end
 
-      def request(uri, method, params={})
-        send method.downcase.to_sym, uri, params
+      # Mimic the old (deprecated) interface
+      def request(uri, method = 'POST', params = {})
+        raise ArgumentError, 'Invalid path parameter' if uri.empty?
+
+        uri = "/#{uri}" unless uri.start_with? '/'
+
+        case method
+        when 'GET'
+          uri += "?#{url_encode(params)}" if params
+          req = Net::HTTP::Get.new uri
+        when 'DELETE'
+          req = Net::HTTP::Delete.new uri
+        when 'PUT'
+          req = Net::HTTP::Put.new uri
+          req.form_data = params
+        when 'POST'
+          req = Net::HTTP::Post.new uri
+          req.form_data = params
+        else
+          raise NotImplementedError, "HTTP #{method} not implemented"
+        end
+
+        req.basic_auth @account_sid, @auth_token
+        @connection.request req
       end
     
       private
     
-      def set_up_connection_to(domain, proxy)
-        @connection = Net::HTTP.new domain, 443
+      def set_up_connection_to(domain, proxy_host = nil, proxy_port = nil)
+        connection_class = Net::HTTP::Proxy proxy_host, proxy_port
+        @connection = connection_class.new domain, 443
         @connection.use_ssl = true
-        # Don't check the server cert. Ideally this is configurable, in case an
-        # app wants to verify that it is actually talking to the real Twilio.
+        # Don't check the server cert. Ideally this is configurable in case an
+        # app wants to verify that it's actually talking to the real Twilio.
+        # But cert validation is usually a nightmare, so we skip it for now.
         @connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
     
       def set_up_subresources
-        accounts_uri = "/#{@api_version}/Accounts"
+        accounts_uri = '/2010-04-01/Accounts'
+        account_uri = "#{accounts_uri}/#{@account_sid}"
         # Set up a special handle to grab the account.
-        @account = Twilio::REST::Account.new "#{accounts_uri}/#{@account_sid}", self
+        @account = Twilio::REST::Account.new account_uri, self
         # Set up the accounts subresource.
         @accounts = Twilio::REST::Accounts.new accounts_uri, self
       end
     
-      def url_encode(hash)
-        hash.to_a.map {|p| p.map {|e| CGI.escape e.to_s}.join '='}.join '&'
-      end
     end
   end
 end

data/lib/twilio-ruby/rest/errors.rb

@@ -0,0 +1,6 @@
+module Twilio
+  module REST
+    class RequestError < StandardError; end
+    class ServerError < StandardError; end
+  end
+end

data/lib/twilio-ruby/rest/instance_resource.rb

@@ -3,20 +3,20 @@ module Twilio
     class InstanceResource
       include Utils
 
-      def initialize(uri, client, params={})
+      def initialize(uri, client, params = {})
         @uri, @client = uri, client
         set_up_properties_from params
       end
 
-      def update(params={})
-        raise "Can't update a resource without a Twilio::Client" unless @client
+      def update(params = {})
+        raise "Can't update a resource without a REST Client" unless @client
         response = @client.post @uri, params
         set_up_properties_from response
         self
       end
 
       def delete
-        raise "Can't delete a resource without a Twilio::Client" unless @client
+        raise "Can't delete a resource without a REST Client" unless @client
         @client.delete @uri
       end
 
@@ -44,8 +44,9 @@ module Twilio
         resources.each do |r|
           resource = twilify r
           relative_uri = r == :sms ? 'SMS' : resource
-          instance_variable_set("@#{r}",
-            Twilio::REST.const_get(resource).new("#{@uri}/#{relative_uri}", @client))
+          uri = "#{@uri}/#{relative_uri}"
+          resource_class = Twilio::REST.const_get resource
+          instance_variable_set("@#{r}", resource_class.new(uri, @client))
         end
         self.class.instance_eval {attr_reader *resources}
       end

data/lib/twilio-ruby/rest/list_resource.rb

@@ -10,8 +10,8 @@ module Twilio
       end
     
       # Grab a list of this kind of resource and return it as an array.
-      def list(params={})
-        raise "Can't get a resource list without a Twilio::Client" unless @client
+      def list(params = {})
+        raise "Can't get a resource list without a REST Client" unless @client
         response = @client.get @uri, params
         resources = response[detwilify(@resource_name)]
         resources.map do |resource|
@@ -25,8 +25,8 @@ module Twilio
       end
     
       # Return a newly created resource.
-      def create(params={})
-        raise "Can't create a resource without a Twilio::Client" unless @client
+      def create(params = {})
+        raise "Can't create a resource without a REST Client" unless @client
         response = @client.post @uri, params
         @instance_class.new "#{@uri}/#{response['sid']}", @client, response
       end

data/lib/twilio-ruby/rest/sms/messages.rb

@@ -1,9 +1,5 @@
 module Twilio
   module REST
-    class Messages < ListResource
-      def send(from, to, body)
-        create :from => from, :to => to, :body => body
-      end
-    end
+    class Messages < ListResource; end
   end
 end

data/lib/twilio-ruby/rest/sms/short_code.rb

@@ -0,0 +1,5 @@
+module Twilio
+  module REST
+    class ShortCode < InstanceResource; end
+  end
+end

data/lib/twilio-ruby/rest/sms/short_codes.rb

@@ -0,0 +1,5 @@
+module Twilio
+  module REST
+    class ShortCodes < ListResource; end
+  end
+end

data/lib/twilio-ruby/rest/sms/sms.rb

@@ -3,7 +3,7 @@ module Twilio
     class Sms < InstanceResource
       def initialize(uri, client, params={})
         super uri, client, params
-        resource :messages
+        resource :messages, :short_codes
       end
     end
   end

data/lib/twilio-ruby/rest/utils.rb

@@ -20,13 +20,6 @@ module Twilio
         end
       end
 
-      def self.validate(auth_token, signature, url, params={})
-        data = url + params.sort.to_s
-        digest = OpenSSL::Digest::Digest.new('sha1')
-        expected = Base64.encode64(OpenSSL::HMAC.digest(digest, auth_token, data)).strip
-        return expected == signature
-      end
-
     end
   end
 end

data/lib/twilio-ruby/util.rb

@@ -0,0 +1,7 @@
+module Twilio
+  module Util
+    def url_encode(hash)
+      hash.to_a.map {|p| p.map {|e| CGI.escape e.to_s}.join '='}.join '&'
+    end
+  end
+end

data/lib/twilio-ruby/util/request_validator.rb

@@ -0,0 +1,22 @@
+module Twilio
+  module Util
+    class RequestValidator
+
+      def initialize(auth_token)
+        @auth_token = auth_token
+      end
+
+      def validate(url, params, signature)
+        expected = build_signature_for url, params
+        expected == signature
+      end
+
+      def build_signature_for(url, params)
+        data = url + params.sort.to_s
+        digest = OpenSSL::Digest::Digest.new('sha1')
+        Base64.encode64(OpenSSL::HMAC.digest(digest, @auth_token, data)).strip
+      end
+
+    end
+  end
+end

data/test/twilio_spec.rb

@@ -7,11 +7,10 @@ describe Twilio::REST::Client do
     FakeWeb.register_uri(:any, %r/http:\/\/api.twilio.com\//, :body => '{"message": "You tried to reach Twilio"}')
   end
 
-  it 'should set up a Twilio::REST::Client' do
-    twilio = Twilio::REST::Client.new('someSid', 'someToken', 'api-version')
+  it 'should set up a new client instance with the given sid and token' do
+    twilio = Twilio::REST::Client.new('someSid', 'someToken')
     twilio.account_sid.should == 'someSid'
     twilio.instance_variable_get('@auth_token').should == 'someToken'
-    twilio.api_version.should == 'api-version'
   end
   
   it 'should set up the proper default http ssl connection' do
@@ -22,7 +21,27 @@ describe Twilio::REST::Client do
   end
   
   it 'should set up the proper http ssl connection when a different domain is given' do
-    twilio = Twilio::REST::Client.new('someSid', 'someToken', '2008-08-01', 'api.faketwilio.com')
+    twilio = Twilio::REST::Client.new('someSid', 'someToken', 'api.faketwilio.com')
+    twilio.instance_variable_get('@connection').address.should == 'api.faketwilio.com'
+    twilio.instance_variable_get('@connection').port.should == 443
+    twilio.instance_variable_get('@connection').use_ssl?.should == true
+  end
+
+  it 'should set up the proper http ssl connection when a proxy_host is given' do
+    twilio = Twilio::REST::Client.new('someSid', 'someToken', 'api.faketwilio.com', 'localhost')
+    twilio.instance_variable_get('@connection').proxy?.should == true
+    twilio.instance_variable_get('@connection').proxy_address.should == 'localhost'
+    twilio.instance_variable_get('@connection').proxy_port.should == 80
+    twilio.instance_variable_get('@connection').address.should == 'api.faketwilio.com'
+    twilio.instance_variable_get('@connection').port.should == 443
+    twilio.instance_variable_get('@connection').use_ssl?.should == true
+  end
+
+  it 'should set up the proper http ssl connection when a proxy_host and proxy_port are given' do
+    twilio = Twilio::REST::Client.new('someSid', 'someToken', 'api.faketwilio.com', 'localhost', 13128)
+    twilio.instance_variable_get('@connection').proxy?.should == true
+    twilio.instance_variable_get('@connection').proxy_address.should == 'localhost'
+    twilio.instance_variable_get('@connection').proxy_port.should == 13128
     twilio.instance_variable_get('@connection').address.should == 'api.faketwilio.com'
     twilio.instance_variable_get('@connection').port.should == 443
     twilio.instance_variable_get('@connection').use_ssl?.should == true
@@ -52,6 +71,20 @@ describe Twilio::REST::Client do
   end
 end
 
+describe Twilio::REST::InstanceResource do
+  it 'should set up an internal reference to the uri and client' do
+    resource = Twilio::REST::InstanceResource.new('some/uri', 'someClient')
+    resource.instance_variable_get('@uri').should == 'some/uri'
+    resource.instance_variable_get('@client').should == 'someClient'
+  end
+
+  it 'should set up object properties if passed' do
+    params = {'SomeKey' => 'someValue'}
+    resource = Twilio::REST::InstanceResource.new('uri', 'client', params)
+    resource.some_key.should == 'someValue'
+  end
+end
+
 describe Twilio::REST::Account do
   it 'should set up an incoming phone numbers resources object' do
     account = Twilio::REST::Account.new('someUri', 'someClient')
@@ -137,3 +170,41 @@ describe Twilio::REST::Recording do
     call.transcriptions.instance_variable_get('@uri').should == 'someUri/Transcriptions'
   end
 end
+
+describe Twilio::Util::RequestValidator do
+  it 'should properly validate a Twilio request based on its signature' do
+    token = '1c892n40nd03kdnc0112slzkl3091j20'
+    validator = Twilio::Util::RequestValidator.new token
+    url = 'http://www.postbin.org/1ed898x'
+    params = {
+      'AccountSid' => 'AC9a9f9392lad99kla0sklakjs90j092j3',
+      'ApiVersion' => '2010-04-01',
+      'CallSid' => 'CAd800bb12c0426a7ea4230e492fef2a4f',
+      'CallStatus' => 'ringing',
+      'Called' => '+15306384866',
+      'CalledCity' => 'OAKLAND',
+      'CalledCountry' => 'US',
+      'CalledState' => 'CA',
+      'CalledZip' => '94612',
+      'Caller' => '+15306666666',
+      'CallerCity' => 'SOUTH LAKE TAHOE',
+      'CallerCountry' => 'US',
+      'CallerName' => 'CA Wireless Call',
+      'CallerState' => 'CA',
+      'CallerZip' => '89449',
+      'Direction' => 'inbound',
+      'From' => '+15306666666',
+      'FromCity' => 'SOUTH LAKE TAHOE',
+      'FromCountry' => 'US',
+      'FromState' => 'CA',
+      'FromZip' => '89449',
+      'To' => '+15306384866',
+      'ToCity' => 'OAKLAND',
+      'ToCountry' => 'US',
+      'ToState' => 'CA',
+      'ToZip' => '94612'
+    }
+    signature = 'fF+xx6dTinOaCdZ0aIeNkHr/ZAA='
+    validator.validate(url, params, signature).should == true
+  end
+end

data/twilio-ruby.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name = "twilio-ruby"
-  s.version = "0.4.0"
+  s.version = "3.0.0"
   s.author = "Andrew Benton"
-  s.email = "andrewmbenton@gmail.com"
+  s.email = "andrew@twilio.com"
   s.description = "A simple library for communicating with the Twilio REST API"
   s.summary = "A simple library for communicating with the Twilio REST API"
-  s.homepage = "http://github.com/andrewmbenton/twilio-ruby"
+  s.homepage = "http://github.com/twilio/twilio-ruby"
   s.platform = Gem::Platform::RUBY
   s.files = Dir['lib/**/*.rb'] + Dir['test/**/*.rb'] + ['examples.rb', 'Rakefile', 'LICENSE', 'README.md', 'twilio-ruby.gemspec']
   s.test_files = Dir['test/**/*.rb']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twilio-ruby
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: 
   segments: 
+  - 3
   - 0
-  - 4
   - 0
-  version: 0.4.0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Andrew Benton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-16 00:00:00 -07:00
+date: 2011-07-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 description: A simple library for communicating with the Twilio REST API
-email: andrewmbenton@gmail.com
+email: andrew@twilio.com
 executables: []
 
 extensions: []
@@ -79,9 +79,12 @@ files:
 - lib/twilio-ruby/rest/accounts/account.rb
 - lib/twilio-ruby/rest/recordings/recording.rb
 - lib/twilio-ruby/rest/recordings/recordings.rb
+- lib/twilio-ruby/rest/errors.rb
 - lib/twilio-ruby/rest/notifications/notification.rb
 - lib/twilio-ruby/rest/notifications/notifications.rb
 - lib/twilio-ruby/rest/sms/messages.rb
+- lib/twilio-ruby/rest/sms/short_code.rb
+- lib/twilio-ruby/rest/sms/short_codes.rb
 - lib/twilio-ruby/rest/sms/sms.rb
 - lib/twilio-ruby/rest/sms/message.rb
 - lib/twilio-ruby/rest/outgoing_caller_ids/outgoing_caller_id.rb
@@ -93,16 +96,17 @@ files:
 - lib/twilio-ruby/rest/available_phone_numbers/toll_free.rb
 - lib/twilio-ruby/rest/sandbox/sandbox.rb
 - lib/twilio-ruby/rest/instance_resource.rb
+- lib/twilio-ruby/util/request_validator.rb
+- lib/twilio-ruby/util.rb
 - lib/twilio-ruby/twiml/response.rb
 - test/twilio_spec.rb
-- test/test_twilio.rb
 - examples.rb
 - Rakefile
 - LICENSE
 - README.md
 - twilio-ruby.gemspec
 has_rdoc: true
-homepage: http://github.com/andrewmbenton/twilio-ruby
+homepage: http://github.com/twilio/twilio-ruby
 licenses: []
 
 post_install_message: 
@@ -137,4 +141,3 @@ specification_version: 3
 summary: A simple library for communicating with the Twilio REST API
 test_files: 
 - test/twilio_spec.rb
-- test/test_twilio.rb

data/test/test_twilio.rb

@@ -1,6 +0,0 @@
-require File.dirname(__FILE__) + '/../lib/twilio'
-
-twilio = Twilio::Client.new('AC2ae18c3d1a42ddb2eea67f8bef081728', 'd15433e698105a045e9d3cd84ed0c909')
-puts twilio.get('/')
-
-