twilio-ruby 3.1.0 → 3.1.1

data/README.md

@@ -1,19 +1,19 @@
-## Get Started
-
-To install:
+## Install
 
 Via rubygems.org:
 
 ```
-$ sudo gem install twilio-ruby
+$ gem install twilio-ruby
 ```
 
-To build and install yourself from the latest source:
+To build and install the development branch yourself from the latest source:
 
 ```
-$ git clone git@github.com:andrewmbenton/twilio-ruby.git
-$ cd twilio-ruby; rake gem
-$ sudo gem install pkg/twilio-ruby-{version}
+$ git clone git@github.com:twilio/twilio-ruby.git
+$ cd twilio-ruby
+$ git checkout develop
+$ rake gem
+$ gem install pkg/twilio-ruby-{version}
 ```
 
 ## Some Code To Get You Started
@@ -21,7 +21,7 @@ $ sudo gem install pkg/twilio-ruby-{version}
 ### Setup Work
 
 ``` ruby
-require 'rubygems'
+require 'rubygems' # not necessary with ruby 1.9.2 but included for completeness
 require 'twilio-ruby'
 
 # put your own credentials here

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

@@ -5,11 +5,17 @@ module Twilio
       include Twilio::Util
       include Twilio::REST::Utils
 
+      HTTP_HEADERS = {
+        'Accept' => 'application/json',
+        'User-Agent' => 'twilio-ruby/3.1.1',
+      }
+
       attr_reader :account_sid, :account, :accounts
 
       def initialize(account_sid, auth_token, domain = 'api.twilio.com',
                      proxy_host = nil, proxy_port = nil)
-        @account_sid, @auth_token = account_sid, auth_token
+        @account_sid = account_sid
+        @auth_token = auth_token
         set_up_connection_to domain, proxy_host, proxy_port
         set_up_subresources
       end
@@ -18,24 +24,13 @@ module Twilio
       [:get, :put, :post, :delete].each do |method|
         method_class = Net::HTTP.const_get method.to_s.capitalize
         define_method method do |uri, *args|
-          uri += '.json'
-          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.1.0'
-          }
-          request = method_class.new uri, headers
+          params = twilify args[0]; params = {} if params.empty?
+          uri += '.json' # create a local copy of the uri to manipulate
+          uri << "?#{url_encode(params)}" if method == :get && !params.empty?
+          request = method_class.new uri, HTTP_HEADERS
           request.basic_auth @account_sid, @auth_token
           request.form_data = params if [:post, :put].include? method
-          http_response = @connection.request request
-          object = JSON.parse http_response.body if http_response.body
-          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
+          connect_and_send request
         end
       end
 
@@ -47,7 +42,7 @@ module Twilio
 
         case method
         when 'GET'
-          uri += "?#{url_encode(params)}" if params
+          uri << "?#{url_encode(params)}" if params
           req = Net::HTTP::Get.new uri
         when 'DELETE'
           req = Net::HTTP::Delete.new uri
@@ -86,6 +81,17 @@ module Twilio
         @accounts = Twilio::REST::Accounts.new accounts_uri, self
       end
 
+      def connect_and_send(request)
+        response = @connection.request request
+        object = JSON.parse response.body if response.body
+        if response.kind_of? Net::HTTPClientError
+          raise Twilio::REST::RequestError, object['message']
+        elsif response.kind_of? Net::HTTPServerError
+          raise Twilio::REST::ServerError, object['message']
+        end
+        object
+      end
+
     end
   end
 end

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

@@ -15,6 +15,13 @@ module Twilio
         self
       end
 
+      def refresh
+        raise "Can't refresh a resource without a REST Client" unless @client
+        @updated = false
+        response = @client.get @uri
+        set_up_properties_from response
+      end
+
       def delete
         raise "Can't delete a resource without a REST Client" unless @client
         @client.delete @uri

data/twilio-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "twilio-ruby"
-  s.version = "3.1.0"
+  s.version = "3.1.1"
   s.author = "Andrew Benton"
   s.email = "andrew@twilio.com"
   s.description = "A simple library for communicating with the Twilio REST API"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twilio-ruby
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Andrew Benton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-17 00:00:00 -07:00
+date: 2011-07-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency