httparty 0.10.2 → 0.11.0

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.8.7
   - ree
   - 1.9.3
+  - 2.0.0
 notifications:
   email: false
 bundler_args: --without development

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
 gem 'rake'

data/features/steps/httparty_response_steps.rb

@@ -1,3 +1,17 @@
+# Not needed anymore in ruby 2.0, but needed to resolve constants
+# in nested namespaces. This is taken from rails :)
+def constantize(camel_cased_word)
+  names = camel_cased_word.split('::')
+  names.shift if names.empty? || names.first.empty?
+
+  constant = Object
+  names.each do |name|
+    constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+  end
+  constant
+end
+
+
 Then /it should return an? (\w+)$/ do |class_string|
   @response_from_httparty.should be_an_instance_of(class_string.class)
 end
@@ -22,5 +36,5 @@ end
 
 Then /it should raise (?:an|a) ([\w:]+) exception/ do |exception|
   @exception_from_httparty.should_not be_nil
-  @exception_from_httparty.class.name.should eql(exception)
+  @exception_from_httparty.should be_a constantize(exception)
 end

data/lib/httparty.rb

@@ -434,6 +434,11 @@ module HTTParty
       perform_request Net::HTTP::Move, path, options, &block
     end
 
+    # Perform a COPY request to a path
+    def copy(path, options={}, &block)
+      perform_request Net::HTTP::Copy, path, options, &block
+    end
+
     # Perform a HEAD request to a path
     def head(path, options={}, &block)
       perform_request Net::HTTP::Head, path, options, &block
@@ -508,6 +513,10 @@ module HTTParty
     Basement.move(*args, &block)
   end
   
+  def self.copy(*args, &block)
+    Basement.move(*args, &block)
+  end
+
   def self.head(*args, &block)
     Basement.head(*args, &block)
   end

data/lib/httparty/cookie_hash.rb

@@ -17,6 +17,6 @@ class HTTParty::CookieHash < Hash #:nodoc:
   end
 
   def to_cookie_string
-    delete_if { |k, v| CLIENT_COOKIES.include?(k.to_s) }.collect { |k, v| "#{k}=#{v}" }.join("; ")
+    delete_if { |k, v| CLIENT_COOKIES.include?(k.to_s.downcase) }.collect { |k, v| "#{k}=#{v}" }.join("; ")
   end
 end

data/lib/httparty/net_digest_auth.rb

@@ -32,7 +32,7 @@ module Net
           fields = [
             %Q(cnonce="#{@cnonce}"),
             %Q(qop="#{@response['qop']}"),
-            %Q(nc="00000001")
+            %Q(nc=00000001)
           ]
           fields.each { |field| header << field }
         end

data/lib/httparty/request.rb

@@ -8,7 +8,8 @@ module HTTParty
       Net::HTTP::Delete,
       Net::HTTP::Head,
       Net::HTTP::Options,
-      Net::HTTP::Move
+      Net::HTTP::Move,
+      Net::HTTP::Copy
     ]
 
     SupportedURISchemes  = [URI::HTTP, URI::HTTPS, URI::Generic]
@@ -53,7 +54,7 @@ module HTTParty
     end
 
     def uri
-      new_uri = path.relative? ? URI.parse("#{base_uri}#{path}") : path
+      new_uri = path.relative? ? URI.parse("#{base_uri}#{path}") : path.clone
 
       # avoid double query string on redirects [#12]
       unless redirect
@@ -102,7 +103,7 @@ module HTTParty
       end
 
       handle_deflation
-      handle_response(chunked_body)
+      handle_response(chunked_body, &block)
     end
 
     private
@@ -171,14 +172,14 @@ module HTTParty
       query_string_parts.size > 0 ? query_string_parts.join('&') : nil
     end
 
-    def handle_response(body)
+    def handle_response(body, &block)
       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
+        perform(&block)
       else
         body = body || last_response.body
         Response.new(self, last_response, lambda { parse_response(body) }, :body => body)

data/lib/httparty/response.rb

@@ -9,7 +9,7 @@ module HTTParty
     def initialize(request, response, parsed_block, options={})
       @request      = request
       @response     = response
-      @body         = response.body || options[:body]
+      @body         = options[:body] || response.body
       @parsed_block = parsed_block
       @headers      = Headers.new(response.to_hash)
     end
@@ -40,6 +40,11 @@ module HTTParty
       end
     end
 
+    # Support old multiple_choice? method from pre 2.0.0 era.
+    if ::RUBY_VERSION >= "2.0.0"
+      alias_method :multiple_choice?, :multiple_choices?
+    end
+
     def respond_to?(name)
       return true if [:request, :response, :parsed_response, :body, :headers].include?(name)
       parsed_response.respond_to?(name) || response.respond_to?(name)

data/lib/httparty/version.rb

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

data/spec/httparty/cookie_hash_spec.rb

@@ -66,5 +66,11 @@ describe HTTParty::CookieHash do
       @s = @cookie_hash.to_cookie_string
       @s.should_not match(/path=\//)
     end
+
+    it "should not include client side only cookies even when attributes use camal case" do
+      @cookie_hash.add_cookies(:Path => "/")
+      @s = @cookie_hash.to_cookie_string
+      @s.should_not match(/Path=\//)
+    end
   end
 end

data/spec/httparty/net_digest_auth_spec.rb

@@ -66,7 +66,7 @@ describe Net::HTTPHeader::DigestAuthenticator do
     end
 
     it "should set nonce-count" do
-      authorization_header.should include(%Q(nc="00000001"))
+      authorization_header.should include(%Q(nc=00000001))
     end
 
     it "should set response" do

data/spec/httparty/request_spec.rb

@@ -133,6 +133,12 @@ describe HTTParty::Request do
         URI.unescape(@request.uri.query).should == ""
       end
 
+      it "does not duplicate query string parameters when uri is called twice" do
+        @request.options[:query] = {:foo => :bar}
+        @request.uri
+        @request.uri.query.should == "foo=bar"
+      end
+
       context "when representing an array" do
         it "returns a Rails style query string" do
           @request.options[:query] = {:foo => %w(bar baz)}
@@ -256,6 +262,15 @@ describe HTTParty::Request do
           response.should == {"hash" => {"foo" => "bar"}}
         end
 
+        it "calls block given to perform with each redirect" do
+          @request = HTTParty::Request.new(Net::HTTP::Get, 'http://test.com/redirect', :format => :xml)
+          FakeWeb.register_uri(:get, "http://test.com/redirect", :status => [300, "REDIRECT"], :location => "http://api.foo.com/v2")
+          FakeWeb.register_uri(:get, "http://api.foo.com/v2", :body => "<hash><foo>bar</foo></hash>")
+          body = ""
+          response = @request.perform { |chunk| body += chunk }
+          body.length.should == 27
+        end
+
         it "redirects if a 300 contains a relative location header" do
           redirect = stub_response '', 300
           redirect['location'] = '/foo/bar'
@@ -363,6 +378,11 @@ describe HTTParty::Request do
         @request.perform.should == {"hash" => {"foo" => "bar"}}
       end
 
+      it "should be handled by COPY transparently" do
+        @request.http_method = Net::HTTP::Copy
+        @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"}}

data/spec/httparty/response_spec.rb

@@ -195,7 +195,14 @@ describe HTTParty::Response do
         :unsupported_media_type?          => Net::HTTPUnsupportedMediaType,
         :use_proxy?                       => Net::HTTPUseProxy,
         :version_not_supported?           => Net::HTTPVersionNotSupported
-      }.each do |method, klass|
+      }
+
+      # Ruby 2.0, new name for this response.
+      if RUBY_VERSION >= "2.0.0"
+        SPECIFIC_CODES[:multiple_choices?] = Net::HTTPMultipleChoices
+      end
+
+      SPECIFIC_CODES.each do |method, klass|
         it "responds to #{method}" do
           net_response = response_mock(klass)
           response = HTTParty::Response.new(@request_object, net_response, '')

data/spec/httparty_spec.rb

@@ -497,6 +497,12 @@ describe HTTParty do
       end.should raise_error(HTTParty::RedirectionTooDeep) {|e| e.response.body.should == 'first redirect'}
     end
 
+    it "should fail with redirected COPY" do
+      lambda do
+        @klass.copy('/foo', :no_follow => true)
+      end.should raise_error(HTTParty::RedirectionTooDeep) {|e| e.response.body.should == 'first redirect'}
+    end
+
     it "should fail with redirected PUT" do
       lambda do
         @klass.put('/foo', :no_follow => true)
@@ -593,11 +599,11 @@ describe HTTParty do
     end
 
     it 'should dup the proc on the child class' do
-      imaginary_option = lambda { "This is a new lambda" }
+      imaginary_option = lambda { 2 * 3.14 }
       @parent.default_options[:imaginary_option] = imaginary_option
-      @parent.default_options[:imaginary_option].should be_equal imaginary_option
+      @parent.default_options[:imaginary_option].call.should == imaginary_option.call
       @child1.default_options[:imaginary_option]
-      @child1.default_options[:imaginary_option].should == imaginary_option
+      @child1.default_options[:imaginary_option].call.should == imaginary_option.call
       @child1.default_options[:imaginary_option].should_not be_equal imaginary_option
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httparty
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2609316283562453644
+      hash: -4402844038872120399
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2609316283562453644
+      hash: -4402844038872120399
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23