httparty 0.6.1 → 0.7.0

data/lib/httparty/request.rb

@@ -11,6 +11,18 @@ module HTTParty
 
     SupportedURISchemes  = [URI::HTTP, URI::HTTPS]
 
+    NON_RAILS_QUERY_STRING_NORMALIZER = Proc.new do |query|
+      query.map do |key, value|
+        if value.nil?
+          key
+        elsif value.is_a?(Array)
+          value.map {|v| "#{key}=#{URI.encode(v.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}"}
+        else
+          {key => value}.to_params
+        end
+      end.flatten.sort.join('&')
+    end
+
     attr_accessor :http_method, :path, :options, :last_response, :redirect
 
     def initialize(http_method, path, o={})
@@ -19,6 +31,7 @@ module HTTParty
       self.options = {
         :limit => o.delete(:no_follow) ? 1 : 5,
         :default_params => {},
+        :follow_redirects => true,
         :parser => Parser
       }.merge(o)
     end
@@ -53,12 +66,34 @@ module HTTParty
     def perform
       validate
       setup_raw_request
-      get_response
+      self.last_response = http.request(@raw_request)
+      handle_deflation
       handle_response
     end
 
     private
 
+    def attach_ssl_certificates(http)
+      if http.use_ssl?
+        # Client certificate authentication
+        if options[:pem]
+          http.cert = OpenSSL::X509::Certificate.new(options[:pem])
+          http.key = OpenSSL::PKey::RSA.new(options[:pem], options[:pem_password])
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        end
+
+        # SSL certificate authority file and/or directory
+        if options[:ssl_ca_file]
+          http.ca_file = options[:ssl_ca_file]
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        end
+        if options[:ssl_ca_path]
+          http.ca_path = options[:ssl_ca_path]
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        end
+      end
+    end
+
     def http
       http = Net::HTTP.new(uri.host, uri.port, options[:http_proxyaddr], options[:http_proxyport])
       http.use_ssl = ssl_implied?
@@ -68,13 +103,7 @@ module HTTParty
         http.read_timeout = options[:timeout]
       end
 
-      if options[:pem] && http.use_ssl?
-        http.cert = OpenSSL::X509::Certificate.new(options[:pem])
-        http.key = OpenSSL::PKey::RSA.new(options[:pem])
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      else
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
+      attach_ssl_certificates(http)
 
       if options[:debug_output]
         http.set_debug_output(options[:debug_output])
@@ -88,7 +117,7 @@ module HTTParty
     end
 
     def body
-      options[:body].is_a?(Hash) ? options[:body].to_params : options[:body]
+      options[:body].is_a?(Hash) ? normalize_query(options[:body]) : options[:body]
     end
 
     def credentials
@@ -103,6 +132,18 @@ module HTTParty
       credentials[:password]
     end
 
+    def normalize_query(query)
+      if query_string_normalizer
+        query_string_normalizer.call(query)
+      else
+        query.to_params
+      end
+    end
+
+    def query_string_normalizer
+      options[:query_string_normalizer]
+    end
+
     def setup_raw_request
       @raw_request = http_method.new(uri.request_uri)
       @raw_request.body = body if body
@@ -118,22 +159,14 @@ module HTTParty
       end
     end
 
-    def perform_actual_request
-      http.request(@raw_request)
-    end
-
-    def get_response
-      self.last_response = perform_actual_request
-    end
-
     def query_string(uri)
       query_string_parts = []
       query_string_parts << uri.query unless uri.query.nil?
 
       if options[:query].is_a?(Hash)
-        query_string_parts << options[:default_params].merge(options[:query]).to_params
+        query_string_parts << normalize_query(options[:default_params].merge(options[:query]))
       else
-        query_string_parts << options[:default_params].to_params unless options[:default_params].empty?
+        query_string_parts << normalize_query(options[:default_params]) unless options[:default_params].empty?
         query_string_parts << options[:query] unless options[:query].nil?
       end
 
@@ -142,26 +175,15 @@ module HTTParty
 
     # Raises exception Net::XXX (http error code) if an http error occured
     def handle_response
-      handle_deflation
-      case last_response
-      when Net::HTTPMultipleChoice, # 300
-        Net::HTTPMovedPermanently, # 301
-        Net::HTTPFound, # 302
-        Net::HTTPSeeOther, # 303
-        Net::HTTPUseProxy, # 305
-        Net::HTTPTemporaryRedirect
-        if last_response.key?('location')
-          options[:limit] -= 1
-          self.path = last_response['location']
-          self.redirect = true
-          self.http_method = Net::HTTP::Get unless options[:maintain_method_across_redirects]
-          capture_cookies(last_response)
-          perform
-        else
-          last_response
-        end
+      if response_redirects?
+        options[:limit] -= 1
+        self.path = last_response['location']
+        self.redirect = true
+        self.http_method = Net::HTTP::Get unless options[:maintain_method_across_redirects]
+        capture_cookies(last_response)
+        perform
       else
-        Response.new(last_response, parse_response(last_response.body))
+        Response.new(self, last_response, parse_response(last_response.body))
       end
     end
 
@@ -176,6 +198,18 @@ module HTTParty
       end
     end
 
+    def response_redirects?
+      case last_response
+      when Net::HTTPMultipleChoice, # 300
+           Net::HTTPMovedPermanently, # 301
+           Net::HTTPFound, # 302
+           Net::HTTPSeeOther, # 303
+           Net::HTTPUseProxy, # 305
+           Net::HTTPTemporaryRedirect
+        options[:follow_redirects] && last_response.key?('location')
+      end
+    end
+
     def parse_response(body)
       parser.call(body, format)
     end
@@ -198,15 +232,15 @@ module HTTParty
       end
     end
 
-      def validate
-        raise HTTParty::RedirectionTooDeep.new(last_response), 'HTTP redirects too deep' if options[:limit].to_i <= 0
-        raise ArgumentError, 'only get, post, put, delete, head, and options methods are supported' unless SupportedHTTPMethods.include?(http_method)
-        raise ArgumentError, ':headers must be a hash' if options[:headers] && !options[:headers].is_a?(Hash)
-        raise ArgumentError, 'only one authentication method, :basic_auth or :digest_auth may be used at a time' if options[:basic_auth] && options[:digest_auth]
-        raise ArgumentError, ':basic_auth must be a hash' if options[:basic_auth] && !options[:basic_auth].is_a?(Hash)
-        raise ArgumentError, ':digest_auth must be a hash' if options[:digest_auth] && !options[:digest_auth].is_a?(Hash)
-        raise ArgumentError, ':query must be hash if using HTTP Post' if post? && !options[:query].nil? && !options[:query].is_a?(Hash)
-      end
+    def validate
+      raise HTTParty::RedirectionTooDeep.new(last_response), 'HTTP redirects too deep' if options[:limit].to_i <= 0
+      raise ArgumentError, 'only get, post, put, delete, head, and options methods are supported' unless SupportedHTTPMethods.include?(http_method)
+      raise ArgumentError, ':headers must be a hash' if options[:headers] && !options[:headers].is_a?(Hash)
+      raise ArgumentError, 'only one authentication method, :basic_auth or :digest_auth may be used at a time' if options[:basic_auth] && options[:digest_auth]
+      raise ArgumentError, ':basic_auth must be a hash' if options[:basic_auth] && !options[:basic_auth].is_a?(Hash)
+      raise ArgumentError, ':digest_auth must be a hash' if options[:digest_auth] && !options[:digest_auth].is_a?(Hash)
+      raise ArgumentError, ':query must be hash if using HTTP Post' if post? && !options[:query].nil? && !options[:query].is_a?(Hash)
+    end
 
     def post?
       Net::HTTP::Post == http_method

data/lib/httparty/response.rb

@@ -28,9 +28,15 @@ module HTTParty
       end
     end
 
-    attr_reader :response, :parsed_response, :body, :headers
 
-    def initialize(response, parsed_response)
+    def self.underscore(string)
+      string.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z])([A-Z])/,'\1_\2').downcase
+    end
+
+    attr_reader :request, :response, :parsed_response, :body, :headers
+
+    def initialize(request, response, parsed_response)
+      @request = request
       @response = response
       @body = response.body
       @parsed_response = parsed_response
@@ -50,6 +56,17 @@ module HTTParty
       %(#<#{self.class}:0x#{inspect_id} @parsed_response=#{parsed_response.inspect}, @response=#{response.inspect}, @headers=#{headers.inspect}>)
     end
 
+    CODES_TO_OBJ = Net::HTTPResponse::CODE_CLASS_TO_OBJ.merge Net::HTTPResponse::CODE_TO_OBJ
+
+    CODES_TO_OBJ.each do |response_code, klass|
+      name = klass.name.sub("Net::HTTP", '')
+      define_method("#{underscore(name)}?") do
+        klass === response
+      end
+    end
+
+    protected
+
     def method_missing(name, *args, &block)
       if parsed_response.respond_to?(name)
         parsed_response.send(name, *args, &block)

data/spec/fixtures/ssl/generate.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+set -e
+
+if [ -d "generated" ] ; then
+    echo >&2 "error: 'generated' directory already exists.  Delete it first."
+    exit 1
+fi
+
+mkdir generated
+
+# Generate the CA private key and certificate
+openssl req -batch -subj '/CN=INSECURE Test Certificate Authority' -newkey rsa:1024 -new -x509 -days 999999 -keyout generated/ca.key -nodes -out generated/ca.crt
+
+# Create symlinks for ssl_ca_path
+c_rehash generated
+
+# Generate the server private key and self-signed certificate
+openssl req -batch -subj '/CN=localhost' -newkey rsa:1024 -new -x509 -days 999999 -keyout generated/server.key -nodes -out generated/selfsigned.crt
+
+# Generate certificate signing request with bogus hostname
+openssl req -batch -subj '/CN=bogo' -new -days 999999 -key generated/server.key -nodes -out generated/bogushost.csr
+
+# Sign the certificate requests
+openssl x509 -CA generated/ca.crt -CAkey generated/ca.key -set_serial 1 -in generated/selfsigned.crt -out generated/server.crt -clrext -extfile openssl-exts.cnf -extensions cert -days 999999
+openssl x509 -req -CA generated/ca.crt -CAkey generated/ca.key -set_serial 1 -in generated/bogushost.csr -out generated/bogushost.crt -clrext -extfile openssl-exts.cnf -extensions cert -days 999999
+
+# Remove certificate signing requests
+rm -f generated/*.csr
+

data/spec/fixtures/ssl/generated/1fe462c2.0

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICbTCCAdagAwIBAgIJAIAeO9TXtJ45MA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
+BAMTI0lOU0VDVVJFIFRlc3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MCAXDTEwMTAy
+MDEzNDYyM1oYDzQ3NDgwOTE1MTM0NjIzWjAuMSwwKgYDVQQDEyNJTlNFQ1VSRSBU
+ZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEA3lkBcd352qiIIzqnyvvJj59cx1dnzMyjnuaK2cRH420rBfukLE2MbOVr
+9nYq/7CdjqXpE8uFAF+UTSIK6MWZ/bidkr2xd/et/Ce2pVIVxH+rt3pJz3wZhC3H
+Yz+HU4CD2iI9wAzsb6mMV7md1fjlYfir4SBGGPTkcqUJUp2/tQMCAwEAAaOBkDCB
+jTAdBgNVHQ4EFgQUy0Lz6RgmtpywlBOXdPABQArp358wXgYDVR0jBFcwVYAUy0Lz
+6RgmtpywlBOXdPABQArp35+hMqQwMC4xLDAqBgNVBAMTI0lOU0VDVVJFIFRlc3Qg
+Q2VydGlmaWNhdGUgQXV0aG9yaXR5ggkAgB471Ne0njkwDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOBgQCmi3JQm+EIWjkRlyz9sijkYS+Ps4opmd/weeaXwa4E
+gVBWJGyiduB+kBnfv61+/tDjlrbjBDH5dP8suczHQL8gox4zGgjw64KH4o1ujZYR
+cEPbhnUpwbXu7yItlajBZfpFefjF5P0Ao2iEzQldDy0D6nQ19h5QANvQxqweTPQp
+pw==
+-----END CERTIFICATE-----

data/spec/fixtures/ssl/generated/bogushost.crt

@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIICBTCCAW6gAwIBAgIBATANBgkqhkiG9w0BAQUFADAuMSwwKgYDVQQDEyNJTlNF
+Q1VSRSBUZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTAgFw0xMDEwMjAxMzQ2MjNa
+GA80NzQ4MDkxNTEzNDYyM1owDzENMAsGA1UEAxMEYm9nbzCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAr6b0ZBrRrVvPmPbQv36Jnj5jv00ZkhimXrmbv9Z1AdIZ
+WSsBpMd8TP7exE5OR5/DaxKmiZqVskgRyRkLm52/Dkt7Ncrzr5I3unHnMqsAv/28
+5fGlYoRxnkCGMse/6NOFgCemRFw/bglxPNAGrFYKStameBRbCm0dCgtlvcwzdf8C
+AwEAAaNQME4wDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUddLPFtGmb0aFWbTl2kAo
+xD+fd6kwHwYDVR0jBBgwFoAUy0Lz6RgmtpywlBOXdPABQArp358wDQYJKoZIhvcN
+AQEFBQADgYEAosqpPVsFu6cOIhGFT85Y1wwRUaihO0vWO7ghBU5ScuRU3tuvyJDZ
+Z/HoAMXV6XZjVZzRosjtPjFbyWkZYjUqJJRMyEaRiGArWe6urKLzwnD6R9O3eNa5
+7bgFhzZ5WBldJmtq4A3oNqBuvgZkYM6NVKvS4UoakkTliHB21/mDOSY=
+-----END CERTIFICATE-----

data/spec/fixtures/ssl/generated/ca.crt

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICbTCCAdagAwIBAgIJAIAeO9TXtJ45MA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
+BAMTI0lOU0VDVVJFIFRlc3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MCAXDTEwMTAy
+MDEzNDYyM1oYDzQ3NDgwOTE1MTM0NjIzWjAuMSwwKgYDVQQDEyNJTlNFQ1VSRSBU
+ZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEA3lkBcd352qiIIzqnyvvJj59cx1dnzMyjnuaK2cRH420rBfukLE2MbOVr
+9nYq/7CdjqXpE8uFAF+UTSIK6MWZ/bidkr2xd/et/Ce2pVIVxH+rt3pJz3wZhC3H
+Yz+HU4CD2iI9wAzsb6mMV7md1fjlYfir4SBGGPTkcqUJUp2/tQMCAwEAAaOBkDCB
+jTAdBgNVHQ4EFgQUy0Lz6RgmtpywlBOXdPABQArp358wXgYDVR0jBFcwVYAUy0Lz
+6RgmtpywlBOXdPABQArp35+hMqQwMC4xLDAqBgNVBAMTI0lOU0VDVVJFIFRlc3Qg
+Q2VydGlmaWNhdGUgQXV0aG9yaXR5ggkAgB471Ne0njkwDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOBgQCmi3JQm+EIWjkRlyz9sijkYS+Ps4opmd/weeaXwa4E
+gVBWJGyiduB+kBnfv61+/tDjlrbjBDH5dP8suczHQL8gox4zGgjw64KH4o1ujZYR
+cEPbhnUpwbXu7yItlajBZfpFefjF5P0Ao2iEzQldDy0D6nQ19h5QANvQxqweTPQp
+pw==
+-----END CERTIFICATE-----

data/spec/fixtures/ssl/generated/ca.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXgIBAAKBgQDeWQFx3fnaqIgjOqfK+8mPn1zHV2fMzKOe5orZxEfjbSsF+6Qs
+TYxs5Wv2dir/sJ2OpekTy4UAX5RNIgroxZn9uJ2SvbF39638J7alUhXEf6u3eknP
+fBmELcdjP4dTgIPaIj3ADOxvqYxXuZ3V+OVh+KvhIEYY9ORypQlSnb+1AwIDAQAB
+AoGBAL147VFCDlM1gGU865V+wIFCFQbNxedwjxGuda4io/v6oEoF6R3Tq5F0Y27v
+va6Lq4fOe/LhYGI0EKU2GEPJd3F2wA21r+81InPKAkqYI5CDQtKDDNLviur8ZVKF
+i3UzutjeYoCqmWeHaKPD6w5DtqeBieem7LTWRyXlFtHZV/nBAkEA8nsMOSd1+JTm
+ZT4HDsEFQrN8mIFUUioFSHPut2CwzvTEW+hTkLQiog3bua4n7uQOFImR63X9qMsh
+IjZRJQNmowJBAOq+mQdnRWYKl0SYb++Eb3uW6L4h1zsW375+caKo9omtpeqDW/y0
+BWyY0q4DPkm3yU26Yr+b2JijISrml9/8PiECQQDHuXyG8y7jktn3GFE94NURbL+6
+6gPnLX9ufzdoSjc4MDowrbtvHEDOlHWgioeP6L6EQhA0DtrhlnbzNCRARX3bAkEA
+jQOsF+dwqAjKr/lGnMKY2cxgyf64NZXbGKsKhmUrnK9E0SjR9G8MJx1yyffGzi/q
+bJf/xAzRw3eTcBsPtwznIQJAHq5MOK7oaUuO+6cbsZYpOYOOkKIvDLiOtdSr7LTI
+DziH/fpzB0VhCmFhhEQwHhlB4t3m66A9TelHmhrCDsIaLA==
+-----END RSA PRIVATE KEY-----

data/spec/fixtures/ssl/generated/selfsigned.crt

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICHTCCAYagAwIBAgIJALT/G+ylQljIMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+BAMTCWxvY2FsaG9zdDAgFw0xMDEwMjAxMzQ2MjNaGA80NzQ4MDkxNTEzNDYyM1ow
+FDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQCvpvRkGtGtW8+Y9tC/fomePmO/TRmSGKZeuZu/1nUB0hlZKwGkx3xM/t7ETk5H
+n8NrEqaJmpWySBHJGQubnb8OS3s1yvOvkje6cecyqwC//bzl8aVihHGeQIYyx7/o
+04WAJ6ZEXD9uCXE80AasVgpK1qZ4FFsKbR0KC2W9zDN1/wIDAQABo3UwczAdBgNV
+HQ4EFgQUddLPFtGmb0aFWbTl2kAoxD+fd6kwRAYDVR0jBD0wO4AUddLPFtGmb0aF
+WbTl2kAoxD+fd6mhGKQWMBQxEjAQBgNVBAMTCWxvY2FsaG9zdIIJALT/G+ylQljI
+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAlOCBO54S88mD3VYviER6
+V+lkd7iWmdas2wUUDeMKA9CxnirWi7ne2U7wQH/5FJ1j3ImSfjb4h/98xiVJE84e
+Ld7mb61g/M4g4b62kt0HK8/cGUxfuz5zwIfi28qJq3ow6AFEq1fywbJvUAnnamwU
+cZF/qoVfJhus2mXjYc4hFWg=
+-----END CERTIFICATE-----

data/spec/fixtures/ssl/generated/server.crt

@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIICCjCCAXOgAwIBAgIBATANBgkqhkiG9w0BAQUFADAuMSwwKgYDVQQDEyNJTlNF
+Q1VSRSBUZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTAgFw0xMDEwMjAxMzQ2MjNa
+GA80NzQ4MDkxNTEzNDYyM1owFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqG
+SIb3DQEBAQUAA4GNADCBiQKBgQCvpvRkGtGtW8+Y9tC/fomePmO/TRmSGKZeuZu/
+1nUB0hlZKwGkx3xM/t7ETk5Hn8NrEqaJmpWySBHJGQubnb8OS3s1yvOvkje6cecy
+qwC//bzl8aVihHGeQIYyx7/o04WAJ6ZEXD9uCXE80AasVgpK1qZ4FFsKbR0KC2W9
+zDN1/wIDAQABo1AwTjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBR10s8W0aZvRoVZ
+tOXaQCjEP593qTAfBgNVHSMEGDAWgBTLQvPpGCa2nLCUE5d08AFACunfnzANBgkq
+hkiG9w0BAQUFAAOBgQCR4Oor0YAvK0tNFrOLtqmC6D0F5IYCyu7komk7JGn9L4nn
+7VyVxd4MXdc1r1v+WP5JtnA9ZjMmEmH9gl4gwR/Cu+TMkArsq0Z8mREOLNL8pwpx
+Zxgk0CwacYR9RQcpuJ9nSDzVoO5ecYkb5C9q7gwgqbmCzr7oz/rwTqRwiUZCVQ==
+-----END CERTIFICATE-----

data/spec/fixtures/ssl/generated/server.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCvpvRkGtGtW8+Y9tC/fomePmO/TRmSGKZeuZu/1nUB0hlZKwGk
+x3xM/t7ETk5Hn8NrEqaJmpWySBHJGQubnb8OS3s1yvOvkje6cecyqwC//bzl8aVi
+hHGeQIYyx7/o04WAJ6ZEXD9uCXE80AasVgpK1qZ4FFsKbR0KC2W9zDN1/wIDAQAB
+AoGALIdgkTgTS6VovVhklwcXEBy04LxE7Tp+gqj/COTvCKUgc/BpHELOCh7ajl1j
+jti7i5tQyLV9mZKXn6lPvgWBd0w+p6VhM4NFA97CoodEJm2ckFC9zUABCh9dOpbm
+8KzF7hdpYWgJJchwwZ60tbcP7K1DkiNX6Kk9qKQEWvitMBECQQDpOSzzLldcEU9l
+ze/nG2+rf6ecaPnKeafY8R2qVils8I7ZJAW3+0bNT5gQs7rT7aWo8vMvrXq++lWb
+JkNV6hK9AkEAwM5wsmg7REmAaDwgUBq5mNt963/uG2ihAODFS70lYT23UYl5Y3rD
+s3qU4ntG4DvWIQgPdwdstzDh9fMBVXa1awJBAID1WoOE5k1ETRDP1I2HwDGmPnng
+Ge75YfQ1LuAXEITqZzJuFrNqv/Waw0zI9M9moqlO3WVJmYusRFWrzKPe8EkCQEwC
+FlN+275z63csHOD3aCtmfCGW8VtEyBP8iErvagkHt3khZQVepD/hF0ihqLNFY4jq
+EI6wEp+1WZ8ICYKTpbkCQQDhl5QLdy5Xo3k3agCnB9nktSzs2iqFvsGvfOAW4628
+iThKTNua6bBvbdiG0Vh2Sv0XBYVJoHB3WnTVgFyPJaaF
+-----END RSA PRIVATE KEY-----

data/spec/fixtures/ssl/openssl-exts.cnf

@@ -0,0 +1,9 @@
+[ca]
+basicConstraints=critical,CA:true
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid:always,issuer:always
+
+[cert]
+basicConstraints=critical,CA:false
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer

data/spec/httparty/parser_spec.rb

@@ -1,7 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
-class CustomParser < HTTParty::Parser; end
-
 describe HTTParty::Parser do
   describe ".SupportedFormats" do
     it "returns a hash" do
@@ -115,10 +113,13 @@ describe HTTParty::Parser do
       end
 
       it "raises a useful exception message for subclasses" do
-        parser = CustomParser.new('body', :atom)
+        atom_parser = Class.new(HTTParty::Parser) do
+          def self.name; 'AtomParser'; end
+        end
+        parser = atom_parser.new 'body', :atom
         expect do
           parser.send(:parse_supported_format)
-        end.to raise_error(NotImplementedError, "CustomParser has not implemented a parsing method for the :atom format.")
+        end.to raise_error(NotImplementedError, "AtomParser has not implemented a parsing method for the :atom format.")
       end
     end
   end

data/spec/httparty/request_spec.rb

@@ -5,6 +5,28 @@ describe HTTParty::Request do
     @request = HTTParty::Request.new(Net::HTTP::Get, 'http://api.foo.com/v1', :format => :xml)
   end
 
+  describe "::NON_RAILS_QUERY_STRING_NORMALIZER" do
+    let(:normalizer) { HTTParty::Request::NON_RAILS_QUERY_STRING_NORMALIZER }
+
+    it "doesn't modify strings" do
+      query_string = normalizer["foo=bar&foo=baz"]
+      URI.unescape(query_string).should == "foo=bar&foo=baz"
+    end
+
+    context "when representing an array" do
+
+      it "doesn't include brackets" do
+        query_string = normalizer[{:page => 1, :foo => %w(bar baz)}]
+        URI.unescape(query_string).should == "foo=bar&foo=baz&page=1"
+      end
+
+      it "URI encodes array values" do
+        query_string = normalizer[{:people => ["Bob Marley", "Tim & Jon"]}]
+        query_string.should == "people=Bob%20Marley&people=Tim%20%26%20Jon"
+      end
+    end
+  end
+
   describe "initialization" do
     it "sets parser to HTTParty::Parser" do
       request = HTTParty::Request.new(Net::HTTP::Get, 'http://google.com')
@@ -74,6 +96,33 @@ describe HTTParty::Request do
         @request.options[:default_params] = {}
         @request.uri.query.should be_nil
       end
+
+      it "respects the query string normalization proc" do
+        empty_proc = lambda {|qs| ""}
+        @request.options[:query_string_normalizer] = empty_proc
+        @request.options[:query] = {:foo => :bar}
+        URI.unescape(@request.uri.query).should == ""
+      end
+
+      context "when representing an array" do
+        it "returns a Rails style query string" do
+          @request.options[:query] = {:foo => %w(bar baz)}
+          URI.unescape(@request.uri.query).should == "foo[]=bar&foo[]=baz"
+        end
+      end
+
+    end
+  end
+
+  describe "#setup_raw_request" do
+    context "when query_string_normalizer is set" do
+      it "sets the body to the return value of the proc" do
+        @request.options[:query_string_normalizer] = HTTParty::Request::NON_RAILS_QUERY_STRING_NORMALIZER
+        @request.options[:body] = {:page => 1, :foo => %w(bar baz)}
+        @request.send(:setup_raw_request)
+        body = @request.instance_variable_get(:@raw_request).body
+        URI.unescape(body).should == "foo=bar&foo=baz&page=1"
+      end
     end
   end
 
@@ -111,9 +160,10 @@ describe HTTParty::Request do
           @cert = mock("OpenSSL::X509::Certificate")
           @key =  mock("OpenSSL::PKey::RSA")
           OpenSSL::X509::Certificate.should_receive(:new).with(pem).and_return(@cert)
-          OpenSSL::PKey::RSA.should_receive(:new).with(pem).and_return(@key)
+          OpenSSL::PKey::RSA.should_receive(:new).with(pem, "password").and_return(@key)
 
           @request.options[:pem] = pem
+          @request.options[:pem_password] = "password"
           @pem_http = @request.send(:http)
         end
 
@@ -139,16 +189,6 @@ describe HTTParty::Request do
           request.options[:pem] = :pem_contents
           request.send(:http)
         end
-
-        it "should not verify a certificate if scheme is not https" do
-          http = Net::HTTP.new('google.com')
-          Net::HTTP.stub(:new => http)
-
-          request = HTTParty::Request.new(Net::HTTP::Get, 'http://google.com')
-          request.options[:pem] = :pem_contents
-          http = request.send(:http)
-          http.verify_mode.should == OpenSSL::SSL::VERIFY_NONE
-        end
       end
 
       context "debugging" do
@@ -282,9 +322,19 @@ describe HTTParty::Request do
           @request.perform.should == {"hash" => {"foo" => "bar"}}
         end
 
-        it "returns the Net::HTTP response if the 300 does not contain a location header" do
+        it "redirects if a 300 contains a relative location header" do
+          redirect = stub_response '', 300
+          redirect['location'] = '/foo/bar'
+          ok = stub_response('<hash><foo>bar</foo></hash>', 200)
+          @http.stub!(:request).and_return(redirect, ok)
+          response = @request.perform
+          response.request.uri.request_uri.should == "/foo/bar"
+          response.should == {"hash" => {"foo" => "bar"}}
+        end
+
+        it "returns the HTTParty::Response when the 300 does not contain a location header" do
           net_response = stub_response '', 300
-          @request.perform.should be_kind_of(Net::HTTPMultipleChoice)
+          HTTParty::Response.should === @request.perform
         end
       end