rest 2.2.0 → 2.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f8cbb0a7cbd9c37659715c57e9703664a550072a
+  data.tar.gz: 190a2eb2c0705d4c7cf5e8ca2934f93a35d7b12f
+SHA512:
+  metadata.gz: e9c3e1dc1b074afab232bc522893f95a787ad467e7059edc1e5f819a0e9097f10a301fd6490ff921d3c943b64d5869e9f7307ee3959b2c833b361f5c26f48a07
+  data.tar.gz: a13e0091460d92d9e0e9ede4f03e6aaba55e0841b3861dbe942ef6ccdb38513c7712413ed0f3de0c047608e0bf985d2b3cdbdbf30dfd04a280fe502d29fa78cf

data/Gemfile.lock

@@ -2,27 +2,27 @@ PATH
   remote: .
   specs:
     rest (2.2.0)
-      net-http-persistent
       rest-client (>= 0.3.0)
+      typhoeus (>= 0.5.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ethon (0.5.7)
-      ffi (~> 1.2.0)
+    ethon (0.5.10)
+      ffi (~> 1.3.0)
       mime-types (~> 1.18)
-    excon (0.16.10)
-    ffi (1.2.1)
-    mime-types (1.19)
-    minitest (4.4.0)
+    excon (0.20.0)
+    ffi (1.3.1)
+    mime-types (1.21)
+    minitest (4.6.2)
     net-http-persistent (2.8)
     quicky (0.4.0)
     rake (10.0.3)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    test-unit (2.5.3)
-    typhoeus (0.5.4)
-      ethon (~> 0.5.7)
+    test-unit (2.5.4)
+    typhoeus (0.6.2)
+      ethon (~> 0.5.10)
     uber_config (1.0.5)
 
 PLATFORMS
@@ -31,9 +31,9 @@ PLATFORMS
 DEPENDENCIES
   excon
   minitest
+  net-http-persistent
   quicky (>= 0.4.0)
   rake
   rest!
   test-unit
-  typhoeus (>= 0.5.4)
   uber_config

data/README.md

@@ -36,8 +36,8 @@ To choose a specific underlying http client lib:
 
 Supported http libraries are:
 
-* rest-client
-* net-http-persistent
+* rest_client
+* net_http_persistent
 * typhoeus
 
 Then use it:

data/lib/rest.rb

@@ -1 +1 @@
-require 'rest/client'
+require File.expand_path('rest/client', File.dirname(__FILE__))

data/lib/rest/client.rb

@@ -34,7 +34,7 @@ module Rest
       @options = options
       # todo: initialize this as module variable above
       @logger = Logger.new(STDOUT)
-      @logger.level = Logger::INFO
+      @logger.level = options[:log_level] || Logger::INFO
       Rest.logger = @logger
 
       @gem = options[:gem] if options[:gem]
@@ -44,15 +44,15 @@ module Rest
       end
 
       if @gem == :excon
-        require 'rest/wrappers/excon_wrapper'
+        require File.expand_path('wrappers/excon_wrapper', File.dirname(__FILE__))
         @wrapper = Rest::Wrappers::ExconWrapper.new(self)
         @logger.debug "Using excon gem."
       elsif @gem == :typhoeus
-        require 'rest/wrappers/typhoeus_wrapper'
+        require File.expand_path('wrappers/typhoeus_wrapper', File.dirname(__FILE__))
         @wrapper = Rest::Wrappers::TyphoeusWrapper.new
         @logger.debug "Using typhoeus gem."
       elsif @gem == :net_http_persistent
-        require 'rest/wrappers/net_http_persistent_wrapper'
+        require File.expand_path('wrappers/net_http_persistent_wrapper', File.dirname(__FILE__))
         @wrapper = Rest::Wrappers::NetHttpPersistentWrapper.new(self)
         @logger.debug "Using net-http-persistent gem."
       else
@@ -64,7 +64,6 @@ module Rest
 
     def choose_best_gem
       begin
-        raise LoadError
         require 'typhoeus'
         @gem = :typhoeus
       rescue LoadError => ex
@@ -73,6 +72,7 @@ module Rest
           require 'net/http/persistent'
           @gem = :net_http_persistent
         rescue LoadError => ex
+          raise ex
         end
       end
       if @gem.nil?
@@ -97,13 +97,14 @@ module Rest
       max_retries = options[:max_retries] || 5
       max_follows = options[:max_follows] || 10
       if options[:follow_count] && options[:follow_count] >= max_follows
-        raise Rest::RestError "Too many follows. #{options[:follow_count]}"
+        raise Rest::RestError, "Too many follows. #{options[:follow_count]}"
       end
       current_retry = 0
       current_follow = 0
       success = false
       tries = 0
       res = nil
+      #  todo: typhoeus does retries in the library so it shouldn't do retries here. And we should use the max_retries here as a parameter to typhoeus
       while current_retry < max_retries && current_follow < max_follows do
         tries += 1
         begin

data/lib/rest/version.rb

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

data/lib/rest/wrappers/typhoeus_wrapper.rb

@@ -39,7 +39,8 @@ module Rest
         req_hash[:connecttimeout] = 5000
         req_hash[:timeout] = 10000
         req_hash[:followlocation] = true
-        req_hash[:maxredirs] = 2
+        req_hash[:maxredirs] = 3
+        req_hash[:accept_encoding] = 'gzip'
         req_hash
       end
 
@@ -53,14 +54,17 @@ module Rest
       end
 
       def handle_response(response)
-        if response.timed_out?
-          raise TyphoeusTimeoutError.new(response)
-        end
         r = TyphoeusResponseWrapper.new(response)
-        if response.code >= 400
+        if response.success?
+          return r
+        elsif response.timed_out?
+          raise TyphoeusTimeoutError.new(response)
+        elsif response.code == 0
+          # Could not get an http response, something's wrong.
+          raise Rest::RestError.new("Could not get a response. Curl error 0.")
+        else
           raise Rest::HttpError.new(r)
         end
-        r
       end
 
       def post(url, req_hash={})

data/rest.gemspec

@@ -17,13 +17,13 @@ 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 "net-http-persistent"
+  gem.add_runtime_dependency "typhoeus", ">= 0.5.4"
 
+  gem.add_development_dependency "net-http-persistent"
   gem.add_development_dependency "test-unit"
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "uber_config"
-  gem.add_development_dependency "typhoeus", ">= 0.5.4"
   gem.add_development_dependency "quicky", ">= 0.4.0"
   gem.add_development_dependency "excon"
 

data/test/test_base.rb

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

data/test/test_performance.rb

@@ -1,8 +1,7 @@
 require 'test/unit'
 require 'yaml'
 require 'quicky'
-
-require 'test_base'
+require File.expand_path('test_base', File.dirname(__FILE__))
 
 class TestPerformance < TestBase
   def setup
@@ -13,11 +12,11 @@ class TestPerformance < TestBase
   def test_get_performance
     puts 'test_get_performance'
 
-    times = 20
+    times = 100
 
     quicky = Quicky::Timer.new
 
-    to_run = [:typhoeus, :rest_client, :net_http_persistent, :excon]
+    to_run = [:typhoeus, :rest_client, :net_http_persistent]
     to_run.each do |gem|
       run_perf(quicky, times, gem)
     end

data/test/test_rest.rb

@@ -2,7 +2,7 @@
 
 require 'test/unit'
 require 'yaml'
-require 'test_base'
+require File.expand_path('test_base', File.dirname(__FILE__))
 
 class TestRest < TestBase
   def setup
@@ -158,7 +158,7 @@ class TestRest < TestBase
   end
 
   def test_form_post
-    r = @rest.post("http://google.com/search", :params=>{:q => "Rick Astley"})
+    r = @rest.post("http://rest-test.iron.io/code/200", :params=>{:q => "Rick Astley"})
     p r
   end
 
@@ -174,5 +174,12 @@ class TestRest < TestBase
     assert res.body.include?("items")
   end
 
+  def test_bad_host
+    puts "test bad host"
+    # OpenDNS, YOU SUCK!
+    r = @rest.get("http://something-that-is-not-here.com", :params=>{:q => "Rick Astley"})
+    p r
+  end
+
 end
 

metadata

@@ -1,158 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: rest
 version: !ruby/object:Gem::Version
-  version: 2.2.0
-  prerelease: 
+  version: 2.5.0
 platform: ruby
 authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uber_config
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: uber_config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: quicky
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Rest client wrapper that chooses best installed client.
@@ -184,27 +165,26 @@ files:
 - test/tmp.rb
 homepage: https://github.com/iron-io/rest
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rest client wrapper that chooses best installed client.
 test_files:
 - test/test_base.rb