restforce 1.0.3 → 1.0.4

data/lib/restforce/client.rb

@@ -15,7 +15,8 @@ module Restforce
     include Restforce::Client::API
 
     OPTIONS = [:username, :password, :security_token, :client_id, :client_secret, :host, :compress,
-       :api_version, :oauth_token, :refresh_token, :instance_url, :cache, :authentication_retries]
+       :api_version, :oauth_token, :refresh_token, :instance_url, :cache, :authentication_retries,
+       :timeout]
 
     # Public: Creates a new client instance
     #
@@ -47,6 +48,7 @@ module Restforce
     #                                  before raising an exception (default: 3).
     #
     #        :compress               - Set to true to have Salesforce compress the response (default: false).
+    #        :timeout                - Faraday connection request read/open timeout. (default: nil).
     #
     # Examples
     #
@@ -73,5 +75,9 @@ module Restforce
       @options = Hash[OPTIONS.map { |option| [option, Restforce.configuration.send(option)] }]
       @options.merge! opts
     end
+
+    def inspect
+      "#<#{self.class} @options=#{@options.inspect}>"
+    end
   end
 end

data/lib/restforce/client/connection.rb

@@ -19,7 +19,7 @@ module Restforce
 
       # Internal: Internal faraday connection where all requests go through
       def connection
-        @connection ||= Faraday.new(@options[:instance_url]) do |builder|
+        @connection ||= Faraday.new(@options[:instance_url], connection_options) do |builder|
           # Parses JSON into Hashie::Mash structures.
           builder.use      Restforce::Middleware::Mashify, self, @options
           # Handles multipart file uploads for blobs.
@@ -45,10 +45,21 @@ module Restforce
           # Compress/Decompress the request/response
           builder.use      Restforce::Middleware::Gzip, self, @options
 
-          builder.adapter  Faraday.default_adapter
+          builder.adapter  adapter
         end
       end
 
+      def adapter
+        Restforce.configuration.adapter
+      end
+
+      # Internal: Faraday Connection options
+      def connection_options
+        { :request => {
+            :timeout => @options[:timeout],
+            :open_timeout => @options[:timeout] } }
+      end
+
       # Internal: Returns true if the middlware stack includes the
       # Restforce::Middleware::Mashify middleware.
       def mashify?

data/lib/restforce/config.rb

@@ -66,6 +66,12 @@ module Restforce
     # Set to true if you want responses from Salesforce to be gzip compressed.
     attr_accessor :compress
 
+    # Faraday request read/open timeout.
+    attr_accessor :timeout
+
+    # Faraday adapter to use. Defaults to Faraday.default_adapter.
+    attr_accessor :adapter
+
     def api_version
       @api_version ||= '26.0'
     end
@@ -98,6 +104,10 @@ module Restforce
       @authentication_retries ||= 3
     end
 
+    def adapter
+      @adapter ||= Faraday.default_adapter
+    end
+
     def logger
       @logger ||= ::Logger.new STDOUT
     end

data/lib/restforce/version.rb

@@ -1,3 +1,3 @@
 module Restforce
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/spec/lib/config_spec.rb

@@ -22,8 +22,9 @@ describe Restforce do
       its(:api_version)            { should eq '26.0' }
       its(:host)                   { should eq 'login.salesforce.com' }
       its(:authentication_retries) { should eq 3 }
+      its(:adapter)                { should eq Faraday.default_adapter }
       [:username, :password, :security_token, :client_id, :client_secret,
-       :oauth_token, :refresh_token, :instance_url, :compress].each do |attr|
+       :oauth_token, :refresh_token, :instance_url, :compress, :timeout].each do |attr|
         its(attr) { should be_nil }
       end
     end
@@ -54,7 +55,7 @@ describe Restforce do
   end
 
   describe '#configure' do
-    [:username, :password, :security_token, :client_id, :client_secret, :compress,
+    [:username, :password, :security_token, :client_id, :client_secret, :compress, :timeout,
      :oauth_token, :refresh_token, :instance_url, :api_version, :host, :authentication_retries].each do |attr|
       it "allows #{attr} to be set" do
         Restforce.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restforce
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday