patron 0.4.14 → 0.4.15

data/.gitignore

@@ -1,3 +1,5 @@
+.rbenv*
+.rvmrc
 *.bundle
 coverage
 rdoc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    patron (0.4.13)
+    patron (0.4.15)
 
 GEM
   remote: http://rubygems.org/

data/ext/patron/session_ext.c

@@ -355,23 +355,25 @@ static void set_options_from_request(VALUE self, VALUE request) {
 }
 
 // Use the info in a Curl handle to create a new Response object.
-static VALUE create_response(CURL* curl) {
-  VALUE response = rb_class_new_instance(0, 0,
-                      rb_const_get(mPatron, rb_intern("Response")));
-
-  char* url = NULL;
-  curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url);
-  rb_iv_set(response, "@url", rb_str_new2(url));
+static VALUE create_response(VALUE self, CURL* curl, VALUE header_buffer, VALUE body_buffer) {
+  char* effective_url = NULL;
+  curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url);
+  VALUE url = rb_str_new2(effective_url);
 
   long code = 0;
   curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code);
-  rb_iv_set(response, "@status", INT2NUM(code));
+  VALUE status = INT2NUM(code);
 
   long count = 0;
   curl_easy_getinfo(curl, CURLINFO_REDIRECT_COUNT, &count);
-  rb_iv_set(response, "@redirect_count", INT2NUM(count));
+  VALUE redirect_count = INT2NUM(count);
+
+  VALUE default_charset = rb_iv_get(self, "@default_response_charset");
 
-  return response;
+  VALUE args[6] = { url, status, redirect_count, header_buffer, body_buffer, default_charset };
+  
+  return rb_class_new_instance(6, args,
+                               rb_const_get(mPatron, rb_intern("Response")));
 }
 
 // Raise an exception based on the Curl error code.
@@ -419,12 +421,7 @@ static VALUE perform_request(VALUE self) {
 #endif
 
   if (CURLE_OK == ret) {
-    VALUE response = create_response(curl);
-    if (!NIL_P(body_buffer)) {
-      rb_iv_set(response, "@body", body_buffer);
-    }
-    rb_funcall(response, rb_intern("parse_headers"), 1, header_buffer);
-    return response;
+    return create_response(self, curl, header_buffer, body_buffer);
   } else {
     rb_raise(select_error(ret), "%s", state->error_buf);
   }

data/lib/patron/response.rb

@@ -28,11 +28,22 @@ module Patron
   # Represents the response from the HTTP server.
   class Response
 
-    def initialize
-      @headers = {}
+    def initialize(url, status, redirect_count, header_data, body, default_charset = "ASCII-8BIT")
+      @url            = url
+      @status         = status
+      @redirect_count = redirect_count
+      @body           = body
+      
+      @charset        = determine_charset(header_data, body) || default_charset
+      
+      [url, header_data, body].each do |attr|
+        convert_to_default_encoding!(attr)
+      end
+      
+      parse_headers(header_data)
     end
 
-    attr_reader :url, :status, :status_line, :redirect_count, :body, :headers
+    attr_reader :url, :status, :status_line, :redirect_count, :body, :headers, :charset
 
     def inspect
       # Avoid spamming the console with the header and body data
@@ -41,8 +52,26 @@ module Patron
 
   private
 
+    def determine_charset(header_data, body)
+      header_data.match(charset_regex) || (body && body.match(charset_regex))
+      
+      $1
+    end
+    
+    def charset_regex
+      /(?:charset|encoding)="?([a-z0-9-]+)"?/i
+    end
+
+    def convert_to_default_encoding!(str)
+      if str.respond_to?(:encode) && Encoding.default_internal
+        str.force_encoding(charset).encode!(Encoding.default_internal)
+      end
+    end
+
     # Called by the C code to parse and set the headers
     def parse_headers(header_data)
+      @headers = {}
+
       header_data.split(/\r\n/).each do |header|
         if header =~ %r|^HTTP/1.[01]|
           @status_line = header.strip

data/lib/patron/session.rb

@@ -75,6 +75,9 @@ module Patron
     # only be set if buffer_size is non-nil
     attr_accessor :buffer_size
 
+    # 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
 
     # Create a new Session object.
@@ -150,8 +153,12 @@ module Patron
     end
 
     # Uploads the passed +data+ to the specified +url+ using HTTP POST. +data+
-    # must be a string.
+    # can be a string or a hash.
     def post(url, data, headers = {})
+      if data.is_a?(Hash)
+        data = data.map {|k,v| urlencode(k.to_s) + '=' + urlencode(v.to_s) }.join('&')
+        headers['Content-Type'] = 'application/x-www-form-urlencoded'
+      end
       request(:post, url, headers, :data => data)
     end
 
@@ -185,22 +192,22 @@ module Patron
       headers['Expect'] ||= ''
 
       req = Request.new
-      req.action = action
-      req.timeout = self.timeout
-      req.connect_timeout = self.connect_timeout
-      req.max_redirects = self.max_redirects
-      req.headers = self.headers.merge(headers)
-      req.username = self.username
-      req.password = self.password
-      req.multipart = options[:multipart]
-      req.upload_data = options[:data]
-      req.file_name = options[:file]
-      req.proxy = proxy
-      req.proxy_type = proxy_type
-      req.auth_type = auth_type
-      req.insecure = insecure
-      req.ignore_content_length = ignore_content_length
-      req.buffer_size = buffer_size
+      req.action                 = action
+      req.headers                = self.headers.merge headers
+      req.timeout                = options.fetch :timeout,               self.timeout
+      req.connect_timeout        = options.fetch :connect_timeout,       self.connect_timeout
+      req.max_redirects          = options.fetch :max_redirects,         self.max_redirects
+      req.username               = options.fetch :username,              self.username
+      req.password               = options.fetch :password,              self.password
+      req.proxy                  = options.fetch :proxy,                 self.proxy
+      req.proxy_type             = options.fetch :proxy_type,            self.proxy_type
+      req.auth_type              = options.fetch :auth_type,             self.auth_type
+      req.insecure               = options.fetch :insecure,              self.insecure
+      req.ignore_content_length  = options.fetch :ignore_content_length, self.ignore_content_length
+      req.buffer_size            = options.fetch :buffer_size,           self.buffer_size
+      req.multipart              = options[:multipart]
+      req.upload_data            = options[:data]
+      req.file_name              = options[:file]
 
       url = self.base_url.to_s + url.to_s
       uri = URI.parse(url)
@@ -214,5 +221,12 @@ 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.14"
+  VERSION = "0.4.15"
 end

data/script/test_server

@@ -36,11 +36,16 @@ class URI::Parser
   end
 end
 
-class TestServlet < HTTPServlet::AbstractServlet
+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)
@@ -76,6 +81,16 @@ class RedirectServlet < HTTPServlet::AbstractServlet
   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"
@@ -104,6 +119,7 @@ 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)

data/spec/session_spec.rb

@@ -23,6 +23,7 @@
 ## -------------------------------------------------------------------
 require File.expand_path("./spec") + '/spec_helper.rb'
 require 'webrick'
+require 'yaml'
 require 'base64'
 require 'fileutils'
 
@@ -165,6 +166,15 @@ describe Patron::Session do
     body.header['content-length'].should == [data.size.to_s]
   end
 
+  it "should post a hash of arguments as a urlencoded form" do
+    data = {:foo => 123, 'baz' => '++hello world++'}
+    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(/foo=123/)
+  end
+
   it "should raise when no data is provided to :post" do
     lambda { @session.post("/test", nil) }.should raise_error(ArgumentError)
   end

metadata

@@ -1,76 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: patron
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.15
   prerelease: 
-  version: 0.4.14
 platform: ruby
-authors: 
+authors:
 - Phillip Toland
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-28 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157493740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2157493740
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: &2157493280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.7.5
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2157493280
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2157492820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2157492820
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &2157492360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.9
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *2157492360
 description: Ruby HTTP client library based on libcurl
-email: 
+email:
 - phil.toland@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/patron/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .autotest
 - .gitignore
 - .rspec
-- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -96,34 +91,29 @@ files:
 - spec/session_spec.rb
 - spec/spec_helper.rb
 - spec/util_spec.rb
-has_rdoc: true
 homepage: https://github.com/toland/patron
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.2.0
 requirements: []
-
 rubyforge_project: patron
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Patron HTTP Client
 test_files: []
-

data/.rvmrc

@@ -1 +0,0 @@
-rvm gemset use patron