patron 0.4.16 → 0.4.17

data/lib/patron/response.rb

@@ -38,11 +38,14 @@ module Patron
       
       @charset        = determine_charset(header_data, body) || default_charset
       
-      [url, header_data, body].each do |attr|
+      [url, header_data].each do |attr|
         convert_to_default_encoding!(attr)
       end
       
       parse_headers(header_data)
+      if @headers["Content-Type"] && @headers["Content-Type"][0, 5] == "text/"
+        convert_to_default_encoding!(@body)
+      end
     end
 
     attr_reader :url, :status, :status_line, :redirect_count, :body, :headers, :charset

data/lib/patron/session.rb

@@ -78,11 +78,10 @@ module Patron
     # Default encoding of responses. Used if no charset is provided by the host.
     attr_accessor :default_response_charset
 
-    private :ext_initialize, :handle_request, :enable_cookie_session, :set_debug_file
+    private :handle_request, :enable_cookie_session, :set_debug_file
 
     # Create a new Session object.
     def initialize
-      ext_initialize
       @headers = {}
       @timeout = 5
       @connect_timeout = 1
@@ -222,11 +221,5 @@ module Patron
       handle_request(req)
     end
 
-    private
-
-    def urlencode(str)
-      str.gsub(/[^a-zA-Z0-9_\.\-]/n) {|s| sprintf('%%%02x', s[0].ord) }
-    end
-
   end
 end

data/lib/patron/version.rb

@@ -1,3 +1,3 @@
 module Patron
-  VERSION = "0.4.16"
+  VERSION = "0.4.17"
 end

data/patron.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "patron"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "rake-compiler", "~> 0.7.5"
-  s.add_development_dependency "rspec", "~> 2.3.0"
-  s.add_development_dependency "rcov", "~> 0.9.9"
+  s.add_development_dependency "rake-compiler", ">= 0.7.5"
+  s.add_development_dependency "rspec", ">= 2.3.0"
+  s.add_development_dependency "rcov", ">= 0.9.9"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/script/test_server

@@ -23,116 +23,8 @@
 ## THE SOFTWARE.
 ##
 ## -------------------------------------------------------------------
-require 'yaml'
-require 'webrick'
-include WEBrick
 
-# This ugly little hack is necessary to make the specs pass when running
-# the test_server script under Ruby 1.9. URI::Parser#to_yaml generates
-# regexp representations that YAML.parse cannot parse.
-class URI::Parser
-  def to_yaml(opts = {})
-    {}.to_yaml(opts)
-  end
-end
+root = File.expand_path('../..', __FILE__)
+require File.join(root, %w[spec support test_server.rb])
 
-module RespondWith
-  def respond_with(method, req, res)
-    res.body = req.to_yaml
-    res['Content-Type'] = "text/plain"
-  end
-end
-
-class TestServlet < HTTPServlet::AbstractServlet
-
-  include RespondWith
-
-  def do_GET(req,res)
-    respond_with(:GET, req, res)
-  end
-
-  def do_POST(req,res)
-    respond_with(:POST, req, res)
-  end
-
-  def do_PUT(req,res)
-    respond_with(:PUT, req, res)
-  end
-
-  def do_DELETE(req,res)
-    respond_with(:DELETE, req, res)
-  end
-
-  def do_COPY(req,res)
-    respond_with(:COPY, req, res)
-  end
-end
-
-class TimeoutServlet < HTTPServlet::AbstractServlet
-  def do_GET(req,res)
-    sleep(1.1)
-  end
-end
-
-class RedirectServlet < HTTPServlet::AbstractServlet
-  def do_GET(req,res)
-    res['Location'] = "http://localhost:9001/test"
-    res.status = 301
-  end
-end
-
-
-class TestPostBodyServlet < HTTPServlet::AbstractServlet
-  include RespondWith
-  def do_POST(req, res)
-    respond_with(:POST, {'body' => req.body, 'content_type' => req.content_type}, res)
-  end
-end
-
-
-
-class SetCookieServlet < HTTPServlet::AbstractServlet
-  def do_GET(req, res)
-    res['Set-Cookie'] = "session_id=foo123"
-    res['Location'] = "http://localhost:9001/test"
-    res.status = 301
-  end
-end
-
-class RepetitiveHeaderServlet < HTTPServlet::AbstractServlet
-  def do_GET(req, res)
-    # the only way to get webrick to output two headers with the same name is using cookies, so that's what we'll do:
-    res.cookies << Cookie.new('a', '1')
-    res.cookies << Cookie.new('b', '2')
-    res['Content-Type'] = "text/plain"
-    res.body = "Hi."
-  end
-end
-
-class WrongContentLengthServlet < HTTPServlet::AbstractServlet
-  def do_GET(req, res)
-    res.keep_alive = false
-    res.content_length = 1024
-    res.body = "Hello."
-  end
-end
-
-server = WEBrick::HTTPServer.new :Port => 9001
-server.mount("/test", TestServlet)
-server.mount("/testpost", TestPostBodyServlet)
-server.mount("/timeout", TimeoutServlet)
-server.mount("/redirect", RedirectServlet)
-server.mount("/setcookie", SetCookieServlet)
-server.mount("/repetitiveheader", RepetitiveHeaderServlet)
-server.mount("/wrongcontentlength", WrongContentLengthServlet)
-
-exit_code = lambda do
-  begin
-    server.shutdown unless server.nil?
-  rescue Object => e
-    puts "Error #{__FILE__}:#{__LINE__}\n#{e.message}"
-  end
-end
-
-trap("INT"){exit_code.call}
-server.start
+PatronTestServer.start($stderr).join

data/spec/response_spec.rb

@@ -43,6 +43,12 @@ describe Patron::Response do
     response.headers['Set-Cookie'].should == ["a=1","b=2"]
   end
 
+  it "should works with non-text files" do
+    response = @session.get("/picture")
+    response.headers['Content-Type'].should == 'image/png'
+    response.body.encoding.should == Encoding::ASCII_8BIT
+  end
+  
   it "should not allow a default charset to be nil" do
     Encoding.stub(:default_internal).and_return("UTF-8")
     expect {

data/spec/session_spec.rb

@@ -171,7 +171,7 @@ describe Patron::Session do
     response = @session.post("/testpost", data)
     body = YAML::load(response.body)
     body['content_type'].should == "application/x-www-form-urlencoded"
-    body['body'].should match(/baz=%2b%2bhello%20world%2b%2b/)
+    body['body'].should match(/baz=%2B%2Bhello%20world%2B%2B/)
     body['body'].should match(/foo=123/)
   end
 
@@ -286,4 +286,17 @@ describe Patron::Session do
     "Basic " + Base64.encode64("#{user}:#{passwd}").strip
   end
 
+  # ------------------------------------------------------------------------
+  describe 'when debug is enabled' do
+    it 'it should not clobber stderr' do
+      rdev = STDERR.stat.rdev
+
+      @session.enable_debug
+      STDERR.stat.rdev.should be == rdev
+
+      @session.enable_debug
+      STDERR.stat.rdev.should be == rdev
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -26,3 +26,7 @@ require 'rspec'
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 $:.unshift(File.dirname(__FILE__) + '/../ext')
 require 'patron'
+
+Dir['./spec/support/**/*.rb'].each { |fn| require fn }
+
+PatronTestServer.start if RUBY_VERSION >= '1.9'

data/spec/support/test_server.rb

@@ -0,0 +1,175 @@
+## -------------------------------------------------------------------
+##
+## Patron HTTP Client: HTTP test server for integration tests
+## Copyright (c) 2008 The Hive http://www.thehive.com/
+##
+## Permission is hereby granted, free of charge, to any person obtaining a copy
+## of this software and associated documentation files (the "Software"), to deal
+## in the Software without restriction, including without limitation the rights
+## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+## copies of the Software, and to permit persons to whom the Software is
+## furnished to do so, subject to the following conditions:
+##
+## The above copyright notice and this permission notice shall be included in
+## all copies or substantial portions of the Software.
+##
+## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+## THE SOFTWARE.
+##
+## -------------------------------------------------------------------
+require 'yaml'
+require 'webrick'
+include WEBrick
+
+# This ugly little hack is necessary to make the specs pass when running
+# the test_server script under Ruby 1.9. URI::Parser#to_yaml generates
+# regexp representations that YAML.parse cannot parse.
+class URI::Parser
+  def to_yaml(opts = {})
+    {}.to_yaml(opts)
+  end
+end
+
+module RespondWith
+  def respond_with(method, req, res)
+    res.body = req.to_yaml
+    res['Content-Type'] = "text/plain"
+  end
+end
+
+class TestServlet < HTTPServlet::AbstractServlet
+
+  include RespondWith
+
+  def do_GET(req,res)
+    respond_with(:GET, req, res)
+  end
+
+  def do_POST(req,res)
+    respond_with(:POST, req, res)
+  end
+
+  def do_PUT(req,res)
+    respond_with(:PUT, req, res)
+  end
+
+  def do_DELETE(req,res)
+    respond_with(:DELETE, req, res)
+  end
+
+  def do_COPY(req,res)
+    respond_with(:COPY, req, res)
+  end
+end
+
+class TimeoutServlet < HTTPServlet::AbstractServlet
+  def do_GET(req,res)
+    sleep(1.1)
+  end
+end
+
+class RedirectServlet < HTTPServlet::AbstractServlet
+  def do_GET(req,res)
+    res['Location'] = "http://localhost:9001/test"
+    res.status = 301
+  end
+end
+
+
+class TestPostBodyServlet < HTTPServlet::AbstractServlet
+  include RespondWith
+  def do_POST(req, res)
+    respond_with(:POST, {'body' => req.body, 'content_type' => req.content_type}, res)
+  end
+end
+
+
+
+class SetCookieServlet < HTTPServlet::AbstractServlet
+  def do_GET(req, res)
+    res['Set-Cookie'] = "session_id=foo123"
+    res['Location'] = "http://localhost:9001/test"
+    res.status = 301
+  end
+end
+
+class RepetitiveHeaderServlet < HTTPServlet::AbstractServlet
+  def do_GET(req, res)
+    # the only way to get webrick to output two headers with the same name is using cookies, so that's what we'll do:
+    res.cookies << Cookie.new('a', '1')
+    res.cookies << Cookie.new('b', '2')
+    res['Content-Type'] = "text/plain"
+    res.body = "Hi."
+  end
+end
+
+class PictureServlet < HTTPServlet::AbstractServlet
+  def do_GET(req, res)
+    res['Content-Type'] = "image/png"
+    res.body = File.read("./pic.png")
+  end
+end
+
+class WrongContentLengthServlet < HTTPServlet::AbstractServlet
+  def do_GET(req, res)
+    res.keep_alive = false
+    res.content_length = 1024
+    res.body = "Hello."
+  end
+end
+
+class PatronTestServer
+
+  def self.start( log_file = nil )
+    new(log_file).start
+  end
+
+  def initialize( log_file = nil )
+    log_file ||= StringIO.new
+    log = WEBrick::Log.new(log_file)
+
+    @server = WEBrick::HTTPServer.new(
+      :Port => 9001,
+      :Logger => log,
+      :AccessLog => [
+          [ log, WEBrick::AccessLog::COMMON_LOG_FORMAT ],
+          [ log, WEBrick::AccessLog::REFERER_LOG_FORMAT ]
+       ]
+    )
+    @server.mount("/test", TestServlet)
+    @server.mount("/testpost", TestPostBodyServlet)
+    @server.mount("/timeout", TimeoutServlet)
+    @server.mount("/redirect", RedirectServlet)
+    @server.mount("/picture", PictureServlet)
+    @server.mount("/setcookie", SetCookieServlet)
+    @server.mount("/repetitiveheader", RepetitiveHeaderServlet)
+    @server.mount("/wrongcontentlength", WrongContentLengthServlet)
+  end
+
+  def start
+    trap('INT') {
+      begin
+        @server.shutdown unless @server.nil?
+      rescue Object => e
+        $stderr.puts "Error #{__FILE__}:#{__LINE__}\n#{e.message}"
+      end
+    }
+
+    @thread = Thread.new { @server.start }
+    Thread.pass
+    self
+  end
+
+  def join
+    if defined? @thread and @thread
+      @thread.join
+    end
+    self
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: patron
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.4.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-07 00:00:00.000000000Z
+date: 2012-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156478240 !ruby/object:Gem::Requirement
+  requirement: &70199940489140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,40 +21,40 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156478240
+  version_requirements: *70199940489140
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2156477780 !ruby/object:Gem::Requirement
+  requirement: &70199940488660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *2156477780
+  version_requirements: *70199940488660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156477320 !ruby/object:Gem::Requirement
+  requirement: &70199940488200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2156477320
+  version_requirements: *70199940488200
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156476860 !ruby/object:Gem::Requirement
+  requirement: &70199940487740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2156476860
+  version_requirements: *70199940487740
 description: Ruby HTTP client library based on libcurl
 email:
 - phil.toland@gmail.com
@@ -73,7 +73,10 @@ files:
 - Rakefile
 - ext/patron/.gitignore
 - ext/patron/extconf.rb
+- ext/patron/membuffer.c
+- ext/patron/membuffer.h
 - ext/patron/session_ext.c
+- ext/patron/sglib.h
 - lib/patron.rb
 - lib/patron/error.rb
 - lib/patron/proxy_type.rb
@@ -83,6 +86,7 @@ files:
 - lib/patron/util.rb
 - lib/patron/version.rb
 - patron.gemspec
+- pic.png
 - script/console
 - script/test_server
 - spec/patron_spec.rb
@@ -90,6 +94,7 @@ files:
 - spec/response_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb
+- spec/support/test_server.rb
 - spec/util_spec.rb
 homepage: https://github.com/toland/patron
 licenses: []