httparty 0.11.0 → 0.12.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 88f8c122e637f99fecd417041020833f2ba2a775
+  data.tar.gz: 308db16b7ab96c4beb228bf72eaf85626c40298b
+SHA512:
+  metadata.gz: ba5e4e41966cb967db3dae1988eb551721cf134f55d008e376353b482538cacda2a35294d7f52a43ddb81a137783e64ef8723962e8b5259617c2d21bc9a07f07
+  data.tar.gz: 7388e5ec85b6a1c5fb862c1ea11e92c1c501da28bce3a4f2af93ec0b4b535fa059a091632e5710c51c5cf3ce520e8c7f3120f95dd797cedbb84c45490fd23871

data/Gemfile

@@ -6,7 +6,6 @@ gem 'cucumber', '~> 0.7'
 gem 'fakeweb',  '~> 1.2'
 gem 'rspec',    '~> 1.3'
 gem 'mongrel',  '1.2.0.pre2'
-gem 'multi_json', '~> 1.3'
 
 group :development do
   gem 'guard'

data/README.md

@@ -10,7 +10,8 @@ gem install httparty
 
 ## Requirements
 
-* multi_json and multi_xml
+* Ruby 1.9.3 or higher
+* multi_xml
 * You like to party!
 
 ## Examples

data/Rakefile

@@ -1,6 +1,3 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.ruby_opts << '-rubygems'
@@ -12,4 +9,4 @@ end
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:features)
 
-task :default => [:spec, :features]
+task :default => [:spec, :features]

data/examples/aaws.rb

@@ -11,17 +11,17 @@ module AAWS
     include HTTParty
     base_uri 'http://ecs.amazonaws.com'
     default_params :Service => 'AWSECommerceService', :Operation => 'ItemSearch', :SearchIndex => 'Books'
-    
+
     def initialize(key)
       self.class.default_params :AWSAccessKeyId => key
     end
-    
+
     def search(options={})
       raise ArgumentError, 'You must search for something' if options[:query].blank?
-      
+
       # amazon uses nasty camelized query params
       options[:query] = options[:query].inject({}) { |h, q| h[q[0].to_s.camelize] = q[1]; h }
-      
+
       # make a request and return the items (NOTE: this doesn't handle errors at this point)
       self.class.get('/onca/xml', options)['ItemSearchResponse']['Items']
     end

data/examples/crack.rb

@@ -15,5 +15,5 @@ class Rep
   )
 end
 
-pp Rep.get('http://whoismyrepresentative.com/whoismyrep.php?zip=46544')
-pp Rep.get('http://whoismyrepresentative.com/whoismyrep.php', :query => {:zip => 46544})
+pp Rep.get('http://whoismyrepresentative.com/getall_mems.php?zip=46544')
+pp Rep.get('http://whoismyrepresentative.com/getall_mems.php', :query => {:zip => 46544})

data/examples/delicious.rb

@@ -6,11 +6,11 @@ config = YAML::load(File.read(File.join(ENV['HOME'], '.delicious')))
 class Delicious
   include HTTParty
   base_uri 'https://api.del.icio.us/v1'
-  
+
   def initialize(u, p)
     @auth = {:username => u, :password => p}
   end
-  
+
   # query params that filter the posts are:
   #   tag (optional). Filter by this tag.
   #   dt (optional). Filter by this date (CCYY-MM-DDThh:mm:ssZ).
@@ -20,7 +20,7 @@ class Delicious
     options.merge!({:basic_auth => @auth})
     self.class.get('/posts/get', options)
   end
-  
+
   # query params that filter the posts are:
   #   tag (optional). Filter by this tag.
   #   count (optional). Number of items to retrieve (Default:15, Maximum:100).
@@ -34,4 +34,4 @@ delicious = Delicious.new(config['username'], config['password'])
 pp delicious.posts(:query => {:tag => 'ruby'})
 pp delicious.recent
 
-delicious.recent['posts']['post'].each { |post| puts post['href'] }
+delicious.recent['posts']['post'].each { |post| puts post['href'] }

data/examples/headers_and_user_agents.rb

@@ -2,5 +2,5 @@
 
 require 'httparty'
 
-APPLICATION_NAME = "Httparty" 
+APPLICATION_NAME = "Httparty"
 response = HTTParty.get('http://example.com', :headers => {"User-Agent" => APPLICATION_NAME})

data/examples/twitter.rb

@@ -6,18 +6,18 @@ config = YAML::load(File.read(File.join(ENV['HOME'], '.twitter')))
 class Twitter
   include HTTParty
   base_uri 'twitter.com'
-  
+
   def initialize(u, p)
     @auth = {:username => u, :password => p}
   end
-  
+
   # which can be :friends, :user or :public
   # options[:query] can be things like since, since_id, count, etc.
   def timeline(which=:friends, options={})
     options.merge!({:basic_auth => @auth})
     self.class.get("/statuses/#{which}_timeline.json", options)
   end
-  
+
   def post(text)
     options = { :query => {:status => text}, :basic_auth => @auth }
     self.class.post('/statuses/update.json', options)
@@ -28,4 +28,4 @@ twitter = Twitter.new(config['email'], config['password'])
 pp twitter.timeline
 # pp twitter.timeline(:friends, :query => {:since_id => 868482746})
 # pp twitter.timeline(:friends, :query => 'since_id=868482746')
-# pp twitter.post('this is a test of 0.2.0')
+# pp twitter.post('this is a test of 0.2.0')

data/examples/whoismyrep.rb

@@ -6,5 +6,5 @@ class Rep
   include HTTParty
 end
 
-pp Rep.get('http://whoismyrepresentative.com/whoismyrep.php?zip=46544')
-pp Rep.get('http://whoismyrepresentative.com/whoismyrep.php', :query => {:zip => 46544})
+pp Rep.get('http://whoismyrepresentative.com/getall_mems.php?zip=46544')
+pp Rep.get('http://whoismyrepresentative.com/getall_mems.php', :query => {:zip => 46544})

data/features/handles_compressed_responses.feature

@@ -17,3 +17,11 @@ Feature: Handles Compressed Responses
     And that service is accessed at the path '/gzip_service.html'
     When I call HTTParty#get with '/gzip_service.html'
     Then the return value should match '<h1>Some HTML</h1>'
+
+  Scenario: Supports HEAD request with gzip encoding
+    Given a remote gzip service
+    And that service is accessed at the path '/gzip_head.gz.js'
+    When I call HTTParty#head with '/gzip_head.gz.js'
+    Then it should return a response with a 200 response code
+    Then it should return a response with a gzip content-encoding
+    Then it should return a response with a blank body

data/features/handles_multiple_formats.feature

@@ -32,3 +32,11 @@ Feature: Handles Multiple Formats
     Then it should return a Hash equaling:
        | key    | value           |
        | singer | waylon jennings |
+
+  Scenario: A Javascript remote file
+    Given a remote service that returns '$(function() { alert("hi"); });'
+    And that service is accessed at the path '/service.js'
+    And the response from the service has a Content-Type of 'application/javascript'
+    When I call HTTParty#get with '/service.js'
+    Then it should return a String
+    And the return value should match '$(function() { alert("hi"); });'

data/features/steps/httparty_response_steps.rb

@@ -11,7 +11,6 @@ def constantize(camel_cased_word)
   constant
 end
 
-
 Then /it should return an? (\w+)$/ do |class_string|
   @response_from_httparty.should be_an_instance_of(class_string.class)
 end
@@ -34,6 +33,14 @@ Then /it should return a response with a (\d+) response code/ do |code|
   @response_from_httparty.code.should eql(code.to_i)
 end
 
+Then /it should return a response with a (.*) content\-encoding$/ do |content_type|
+  @response_from_httparty.headers['content-encoding'].should eql('gzip')
+end
+
+Then /it should return a response with a blank body$/ do
+  @response_from_httparty.body.should be(nil)
+end
+
 Then /it should raise (?:an|a) ([\w:]+) exception/ do |exception|
   @exception_from_httparty.should_not be_nil
   @exception_from_httparty.should be_a constantize(exception)

data/features/steps/httparty_steps.rb

@@ -10,6 +10,14 @@ When /I call HTTParty#get with '(.*)'$/ do |url|
   end
 end
 
+When /^I call HTTParty#head with '(.*)'$/ do |url|
+  begin
+    @response_from_httparty = HTTParty.head("http://#{@host_and_port}#{url}", @request_options)
+  rescue HTTParty::RedirectionTooDeep, Timeout::Error => e
+    @exception_from_httparty = e
+  end
+end
+
 When /I call HTTParty#get with '(.*)' and a basic_auth hash:/ do |url, auth_table|
   h = auth_table.hashes.first
   @response_from_httparty = HTTParty.get(
@@ -24,4 +32,4 @@ When /I call HTTParty#get with '(.*)' and a digest_auth hash:/ do |url, auth_tab
     "http://#{@host_and_port}#{url}",
     :digest_auth => { :username => h["username"], :password => h["password"] }
   )
-end
+end

data/httparty.gemspec

@@ -12,7 +12,9 @@ Gem::Specification.new do |s|
   s.summary     = %q{Makes http fun! Also, makes consuming restful web services dead easy.}
   s.description = %q{Makes http fun! Also, makes consuming restful web services dead easy.}
 
-  s.add_dependency 'multi_json', "~> 1.0"
+  s.required_ruby_version     = '>= 1.9.3'
+
+  s.add_dependency 'json',      "~> 1.8"
   s.add_dependency 'multi_xml', ">= 0.5.2"
 
   s.post_install_message = "When you HTTParty, you must party hard!"

data/lib/httparty.rb

@@ -4,13 +4,14 @@ require 'net/https'
 require 'uri'
 require 'zlib'
 require 'multi_xml'
-require 'multi_json'
+require 'json'
 
 require 'httparty/module_inheritable_attributes'
 require 'httparty/cookie_hash'
 require 'httparty/net_digest_auth'
 require 'httparty/version'
 require 'httparty/connection_adapter'
+require 'httparty/logger/logger'
 
 # @see HTTParty::ClassMethods
 module HTTParty
@@ -47,6 +48,8 @@ module HTTParty
   # [:+limit+:] Maximum number of redirects to follow. Takes precedences over :+no_follow+.
   # [:+query+:] Query string, or a Hash representing it. Normalized according to the same rules as :+body+. If you specify this on a POST, you must use a Hash. See also HTTParty::ClassMethods.default_params.
   # [:+timeout+:] Timeout for opening connection and reading data.
+  # [:+local_host:] Local address to bind to before connecting.
+  # [:+local_port:] Local port to bind to before connecting.
   #
   # There are also another set of options with names corresponding to various class methods. The methods in question are those that let you set a class-wide default, and the options override the defaults on a request-by-request basis. Those options are:
   # * :+base_uri+: see HTTParty::ClassMethods.base_uri.
@@ -68,6 +71,18 @@ module HTTParty
 
     extend AllowedFormatsDeprecation
 
+    # Turns on logging
+    #
+    #   class Foo
+    #     include HTTParty
+    #     logger Logger.new('http_logger'), :info, :apache
+    #   end
+    def logger(logger, level=:info, format=:apache)
+      default_options[:logger]     = logger
+      default_options[:log_level]  = level
+      default_options[:log_format] = format
+    end
+
     # Allows setting http proxy information to be used
     #
     #   class Foo
@@ -312,7 +327,7 @@ module HTTParty
 
     # Allows setting of SSL ciphers to use.  This only works in Ruby 1.9+.
     # You can get a list of valid specific ciphers from OpenSSL::Cipher.ciphers.
-    # You also can specify a cipher suite here, listed here at openssl.org: 
+    # You also can specify a cipher suite here, listed here at openssl.org:
     # http://www.openssl.org/docs/apps/ciphers.html#CIPHER_SUITE_NAMES
     #
     #   class Foo
@@ -323,7 +338,13 @@ module HTTParty
       default_options[:ciphers] = cipher_names
     end
 
-    # Allows setting an OpenSSL certificate authority file
+    # Allows setting an OpenSSL certificate authority file.  The file
+    # should contain one or more certificates in PEM format.
+    #
+    # Setting this option enables certificate verification.  All
+    # certificates along a chain must be available in ssl_ca_file or
+    # ssl_ca_path for verification to succeed.
+    #
     #
     #   class Foo
     #     include HTTParty
@@ -333,7 +354,11 @@ module HTTParty
       default_options[:ssl_ca_file] = path
     end
 
-    # Allows setting an OpenSSL certificate authority path (directory)
+    # Allows setting an OpenSSL certificate authority path (directory).
+    #
+    # Setting this option enables certificate verification.  All
+    # certificates along a chain must be available in ssl_ca_file or
+    # ssl_ca_path for verification to succeed.
     #
     #   class Foo
     #     include HTTParty
@@ -512,7 +537,7 @@ module HTTParty
   def self.move(*args, &block)
     Basement.move(*args, &block)
   end
-  
+
   def self.copy(*args, &block)
     Basement.move(*args, &block)
   end

data/lib/httparty/connection_adapter.rb

@@ -66,7 +66,11 @@ module HTTParty
 
     def connection
       host = clean_host(uri.host)
-      http = Net::HTTP.new(host, uri.port, options[:http_proxyaddr], options[:http_proxyport], options[:http_proxyuser], options[:http_proxypass])
+      if options[:http_proxyaddr]
+        http = Net::HTTP.new(host, uri.port, options[:http_proxyaddr], options[:http_proxyport], options[:http_proxyuser], options[:http_proxypass])
+      else
+        http = Net::HTTP.new(host, uri.port)
+      end
 
       http.use_ssl = ssl_implied?(uri)
 
@@ -85,6 +89,25 @@ module HTTParty
         http.ciphers = options[:ciphers]
       end
 
+      # Bind to a specific local address or port
+      #
+      # @see https://bugs.ruby-lang.org/issues/6617
+      if options[:local_host]
+        if RUBY_VERSION >= "2.0.0"
+          http.local_host = options[:local_host]
+        else
+          Kernel.warn("Warning: option :local_host requires Ruby version 2.0 or later")
+        end
+      end
+
+      if options[:local_port]
+        if RUBY_VERSION >= "2.0.0"
+          http.local_port = options[:local_port]
+        else
+          Kernel.warn("Warning: option :local_port requires Ruby version 2.0 or later")
+        end
+      end
+
       return http
     end
 
@@ -104,7 +127,18 @@ module HTTParty
 
     def attach_ssl_certificates(http, options)
       if http.use_ssl?
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        if options.fetch(:verify, true)
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          if options[:cert_store]
+            http.cert_store = options[:cert_store]
+          else
+            # Use the default cert store by default, i.e. system ca certs
+            http.cert_store = OpenSSL::X509::Store.new
+            http.cert_store.set_default_paths
+          end
+        else
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
 
         # Client certificate authentication
         if options[:pem]

data/lib/httparty/cookie_hash.rb

@@ -8,7 +8,7 @@ class HTTParty::CookieHash < Hash #:nodoc:
       merge!(value)
     when String
       value.split('; ').each do |cookie|
-        array = cookie.split('=')
+        array = cookie.split('=',2)
         self[array[0].to_sym] = array[1]
       end
     else

data/lib/httparty/logger/apache_logger.rb

@@ -0,0 +1,22 @@
+module HTTParty
+  module Logger
+    class ApacheLogger #:nodoc:
+      TAG_NAME = HTTParty.name
+
+      attr_accessor :level, :logger, :current_time
+
+      def initialize(logger, level)
+        @logger = logger
+        @level  = level.to_sym
+      end
+
+      def format(request, response)
+        current_time   = Time.now.strftime("%Y-%m-%d %H:%M:%S %z")
+        http_method    = request.http_method.name.split("::").last.upcase
+        path           = request.path.to_s
+        content_length = response['Content-Length']
+        @logger.send @level, "[#{TAG_NAME}] [#{current_time}] #{response.code} \"#{http_method} #{path}\" #{content_length || "-"} "
+      end
+    end
+  end
+end

data/lib/httparty/logger/curl_logger.rb

@@ -0,0 +1,48 @@
+module HTTParty
+  module Logger
+    class CurlLogger #:nodoc:
+      TAG_NAME = HTTParty.name
+      OUT = ">"
+      IN = "<"
+
+      attr_accessor :level, :logger, :current_time
+
+      def initialize(logger, level)
+        @logger = logger
+        @level  = level.to_sym
+      end
+
+      def format(request, response)
+        messages        = []
+        time            = Time.now.strftime("%Y-%m-%d %H:%M:%S %z")
+        http_method     = request.http_method.name.split("::").last.upcase
+        path            = request.path.to_s
+
+        messages << print(time, OUT, "#{http_method} #{path}")
+
+        if request.options[:headers] && request.options[:headers].size > 0
+          request.options[:headers].each do |k, v|
+            messages << print(time, OUT, "#{k}: #{v}")
+          end
+        end
+
+        messages << print(time, OUT, request.raw_body)
+        messages << print(time, OUT, "")
+        messages << print(time, IN, "HTTP/#{response.http_version} #{response.code}")
+
+        headers = response.respond_to?(:headers) ? response.headers : response
+        response.each_header do |response_header|
+          messages << print(time, IN, "#{response_header.capitalize}: #{headers[response_header]}")
+        end
+
+        messages << print(time, IN, "\n#{response.body}")
+
+        @logger.send @level, messages.join("\n")
+      end
+
+      def print(time, direction, line)
+        "[#{TAG_NAME}] [#{time}] #{direction} #{line}"
+      end
+    end
+  end
+end

data/lib/httparty/logger/logger.rb

@@ -0,0 +1,18 @@
+require 'httparty/logger/apache_logger'
+require 'httparty/logger/curl_logger'
+
+module HTTParty
+  module Logger
+    def self.build(logger, level, formatter)
+      level  ||= :info
+      format ||= :apache
+
+      case formatter
+      when :curl
+        Logger::CurlLogger.new(logger, level)
+      else
+        Logger::ApacheLogger.new(logger, level)
+      end
+    end
+  end
+end

data/lib/httparty/parser.rb

@@ -42,8 +42,8 @@ module HTTParty
       'application/xml'        => :xml,
       'application/json'       => :json,
       'text/json'              => :json,
-      'application/javascript' => :json,
-      'text/javascript'        => :json,
+      'application/javascript' => :plain,
+      'text/javascript'        => :plain,
       'text/html'              => :html,
       'text/plain'             => :plain
     }
@@ -110,12 +110,7 @@ module HTTParty
     end
 
     def json
-      # https://github.com/sferik/rails/commit/5e62670131dfa1718eaf21ff8dd3371395a5f1cc
-      if MultiJson.respond_to?(:adapter)
-        MultiJson.load(body)
-      else
-        MultiJson.decode(body)
-      end
+      JSON.load(body, nil)
     end
 
     def html

data/lib/httparty/request.rb

@@ -34,6 +34,7 @@ module HTTParty
       self.path = path
       self.options = {
         :limit => o.delete(:no_follow) ? 1 : 5,
+        :assume_utf16_is_big_endian => true,
         :default_params => {},
         :follow_redirects => true,
         :parser => Parser,
@@ -102,10 +103,14 @@ module HTTParty
         end
       end
 
-      handle_deflation
+      handle_deflation unless http_method == Net::HTTP::Head
       handle_response(chunked_body, &block)
     end
 
+    def raw_body
+      @raw_request.body
+    end
+
     private
 
     def http
@@ -172,9 +177,82 @@ module HTTParty
       query_string_parts.size > 0 ? query_string_parts.join('&') : nil
     end
 
+    def get_charset
+      content_type = last_response["content-type"]
+      if content_type.nil?
+        return nil
+      end
+
+      if content_type =~ /;\s*charset\s*=\s*([^=,;"\s]+)/i
+        return $1
+      end
+
+      if content_type =~ /;\s*charset\s*=\s*"((\\.|[^\\"])+)"/i
+        return $1.gsub(/\\(.)/, '\1')
+      end
+
+      nil
+    end
+
+    def encode_with_ruby_encoding(body, charset)
+      begin
+        encoding = Encoding.find(charset)
+        body.force_encoding(encoding)
+      rescue
+        body
+      end
+    end
+
+    def assume_utf16_is_big_endian
+      options[:assume_utf16_is_big_endian]
+    end
+
+    def encode_utf_16(body)
+      if body.bytesize >= 2
+        if body.getbyte(0) == 0xFF && body.getbyte(1) == 0xFE
+          return body.force_encoding("UTF-16LE")
+        elsif body.getbyte(0) == 0xFE && body.getbyte(1) == 0xFF
+          return body.force_encoding("UTF-16BE")
+        end
+      end
+
+      if assume_utf16_is_big_endian
+        body.force_encoding("UTF-16BE")
+      else
+        body.force_encoding("UTF-16LE")
+      end
+
+    end
+
+    def _encode_body(body)
+      charset = get_charset
+
+      if charset.nil?
+        return body
+      end
+
+      if "utf-16".casecmp(charset) == 0
+        encode_utf_16(body)
+      else
+        encode_with_ruby_encoding(body, charset)
+      end
+    end
+
+    def encode_body(body)
+      if "".respond_to?(:encoding)
+        _encode_body(body)
+      else
+        body
+      end
+    end
+
     def handle_response(body, &block)
       if response_redirects?
         options[:limit] -= 1
+        if options[:logger]
+          logger = HTTParty::Logger.build(options[:logger], options[:log_level], options[:log_format])
+          logger.format(self, last_response)
+        end
         self.path = last_response['location']
         self.redirect = true
         self.http_method = Net::HTTP::Get unless options[:maintain_method_across_redirects]
@@ -182,6 +260,7 @@ module HTTParty
         perform(&block)
       else
         body = body || last_response.body
+        body = encode_body(body)
         Response.new(self, last_response, lambda { parse_response(body) }, :body => body)
       end
     end
@@ -219,7 +298,7 @@ module HTTParty
       return unless response['Set-Cookie']
       cookies_hash = HTTParty::CookieHash.new()
       cookies_hash.add_cookies(options[:headers]['Cookie']) if options[:headers] && options[:headers]['Cookie']
-      cookies_hash.add_cookies(response['Set-Cookie'])
+      response.get_fields('Set-Cookie').each { |cookie| cookies_hash.add_cookies(cookie) }
       options[:headers] ||= {}
       options[:headers]['Cookie'] = cookies_hash.to_cookie_string
     end

data/lib/httparty/response.rb

@@ -12,6 +12,11 @@ module HTTParty
       @body         = options[:body] || response.body
       @parsed_block = parsed_block
       @headers      = Headers.new(response.to_hash)
+
+      if request.options[:logger]
+        logger = ::HTTParty::Logger.build(request.options[:logger], request.options[:log_level], request.options[:log_format])
+        logger.format(request, self)
+      end
     end
 
     def parsed_response
@@ -41,7 +46,7 @@ module HTTParty
     end
 
     # Support old multiple_choice? method from pre 2.0.0 era.
-    if ::RUBY_VERSION >= "2.0.0"
+    if ::RUBY_VERSION >= "2.0.0" && ::RUBY_PLATFORM != "java"
       alias_method :multiple_choice?, :multiple_choices?
     end
 

data/lib/httparty/version.rb

@@ -1,3 +1,3 @@
 module HTTParty
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/script/release

@@ -0,0 +1,42 @@
+#!/bin/sh
+#/ Usage: release
+#/
+#/ Tag the version in the repo and push the gem.
+#/
+
+set -e
+cd $(dirname "$0")/..
+
+[ "$1" = "--help" -o "$1" = "-h" -o "$1" = "help" ] && {
+    grep '^#/' <"$0"| cut -c4-
+    exit 0
+}
+
+gem_name=httparty
+
+# Build a new gem archive.
+rm -rf $gem_name-*.gem
+gem build -q $gem_name.gemspec
+
+# Make sure we're on the master branch.
+(git branch | grep -q '* master') || {
+  echo "Only release from the master branch."
+  exit 1
+}
+
+# Figure out what version we're releasing.
+tag=v`ls $gem_name-*.gem | sed "s/^$gem_name-\(.*\)\.gem$/\1/"`
+
+echo "Releasing $tag"
+
+# Make sure we haven't released this version before.
+git fetch -t origin
+
+(git tag -l | grep -q "$tag") && {
+  echo "Whoops, there's already a '${tag}' tag."
+  exit 1
+}
+
+# Tag it and bag it.
+gem push $gem_name-*.gem && git tag "$tag" &&
+  git push origin master && git push origin "$tag"

data/spec/httparty/connection_adapter_spec.rb

@@ -64,6 +64,22 @@ describe HTTParty::ConnectionAdapter do
       context "when dealing with ssl" do
         let(:uri) { URI 'https://foobar.com' }
 
+        context "uses the system cert_store, by default" do
+          let(:system_cert_store) do
+            system_cert_store = mock('default_cert_store')
+            system_cert_store.should_receive(:set_default_paths)
+            OpenSSL::X509::Store.should_receive(:new).and_return(system_cert_store)
+            system_cert_store
+          end
+          it { should use_cert_store(system_cert_store) }
+        end
+
+        context "should use the specified cert store, when one is given" do
+          let(:custom_cert_store) { mock('custom_cert_store') }
+          let(:options) { {:cert_store => custom_cert_store} }
+          it { should use_cert_store(custom_cert_store) }
+        end
+
         context "using port 443 for ssl" do
           let(:uri) { URI 'https://api.foo.com/v1:443' }
           it { should use_ssl }
@@ -176,6 +192,23 @@ describe HTTParty::ConnectionAdapter do
         end
       end
 
+      context 'when not providing a proxy address' do
+        let(:uri) { URI 'http://proxytest.com' }
+
+        it "does not pass any proxy parameters to the connection" do
+          http = Net::HTTP.new("proxytest.com")
+          Net::HTTP.should_receive(:new).once.with("proxytest.com", 80).and_return(http)
+          adapter.connection
+        end
+      end
+
+      context 'when providing a local bind address and port' do
+        let(:options) { {:local_host => "127.0.0.1", :local_port => 12345 } }
+
+        its(:local_host) { should == '127.0.0.1' }
+        its(:local_port) { should == 12345 }
+      end if RUBY_VERSION >= '2.0'
+
       context "when providing PEM certificates" do
         let(:pem) { :pem_contents }
         let(:options) { {:pem => pem, :pem_password => "password"} }

data/spec/httparty/cookie_hash_spec.rb

@@ -35,6 +35,13 @@ describe HTTParty::CookieHash do
         @cookie_hash.length.should eql(1)
         @cookie_hash[:foo].should eql("tar")
       end
+
+      it "should handle '=' within cookie value" do
+          @cookie_hash.add_cookies("first=one=1; second=two=2==")
+          @cookie_hash.keys.should include(:first, :second)
+          @cookie_hash[:first].should == 'one=1'
+          @cookie_hash[:second].should == 'two=2=='
+      end
     end
 
     describe 'with other class' do

data/spec/httparty/logger/apache_logger_spec.rb

@@ -0,0 +1,26 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+
+describe HTTParty::Logger::ApacheLogger do
+  describe "#format" do
+    it "formats a response in a style that resembles apache's access log" do
+      request_time = Time.new.strftime("%Y-%m-%d %H:%M:%S %z")
+      log_message = "[HTTParty] [#{request_time}] 302 \"GET http://my.domain.com/my_path\" - "
+
+      request_double  = double(
+        :http_method => Net::HTTP::Get,
+        :path => "http://my.domain.com/my_path"
+      )
+      response_double = double(
+        :code => 302,
+        :[]   => nil
+      )
+
+      logger_double = double
+      logger_double.should_receive(:info).with(log_message)
+
+      subject = described_class.new(logger_double, :info)
+      subject.current_time = request_time
+      subject.format(request_double, response_double)
+    end
+  end
+end

data/spec/httparty/logger/curl_logger_spec.rb

@@ -0,0 +1,18 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+
+describe HTTParty::Logger::CurlLogger do
+  describe "#format" do
+    it "formats a response in a style that resembles a -v curl" do
+      logger_double = double
+      logger_double.should_receive(:info).with(
+          /\[HTTParty\] \[\d{4}-\d\d-\d\d \d\d:\d\d:\d\d\ [+-]\d{4}\] > GET http:\/\/localhost/)
+
+      subject = described_class.new(logger_double, :info)
+
+      stub_http_response_with("google.html")
+
+      response = HTTParty::Request.new.perform
+      subject.format(response.request, response)
+    end
+  end
+end

data/spec/httparty/logger/logger_spec.rb

@@ -0,0 +1,22 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+
+describe HTTParty::Logger do
+  describe ".build" do
+    subject { HTTParty::Logger }
+
+    it "defaults level to :info" do
+      logger_double = double()
+      subject.build(logger_double, nil, nil).level.should == :info
+    end
+
+    it "defaults format to :apache" do
+      logger_double = double()
+      subject.build(logger_double, nil, nil).should be_an_instance_of(HTTParty::Logger::ApacheLogger)
+    end
+
+    it "builds :curl style logger" do
+      logger_double = double()
+      subject.build(logger_double, nil, :curl).should be_an_instance_of(HTTParty::Logger::CurlLogger)
+    end
+  end
+end

data/spec/httparty/net_digest_auth_spec.rb

@@ -30,11 +30,11 @@ describe Net::HTTPHeader::DigestAuthenticator do
     before do
       @digest = setup_digest({
         'www-authenticate' => 'Digest realm="myhost@testrealm.com"'
-      })  
+      })
     end
 
     it "should not set opaque" do
-      authorization_header.should_not include(%Q(opaque=)) 
+      authorization_header.should_not include(%Q(opaque=))
     end
   end
 

data/spec/httparty/parser_spec.rb

@@ -144,14 +144,8 @@ describe HTTParty::Parser do
       subject.send(:xml)
     end
 
-    it "parses json with MultiJson" do
-      MultiJson.should_receive(:load).with('body')
-      subject.send(:json)
-    end
-
-    it "uses MultiJson.decode if MultiJson does not respond to adapter" do
-      MultiJson.should_receive(:respond_to?).with(:adapter).and_return(false)
-      MultiJson.should_receive(:decode).with('body')
+    it "parses json with JSON" do
+      JSON.should_receive(:load).with('body', nil)
       subject.send(:json)
     end
 

data/spec/httparty/request_spec.rb

@@ -198,13 +198,13 @@ describe HTTParty::Request do
 
     it 'should handle text/javascript' do
       ["text/javascript", "text/javascript; charset=iso8859-1"].each do |ct|
-        @request.send(:format_from_mimetype, ct).should == :json
+        @request.send(:format_from_mimetype, ct).should == :plain
       end
     end
 
     it 'should handle application/javascript' do
       ["application/javascript", "application/javascript; charset=iso8859-1"].each do |ct|
-        @request.send(:format_from_mimetype, ct).should == :json
+        @request.send(:format_from_mimetype, ct).should == :plain
       end
     end
 
@@ -239,6 +239,77 @@ describe HTTParty::Request do
       @request.perform.headers.should == { "key" => ["value"] }
     end
 
+    if "".respond_to?(:encoding)
+
+      it "should process charset in content type properly" do
+        response = stub_response "Content"
+        response.initialize_http_header("Content-Type" => "text/plain;charset = utf-8")
+        resp = @request.perform
+        resp.body.encoding.should == Encoding.find("UTF-8")
+      end
+
+      it "should process charset in content type properly if it has a different case" do
+        response = stub_response "Content"
+        response.initialize_http_header("Content-Type" => "text/plain;CHARSET = utf-8")
+        resp = @request.perform
+        resp.body.encoding.should == Encoding.find("UTF-8")
+      end
+
+      it "should process quoted charset in content type properly" do
+        response = stub_response "Content"
+        response.initialize_http_header("Content-Type" => "text/plain;charset = \"utf-8\"")
+        resp = @request.perform
+        resp.body.encoding.should == Encoding.find("UTF-8")
+      end
+
+      it "should process utf-16 charset with little endian bom correctly" do
+        @request.options[:assume_utf16_is_big_endian] = true
+
+        response = stub_response "\xFF\xFEC\x00o\x00n\x00t\x00e\x00n\x00t\x00"
+        response.initialize_http_header("Content-Type" => "text/plain;charset = utf-16")
+        resp = @request.perform
+        resp.body.encoding.should == Encoding.find("UTF-16LE")
+      end
+
+      it "should process utf-16 charset with big endian bom correctly" do
+        @request.options[:assume_utf16_is_big_endian] = false
+
+        response = stub_response "\xFE\xFF\x00C\x00o\x00n\x00t\x00e\x00n\x00t"
+        response.initialize_http_header("Content-Type" => "text/plain;charset = utf-16")
+        resp = @request.perform
+        resp.body.encoding.should == Encoding.find("UTF-16BE")
+      end
+
+      it "should assume utf-16 little endian if options has been chosen" do
+        @request.options[:assume_utf16_is_big_endian] = false
+
+        response = stub_response "C\x00o\x00n\x00t\x00e\x00n\x00t\x00"
+        response.initialize_http_header("Content-Type" => "text/plain;charset = utf-16")
+        resp = @request.perform
+        resp.body.encoding.should == Encoding.find("UTF-16LE")
+      end
+
+
+      it "should perform no encoding if the charset is not available" do
+
+        response = stub_response "Content"
+        response.initialize_http_header("Content-Type" => "text/plain;charset = utf-lols")
+        resp = @request.perform
+        resp.body.should == "Content"
+        resp.body.encoding.should == "Content".encoding
+      end
+
+      it "should perform no encoding if the content type is specified but no charset is specified" do
+
+        response = stub_response "Content"
+        response.initialize_http_header("Content-Type" => "text/plain")
+        resp = @request.perform
+        resp.body.should == "Content"
+        resp.body.encoding.should == "Content".encoding
+      end
+    end
+
+
     describe 'with non-200 responses' do
       context "3xx responses" do
         it 'returns a valid object for 304 not modified' do
@@ -424,6 +495,16 @@ describe HTTParty::Request do
         @request.options[:headers]['Cookie'].should match(/keep=me/)
       end
 
+      it "should handle multiple Set-Cookie headers between redirects" do
+        @redirect.add_field 'set-cookie', 'foo=bar; name=value; HTTPOnly'
+        @redirect.add_field 'set-cookie', 'one=1; two=2; HTTPOnly'
+        @request.perform
+        @request.options[:headers]['Cookie'].should match(/foo=bar/)
+        @request.options[:headers]['Cookie'].should match(/name=value/)
+        @request.options[:headers]['Cookie'].should match(/one=1/)
+        @request.options[:headers]['Cookie'].should match(/two=2/)
+      end
+
       it 'should make resulting request a get request if it not already' do
         @request.http_method = Net::HTTP::Delete
         @request.perform.should == {"hash" => {"foo" => "bar"}}
@@ -436,6 +517,13 @@ describe HTTParty::Request do
         @request.perform.should == {"hash" => {"foo" => "bar"}}
         @request.http_method.should == Net::HTTP::Delete
       end
+
+      it 'should log the redirection' do
+        logger_double = double
+        logger_double.should_receive(:info).twice
+        @request.options[:logger] = logger_double
+        @request.perform
+      end
     end
 
     describe "infinitely" do
@@ -511,4 +599,3 @@ describe HTTParty::Request do
     end
   end
 end
-

data/spec/httparty/response_spec.rb

@@ -198,7 +198,7 @@ describe HTTParty::Response do
       }
 
       # Ruby 2.0, new name for this response.
-      if RUBY_VERSION >= "2.0.0"
+      if RUBY_VERSION >= "2.0.0" && ::RUBY_PLATFORM != "java"
         SPECIFIC_CODES[:multiple_choices?] = Net::HTTPMultipleChoices
       end
 

data/spec/httparty/ssl_spec.rb

@@ -10,12 +10,24 @@ describe HTTParty::Request do
       FakeWeb.allow_net_connect = false
     end
 
-    it "should work when no trusted CA list is specified" do
-      ssl_verify_test(nil, nil, "selfsigned.crt").should == {'success' => true}
+    it "should fail when no trusted CA list is specified, by default" do
+      lambda do
+        ssl_verify_test(nil, nil, "selfsigned.crt")
+      end.should raise_error OpenSSL::SSL::SSLError
+    end
+
+    it "should work when no trusted CA list is specified, when the verify option is set to false" do
+      ssl_verify_test(nil, nil, "selfsigned.crt", :verify => false).should == {'success' => true}
+    end
+
+    it "should fail when no trusted CA list is specified, with a bogus hostname, by default" do
+      lambda do
+        ssl_verify_test(nil, nil, "bogushost.crt")
+      end.should raise_error OpenSSL::SSL::SSLError
     end
 
-    it "should work when no trusted CA list is specified, even with a bogus hostname" do
-      ssl_verify_test(nil, nil, "bogushost.crt").should == {'success' => true}
+    it "should work when no trusted CA list is specified, even with a bogus hostname, when the verify option is set to true" do
+      ssl_verify_test(nil, nil, "bogushost.crt", :verify => false).should == {'success' => true}
     end
 
     it "should work when using ssl_ca_file with a self-signed CA" do
@@ -27,10 +39,10 @@ describe HTTParty::Request do
     end
 
     it "should work when using ssl_ca_path with a certificate authority" do
-      http = Net::HTTP.new('www.google.com', 443, nil, nil, nil, nil)
+      http = Net::HTTP.new('www.google.com', 443)
       response = stub(Net::HTTPResponse, :[] => '', :body => '', :to_hash => {})
       http.stub(:request).and_return(response)
-      Net::HTTP.should_receive(:new).with('www.google.com', 443, nil, nil, nil, nil).and_return(http)
+      Net::HTTP.should_receive(:new).with('www.google.com', 443).and_return(http)
       http.should_receive(:ca_path=).with('/foo/bar')
       HTTParty.get('https://www.google.com', :ssl_ca_path => '/foo/bar')
     end

data/spec/spec_helper.rb

@@ -28,3 +28,9 @@ Spec::Matchers.define :use_ssl do
     connection.use_ssl?
   end
 end
+
+Spec::Matchers.define :use_cert_store do |cert_store|
+  match do |connection|
+    connection.cert_store == cert_store
+  end
+end

data/spec/support/ssl_test_helper.rb

@@ -2,11 +2,11 @@ require 'pathname'
 
 module HTTParty
   module SSLTestHelper
-    def ssl_verify_test(mode, ca_basename, server_cert_filename)
+    def ssl_verify_test(mode, ca_basename, server_cert_filename, options = {})
       options = {
         :format  => :json,
         :timeout => 30,
-      }
+      }.merge(options)
 
       if mode
         ca_path = File.expand_path("../../fixtures/ssl/generated/#{ca_basename}", __FILE__)
@@ -24,9 +24,9 @@ module HTTParty
         if mode
           ca_path = File.expand_path("../../fixtures/ssl/generated/#{ca_basename}", __FILE__)
           raise ArgumentError.new("#{ca_path} does not exist") unless File.exist?(ca_path)
-          return HTTParty.get("https://localhost:#{test_server.port}/", :format => :json, :timeout => 30, mode => ca_path)
+          return HTTParty.get("https://localhost:#{test_server.port}/", options)
         else
-          return HTTParty.get("https://localhost:#{test_server.port}/", :format => :json, :timeout => 30)
+          return HTTParty.get("https://localhost:#{test_server.port}/", options)
         end
       ensure
         test_server.stop if test_server

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httparty
 version: !ruby/object:Gem::Version
-  version: 0.11.0
-  prerelease: 
+  version: 0.12.0
 platform: ruby
 authors:
 - John Nunemaker
@@ -10,38 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
 description: Makes http fun! Also, makes consuming restful web services dead easy.
@@ -94,6 +89,9 @@ files:
 - lib/httparty/core_extensions.rb
 - lib/httparty/exceptions.rb
 - lib/httparty/hash_conversions.rb
+- lib/httparty/logger/apache_logger.rb
+- lib/httparty/logger/curl_logger.rb
+- lib/httparty/logger/logger.rb
 - lib/httparty/module_inheritable_attributes.rb
 - lib/httparty/net_digest_auth.rb
 - lib/httparty/parser.rb
@@ -101,6 +99,7 @@ files:
 - lib/httparty/response.rb
 - lib/httparty/response/headers.rb
 - lib/httparty/version.rb
+- script/release
 - spec/fixtures/delicious.xml
 - spec/fixtures/empty.xml
 - spec/fixtures/google.html
@@ -118,6 +117,9 @@ files:
 - spec/fixtures/undefined_method_add_node_for_nil.xml
 - spec/httparty/connection_adapter_spec.rb
 - spec/httparty/cookie_hash_spec.rb
+- spec/httparty/logger/apache_logger_spec.rb
+- spec/httparty/logger/curl_logger_spec.rb
+- spec/httparty/logger/logger_spec.rb
 - spec/httparty/net_digest_auth_spec.rb
 - spec/httparty/parser_spec.rb
 - spec/httparty/request_spec.rb
@@ -133,33 +135,26 @@ files:
 - website/index.html
 homepage: http://jnunemaker.github.com/httparty
 licenses: []
+metadata: {}
 post_install_message: When you HTTParty, you must party hard!
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -4402844038872120399
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4402844038872120399
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Makes http fun! Also, makes consuming restful web services dead easy.
 test_files:
 - features/basic_authentication.feature
@@ -192,6 +187,9 @@ test_files:
 - spec/fixtures/undefined_method_add_node_for_nil.xml
 - spec/httparty/connection_adapter_spec.rb
 - spec/httparty/cookie_hash_spec.rb
+- spec/httparty/logger/apache_logger_spec.rb
+- spec/httparty/logger/curl_logger_spec.rb
+- spec/httparty/logger/logger_spec.rb
 - spec/httparty/net_digest_auth_spec.rb
 - spec/httparty/parser_spec.rb
 - spec/httparty/request_spec.rb