glebtv-httpclient 3.2.4 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67da2be91a12b0b8e107d865eea78fca6118bf5c
-  data.tar.gz: 9ffc63296d22b328aab17af7832060cd3894c1f1
+  metadata.gz: d57dc51e3125fe47a5913b35f918f7de23a198b3
+  data.tar.gz: b246d47f730cb1da959fab0574674fd1e2046ddd
 SHA512:
-  metadata.gz: 78f6a87dfda29f7ee7cf46d812b6b3af37419ebf9088898c6b994c129a2e4b4692cfd19f276dfba61c71a590a0a0795f0c50f1d702d6b8251c032014d7b805d2
-  data.tar.gz: 97e997886c7c72cb855783e94bd95b2cd8425af4f72e5d178c4dc1846dd6451d680cef33cfaa4d7fd632b90e22aca106dec5ec237546a03fa30a03a5a2cf6c8f
+  metadata.gz: 494ab4ac5e4357fec105b6d48b74f6b494d05e7343344f8f37c09e22d176f052716239c1953d3a293091e81e7b7876fa0c2560cc441f0d149bbb773d7238396e
+  data.tar.gz: 7ff5805d66e3d6cf6602152c246799c7656a109708dbf6d215cc633a23b7823b44998ec8895a60c3f1073c6272d2af0023493084c56b23e6365605dedb7f3adb

data/Gemfile.lock

@@ -1,12 +1,17 @@
 PATH
   remote: .
   specs:
-    glebtv-httpclient (3.2.3)
+    glebtv-httpclient (3.2.5)
       lru_redux
 
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
@@ -16,11 +21,12 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.3)
     ffi2-generators (0.1.1)
+    i18n (0.6.9)
     json (1.8.1)
     lru_redux (0.8.1)
     mime-types (2.2)
     multi_json (1.9.2)
-    rake (10.2.2)
+    rake (10.3.0)
     rdoc (4.1.1)
       json (~> 1.4)
     rest-client (1.6.7)
@@ -33,6 +39,13 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
+    rspecify (0.1.7)
+      activesupport (>= 3.0)
+      i18n (~> 0.6.0)
+      ruby_parser (~> 2.3.1)
+      ruby_scribe (~> 0.1.4)
+      ruby_transform (~> 0.1.4)
+      thor (~> 0.13)
     rubinius-coverage (2.0.3)
     rubinius-debugger (2.0.3)
     rubinius-developer_tools (2.0.0)
@@ -40,6 +53,19 @@ GEM
       rubinius-debugger (~> 2.0)
       rubinius-profiler (~> 2.0)
     rubinius-profiler (2.0.1)
+    ruby_parser (2.3.1)
+      sexp_processor (~> 3.0)
+    ruby_scribe (0.1.5)
+      activesupport (~> 3.0)
+      i18n (~> 0.6.0)
+      ruby_parser (~> 2.3.1)
+      thor (~> 0.13)
+    ruby_transform (0.1.5)
+      activesupport (>= 3.0)
+      i18n (~> 0.6.0)
+      ruby_parser (~> 2.3.1)
+      ruby_scribe (~> 0.1.4)
+      thor (~> 0.13)
     rubysl (2.0.15)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
@@ -242,6 +268,7 @@ GEM
     rubysl-xmlrpc (2.0.0)
     rubysl-yaml (2.0.4)
     rubysl-zlib (2.0.1)
+    sexp_processor (3.2.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -258,12 +285,14 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
+  climate_control
   coveralls
   glebtv-httpclient!
   jruby-openssl
   rake
   rdoc
   rspec
+  rspecify
   rubinius-developer_tools
   rubysl (~> 2.0)
   test-unit

data/httpclient.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rdoc'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'climate_control'
+  spec.add_development_dependency 'rspecify'
 end

data/lib/httpclient/session.rb

@@ -816,30 +816,33 @@ class HTTPClient
       socket = nil
       begin
         @debug_dev << "! CONNECT TO #{site.host}:#{site.port}\n" if @debug_dev
+        raise HTTPClient::BadURIError.new('Unable to get hostname from URI') if site.host.nil?
         clean_host = site.host.delete("[]")
-        clean_local = @socket_local.host.delete("[]")
         if str = @test_loopback_http_response.shift
           socket = LoopBackSocket.new(clean_host, site.port, str)
         else
           begin
-            ip = IPAddr.new(clean_host).to_s
-            # puts "! #{site.host} IS AN IP!\n"
-            # @debug_dev <<  "! #{site.host} IS AN IP!\n" if @debug_dev
+            ips = [ IPAddr.new(clean_host) ]
           rescue
-            ip = HTTPClient.dns_cache.fetch clean_host do
+            ips = HTTPClient.dns_cache.fetch clean_host do
               Timeout.timeout(10) do
-                # @debug_dev << "! RESOLVING #{clean_host}" if @debug_dev
-                ip = Resolv.getaddress(clean_host)
-                # puts "! RESOLVED #{clean_host} TO #{ip}\n"
-                # @debug_dev << "! RESOLVED #{clean_host} TO #{ip}\n" if @debug_dev
-                ip
+                Resolv.getaddresses(clean_host)
               end
             end
           end
 
           if @socket_local == Site::EMPTY
-            socket = TCPSocket.new(ip, site.port)
+            socket = TCPSocket.new(ips.first.to_s, site.port)
           else
+            clean_local = @socket_local.host.delete("[]").to_s
+            if IPAddr.new(clean_local).ipv6?
+              ip = ips.select { |i| IPAddr.new(i).ipv6? }.first
+            else
+              ip = ips.select { |i| IPAddr.new(i).ipv4? }.first
+            end
+            if ip.nil?
+              raise HTTPClient::BadIPProtoError.new("Unable to select matching source and destination ip addresses (v4/v6) for connecting to #{ips.join(',')} from #{clean_local}")
+            end
             socket = TCPSocket.new(ip, site.port, clean_local, @socket_local.port)
           end
         end

data/lib/httpclient/version.rb

@@ -1,3 +1,3 @@
 class HTTPClient
-  VERSION = '3.2.4' unless defined?(VERSION)
+  VERSION = '3.2.6' unless defined?(VERSION)
 end

data/lib/httpclient.rb

@@ -260,6 +260,14 @@ class HTTPClient
       @res = res
     end
   end
+  
+  # Raised for indicating bad URIs
+  class BadURIError < RuntimeError
+  end
+
+  # Raised when trying to request with bad proto
+  class BadIPProtoError < RuntimeError
+  end
 
   # Raised for indicating a timeout error.
   class TimeoutError < RuntimeError

data/spec/basic_spec.rb

@@ -0,0 +1,326 @@
+# coding: utf-8
+require 'spec_helper'
+
+describe HTTPClient do
+  before :each do
+    @client = HTTPClient.new
+  end
+
+  describe 'GET' do
+    it 'performs normal GET' do
+      HTTPClient.new.get(@srv.u('servlet')) do |s|
+        s.should eq 'get'
+      end
+    end
+    
+    it 'raises if bad URI' do
+      expect { HTTPClient.get_content '/z/' }.to raise_error(HTTPClient::BadURIError)
+    end
+    
+    describe '#download_file' do
+      it 'writes to file' do
+        file = Tempfile.new('httpcl')
+        HTTPClient.new.download_file(@srv.u('largebody'), file.path)
+        file.read.length.should eq 1_000_000
+      end
+
+      it 'compressed' do
+        file = Tempfile.new('httpcl')
+        @client.download_file(@srv.u('compressed?enc=gzip'), file.path)
+        file.read.length.should eq 25
+      end
+
+      it 'compressed transparent' do
+        @client.transparent_gzip_decompression = true
+
+        file = Tempfile.new('httpcl')
+        @client.download_file(@srv.u('compressed?enc=gzip'), file.path)
+        cnt = file.read
+        cnt.length.should eq 5
+        cnt.should eq 'hello'
+
+        @client.download_file(@srv.u('compressed?enc=deflate'), file.path)
+        cnt = file.read
+        cnt.length.should eq 5
+        cnt.should eq 'hello'
+      end
+
+      it 'compressed large' do
+        file = Tempfile.new('httpcl')
+        @client.transparent_gzip_decompression = true
+
+        content = @client.download_file(@srv.u('compressed_large?enc=gzip'), file.path)
+        file.read.should eq LARGE_STR
+
+        content = @client.download_file(@srv.u('compressed_large?enc=deflate'), file.path)
+        file.read.should eq LARGE_STR
+      end
+    end
+
+    describe '#get_content' do
+      it 'normal' do
+        @client.get_content(@srv.u('hello')).should eq 'hello'
+        @client.get_content(@srv.u('redirect1')).should eq 'hello'
+        @client.get_content(@srv.u('redirect2')).should eq 'hello'
+      end
+
+      it '127.0.0.1' do
+        url = @srv.u.sub(/localhost/, '127.0.0.1')
+        @client.get_content(url + 'hello').should eq 'hello'
+        @client.get_content(url + 'redirect1').should eq 'hello'
+        @client.get_content(url + 'redirect2').should eq 'hello'
+      end
+
+      it 'redirect callback' do
+        called = false
+        @client.redirect_uri_callback = lambda { |uri, res|
+          newuri = res.header['location'][0]
+          called = true
+          newuri
+        }
+
+        @client.get_content(@srv.u('relative_redirect')).should eq 'hello'
+        called.should be_true
+      end
+
+      it 'errors' do
+        expect {
+          @client.get_content(@srv.u 'notfound')
+        }.to raise_error(HTTPClient::BadResponseError)
+
+        expect {
+          @client.get_content(@srv.u 'redirect_self')
+        }.to raise_error(HTTPClient::BadResponseError)
+      end
+
+      it 'with block' do
+        @client.get_content(@srv.u 'hello') do |str|
+          str.should eq 'hello' 
+        end
+        @client.get_content(@srv.u + 'redirect1') do |str|
+          str.should eq 'hello' 
+        end
+        @client.get_content(@srv.u + 'redirect2') do |str|
+          str.should eq 'hello' 
+        end
+      end
+
+      it 'compressed' do
+        @client.transparent_gzip_decompression = false
+
+        content = @client.get_content(@srv.u 'compressed?enc=gzip')
+        content.should_not eq 'hello'
+        content.should eq GZIP_CONTENT
+        @client.transparent_gzip_decompression = true
+
+        content = @client.get_content(@srv.u 'compressed?enc=gzip')
+        content.should eq 'hello'
+
+        content = @client.get_content(@srv.u 'compressed?enc=deflate')
+        content.should eq 'hello'
+      end
+
+      it 'compressed large' do
+        @client.transparent_gzip_decompression = true
+
+        content = @client.get_content(@srv.u 'compressed_large?enc=gzip')
+        content.should eq LARGE_STR
+
+        content = @client.get_content(@srv.u 'compressed_large?enc=deflate')
+        content.should eq LARGE_STR
+      end
+    end
+  end
+  describe 'request' do
+    describe 'get with block' do
+      it 'works with filter_block: true' do
+        @client.request(:get, @srv.u('hello')) do |str|
+          str.should eq 'hello' 
+        end
+      end
+      it 'works with filter_block: false' do
+        @client.request(:get, @srv.u('hello'), filter_block: false) do |req, str|
+          req.class.name.should eq 'HTTP::Message' 
+          str.should eq 'hello' 
+        end
+      end
+    end
+  end
+  describe 'agent name' do
+    it 'default' do
+      str = ""
+      @client.debug_dev = str
+      @client.get(@srv.u)
+      lines = str.split(/(?:\r?\n)+/)
+      lines[0].should eq '= Request'
+      lines[4].should eq "User-Agent: HTTPClient #{HTTPClient::VERSION}"
+    end
+
+    it 'custom' do
+      client = HTTPClient.new(nil, "agent_name_foo")
+      str = ""
+      client.debug_dev = str
+      client.get(@srv.u)
+      lines = str.split(/(?:\r?\n)+/)
+      lines[0].should eq '= Request'
+      lines[4].should eq 'User-Agent: agent_name_foo'
+    end
+  end
+
+  describe 'protocol versions' do
+    it '0.9' do
+      @client.protocol_version = 'HTTP/0.9'
+      @client.debug_dev = str = ''
+      @client.test_loopback_http_response << "hello\nworld\n"
+      res = @client.get(@srv.u 'hello')
+      res.http_version.should eq '0.9' 
+      res.status.should be_nil 
+      res.reason.should be_nil 
+      res.content.should eq "hello\nworld\n" 
+      lines = str.split(/(?:\r?\n)+/)
+      lines[0].should eq "= Request" 
+      lines[2].should eq "! CONNECTION ESTABLISHED" 
+      lines[3].should eq "GET /hello HTTP/0.9" 
+      lines[7].should eq "Connection: close" 
+      lines[8].should eq "= Response" 
+      lines[9].should match /^hello$/ 
+      lines[10].should match /^world$/ 
+    end
+
+    it '1.0' do
+      @client.protocol_version.should be_nil 
+      @client.protocol_version = 'HTTP/1.0'
+      @client.protocol_version.should eq 'HTTP/1.0' 
+      str = ""
+      @client.debug_dev = str
+      @client.get(@srv.u 'hello')
+      lines = str.split(/(?:\r?\n)+/)
+      lines[0].should eq "= Request"
+      lines[2].should eq "! CONNECTION ESTABLISHED"
+      lines[3].should eq "GET /hello HTTP/1.0"
+      lines[7].should eq "Connection: close"
+      lines[8].should eq "= Response"
+    end
+
+    it '1.1' do
+      @client.protocol_version.should be_nil 
+      str = ""
+      @client.debug_dev = str
+      @client.get(@srv.u)
+      lines = str.split(/(?:\r?\n)+/)
+      lines[0].should eq "= Request" 
+      lines[2].should eq "! CONNECTION ESTABLISHED" 
+      lines[3].should eq "GET / HTTP/1.1" 
+      lines[7].should eq "Host: localhost:#{@srv.port}" 
+      @client.protocol_version = 'HTTP/1.1'
+      @client.protocol_version.should eq 'HTTP/1.1' 
+      str = ""
+      @client.debug_dev = str
+      @client.get(@srv.u)
+      lines = str.split(/(?:\r?\n)+/)
+      lines[0].should eq "= Request" 
+      lines[2].should eq "! CONNECTION ESTABLISHED" 
+      lines[3].should eq "GET / HTTP/1.1" 
+      @client.protocol_version = 'HTTP/1.0'
+      str = ""
+      @client.debug_dev = str
+      @client.get(@srv.u)
+      lines = str.split(/(?:\r?\n)+/)
+      lines[0].should eq "= Request" 
+      lines[2].should eq "! CONNECTION ESTABLISHED" 
+      lines[3].should eq "GET / HTTP/1.0" 
+    end
+  end
+
+  describe 'accept' do
+    it '*/* by default' do
+      str = ""
+      @client.debug_dev = str
+      @client.get(@srv.u)
+      lines = str.split(/(?:\r?\n)+/)
+      lines[5].should eq "Accept: */*" 
+    end
+
+    it 'sets properly' do
+      str = ""
+      @client.debug_dev = str
+      @client.get(@srv.u, :header => {:Accept => 'text/html'})
+      lines = str.split(/(?:\r?\n)+/)
+      lines[4].should eq "Accept: text/html" 
+      lines.each do |line|
+        line.should_not eq "Accept: */*" 
+      end
+    end
+  end
+
+  describe 'POST' do
+    describe '#post_content' do
+      it 'works' do
+        @client.post_content(@srv.u('hello')).should eq 'hello'
+        @client.post_content(@srv.u("redirect1")).should eq 'hello'
+        @client.post_content(@srv.u("redirect2")).should eq 'hello'
+      end
+    end
+
+    it 'redirect callback' do
+      called = false
+      @client.redirect_uri_callback = lambda { |uri, res|
+        newuri = res.header['location'][0]
+        called = true
+        newuri
+      }
+      @client.post_content(@srv.u("relative_redirect")).should eq 'hello'
+      called.should be_true
+    end
+
+    it 'errors' do
+      expect {
+        @client.post_content(@srv.u 'notfound')
+      }.to raise_error(HTTPClient::BadResponseError)
+
+      expect {
+        @client.post_content(@srv.u 'redirect_self')
+      }.to raise_error(HTTPClient::BadResponseError)
+    end
+
+
+    describe 'string io' do
+      it do
+        post_body = StringIO.new("1234567890")
+        @client.post_content(@srv.u("servlet"), post_body).should eq 'post,1234567890'
+
+        # all browsers use GET for 302
+        post_body = StringIO.new("1234567890")
+        @client.post_content(@srv.u("servlet_413"), post_body).should eq '1234567890' 
+
+        @client.get_content(@srv.u("servlet_redirect_413")).should eq ''
+
+        post_body = StringIO.new("1234567890")
+        @client.post_content(@srv.u("servlet_redirect_413"), post_body).should eq ''
+
+        post_body = StringIO.new("1234567890")
+        @client.post_content(@srv.u("servlet_temporary_redirect"), post_body).should eq 'post,1234567890'
+
+        post_body = StringIO.new("1234567890")
+        @client.post_content(@srv.u("servlet_see_other"), post_body).should eq 'get'
+      end
+
+      it 'doesnt rewind' do
+        post_body = StringIO.new("1234567890")
+        post_body.read(5)
+        @client.post_content(@srv.u("servlet_temporary_redirect"), post_body).should eq 'post,67890' 
+      end
+    end
+  end
+
+  describe 'util' do
+    it '#urify' do
+      urify(nil).should be_nil
+      uri = 'http://foo'
+      # urify(uri).class.name.should eq 'HTTPClient::Util::AddressableURI'
+      urify(uri).should eq urify(uri)
+      urify(uri).to_s.should eq uri
+      urify(urify(uri)).should eq urify(uri)
+    end
+  end
+end

data/spec/hexdump_spec.rb

@@ -0,0 +1,11 @@
+# coding: utf-8
+require 'spec_helper'
+require 'hexdump'
+
+describe 'HexDump' do
+  it 'encode' do
+    str = "\032l\277\370\2429\216\236\351[{\{\262\350\274\376"
+    str.force_encoding('BINARY') if str.respond_to?(:force_encoding)
+    HexDump.encode(str).should eq ["00000000  1a6cbff8 a2398e9e e95b7b7b b2e8bcfe   .l...9...[{{...."]
+  end
+end