twilio-ruby 3.0.0 → 3.1.0

data/lib/twilio-ruby.rb

@@ -3,7 +3,7 @@ TWILIO_RUBY_ROOT = File.expand_path(File.dirname(__FILE__))
 require 'net/http'
 require 'net/https'
 require 'builder'
-require 'crack'
+require 'json'
 require 'cgi'
 require 'openssl'
 require 'base64'

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

@@ -6,15 +6,14 @@ module Twilio
       include Twilio::REST::Utils
 
       attr_reader :account_sid, :account, :accounts
-    
+
       def initialize(account_sid, auth_token, domain = 'api.twilio.com',
                      proxy_host = nil, proxy_port = nil)
-        @account_sid = account_sid
-        @auth_token = auth_token
+        @account_sid, @auth_token = account_sid, auth_token
         set_up_connection_to domain, proxy_host, proxy_port
         set_up_subresources
       end
-    
+
       # Define some helper methods for sending HTTP requests
       [:get, :put, :post, :delete].each do |method|
         method_class = Net::HTTP.const_get method.to_s.capitalize
@@ -24,13 +23,13 @@ module Twilio
           uri += "?#{url_encode(params)}" if !params.empty? && method == :get
           headers = {
             'Accept' => 'application/json',
-            'User-Agent' => 'twilio-ruby/3.0.0'
+            'User-Agent' => 'twilio-ruby/3.1.0'
           }
           request = method_class.new uri, headers
           request.basic_auth @account_sid, @auth_token
           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
+          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
@@ -65,9 +64,9 @@ module Twilio
         req.basic_auth @account_sid, @auth_token
         @connection.request req
       end
-    
+
       private
-    
+
       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
@@ -77,7 +76,7 @@ module 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 = '/2010-04-01/Accounts'
         account_uri = "#{accounts_uri}/#{@account_sid}"
@@ -86,7 +85,7 @@ module Twilio
         # Set up the accounts subresource.
         @accounts = Twilio::REST::Accounts.new accounts_uri, self
       end
-    
+
     end
   end
 end

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

@@ -1,5 +1,11 @@
 module Twilio
   module REST
-    class Messages < ListResource; end
+    class Messages < ListResource
+      def initialize(uri, client)
+        super
+        # hard-code the json key since 'messages' doesn't exist in the response
+        @resource_name = 'sms_messages'
+      end
+    end
   end
 end

data/twilio-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "twilio-ruby"
-  s.version = "3.0.0"
+  s.version = "3.1.0"
   s.author = "Andrew Benton"
   s.email = "andrew@twilio.com"
   s.description = "A simple library for communicating with the Twilio REST API"
@@ -9,6 +9,6 @@ Gem::Specification.new do |s|
   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']
+  s.add_dependency("json", ">= 1.2.0")
   s.add_dependency("builder", ">= 2.1.2")
-  s.add_dependency("crack", ">= 0.1.8")
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twilio-ruby
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 3
+  - 1
   - 0
-  - 0
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors: 
 - Andrew Benton
@@ -15,39 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 -07:00
+date: 2011-07-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 31
         segments: 
-        - 2
         - 1
         - 2
-        version: 2.1.2
+        - 0
+        version: 1.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: crack
+  name: builder
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 15
         segments: 
-        - 0
+        - 2
         - 1
-        - 8
-        version: 0.1.8
+        - 2
+        version: 2.1.2
   type: :runtime
   version_requirements: *id002
 description: A simple library for communicating with the Twilio REST API