rest 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba15d81f6c76785edf3428a260a198255381a560
-  data.tar.gz: 6fc466049561186c8a9630dbb378829e720564d9
+  metadata.gz: 880fe5136cd250c97eb7862c93a4b296a4f9b9ad
+  data.tar.gz: 02dac2153fbc8a86bab768b732547604d19a2c21
 SHA512:
-  metadata.gz: 62942db61c51d3778091b33cd10e948d731376778ae6d087c443544b64e96260c8c574dcbb57c9ce81d062c98f19be5d92c40db34f1f878994c72299bbde5ff8
-  data.tar.gz: 356f07a9816be48f97650bf97ab5d7ab81366217ebb835ebffdfdbe1990128dffd96fb17a522de84d3e88855174407189a60e2419593c97018f4b8a5ca7273bb
+  metadata.gz: 8087772b56f2ceebcde26485b8b3a16a2e3cf4ff77ba4e1e6c6ac42a512690b53b056d59bc28c1de0c43529da19d5bad2609af15813851f02ed8b9ae347acfb7
+  data.tar.gz: 4ffccb545451c80d261cca8071c41c3f2d69e387fb30419106f7c300832fa82447be3213f6dbfffc39a87b25f3cf4884c4e0353771d016d2a15e8b192e1a291b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest (3.0.3)
+    rest (3.0.5)
       net-http-persistent (>= 2.9.1)
       netrc
 

data/lib/rest/client.rb

@@ -50,6 +50,7 @@ module Rest
   class Client
 
     attr_accessor :options, :logger, :gem
+    attr_reader :wrapper
     # options:
     # - :gem => specify gem explicitly
     #
@@ -70,7 +71,7 @@ module Rest
         @logger.debug "Using excon gem."
       elsif @gem == :typhoeus
         require File.expand_path('wrappers/typhoeus_wrapper', File.dirname(__FILE__))
-        @wrapper = Rest::Wrappers::TyphoeusWrapper.new
+        @wrapper = Rest::Wrappers::TyphoeusWrapper.new(self)
         @logger.debug "Using typhoeus gem."
       elsif @gem == :net_http_persistent
         require File.expand_path('wrappers/net_http_persistent_wrapper', File.dirname(__FILE__))
@@ -79,13 +80,15 @@ module Rest
       elsif @gem == :rest_client
         require File.expand_path('wrappers/rest_client_wrapper', File.dirname(__FILE__))
         @wrapper = Rest::Wrappers::RestClientWrapper.new
-        hint = (options[:gem] ? "" : "NOTICE: Please install 'typhoeus' gem or upgrade to Ruby 2.X for optimal performance.")
+        hint = (options[:gem] ? "" : "NOTICE: Please upgrade to Ruby 2.X for optimal performance.")
         puts hint
         @logger.debug "Using rest-client gem. #{hint}"
+        RestClient.proxy = options[:http_proxy] if options[:http_proxy]
       else # use internal client
         require File.expand_path('wrappers/internal_client_wrapper', File.dirname(__FILE__))
         @wrapper = Rest::Wrappers::InternalClientWrapper.new
         @logger.debug "Using rest internal client. #{hint}"
+        InternalClient.proxy = options[:http_proxy] if options[:http_proxy]
       end
     end
 

data/lib/rest/version.rb

@@ -1,3 +1,3 @@
 module Rest
-  VERSION = "3.0.4"
+  VERSION = "3.0.5"
 end

data/lib/rest/wrappers/net_http_persistent_wrapper.rb

@@ -54,7 +54,8 @@ module Rest
 
       def initialize(client)
         @client = client
-        @http = Net::HTTP::Persistent.new 'rest_gem'
+        @http = Net::HTTP::Persistent.new('rest_gem')
+        @http.proxy = URI(@client.options[:http_proxy]) if @client.options[:http_proxy]
         @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
 

data/lib/rest/wrappers/typhoeus_wrapper.rb

@@ -33,6 +33,10 @@ module Rest
 
     class TyphoeusWrapper < BaseWrapper
 
+      def initialize(client)
+        @client = client
+      end
+
       def default_typhoeus_options
         req_hash = {}
         # todo: should change this timeout to longer if it's for posting file
@@ -46,6 +50,7 @@ module Rest
 
       def get(url, req_hash={})
         req_hash = default_typhoeus_options.merge(req_hash)
+        req_hash[:proxy] = @client.options[:http_proxy] if @client.options[:http_proxy]
         # puts "REQ_HASH=" + req_hash.inspect
         response = Typhoeus::Request.get(url, req_hash)
         #p response

data/test/tmp.rb

@@ -8,7 +8,6 @@ class TestTemp < TestBase
 
   end
 
-
   def test_post_file
     r = @rest.post_file("http://httpbin.org/post", :params=>{:q => "Rick Astley"})
     p r

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent