Fix timeout bug; lock faraday dependency to version < 0.10

sferik · Jan 6, 2013 · 01e2781 · 01e2781
1 parent 70c05b1
commit 01e2781
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/lib/twitter/default.rb b/lib/twitter/default.rb
@@ -1,4 +1,5 @@
 require 'faraday'
+require 'faraday/request/multipart'
 require 'twitter/configurable'
 require 'twitter/error/client_error'
 require 'twitter/error/server_error'
@@ -13,12 +14,15 @@ module Default
     CONNECTION_OPTIONS = {
       :headers => {
         :accept => 'application/json',
-        :user_agent => "Twitter Ruby Gem #{Twitter::Version}"
+        :user_agent => "Twitter Ruby Gem #{Twitter::Version}",
+      },
+      :request => {
+        :open_timeout => 5,
+        :timeout => 10,
+      },
+      :ssl => {
+        :verify => false
       },
-      :open_timeout => 5,
-      :raw => true,
-      :ssl => {:verify => false},
-      :timeout => 10,
     } unless defined? Twitter::Default::CONNECTION_OPTIONS
     IDENTITY_MAP = false unless defined? Twitter::Default::IDENTITY_MAP
     MIDDLEWARE = Faraday::Builder.new do |builder|

diff --git a/twitter.gemspec b/twitter.gemspec
@@ -2,9 +2,9 @@
 require File.expand_path('../lib/twitter/version', __FILE__)
 
 Gem::Specification.new do |spec|
-  spec.add_dependency 'faraday', '~> 0.8'
-  spec.add_dependency 'multi_json', '~> 1.3'
-  spec.add_dependency 'simple_oauth', '~> 0.2'
+  spec.add_dependency 'faraday',      ['~> 0.8', '< 0.10']
+  spec.add_dependency 'multi_json',   ['~> 1.3']
+  spec.add_dependency 'simple_oauth', ['~> 0.2']
   spec.add_development_dependency 'kramdown'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'simplecov'