twilio-ruby 3.4.2 → 3.5.0

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

@@ -79,13 +79,15 @@ module Twilio
       #
       # Declare whether to verify the host's ssl cert when setting up the
       # connection to the above domain. Defaults to true, but can be turned off
-      # to avoid insecure connection warnings in environments without the proper
-      # cert validation chain.
+      # to avoid ssl certificate verification failures in environments without
+      # the necessary ca certificates.
       #
       # === <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.
+      # to verify Twilio's SSL certificate on each request. If not specified, a
+      # certificate bundle extraced from Firefox is packaged with the gem and
+      # used by default.
       #
       # === <tt>:timeout => 30</tt>
       #
@@ -111,7 +113,7 @@ module Twilio
       # === <tt>:proxy_pass => 'password'</tt>
       #
       # The password to use for authentication with the proxy. Defaults to nil.
-      def initialize(account_sid, auth_token, options = {})
+      def initialize(account_sid, auth_token, options={})
         @account_sid, @auth_token = account_sid.strip, auth_token.strip
         set_up_connection_from options
         set_up_subresources
@@ -148,7 +150,7 @@ module Twilio
       # body.
       #
       # Returns the raw Net::HTTP::Response object.
-      def request(uri, method = 'POST', params = {}) # :nodoc:
+      def request(uri, method='POST', params={}) # :nodoc:
         raise ArgumentError, 'Invalid path parameter' if uri.empty?
 
         uri = "/#{uri}" unless uri.start_with? '/'
@@ -179,19 +181,33 @@ module Twilio
       ##
       # Set up and cache a Net::HTTP object to use when making requests. This is
       # a private method documented for completeness.
-      def set_up_connection_from(options = {}) # :doc:
+      def set_up_connection_from(options={}) # :doc:
         config = {:host => 'api.twilio.com', :port => 443, :use_ssl => true,
           :ssl_verify_peer => true, :timeout => 30}.merge! options
         connection_class = Net::HTTP::Proxy config[:proxy_addr],
           config[:proxy_port], config[:proxy_user], config[:proxy_pass]
         @connection = connection_class.new config[:host], config[:port]
+        set_up_ssl_from config
+        @connection.open_timeout = options[:timeout]
+        @connection.read_timeout = options[:timeout]
+      end
+ 
+      ##
+      # Set up the ssl properties of the <tt>@connection</tt> Net::HTTP object.
+      # This is a private method documented for completeness.
+      def set_up_ssl_from(config) # :doc:
         @connection.use_ssl = config[:use_ssl]
-        @connection.ca_file = config[:ssl_ca_file]
-        unless config[:ssl_verify_peer]
+        if config[:ssl_verify_peer]
+          @connection.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          if config[:ssl_ca_file]
+            @connection.ca_file = config[:ssl_ca_file]
+          else
+            conf_dir = File.dirname(__FILE__) + '/../../../conf'
+            @connection.ca_file = conf_dir + '/cacert.pem'
+          end
+        else
           @connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
-        @connection.open_timeout = options[:timeout]
-        @connection.read_timeout = options[:timeout]
       end
 
       ##

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-  VERSION = '3.4.2'
+  VERSION = '3.5.0'
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 3
-  - 4
-  - 2
-  version: 3.4.2
+  - 5
+  - 0
+  version: 3.5.0
 platform: ruby
 authors: 
 - Andrew Benton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 -07:00
+date: 2012-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,6 +146,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- conf/cacert.pem
 - examples.rb
 - lib/twilio-ruby.rb
 - lib/twilio-ruby/rest/accounts.rb