twilio-ruby 3.4.0 → 3.4.1

data/README.md

@@ -42,13 +42,13 @@ capability.allow_client_incoming 'andrew'
 @token = capability.generate
 ```
 
-There is a slightly more detailed document in the
-[Capability](twilio-ruby/wiki/Capability) section of the wiki.
+There is a slightly more detailed document in the [Capability][capability]
+section of the wiki.
 
 ## Getting Started With TwiML
 
-TwiML support is based on the [builder][1] library. You can construct a TwiML
-response like this:
+TwiML support is based on the [builder][builder] library. You can construct a
+TwiML response like this:
 
 ``` ruby
 require 'rubygems' # not necessary with ruby 1.9 but included for completeness
@@ -144,8 +144,15 @@ auth_token = '62ea81de3a5b414154eb263595357c69'
 
 ## More Information
 
-There are more detailed examples in the included [examples.rb](twilio-ruby/blob/master/examples.rb).
+There are more detailed examples in the included [examples.rb][examples].
 
-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).
+Full [API documentation][documentation], as well as an [upgrade guide][upgrade]
+for users of the old twiliolib gem, is available in the
+[twilio-ruby github wiki][wiki].
 
-[1]:http://builder.rubyforge.org/
+[capability]:https://github.com/twilio/twilio-ruby/wiki/Capability
+[builder]:http://builder.rubyforge.org/
+[examples]:https://github.com/twilio/twilio-ruby/blob/master/examples.rb
+[documentation]:https://github.com/twilio/twilio-ruby/wiki/Documentation
+[upgrade]:https://github.com/twilio/twilio-ruby/wiki/UpgradeGuide
+[wiki]:https://github.com/twilio/twilio-ruby/wiki

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

@@ -82,6 +82,11 @@ module Twilio
       # to avoid insecure connection warnings in environments without the proper
       # cert validation chain.
       #
+      # === <tt>:ssl_ca_file => '/path/to/ca/file'</tt>
+      #
+      # Specify the path to the certificate authority bundle you'd like to use
+      # when verifying Twilio's SSL certificate.
+      #
       # === <tt>:timeout => 30</tt>
       #
       # Set the time in seconds to wait before timing out the HTTP request.
@@ -125,7 +130,7 @@ module Twilio
         method_class = Net::HTTP.const_get method.to_s.capitalize
         define_method method do |uri, *args|
           params = twilify args[0]; params = {} if params.empty?
-          uri += '.json' # create a local copy of the uri to manipulate
+          uri = "#{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
@@ -181,6 +186,7 @@ module Twilio
           config[:proxy_port], config[:proxy_user], config[:proxy_pass]
         @connection = connection_class.new config[:host], config[:port]
         @connection.use_ssl = config[:use_ssl]
+        @connection.ca_file = config[:ssl_ca_file]
         unless config[:ssl_verify_peer]
           @connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end

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

@@ -38,8 +38,7 @@ module Twilio
       # instance resource, including the newly updated properties.
       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
+        set_up_properties_from(@client.post(@uri, params))
         self
       end
 
@@ -49,8 +48,7 @@ module Twilio
       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
+        set_up_properties_from(@client.get(@uri))
         self
       end
 
@@ -68,8 +66,7 @@ module Twilio
       # until an attempt is made to access an unknown attribute.
       def method_missing(method, *args)
         super if @updated
-        response = @client.get @uri
-        set_up_properties_from response
+        set_up_properties_from(@client.get(@uri))
         self.send method, *args
       end
 

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

@@ -33,10 +33,10 @@ module Twilio
             resource
         end
         # set the +total+ property on the array
-        resource_list.instance_eval {
+        resource_list.instance_eval do
           eigenclass = class << self; self; end
           eigenclass.send :define_method, :total, &lambda {response['total']}
-        }
+        end
         resource_list
       end
 
@@ -49,8 +49,7 @@ module Twilio
       # +total+ attribute as well.
       def total
         raise "Can't get a resource total without a REST Client" unless @client
-        response = @client.get @uri, :page_size => 1
-        @total = response['total']
+        @client.get(@uri, :page_size => 1)['total']
       end
 
       ##

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-  VERSION = '3.4.0'
+  VERSION = '3.4.1'
 end

data/test/twilio_spec.rb

@@ -21,6 +21,12 @@ describe Twilio::REST::Client do
     twilio.instance_variable_get('@connection').use_ssl?.should == true
   end
   
+  it 'should set up the requested ssl verification ca_file if provided' do
+    twilio = Twilio::REST::Client.new('someSid', 'someToken', :ssl_ca_file => '/path/to/ca/file')
+    connection = twilio.instance_variable_get('@connection')
+    connection.ca_file.should == '/path/to/ca/file'
+  end
+
   it 'should set up the proper http ssl connection when a different domain is given' do
     twilio = Twilio::REST::Client.new('someSid', 'someToken', :host => 'api.faketwilio.com')
     twilio.instance_variable_get('@connection').address.should == 'api.faketwilio.com'
@@ -182,39 +188,65 @@ describe Twilio::REST::Recording do
 end
 
 describe Twilio::Util::RequestValidator do
-  it 'should properly validate a Twilio request based on its signature' do
-    token = '1c892n40nd03kdnc0112slzkl3091j20'
+  it 'should properly validate a Twilio Voice request' do
+    token = '2bd9e9638872de601313dc77410d3b23'
     validator = Twilio::Util::RequestValidator.new token
-    url = 'http://www.postbin.org/1ed898x'
+    url = 'http://twiliotests.heroku.com/validate/voice'
     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',
+      'ToState' => 'California',
+      'CalledState' => 'California',
       'Direction' => 'inbound',
-      'From' => '+15306666666',
-      'FromCity' => 'SOUTH LAKE TAHOE',
-      'FromCountry' => 'US',
       'FromState' => 'CA',
-      'FromZip' => '89449',
-      'To' => '+15306384866',
-      'ToCity' => 'OAKLAND',
+      'AccountSid' => 'ACba8bc05eacf94afdae398e642c9cc32d',
+      'Caller' => '+14153595711',
+      'CallerZip' => '94108',
+      'CallerCountry' => 'US',
+      'From' => '+14153595711',
+      'FromCity' => 'SAN FRANCISCO',
+      'CallerCity' => 'SAN FRANCISCO',
+      'To' => '+14157669926',
+      'FromZip' => '94108',
+      'FromCountry' => 'US',
+      'ToCity' => '',
+      'CallStatus' => 'ringing',
+      'CalledCity' => '',
+      'CallerState' => 'CA',
+      'CalledZip' => '',
+      'ToZip' => '',
       'ToCountry' => 'US',
+      'CallSid' => 'CA136d09cd59a3c0ec8dbff44da5c03f31',
+      'CalledCountry' => 'US',
+      'Called' => '+14157669926',
+      'ApiVersion' => '2010-04-01',
+      'ApplicationSid' => 'AP44efecad51364e80b133bb7c07eb8204'
+    }
+    signature = 'oVb2kXoVy8GEfwBDjR8bk/ZZ6eA='
+    validator.validate(url, params, signature).should == true
+  end
+
+  it 'should properly validate a Twilio SMS request' do
+    token = '2bd9e9638872de601313dc77410d3b23'
+    validator = Twilio::Util::RequestValidator.new token
+    url = 'http://twiliotests.heroku.com/validate/sms'
+    params = {
       'ToState' => 'CA',
-      'ToZip' => '94612'
+      'FromState' => 'CA',
+      'AccountSid' => 'ACba8bc05eacf94afdae398e642c9cc32d',
+      'SmsMessageSid' => 'SM2003cbd5e6a3701999aa3e5f20ff2787',
+      'Body' => 'Orly',
+      'From' => '+14159354345',
+      'FromCity' => 'SAN FRANCISCO',
+      'SmsStatus' => 'received',
+      'FromZip' => '94107',
+      'FromCountry' => 'US',
+      'To' => '+14158141819',
+      'ToCity' => 'SAN FRANCISCO',
+      'ToZip' => '94105',
+      'ToCountry' => 'US',
+      'ApiVersion' => '2010-04-01',
+      'SmsSid' => 'SM2003cbd5e6a3701999aa3e5f20ff2787'
     }
-    signature = 'fF+xx6dTinOaCdZ0aIeNkHr/ZAA='
+    signature = 'mxeiv65lEe0b8L6LdVw2jgJi8yw='
     validator.validate(url, params, signature).should == true
   end
 end

data/twilio-ruby.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakeweb', '~> 1.3.0'
   s.add_development_dependency 'rack',    '~> 1.3.0'
 
-  s.extra_rdoc_files = ['README.md', 'README.rdoc', 'examples.rb', 'LICENSE']
+  s.extra_rdoc_files = ['README.md', 'examples.rb', 'LICENSE']
   s.rdoc_options = ['--line-numbers', '--inline-source', '--title', 'twilio-ruby', '--main', 'README.md']
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twilio-ruby
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 3
   - 4
-  - 0
-  version: 3.4.0
+  - 1
+  version: 3.4.1
 platform: ruby
 authors: 
 - Andrew Benton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 -07:00
+date: 2011-10-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,7 +138,6 @@ extensions: []
 
 extra_rdoc_files: 
 - README.md
-- README.rdoc
 - examples.rb
 - LICENSE
 files: 
@@ -146,7 +145,6 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- README.rdoc
 - Rakefile
 - examples.rb
 - lib/twilio-ruby.rb