httparty 0.8.2 → 0.8.3

data/.gitignore

@@ -7,3 +7,4 @@ log/
 pkg/
 *.swp
 /.bundle
+.rvmrc

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - ree
+  - 1.9.2
+  - 1.9.3
+notifications:
+  email: false
+bundler_args: --without development

data/Gemfile

@@ -1,8 +1,15 @@
 source :rubygems
 gemspec
 
-gem 'rake',     '~> 0.8.7'
+gem 'rake'
 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'
+  gem 'guard-rspec'
+  gem 'guard-bundler'
+end

data/Guardfile

@@ -0,0 +1,16 @@
+rspec_options = {
+  :version        => 1,
+  :all_after_pass => false,
+  :all_on_start   => false,
+}
+
+guard 'rspec', rspec_options do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+
+guard 'bundler' do
+  watch('Gemfile')
+  watch(/^.+\.gemspec/)
+end

data/History

@@ -1,3 +1,10 @@
+== 0.8.3 2012-04-21
+* new
+  * [lazy parsing of responses](https://github.com/jnunemaker/httparty/commit/9fd5259c8dab00e426082b66af44ede2c9068f45)
+  * [add support for PATCH requests](https://github.com/jnunemaker/httparty/commit/7ab6641e37a9e31517e46f6124f38c615395d38a)
+* bug fixes
+  * [subclasses no longer override superclass options](https://github.com/jnunemaker/httparty/commit/682af8fbf672e7b3009e650da776c85cdfe78d39)
+
 == 0.8.2 2012-04-12
 * new
   * add -r to make CLI return failure code if status >= 400

data/README.rdoc

@@ -2,22 +2,6 @@
 
 Makes http fun again!
 
-== Note on Releases
-
-Releases are tagged on github and also released as gems on github and rubyforge. Master is pushed to whenever I add a patch or a new feature. To build from master, you can clone the code, generate the updated gemspec, build the gem and install.
-
-* rake gemspec
-* gem build httparty.gemspec
-* gem install the gem that was built
-
-== Note on Patches/Pull Requests
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself in another branch so I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
 == Features:
 
 * Easy get, post requests
@@ -29,6 +13,14 @@ Releases are tagged on github and also released as gems on github and rubyforge.
 
 See http://github.com/jnunemaker/httparty/tree/master/examples
 
+== Note on Patches/Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a future version unintentionally.
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself in another branch so I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
 == Command Line Interface
 
 httparty also includes the executable <tt>httparty</tt> which can be

data/cucumber.yml

@@ -1 +1 @@
-default: features
+default: features --format progress

data/httparty.gemspec

@@ -12,7 +12,7 @@ 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'
+  s.add_dependency 'multi_json', "~> 1.0"
   s.add_dependency 'multi_xml'
 
   s.post_install_message = "When you HTTParty, you must party hard!"

data/lib/httparty.rb

@@ -36,7 +36,7 @@ module HTTParty
   end
 
   # == Common Request Options
-  # Request methods (get, post, put, delete, head, options) all take a common set of options. These are:
+  # Request methods (get, post, patch, put, delete, head, options) all take a common set of options. These are:
   #
   # [:+body+:] Body of the request. If passed a Hash, will try to normalize it first, by default passing it to ActiveSupport::to_params. Any other kind of object will get used as-is.
   # [:+http_proxyaddr+:] Address of proxy server to use.
@@ -363,6 +363,11 @@ module HTTParty
       perform_request Net::HTTP::Post, path, options, &block
     end
 
+    # Perform a PATCH request to a path
+    def patch(path, options={}, &block)
+      perform_request Net::HTTP::Patch, path, options, &block
+    end
+
     # Perform a PUT request to a path
     def put(path, options={}, &block)
       perform_request Net::HTTP::Put, path, options, &block
@@ -431,6 +436,10 @@ module HTTParty
     Basement.post(*args, &block)
   end
 
+  def self.patch(*args, &block)
+    Basement.patch(*args, &block)
+  end
+
   def self.put(*args, &block)
     Basement.put(*args, &block)
   end

data/lib/httparty/cookie_hash.rb

@@ -1,7 +1,7 @@
 class HTTParty::CookieHash < Hash #:nodoc:
-  
+
   CLIENT_COOKIES = %w{path expires domain path secure HTTPOnly}
-  
+
   def add_cookies(value)
     case value
     when Hash

data/lib/httparty/core_extensions.rb

@@ -6,4 +6,27 @@ module HTTParty
       instance_methods.each { |m| undef_method m unless m =~ /^__|instance_eval/ }
     end
   end
+
+  unless defined?(Net::HTTP::Patch)
+    class Net::HTTP
+      def patch(path, data, initheader = nil, dest = nil, &block) #:nodoc:
+        res = nil
+        request(Patch.new(path, initheader), data) {|r|
+          r.read_body dest, &block
+          res = r
+        }
+        unless @newimpl
+          res.value
+          return res, res.body
+        end
+        res
+      end
+
+      class Patch < Net::HTTPRequest
+        METHOD = 'PATCH'
+        REQUEST_HAS_BODY = true
+        RESPONSE_HAS_BODY = true
+      end
+    end
+  end
 end

data/lib/httparty/hash_conversions.rb

@@ -48,4 +48,4 @@ module HTTParty
       param
     end
   end
-end
+end

data/lib/httparty/module_inheritable_attributes.rb

@@ -22,7 +22,7 @@ module HTTParty
           if instance_variable_get(ivar).respond_to?(:merge)
             method = <<-EOM
               def self.#{inheritable_attribute}
-                #{ivar} = superclass.#{inheritable_attribute}.merge #{ivar}
+                #{ivar} = superclass.#{inheritable_attribute}.merge Marshal.load(Marshal.dump(#{ivar}))
               end
             EOM
             subclass.class_eval method

data/lib/httparty/parser.rb

@@ -93,7 +93,6 @@ module HTTParty
       @body = body
       @format = format
     end
-    private_class_method :new
 
     # @return [Object] the parsed body
     # @return [nil] when the response body is nil, an empty string, spaces only or "null"
@@ -113,7 +112,12 @@ module HTTParty
     end
 
     def json
-      MultiJson.decode(body)
+      # https://github.com/sferik/rails/commit/5e62670131dfa1718eaf21ff8dd3371395a5f1cc
+      if MultiJson.respond_to?(:adapter)
+        MultiJson.load(body)
+      else
+        MultiJson.decode(body)
+      end
     end
 
     def yaml

data/lib/httparty/request.rb

@@ -3,6 +3,7 @@ module HTTParty
     SupportedHTTPMethods = [
       Net::HTTP::Get,
       Net::HTTP::Post,
+      Net::HTTP::Patch,
       Net::HTTP::Put,
       Net::HTTP::Delete,
       Net::HTTP::Head,
@@ -70,6 +71,7 @@ module HTTParty
     def perform(&block)
       validate
       setup_raw_request
+      chunked_body = nil
 
       self.last_response = http.request(@raw_request) do |http_response|
         if block
@@ -80,12 +82,12 @@ module HTTParty
             block.call(fragment)
           end
 
-          http_response.body = chunks.join
+          chunked_body = chunks.join
         end
       end
 
       handle_deflation
-      handle_response
+      handle_response(chunked_body)
     end
 
     private
@@ -196,7 +198,7 @@ module HTTParty
       query_string_parts.size > 0 ? query_string_parts.join('&') : nil
     end
 
-    def handle_response
+    def handle_response(body)
       if response_redirects?
         options[:limit] -= 1
         self.path = last_response['location']
@@ -205,7 +207,8 @@ module HTTParty
         capture_cookies(last_response)
         perform
       else
-        Response.new(self, last_response, parse_response(last_response.body))
+        body = body || last_response.body
+        Response.new(self, last_response, lambda { parse_response(body) }, :body => body)
       end
     end
 
@@ -258,7 +261,7 @@ module HTTParty
 
     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, 'only get, post, patch, 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)

data/lib/httparty/response.rb

@@ -1,46 +1,21 @@
 module HTTParty
   class Response < HTTParty::BasicObject #:nodoc:
-    class Headers
-      include ::Net::HTTPHeader
-
-      def initialize(header = {})
-        @header = header
-      end
-
-      def ==(other)
-        @header == other
-      end
-
-      def inspect
-        @header.inspect
-      end
-
-      def method_missing(name, *args, &block)
-        if @header.respond_to?(name)
-          @header.send(name, *args, &block)
-        else
-          super
-        end
-      end
-
-      def respond_to?(method)
-        super || @header.respond_to?(method)
-      end
-    end
-
-
     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
+    attr_reader :request, :response, :body, :headers
 
-    def initialize(request, response, parsed_response)
-      @request = request
-      @response = response
-      @body = response.body
-      @parsed_response = parsed_response
-      @headers = Headers.new(response.to_hash)
+    def initialize(request, response, parsed_block, options={})
+      @request      = request
+      @response     = response
+      @body         = response.body || options[:body]
+      @parsed_block = parsed_block
+      @headers      = Headers.new(response.to_hash)
+    end
+
+    def parsed_response
+      @parsed_response ||= @parsed_block.call
     end
 
     def class
@@ -53,7 +28,7 @@ module HTTParty
 
     def inspect
       inspect_id = "%x" % (object_id * 2)
-      %(#<#{self.class}:0x#{inspect_id} @parsed_response=#{parsed_response.inspect}, @response=#{response.inspect}, @headers=#{headers.inspect}>)
+      %(#<#{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
@@ -64,10 +39,10 @@ module HTTParty
         klass === response
       end
     end
-    
+
     def respond_to?(name)
-      return true if [:request,:response,:parsed_response,:body,:headers].include?(name)
-      parsed_response.respond_to?(name) or response.respond_to?(name)
+      return true if [:request, :response, :parsed_response, :body, :headers].include?(name)
+      parsed_response.respond_to?(name) || response.respond_to?(name)
     end
 
     protected
@@ -83,3 +58,5 @@ module HTTParty
     end
   end
 end
+
+require 'httparty/response/headers'

data/lib/httparty/response/headers.rb

@@ -0,0 +1,31 @@
+module HTTParty
+  class Response #:nodoc:
+    class Headers
+      include ::Net::HTTPHeader
+
+      def initialize(header = {})
+        @header = header
+      end
+
+      def ==(other)
+        @header == other
+      end
+
+      def inspect
+        @header.inspect
+      end
+
+      def method_missing(name, *args, &block)
+        if @header.respond_to?(name)
+          @header.send(name, *args, &block)
+        else
+          super
+        end
+      end
+
+      def respond_to?(method)
+        super || @header.respond_to?(method)
+      end
+    end
+  end
+end

data/lib/httparty/version.rb

@@ -1,3 +1,3 @@
 module HTTParty
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/spec/httparty/cookie_hash_spec.rb

@@ -6,7 +6,6 @@ describe HTTParty::CookieHash do
   end
 
   describe "#add_cookies" do
-    
     describe "with a hash" do
       it "should add new key/value pairs to the hash" do
         @cookie_hash.add_cookies(:foo => "bar")
@@ -29,7 +28,7 @@ describe HTTParty::CookieHash do
         @cookie_hash[:second].should == 'two'
         @cookie_hash[:third].should == nil
       end
-      
+
       it "should overwrite any existing key" do
         @cookie_hash[:foo] = 'bar'
         @cookie_hash.add_cookies("foo=tar")
@@ -37,7 +36,7 @@ describe HTTParty::CookieHash do
         @cookie_hash[:foo].should eql("tar")
       end
     end
-    
+
     describe 'with other class' do
       it "should error" do
         lambda {
@@ -61,7 +60,7 @@ describe HTTParty::CookieHash do
       @s.should match(/rofl=copter/)
       @s.should match(/^\w+=\w+; \w+=\w+$/)
     end
-    
+
     it "should not include client side only cookies" do
       @cookie_hash.add_cookies(:path => "/")
       @s = @cookie_hash.to_cookie_string

data/spec/httparty/net_digest_auth_spec.rb

@@ -13,11 +13,11 @@ describe Net::HTTPHeader::DigestAuthenticator do
     @digest.authorization_header.join(", ")
   end
 
-
   context "with specified quality of protection (qop)" do
     before do
-      @digest = setup_digest({'www-authenticate' =>
-        'Digest realm="myhost@testrealm.com", nonce="NONCE", qop="auth"'})
+      @digest = setup_digest({
+        'www-authenticate' => 'Digest realm="myhost@testrealm.com", nonce="NONCE", qop="auth"',
+      })
     end
 
     it "should set prefix" do
@@ -45,9 +45,7 @@ describe Net::HTTPHeader::DigestAuthenticator do
     end
 
     it "should set response" do
-      request_digest =
-        "md5(md5(Mufasa:myhost@testrealm.com:Circle Of Life)" +
-        ":NONCE:0:md5(deadbeef):auth:md5(GET:/dir/index.html))"
+      request_digest = "md5(md5(Mufasa:myhost@testrealm.com:Circle Of Life):NONCE:0:md5(deadbeef):auth:md5(GET:/dir/index.html))"
       authorization_header.should include(%Q(response="#{request_digest}"))
     end
   end
@@ -55,8 +53,9 @@ describe Net::HTTPHeader::DigestAuthenticator do
 
   context "with unspecified quality of protection (qop)" do
     before do
-      @digest = setup_digest({'www-authenticate' =>
-        'Digest realm="myhost@testrealm.com", nonce="NONCE"'})
+      @digest = setup_digest({
+        'www-authenticate' => 'Digest realm="myhost@testrealm.com", nonce="NONCE"',
+      })
     end
 
     it "should set prefix" do
@@ -84,9 +83,7 @@ describe Net::HTTPHeader::DigestAuthenticator do
     end
 
     it "should set response" do
-      request_digest =
-        "md5(md5(Mufasa:myhost@testrealm.com:Circle Of Life)" +
-        ":NONCE:md5(GET:/dir/index.html))"
+      request_digest = "md5(md5(Mufasa:myhost@testrealm.com:Circle Of Life):NONCE:md5(GET:/dir/index.html))"
       authorization_header.should include(%Q(response="#{request_digest}"))
     end
   end

data/spec/httparty/parser_spec.rb

@@ -145,6 +145,12 @@ describe HTTParty::Parser do
     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')
       subject.send(:json)
     end

data/spec/httparty/request_spec.rb

@@ -411,6 +411,16 @@ describe HTTParty::Request do
         resp.body.should == "<foo><bar>error</bar></foo>"
         resp['foo']['bar'].should == "error"
       end
+
+      it "parses response lazily so codes can be checked prior" do
+        stub_response 'not xml', 500
+        @request.options[:format] = :xml
+        lambda {
+          response = @request.perform
+          response.code.should == 500
+          response.body.should == 'not xml'
+        }.should_not raise_error
+      end
     end
   end
 
@@ -456,6 +466,11 @@ describe HTTParty::Request do
         @request.perform.should == {"hash" => {"foo" => "bar"}}
       end
 
+      it "should be handled by PATCH transparently" do
+        @request.http_method = Net::HTTP::Patch
+        @request.perform.should == {"hash" => {"foo" => "bar"}}
+      end
+
       it "should be handled by PUT transparently" do
         @request.http_method = Net::HTTP::Put
         @request.perform.should == {"hash" => {"foo" => "bar"}}

data/spec/httparty/response_spec.rb

@@ -9,7 +9,7 @@ describe HTTParty::Response do
     @response_object.stub(:body => "{foo:'bar'}")
     @response_object['last-modified'] = @last_modified
     @response_object['content-length'] = @content_length
-    @parsed_response = {"foo" => "bar"}
+    @parsed_response = lambda { {"foo" => "bar"} }
     @response = HTTParty::Response.new(@request_object, @response_object, @parsed_response)
   end
 
@@ -51,17 +51,42 @@ describe HTTParty::Response do
   end
 
   it "should send missing methods to delegate" do
-    response = HTTParty::Response.new(@request_object, @response_object, {'foo' => 'bar'})
+    response = HTTParty::Response.new(@request_object, @response_object, @parsed_response)
     response['foo'].should == 'bar'
   end
-  
-  it "should respond_to? methods it supports" do
-    response = HTTParty::Response.new(@request_object, @response_object, {'foo' => 'bar'})
+
+  it "response to request" do
+    response = HTTParty::Response.new(@request_object, @response_object, @parsed_response)
+    response.respond_to?(:request).should be_true
+  end
+
+  it "responds to response" do
+    response = HTTParty::Response.new(@request_object, @response_object, @parsed_response)
+    response.respond_to?(:response).should be_true
+  end
+
+  it "responds to body" do
+    response = HTTParty::Response.new(@request_object, @response_object, @parsed_response)
+    response.respond_to?(:body).should be_true
+  end
+
+  it "responds to headers" do
+    response = HTTParty::Response.new(@request_object, @response_object, @parsed_response)
+    response.respond_to?(:headers).should be_true
+  end
+
+  it "responds to parsed_response" do
+    response = HTTParty::Response.new(@request_object, @response_object, @parsed_response)
     response.respond_to?(:parsed_response).should be_true
   end
 
+  it "responds to anything parsed_response responds to" do
+    response = HTTParty::Response.new(@request_object, @response_object, @parsed_response)
+    response.respond_to?(:[]).should be_true
+  end
+
   it "should be able to iterate if it is array" do
-    response = HTTParty::Response.new(@request_object, @response_object, [{'foo' => 'bar'}, {'foo' => 'baz'}])
+    response = HTTParty::Response.new(@request_object, @response_object, lambda { [{'foo' => 'bar'}, {'foo' => 'baz'}] })
     response.size.should == 2
     expect {
       response.each { |item| }
@@ -89,22 +114,11 @@ describe HTTParty::Response do
     end
   end
 
-  xit "should allow hashes to be accessed with dot notation" do
-    response = HTTParty::Response.new(@request_object, {'foo' => 'bar'}, "{foo:'bar'}", 200, 'OK')
-    response.foo.should == 'bar'
-  end
-
-  xit "should allow nested hashes to be accessed with dot notation" do
-    response = HTTParty::Response.new(@request_object, {'foo' => {'bar' => 'baz'}}, "{foo: {bar:'baz'}}", 200, 'OK')
-    response.foo.should == {'bar' => 'baz'}
-    response.foo.bar.should == 'baz'
-  end
-
   describe "semantic methods for response codes" do
     def response_mock(klass)
-      r = klass.new('', '', '')
-      r.stub(:body)
-      r
+      response = klass.new('', '', '')
+      response.stub(:body)
+      response
     end
 
     context "major codes" do

data/spec/httparty/ssl_spec.rb

@@ -3,18 +3,18 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 describe HTTParty::Request do
   context "SSL certificate verification" do
     before do
-      FakeWeb.allow_net_connect = true    # enable network connections just for this test
+      FakeWeb.allow_net_connect = true
     end
 
     after do
-      FakeWeb.allow_net_connect = false   # Restore allow_net_connect value for testing
+      FakeWeb.allow_net_connect = false
     end
 
-    it "should work with when no trusted CA list is specified" do
+    it "should work when no trusted CA list is specified" do
       ssl_verify_test(nil, nil, "selfsigned.crt").should == {'success' => true}
     end
 
-    it "should work with when no trusted CA list is specified, even with a bogus hostname" do
+    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}
     end
 
@@ -25,8 +25,14 @@ describe HTTParty::Request do
     it "should work when using ssl_ca_file with a certificate authority" do
       ssl_verify_test(:ssl_ca_file, "ca.crt", "server.crt").should == {'success' => true}
     end
+
     it "should work when using ssl_ca_path with a certificate authority" do
-      ssl_verify_test(:ssl_ca_path, ".", "server.crt").should == {'success' => true}
+      http = Net::HTTP.new('www.google.com', 443, nil, nil, nil, nil)
+      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)
+      http.should_receive(:ca_path=).with('/foo/bar')
+      HTTParty.get('https://www.google.com', :ssl_ca_path => '/foo/bar')
     end
 
     it "should fail when using ssl_ca_file and the server uses an unrecognized certificate authority" do
@@ -34,6 +40,7 @@ describe HTTParty::Request do
         ssl_verify_test(:ssl_ca_file, "ca.crt", "selfsigned.crt")
       end.should raise_error(OpenSSL::SSL::SSLError)
     end
+
     it "should fail when using ssl_ca_path and the server uses an unrecognized certificate authority" do
       lambda do
         ssl_verify_test(:ssl_ca_path, ".", "selfsigned.crt")
@@ -45,6 +52,7 @@ describe HTTParty::Request do
         ssl_verify_test(:ssl_ca_file, "ca.crt", "bogushost.crt")
       end.should raise_error(OpenSSL::SSL::SSLError)
     end
+
     it "should fail when using ssl_ca_path and the server uses a bogus hostname" do
       lambda do
         ssl_verify_test(:ssl_ca_path, ".", "bogushost.crt")

data/spec/httparty_spec.rb

@@ -10,6 +10,7 @@ describe HTTParty do
     before do
       Kernel.stub(:warn)
     end
+
     it "warns with a deprecation message" do
       Kernel.should_receive(:warn).with("Deprecated: Use HTTParty::Parser::SupportedFormats")
       HTTParty::AllowedFormats
@@ -21,7 +22,6 @@ describe HTTParty do
   end
 
   describe "pem" do
-
     it 'should set the pem content' do
       @klass.pem 'PEM-CONTENT'
       @klass.default_options[:pem].should == 'PEM-CONTENT'
@@ -36,7 +36,6 @@ describe HTTParty do
       @klass.pem 'PEM-CONTENT', 'PASSWORD'
       @klass.default_options[:pem_password].should == 'PASSWORD'
     end
-
   end
 
   describe 'http_proxy' do
@@ -433,6 +432,12 @@ describe HTTParty do
       end.should raise_error(HTTParty::RedirectionTooDeep) {|e| e.response.body.should == 'first redirect'}
     end
 
+    it "should fail with redirected PATCH" do
+      lambda do
+        @klass.patch('/foo', :no_follow => true)
+      end.should raise_error(HTTParty::RedirectionTooDeep) {|e| e.response.body.should == 'first redirect'}
+    end
+
     it "should fail with redirected DELETE" do
       lambda do
         @klass.delete('/foo', :no_follow => true)
@@ -521,6 +526,14 @@ describe HTTParty do
       @parent.default_options.should == {:basic_auth => {:username => 'user', :password => 'password'}}
     end
 
+    it "doesn't modify hashes in the parent's default options" do
+      @parent.headers 'Accept' => 'application/json'
+      @child1.headers 'Accept' => 'application/xml'
+
+      @parent.default_options[:headers].should == {'Accept' => 'application/json'}
+      @child1.default_options[:headers].should == {'Accept' => 'application/xml'}
+    end
+
     it "inherits default_cookies from the parent class" do
       @parent.cookies 'type' => 'chocolate_chip'
       @child1.default_cookies.should == {"type" => "chocolate_chip"}

data/spec/spec.opts

@@ -1,3 +1,2 @@
 --colour
---format specdoc
 --backtrace

data/spec/spec_helper.rb

@@ -13,9 +13,11 @@ Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].e
 Spec::Runner.configure do |config|
   config.include HTTParty::StubResponse
   config.include HTTParty::SSLTestHelper
+
   config.before(:suite) do
     FakeWeb.allow_net_connect = false
   end
+
   config.after(:suite) do
     FakeWeb.allow_net_connect = true
   end

data/spec/support/ssl_test_helper.rb

@@ -1,25 +1,47 @@
+require 'pathname'
+
 module HTTParty
   module SSLTestHelper
     def ssl_verify_test(mode, ca_basename, server_cert_filename)
-      test_server = nil
+      options = {
+        :format  => :json,
+        :timeout => 30,
+      }
+
+      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)
+        options[mode] = ca_path
+      end
+
       begin
-        # Start an HTTPS server
         test_server = SSLTestServer.new(
             :rsa_key => File.read(File.expand_path("../../fixtures/ssl/generated/server.key", __FILE__)),
-            :cert => File.read(File.expand_path("../../fixtures/ssl/generated/#{server_cert_filename}", __FILE__)))
+            :cert    => File.read(File.expand_path("../../fixtures/ssl/generated/#{server_cert_filename}", __FILE__)))
+
         test_server.start
 
-        # Build a request
         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}/", :format => :json, :timeout => 30, mode => ca_path)
         else
-          return HTTParty.get("https://localhost:#{test_server.port}/", :format => :json, :timeout=>30)
+          return HTTParty.get("https://localhost:#{test_server.port}/", :format => :json, :timeout => 30)
         end
       ensure
         test_server.stop if test_server
       end
+
+      test_server = SSLTestServer.new({
+        :rsa_key => path.join('server.key').read,
+        :cert    => path.join(server_cert_filename).read,
+      })
+
+      test_server.start
+
+      HTTParty.get("https://localhost:#{test_server.port}/", options)
+    ensure
+      test_server.stop if test_server
     end
   end
 end

data/spec/support/ssl_test_server.rb

@@ -10,26 +10,30 @@ class SSLTestServer
   attr_reader :port
 
   def initialize(options={})
-    @ctx = OpenSSL::SSL::SSLContext.new
-    @ctx.cert = OpenSSL::X509::Certificate.new(options[:cert])
-    @ctx.key = OpenSSL::PKey::RSA.new(options[:rsa_key])
+    @ctx             = OpenSSL::SSL::SSLContext.new
+    @ctx.cert        = OpenSSL::X509::Certificate.new(options[:cert])
+    @ctx.key         = OpenSSL::PKey::RSA.new(options[:rsa_key])
     @ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE   # Don't verify client certificate
-    @port = options[:port] || 0
-    @thread = nil
-    @stopping_mutex = Mutex.new
-    @stopping = false
+    @port            = options[:port] || 0
+    @thread          = nil
+    @stopping_mutex  = Mutex.new
+    @stopping        = false
   end
 
   def start
     @raw_server = TCPServer.new(@port)
+
     if @port == 0
       @port = Socket::getnameinfo(@raw_server.getsockname, Socket::NI_NUMERICHOST|Socket::NI_NUMERICSERV)[1].to_i
     end
+
     @ssl_server = OpenSSL::SSL::SSLServer.new(@raw_server, @ctx)
+
     @stopping_mutex.synchronize{
       return if @stopping
       @thread = Thread.new{ thread_main }
     }
+
     nil
   end
 
@@ -46,24 +50,31 @@ class SSLTestServer
     def thread_main
       until @stopping_mutex.synchronize{ @stopping }
         (rr,ww,ee) = select([@ssl_server.to_io], nil, nil, 0.1)
+
         next unless rr && rr.include?(@ssl_server.to_io)
+
         socket = @ssl_server.accept
+
         Thread.new{
           header = []
+
           until (line = socket.readline).rstrip.empty?
             header << line
           end
 
-          socket.write <<'EOF'.gsub(/\r\n/n, "\n").gsub(/\n/n, "\r\n")
+          response =<<EOF
 HTTP/1.1 200 OK
 Connection: close
 Content-Type: application/json; charset=UTF-8
 
 {"success":true}
 EOF
+
+          socket.write(response.gsub(/\r\n/n, "\n").gsub(/\n/n, "\r\n"))
           socket.close
       }
       end
+
       @ssl_server.close
     end
 end

metadata

@@ -1,49 +1,66 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: httparty
-version: !ruby/object:Gem::Version
-  version: 0.8.2
+version: !ruby/object:Gem::Version 
+  hash: 57
   prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 3
+  version: 0.8.3
 platform: ruby
-authors:
+authors: 
 - John Nunemaker
 - Sandro Turriate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: &70278647636880 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+
+date: 2012-04-22 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: *70278647636880
-- !ruby/object:Gem::Dependency
-  name: multi_xml
-  requirement: &70278647636320 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  version_requirements: *id001
+  name: multi_json
+- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: *70278647636320
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id002
+  name: multi_xml
 description: Makes http fun! Also, makes consuming restful web services dead easy.
-email:
+email: 
 - nunemaker@gmail.com
-executables:
+executables: 
 - httparty
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- .travis.yml
 - Gemfile
+- Guardfile
 - History
 - MIT-LICENSE
 - README.rdoc
@@ -86,6 +103,7 @@ files:
 - lib/httparty/parser.rb
 - lib/httparty/request.rb
 - lib/httparty/response.rb
+- lib/httparty/response/headers.rb
 - lib/httparty/version.rb
 - spec/fixtures/delicious.xml
 - spec/fixtures/empty.xml
@@ -118,29 +136,38 @@ files:
 - website/index.html
 homepage: http://httparty.rubyforge.org/
 licenses: []
+
 post_install_message: When you HTTParty, you must party hard!
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-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 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Makes http fun! Also, makes consuming restful web services dead easy.
-test_files:
+test_files: 
 - features/basic_authentication.feature
 - features/command_line.feature
 - features/deals_with_http_error_codes.feature