httpclient 2.3.2 → 2.3.3

data/README.txt

@@ -107,6 +107,15 @@ Thanks in advance.
 
 == Changes
 
+= Changes in 2.3.3 =
+
+  February 24, 2013 - version 2.3.3
+
+  * Changes
+
+    * #144 Add User-Agent field by default. You can remove the header by
+      setting nil to HTTPClient#agent_name.
+
 = Changes in 2.3.2 =
 
   January 5, 2013 - version 2.3.2

data/lib/httpclient.rb

@@ -229,7 +229,7 @@ require 'httpclient/cookie'
 #   ruby -rhttpclient -e 'p HTTPClient.head(ARGV.shift).header["last-modified"]' http://dev.ctor.org/
 #
 class HTTPClient
-  RUBY_VERSION_STRING = "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  RUBY_VERSION_STRING = "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
   LIB_NAME = "(#{VERSION}, #{RUBY_VERSION_STRING})"
 
   include Util
@@ -357,6 +357,9 @@ class HTTPClient
   # Default header for PROPFIND request.
   PROPFIND_DEFAULT_EXTHEADER = { 'Depth' => '0' }
 
+  # Default User-Agent header
+  DEFAULT_AGENT_NAME = 'HTTPClient/1.0'
+
   # Creates a HTTPClient instance which manages sessions, cookies, etc.
   #
   # HTTPClient.new takes 3 optional arguments for proxy url string,
@@ -385,7 +388,7 @@ class HTTPClient
     @redirect_uri_callback = method(:default_redirect_uri_callback)
     @test_loopback_response = []
     @session_manager = SessionManager.new(self)
-    @session_manager.agent_name = agent_name
+    @session_manager.agent_name = agent_name || DEFAULT_AGENT_NAME
     @session_manager.from = from
     @session_manager.ssl_config = @ssl_config = SSLConfig.new(self)
     @cookie_manager = WebAgent::CookieManager.new

data/lib/httpclient/session.rb

@@ -726,10 +726,10 @@ class HTTPClient
           req.http_version = $1
         end
       end
-      if @agent_name
+      if @agent_name && req.header.get('User-Agent').empty?
         req.header.set('User-Agent', "#{@agent_name} #{LIB_NAME}")
       end
-      if @from
+      if @from && req.header.get('From').empty?
         req.header.set('From', @from)
       end
       if req.header.get('Accept').empty?

data/lib/httpclient/version.rb

@@ -1,3 +1,3 @@
 class HTTPClient
-  VERSION = '2.3.2'
+  VERSION = '2.3.3'
 end

data/test/test_http-access2.rb

@@ -47,7 +47,7 @@ class TestClient < Test::Unit::TestCase
     @client.get(serverurl)
     lines = str.split(/(?:\r?\n)+/)
     assert_equal("= Request", lines[0])
-    assert_match(/^From: from_bar/, lines[4])
+    assert_match(/^From: from_bar/, lines[5])
   end
 
   def test_debug_dev
@@ -81,8 +81,8 @@ class TestClient < Test::Unit::TestCase
     assert_equal("= Request", lines[0])
     assert_equal("! CONNECTION ESTABLISHED", lines[2])
     assert_equal("GET /hello HTTP/1.0", lines[3])
-    assert_equal("Connection: close", lines[6])
-    assert_equal("= Response", lines[7])
+    assert_equal("Connection: close", lines[7])
+    assert_equal("= Response", lines[8])
   end
 
   def test_protocol_version_http11
@@ -93,7 +93,7 @@ class TestClient < Test::Unit::TestCase
     assert_equal("= Request", lines[0])
     assert_equal("! CONNECTION ESTABLISHED", lines[2])
     assert_equal("GET / HTTP/1.1", lines[3])
-    assert_equal("Host: localhost:#{serverport}", lines[6])
+    assert_equal("Host: localhost:#{serverport}", lines[7])
     @client.protocol_version = 'HTTP/1.1'
     str = ""
     @client.debug_dev = str

data/test/test_httpclient.rb

@@ -44,7 +44,7 @@ class TestHTTPClient < Test::Unit::TestCase
     @client.get(serverurl)
     lines = str.split(/(?:\r?\n)+/)
     assert_equal("= Request", lines[0])
-    assert_match(/^From: from_bar/, lines[4])
+    assert_match(/^From: from_bar/, lines[5])
   end
 
   def test_debug_dev
@@ -77,10 +77,10 @@ class TestHTTPClient < Test::Unit::TestCase
     assert_equal("= Request", lines[0])
     assert_equal("! CONNECTION ESTABLISHED", lines[2])
     assert_equal("GET /hello HTTP/0.9", lines[3])
-    assert_equal("Connection: close", lines[6])
-    assert_equal("= Response", lines[7])
-    assert_match(/^hello$/, lines[8])
-    assert_match(/^world$/, lines[9])
+    assert_equal("Connection: close", lines[7])
+    assert_equal("= Response", lines[8])
+    assert_match(/^hello$/, lines[9])
+    assert_match(/^world$/, lines[10])
   end
 
   def test_protocol_version_http10
@@ -94,8 +94,8 @@ class TestHTTPClient < Test::Unit::TestCase
     assert_equal("= Request", lines[0])
     assert_equal("! CONNECTION ESTABLISHED", lines[2])
     assert_equal("GET /hello HTTP/1.0", lines[3])
-    assert_equal("Connection: close", lines[6])
-    assert_equal("= Response", lines[7])
+    assert_equal("Connection: close", lines[7])
+    assert_equal("= Response", lines[8])
   end
 
   def test_header_accept_by_default
@@ -103,7 +103,7 @@ class TestHTTPClient < Test::Unit::TestCase
     @client.debug_dev = str
     @client.get(serverurl)
     lines = str.split(/(?:\r?\n)+/)
-    assert_equal("Accept: */*", lines[4])
+    assert_equal("Accept: */*", lines[5])
   end
 
   def test_header_accept
@@ -122,7 +122,7 @@ class TestHTTPClient < Test::Unit::TestCase
     assert_equal("= Request", lines[0])
     assert_equal("! CONNECTION ESTABLISHED", lines[2])
     assert_equal("GET / HTTP/1.1", lines[3])
-    assert_equal("Host: localhost:#{serverport}", lines[6])
+    assert_equal("Host: localhost:#{serverport}", lines[7])
     #
     @client.reset_all
     str = ""
@@ -152,7 +152,7 @@ class TestHTTPClient < Test::Unit::TestCase
     assert_equal("= Request", lines[0])
     assert_equal("! CONNECTION ESTABLISHED", lines[2])
     assert_equal("GET / HTTP/1.1", lines[3])
-    assert_equal("Host: localhost:#{serverport}", lines[6])
+    assert_equal("Host: localhost:#{serverport}", lines[7])
     @client.protocol_version = 'HTTP/1.1'
     assert_equal('HTTP/1.1', @client.protocol_version)
     str = ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpclient
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nahi@ruby-lang.org
@@ -87,18 +87,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3461181024347964072
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3461181024347964072
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -106,3 +100,4 @@ signing_key:
 specification_version: 3
 summary: gives something like the functionality of libwww-perl (LWP) in Ruby
 test_files: []
+has_rdoc: