Merge pull request #32 from gabceb/weary-relax-dependencies

Relax dependencies
mwunsch · Apr 15, 2013 · 20d6379 · 20d6379
2 parents c3d5ae6 + bdfbf17
commit 20d6379
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 65 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/Gemfile.lock
 .DS_Store
 pkg/
 doc/

diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gem "excon"
 
 group :test do
   gem "rspec", "~> 2.11.0"
-  gem "webmock", "~> 1.8.10"
+  gem "webmock", "~> 1.8"
 end
 
 group :doc do
@@ -20,5 +20,5 @@ platforms :jruby do
 end
 
 platforms :mri, :jruby do
-  gem "typhoeus"
+  gem "typhoeus", "~> 0.5"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/lib/weary/adapters/typhoeus.rb b/lib/weary/adapters/typhoeus.rb
@@ -8,7 +8,7 @@ class << self
         include Weary::Adapter
 
         def connect(rack_request)
-          response = ::Typhoeus::Request.run(rack_request.url, parameters_for(rack_request))
+          response = ::Typhoeus::Request.new(rack_request.url, parameters_for(rack_request)).run
           Rack::Response.new response.body, response.code, response.headers_hash
         end
 

diff --git a/weary.gemspec b/weary.gemspec
@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "addressable", "~> 2.3.2"
   s.add_runtime_dependency "promise", "~> 0.3.0"
   s.add_runtime_dependency "simple_oauth", "~> 0.1.5"
-  s.add_runtime_dependency "multi_json", "~> 1.5.0"
+  s.add_runtime_dependency "multi_json", "~> 1.5"
 end