rest 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f2c87b817f752f83b83d5109dbb13f6fa8147f9
-  data.tar.gz: fed1199968e17dc999261c36e772741a3003e2c9
+  metadata.gz: f1afdece56690dfa86347a2d7bd953644e8b8d32
+  data.tar.gz: 281bc6cbbdf47f459525e393453d8fb901789da1
 SHA512:
-  metadata.gz: 210627d380615bc20180dc3facf6baf06e9965236e1effbc03e4afa548a81c6bbd8e53eb5e1b7821ec7d9da7f3241742f44ea1d63c31214f1d074127f292d7ba
-  data.tar.gz: b55b83cc26bdd0c2b1c4cb6987cd2684d67492a14ca3d8f73a310765f881cdb0c68f4208b952c3f7b8ab0f09cf806ea7a15113d099a1948e2cd7bb9fa9f65cae
+  metadata.gz: affe77b4760847ba758fe5f671fdcd05676d6046c70a58fa6f7258e32f1e336abb38154056a3f3d455eddc2333075dd59893bd1ed2d74b91c34ae42bfbec93b1
+  data.tar.gz: 28e8c4852078a9f5d4788fb52a66604837c047e41cae072781737a32a67274ffc21a0e683446ad803a4fc48b405d2b0b4bda612c850f69ef2008668e2f938366

data/Gemfile.lock

@@ -2,26 +2,27 @@ PATH
   remote: .
   specs:
     rest (2.6.0)
+      net-http-persistent
       rest-client (>= 0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ethon (0.5.10)
-      ffi (~> 1.3.0)
+    ethon (0.5.12)
+      ffi (>= 1.3.0)
       mime-types (~> 1.18)
-    excon (0.20.0)
-    ffi (1.3.1)
-    mime-types (1.21)
-    minitest (4.6.2)
+    excon (0.21.0)
+    ffi (1.8.1)
+    mime-types (1.23)
+    minitest (5.0.0)
     net-http-persistent (2.8)
     quicky (0.4.0)
-    rake (10.0.3)
+    rake (10.0.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     test-unit (2.5.4)
-    typhoeus (0.6.2)
-      ethon (~> 0.5.10)
+    typhoeus (0.6.3)
+      ethon (~> 0.5.11)
     uber_config (1.0.5)
 
 PLATFORMS
@@ -30,7 +31,6 @@ PLATFORMS
 DEPENDENCIES
   excon
   minitest
-  net-http-persistent
   quicky (>= 0.4.0)
   rake
   rest!

data/lib/rest.rb

@@ -1 +1,16 @@
+module Rest
+  def self.ruby_major
+    RUBY_VERSION.split('.')[0].to_i
+  end
+  def self.ruby_minor
+    RUBY_VERSION.split('.')[1].to_i
+  end
+end
+
+# 1.8 support
+if Rest.ruby_major == 1 && Rest.ruby_minor == 8
+  require 'rubygems'
+  gem 'json'
+end
+
 require File.expand_path('rest/client', File.dirname(__FILE__))

data/lib/rest/client.rb

@@ -16,12 +16,35 @@ module Rest
 
   require 'rest/wrappers/base_wrapper'
 
+  @@logger = Logger.new(STDOUT)
+
   def self.logger=(logger)
-    @logger = logger
+    @@logger = logger
   end
 
   def self.logger()
-    @logger
+    @@logger
+  end
+
+
+  class BackingGem
+    attr_accessor :name, :gem_name
+
+    def initialize(name, gem_name)
+      @name = name
+      @gem_name = gem_name
+    end
+
+  end
+
+  # setup metadata about backing gem options
+  @@backing_gems = {}
+  @@backing_gems[:typhoeus] = BackingGem.new(:typhoeus, 'typhoeus')
+  @@backing_gems[:rest_client] = BackingGem.new(:rest_client, 'rest_client')
+  @@backing_gems[:net_http_persistent] = BackingGem.new(:net_http_persistent, 'net/http/persistent')
+
+  def self.backing_gems
+    @@backing_gems
   end
 
   class Client
@@ -32,10 +55,8 @@ module Rest
     #
     def initialize(options={})
       @options = options
-      # todo: initialize this as module variable above
-      @logger = Logger.new(STDOUT)
-      @logger.level = options[:log_level] || Logger::INFO
-      Rest.logger = @logger
+
+      @logger = Rest.logger
 
       @gem = options[:gem] if options[:gem]
 
@@ -57,30 +78,37 @@ module Rest
         @logger.debug "Using net-http-persistent gem."
       else
         @wrapper = Rest::Wrappers::RestClientWrapper.new
-        hint = (options[:gem] ? "" : " NOTICE: Please install 'typhoeus' gem for optimal performance.")
+        hint = (options[:gem] ? "" : "NOTICE: Please install 'typhoeus' gem or upgrade to Ruby 2.X for optimal performance.")
         puts hint
-        @logger.debug "Using rest-client gem.#{hint}"
+        @logger.debug "Using rest-client gem. #{hint}"
       end
     end
 
     def choose_best_gem
-      begin
-        require 'typhoeus'
-        @gem = :typhoeus
-      rescue LoadError => ex
-        @logger.debug "LoadError on typhoeus, trying net-http-persistent..."
+      gems_to_try = []
+      #puts "Ruby MAJOR: #{Rest.ruby_major}"
+      if Rest.ruby_major >= 2
+        gems_to_try << :net_http_persistent
+        gems_to_try << :typhoeus
+        gems_to_try << :rest_client
+      else
+        # net-http-persistent has issues with ssl and keep-alive connections on ruby < 1.9.3p327
+        gems_to_try << :typhoeus
+        gems_to_try << :rest_client
+      end
+      gems_to_try.each_with_index do |g, i|
+        bg = Rest.backing_gems[g]
         begin
-          # try net-http-persistent
-          require 'net/http/persistent'
-          @gem = :net_http_persistent
+          require bg.gem_name
+          @gem = bg.name
+          return @gem
         rescue LoadError => ex
-          @logger.debug "LoadError on net-http-persistent, falling back to rest-client..."
+          if (i+1) >= gems_to_try.length
+            raise ex
+          end
+          @logger.debug "LoadError on #{bg.name}, trying #{Rest.backing_gems[gems_to_try[i+1]].name}..."
         end
       end
-      if @gem.nil?
-        require 'rest_client'
-        @gem = :rest_client
-      end
     end
 
     def get(url, req_hash={})

data/lib/rest/errors.rb

@@ -7,16 +7,14 @@ module Rest
   end
 
   class HttpError < RestError
-    def initialize(response)
-      super("#{response.code} Error")
-      @response = response
-    end
+    attr_reader :response, :code
+    attr_accessor :options
 
-    def response
-      @response
-    end
-    def code
-      response.code
+    def initialize(response, code, options={})
+      super("#{code} Error")
+      @response = response
+      @code = code
+      @options = options
     end
 
     def to_s

data/lib/rest/version.rb

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

data/lib/rest/wrappers/excon_wrapper.rb

@@ -63,7 +63,7 @@ module Rest
         r2 = conn.request(req_hash)
         response = ExconResponseWrapper.new(r2)
         if response.code >= 400
-          raise HttpError.new(response)
+          raise HttpError.new(response, response.code)
         end
         response
       end
@@ -76,7 +76,7 @@ module Rest
           to_json_parts(req_hash)
           response = excon_request(url, req_hash)
         rescue RestClient::Exception => ex
-          raise HttpError.new(ex)
+          raise HttpError.new(ex.response, ex.http_code)
         end
         response
       end

data/lib/rest/wrappers/net_http_persistent_wrapper.rb

@@ -93,7 +93,7 @@ module Rest
           r = NetHttpPersistentResponseWrapper.new(response)
           case response
             when Net::HTTPClientError, Net::HTTPServerError
-              raise Rest::HttpError.new(r)
+              raise Rest::HttpError.new(r, r.code.to_i)
           end
           #  when Net::HTTPRedirection
           #    @client.logger.debug "moved to #{response['location']}"
@@ -143,7 +143,7 @@ module Rest
         r = NetHttpPersistentResponseWrapper.new(response)
         case response
           when Net::HTTPClientError, Net::HTTPServerError
-            raise Rest::HttpError.new(r)
+            raise Rest::HttpError.new(r, r.code.to_i)
         end
         r
       end
@@ -167,7 +167,7 @@ module Rest
         r = NetHttpPersistentResponseWrapper.new(response)
         case response
           when Net::HTTPClientError, Net::HTTPServerError
-            raise Rest::HttpError.new(r)
+            raise Rest::HttpError.new(r, r.code.to_i)
         end
         r
       end
@@ -183,7 +183,7 @@ module Rest
         r = NetHttpPersistentResponseWrapper.new(response)
         case response
           when Net::HTTPClientError, Net::HTTPServerError
-            raise Rest::HttpError.new(r)
+            raise Rest::HttpError.new(r, r.code.to_i)
         end
         r
       end

data/lib/rest/wrappers/rest_client_wrapper.rb

@@ -7,7 +7,7 @@ module Rest
       attr_reader :ex
 
       def initialize(ex)
-        super(ex.response)
+        super(ex.response, ex.http_code)
         @ex = ex
       end
     end

data/lib/rest/wrappers/typhoeus_wrapper.rb

@@ -63,7 +63,7 @@ module Rest
           # 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)
+          raise Rest::HttpError.new(r, r.code)
         end
       end
 

data/rest.gemspec

@@ -17,9 +17,9 @@ 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_development_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"

data/test/test_base.rb

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

data/test/test_rest.rb

@@ -16,7 +16,7 @@ class TestRest < TestBase
     p response.code
     assert response.code == 200
     p response.body
-    assert response.body.include?("Explore GitHub")
+    assert response.body.include?("Explore")
   end
 
   def test_backoff
@@ -69,7 +69,7 @@ class TestRest < TestBase
         assert ex.is_a?(Rest::HttpError)
         assert ex.response
         assert ex.response.body
-        assert ex.code == 404
+        assert_equal 404, ex.code
         assert ex.response.body.include?("404")
         assert ex.to_s.include?("404")
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Rest client wrapper that chooses best installed client.