httparty 0.7.8 → 0.8.0

data/Gemfile

@@ -1,6 +1,8 @@
 source :rubygems
 gemspec
 
-group(:development) do
-  gem 'rake', '~> 0.8.7'
-end
+gem 'rake',     '~> 0.8.7'
+gem 'cucumber', '~> 0.7'
+gem 'fakeweb',  '~> 1.2'
+gem 'rspec',    '~> 1.3'
+gem 'mongrel',  '1.2.0.pre2'

data/History

@@ -1,3 +1,9 @@
+== 0.8.0 2011-09-13
+* new
+  * switch to multi json/xml for parsing by default
+* bug fixes
+  * fix redirects to relative uri's
+
 == 0.7.8 2011-06-06
 * bug fix
   * Make response honor respond to
@@ -125,11 +131,11 @@
   * :query no longer sets form data. Use body and set content type to application/x-www-form-urlencoded if you need it. :query was wrong for that.
   * Fixed a bug in the cookies class method that caused cookies to be forgotten after the first request.
   * Also, some general cleanup of tests and such.
-  
+
 == 0.4.3 2009-04-23
 * 1 minor update
   * added message to the response object
-  
+
 == 0.4.2 2009-03-30
 * 2 minor changes
   * response code now returns an integer instead of a string (jqr)
@@ -138,36 +144,36 @@
 == 0.4.1 2009-03-29
 * 1 minor fix
   * gem 'jnunemaker-crack' instead of gem 'crack'
-  
+
 == 0.4.0 2009-03-29
 * 1 minor change
   * Switched xml and json parsing to crack (same code as before just moved to gem for easier reuse in other projects)
-  
+
 == 0.3.1 2009-02-10
 * 1 minor fix, 1 minor enhancement
   * Fixed unescaping umlauts (siebertm)
   * Added yaml response parsing (Miha Filej)
-  
+
 == 0.3.0 2009-01-31
 * 1 major enhancement, 1 bug fix
   * JSON gem no longer a requirement. It was conflicting with rails json stuff so I just stole ActiveSupport's json decoding and bundled it with HTTParty.
   * Fixed bug where query strings were being duplicated on redirects
   * Added a bunch of specs and moved some code around.
-  
+
 == 0.2.10 2009-01-29
 * 1 minor enhancement
   * Made encoding on query parameters treat everything except URI::PATTERN::UNRESERVED as UNSAFE to force encoding of '+' character (Julian Russell)
-  
+
 == 0.2.9 2009-01-29
 * 3 minor enhancements
   * Added a 'headers' accessor to the response with a hash of any HTTP headers. (Don Peterson)
   * Add support for a ":cookies" option to be used at the class level, or as an option on any individual call.  It should be passed a hash, which will be converted to the proper format and added to the request headers when the call is made. (Don Peterson)
   * Refactored several specs and added a full suite of cucumber features (Don Peterson)
-  
+
 == 0.2.8 2009-01-28
 * 1 major fix
   * fixed major bug with response where it wouldn't iterate or really work at all with parsed responses
-  
+
 == 0.2.7 2009-01-28
 * 2 minor fixes, 2 minor enhancements, 2 major enhancements
   * fixed undefined method add_node for nil class error that occasionally happened (juliocesar)
@@ -180,11 +186,11 @@
 == 0.2.6 2009-01-05
 * 1 minor bug fix
   * added explicit require of time as Time#parse failed outside of rails (willcodeforfoo)
-  
+
 == 0.2.5 2009-01-05
 * 1 major enhancement
   * Add command line interface to HTTParty (Alex Vollmer)
-  
+
 == 0.2.4 2008-12-23
 * 1 bug fix
   * Fixed that mimetype detection was failing if no mimetype was returned from service (skippy)
@@ -206,7 +212,7 @@
 
 == 0.1.8 2008-11-30
 * 3 major enhancements
-  * Moved base_uri normalization into request class and out of httparty module, fixing 
+  * Moved base_uri normalization into request class and out of httparty module, fixing
     the problem where base_uri was not always being normalized.
   * Stupid simple support for HTTParty.get/post/put/delete. (jqr)
   * Switched gem management to Echoe from newgem.
@@ -214,16 +220,16 @@
 == 0.1.7 2008-11-30
 * 1 major enhancement
   * fixed multiple class definitions overriding each others options
-  
+
 == 0.1.6 2008-11-26
 * 1 major enhancement
   * now passing :query to set_form_data if post request to avoid content length errors
-  
+
 == 0.1.5 2008-11-14
 * 2 major enhancements
   * Refactored send request method out into its own object.
   * Added :html format if you just want to do that.
-  
+
 == 0.1.4 2008-11-08
 * 3 major enhancements:
   * Removed some cruft

data/README.rdoc

@@ -42,7 +42,7 @@ options. Below is an example of how easy it is.
 
 == Requirements
 
-* Crack http://github.com/jnunemaker/crack/ - For XML and JSON parsing.
+* multijson and multixml
 * You like to party!
 
 == Install

data/features/steps/env.rb

@@ -1,5 +1,4 @@
 require 'mongrel'
-require 'active_support'
 require './lib/httparty'
 require 'spec/expectations'
 

data/httparty.gemspec

@@ -12,13 +12,8 @@ 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 'crack', HTTParty::CRACK_DEPENDENCY
-
-  s.add_development_dependency "activesupport", "~> 2.3"
-  s.add_development_dependency "cucumber",      "~> 0.7"
-  s.add_development_dependency "fakeweb",       "~> 1.2"
-  s.add_development_dependency "rspec",         "~> 1.3"
-  s.add_development_dependency "mongrel",       "1.2.0.pre2"
+  s.add_dependency 'multi_json'
+  s.add_dependency 'multi_xml'
 
   s.post_install_message = "When you HTTParty, you must party hard!"
 

data/lib/httparty.rb

@@ -3,7 +3,8 @@ require 'net/http'
 require 'net/https'
 require 'uri'
 require 'zlib'
-require 'crack'
+require 'multi_xml'
+require 'multi_json'
 
 require 'httparty/module_inheritable_attributes'
 require 'httparty/cookie_hash'
@@ -441,15 +442,11 @@ module HTTParty
   def self.options(*args)
     Basement.options(*args)
   end
-
 end
 
 require 'httparty/core_extensions'
+require 'httparty/hash_conversions'
 require 'httparty/exceptions'
 require 'httparty/parser'
 require 'httparty/request'
 require 'httparty/response'
-
-if Crack::VERSION != HTTParty::CRACK_DEPENDENCY
-  warn "warning: HTTParty depends on version #{HTTParty::CRACK_DEPENDENCY} of crack, not #{Crack::VERSION}."
-end

data/lib/httparty/core_extensions.rb

@@ -7,25 +7,3 @@ module HTTParty
     end
   end
 end
-
-# 1.8.6 has mistyping of transitive in if statement
-require "rexml/document"
-module REXML #:nodoc:
-  class Document < Element #:nodoc:
-    def write( output=$stdout, indent=-1, transitive=false, ie_hack=false )
-      if xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
-        output = Output.new( output, xml_decl.encoding )
-      end
-      formatter = if indent > -1
-          if transitive
-            REXML::Formatters::Transitive.new( indent, ie_hack )
-          else
-            REXML::Formatters::Pretty.new( indent, ie_hack )
-          end
-        else
-          REXML::Formatters::Default.new( ie_hack )
-        end
-      formatter.write( self, output )
-    end
-  end
-end

data/lib/httparty/hash_conversions.rb

@@ -0,0 +1,51 @@
+module HTTParty
+  module HashConversions
+    # @return <String> This hash as a query string
+    #
+    # @example
+    #   { :name => "Bob",
+    #     :address => {
+    #       :street => '111 Ruby Ave.',
+    #       :city => 'Ruby Central',
+    #       :phones => ['111-111-1111', '222-222-2222']
+    #     }
+    #   }.to_params
+    #     #=> "name=Bob&address[city]=Ruby Central&address[phones][]=111-111-1111&address[phones][]=222-222-2222&address[street]=111 Ruby Ave."
+    def self.to_params(hash)
+      params = hash.map { |k,v| normalize_param(k,v) }.join
+      params.chop! # trailing &
+      params
+    end
+
+    # @param key<Object> The key for the param.
+    # @param value<Object> The value for the param.
+    #
+    # @return <String> This key value pair as a param
+    #
+    # @example normalize_param(:name, "Bob Jones") #=> "name=Bob%20Jones&"
+    def self.normalize_param(key, value)
+      param = ''
+      stack = []
+
+      if value.is_a?(Array)
+        param << value.map { |element| normalize_param("#{key}[]", element) }.join
+      elsif value.is_a?(Hash)
+        stack << [key,value]
+      else
+        param << "#{key}=#{URI.encode(value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}&"
+      end
+
+      stack.each do |parent, hash|
+        hash.each do |key, value|
+          if value.is_a?(Hash)
+            stack << ["#{parent}[#{key}]", value]
+          else
+            param << normalize_param("#{parent}[#{key}]", value)
+          end
+        end
+      end
+
+      param
+    end
+  end
+end

data/lib/httparty/parser.rb

@@ -109,11 +109,11 @@ module HTTParty
     protected
 
     def xml
-      Crack::XML.parse(body)
+      MultiXml.parse(body)
     end
 
     def json
-      Crack::JSON.parse(body)
+      MultiJson.decode(body)
     end
 
     def yaml

data/lib/httparty/request.rb

@@ -18,12 +18,12 @@ module HTTParty
         elsif value.is_a?(Array)
           value.map {|v| "#{key}=#{URI.encode(v.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}"}
         else
-          {key => value}.to_params
+          HashConversions.to_params(key => value)
         end
       end.flatten.sort.join('&')
     end
 
-    attr_accessor :http_method, :path, :options, :last_response, :redirect
+    attr_accessor :http_method, :path, :options, :last_response, :redirect, :last_uri
 
     def initialize(http_method, path, o={})
       self.http_method = http_method
@@ -41,7 +41,7 @@ module HTTParty
     end
 
     def uri
-      new_uri = path.relative? ? URI.parse("#{options[:base_uri]}#{path}") : path
+      new_uri = path.relative? ? URI.parse("#{base_uri}#{path}") : path
 
       # avoid double query string on redirects [#12]
       unless redirect
@@ -52,7 +52,11 @@ module HTTParty
         raise UnsupportedURIScheme, "'#{new_uri}' Must be HTTP or HTTPS"
       end
 
-      new_uri
+      @last_uri = new_uri
+    end
+
+    def base_uri
+      redirect ? "#{@last_uri.scheme}://#{@last_uri.host}" : options[:base_uri]
     end
 
     def format
@@ -139,7 +143,7 @@ module HTTParty
       if query_string_normalizer
         query_string_normalizer.call(query)
       else
-        query.to_params
+        HashConversions.to_params(query)
       end
     end
 

data/lib/httparty/version.rb

@@ -1,5 +1,3 @@
 module HTTParty
-  VERSION = "0.7.8".freeze
-
-  CRACK_DEPENDENCY = "0.1.8".freeze
+  VERSION = "0.8.0"
 end

data/spec/httparty/parser_spec.rb

@@ -129,13 +129,13 @@ describe HTTParty::Parser do
       HTTParty::Parser.new('body', nil)
     end
 
-    it "parses xml with Crack" do
-      Crack::XML.should_receive(:parse).with('body')
+    it "parses xml with MultiXml" do
+      MultiXml.should_receive(:parse).with('body')
       subject.send(:xml)
     end
 
-    it "parses json with Crack" do
-      Crack::JSON.should_receive(:parse).with('body')
+    it "parses json with MultiJson" do
+      MultiJson.should_receive(:decode).with('body')
       subject.send(:json)
     end
 

data/spec/httparty/request_spec.rb

@@ -326,7 +326,12 @@ describe HTTParty::Request do
           redirect['location'] = 'http://foo.com/foo'
           ok = stub_response('<hash><foo>bar</foo></hash>', 200)
           @http.stub!(:request).and_return(redirect, ok)
-          @request.perform.should == {"hash" => {"foo" => "bar"}}
+          response = @request.perform
+          response.request.base_uri.to_s.should == "http://foo.com"
+          response.request.path.to_s.should == "http://foo.com/foo"
+          response.request.uri.request_uri.should == "/foo"
+          response.request.uri.to_s.should == "http://foo.com/foo"
+          response.should == {"hash" => {"foo" => "bar"}}
         end
 
         it "redirects if a 300 contains a relative location header" do
@@ -335,7 +340,23 @@ describe HTTParty::Request do
           ok = stub_response('<hash><foo>bar</foo></hash>', 200)
           @http.stub!(:request).and_return(redirect, ok)
           response = @request.perform
+          response.request.base_uri.to_s.should == "http://api.foo.com"
+          response.request.path.to_s.should == "/foo/bar"
           response.request.uri.request_uri.should == "/foo/bar"
+          response.request.uri.to_s.should == "http://api.foo.com/foo/bar"
+          response.should == {"hash" => {"foo" => "bar"}}
+        end
+
+        it "handles multiple redirects and relative location headers on different hosts" 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", :status => [300, "REDIRECT"], :location => "/v3")
+          FakeWeb.register_uri(:get, "http://api.foo.com/v3", :body => "<hash><foo>bar</foo></hash>")
+          response = @request.perform
+          response.request.base_uri.to_s.should == "http://api.foo.com"
+          response.request.path.to_s.should == "/v3"
+          response.request.uri.request_uri.should == "/v3"
+          response.request.uri.to_s.should == "http://api.foo.com/v3"
           response.should == {"hash" => {"foo" => "bar"}}
         end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httparty
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
   - 8
-  version: 0.7.8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -16,102 +16,36 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 Z
+date: 2011-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: crack
+  name: multi_json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
         - 0
-        - 1
-        - 8
-        version: 0.1.8
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: multi_xml
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 0
-        - 7
-        version: "0.7"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mongrel
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 1923831981
-        segments: 
-        - 1
-        - 2
-        - 0
-        - pre
-        - 2
-        version: 1.2.0.pre2
-  type: :development
-  version_requirements: *id006
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Makes http fun! Also, makes consuming restful web services dead easy.
 email: 
 - nunemaker@gmail.com
@@ -157,6 +91,7 @@ files:
 - lib/httparty/cookie_hash.rb
 - lib/httparty/core_extensions.rb
 - lib/httparty/exceptions.rb
+- lib/httparty/hash_conversions.rb
 - lib/httparty/module_inheritable_attributes.rb
 - lib/httparty/net_digest_auth.rb
 - lib/httparty/parser.rb
@@ -221,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Makes http fun! Also, makes consuming restful web services dead easy.
@@ -266,4 +201,3 @@ test_files:
 - spec/support/ssl_test_helper.rb
 - spec/support/ssl_test_server.rb
 - spec/support/stub_response.rb
-has_rdoc: