rest 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8cbb0a7cbd9c37659715c57e9703664a550072a
-  data.tar.gz: 190a2eb2c0705d4c7cf5e8ca2934f93a35d7b12f
+  metadata.gz: 3f2c87b817f752f83b83d5109dbb13f6fa8147f9
+  data.tar.gz: fed1199968e17dc999261c36e772741a3003e2c9
 SHA512:
-  metadata.gz: e9c3e1dc1b074afab232bc522893f95a787ad467e7059edc1e5f819a0e9097f10a301fd6490ff921d3c943b64d5869e9f7307ee3959b2c833b361f5c26f48a07
-  data.tar.gz: a13e0091460d92d9e0e9ede4f03e6aaba55e0841b3861dbe942ef6ccdb38513c7712413ed0f3de0c047608e0bf985d2b3cdbdbf30dfd04a280fe502d29fa78cf
+  metadata.gz: 210627d380615bc20180dc3facf6baf06e9965236e1effbc03e4afa548a81c6bbd8e53eb5e1b7821ec7d9da7f3241742f44ea1d63c31214f1d074127f292d7ba
+  data.tar.gz: b55b83cc26bdd0c2b1c4cb6987cd2684d67492a14ca3d8f73a310765f881cdb0c68f4208b952c3f7b8ab0f09cf806ea7a15113d099a1948e2cd7bb9fa9f65cae

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    rest (2.2.0)
+    rest (2.6.0)
       rest-client (>= 0.3.0)
-      typhoeus (>= 0.5.4)
 
 GEM
   remote: https://rubygems.org/
@@ -36,4 +35,5 @@ DEPENDENCIES
   rake
   rest!
   test-unit
+  typhoeus (>= 0.5.4)
   uber_config

data/lib/rest/client.rb

@@ -57,7 +57,8 @@ module Rest
         @logger.debug "Using net-http-persistent gem."
       else
         @wrapper = Rest::Wrappers::RestClientWrapper.new
-        hint = (options[:gem] ? "" : " Please install 'typhoeus' or net-http-persistent gem for best performance.")
+        hint = (options[:gem] ? "" : " NOTICE: Please install 'typhoeus' gem for optimal performance.")
+        puts hint
         @logger.debug "Using rest-client gem.#{hint}"
       end
     end
@@ -67,12 +68,13 @@ module Rest
         require 'typhoeus'
         @gem = :typhoeus
       rescue LoadError => ex
+        @logger.debug "LoadError on typhoeus, trying net-http-persistent..."
         begin
           # try net-http-persistent
           require 'net/http/persistent'
           @gem = :net_http_persistent
         rescue LoadError => ex
-          raise ex
+          @logger.debug "LoadError on net-http-persistent, falling back to rest-client..."
         end
       end
       if @gem.nil?

data/lib/rest/version.rb

@@ -1,3 +1,3 @@
 module Rest
-  VERSION = "2.5.0"
+  VERSION = "2.6.0"
 end

data/lib/rest/wrappers/typhoeus_wrapper.rb

@@ -6,7 +6,7 @@ module Rest
 
     class TyphoeusTimeoutError < Rest::TimeoutError
       def initialize(response)
-        msg ||= "HTTP Request Timed out. Curl code: #{response.curl_return_code}. Curl error msg: #{response.curl_error_message}."
+        msg ||= "HTTP Request Timed out. Curl code: #{response.return_code}. Curl error msg: #{response.return_message}."
         super(msg)
       end
     end

data/rest.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.required_rubygems_version = ">= 1.3.6"
   gem.required_ruby_version = Gem::Requirement.new(">= 1.8")
   gem.add_runtime_dependency "rest-client", ">= 0.3.0"
-  gem.add_runtime_dependency "typhoeus", ">= 0.5.4"
 
+  gem.add_development_dependency "typhoeus", ">= 0.5.4"
   gem.add_development_dependency "net-http-persistent"
   gem.add_development_dependency "test-unit"
   gem.add_development_dependency "minitest"

data/test/test_base.rb

@@ -11,7 +11,7 @@ class TestBase < Test::Unit::TestCase
 
   def setup
     puts 'setup'
-    @rest = Rest::Client.new(:gem => :typhoeus, :log_level=>Logger::DEBUG)
+    @rest = Rest::Client.new(:gem => nil, :log_level=>Logger::DEBUG)
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -31,7 +31,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.4
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: