httparty 0.4.4 → 0.4.5

data/.gitignore

@@ -0,0 +1,6 @@
+.DS_Store
+doc/
+tmp/
+log/
+pkg/
+*.swp

data/History

@@ -1,3 +1,13 @@
+== 0.4.5 2009-09-12
+* bug fixes
+  * Fixed class-level headers overwritten by cookie management code. Closes #19
+  * Fixed "superclass mismatch for class BlankSlate" error. Closes #20
+  * Fixed reading files as post data from the command line (vesan)
+* minor enhancements
+  * Timeout option added; will raise a Timeout::Error after the timeout has elapsed (attack). Closes #17
+    HTTParty.get "http://github.com", :timeout => 1
+  * Building gem with Jeweler
+
 == 0.4.4 2009-07-19
 * 2 minor update
   * :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.
@@ -128,4 +138,4 @@
 == 0.1.0 2008-07-27
 
 * 1 major enhancement:
-  * Initial release
+  * Initial release

data/README.rdoc

@@ -6,7 +6,7 @@ Makes http fun again!
 
 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 build_gemspec
+* rake gemspec
 * gem build httparty.gemspec
 * gem install the gem that was built
 

data/Rakefile

@@ -1,48 +1,71 @@
-ProjectName = 'httparty'
-WebsitePath = "jnunemaker@rubyforge.org:/var/www/gforge-projects/#{ProjectName}"
-
-require 'rubygems'
-require 'rake'
-require 'echoe'
-require 'spec/rake/spectask'
-require "lib/#{ProjectName}/version"
-require 'cucumber/rake/task'
-
-Echoe.new(ProjectName, HTTParty::Version) do |p|
-  p.description     = "Makes http fun! Also, makes consuming restful web services dead easy."
-  p.install_message = "When you HTTParty, you must party hard!"
-  p.url             = "http://#{ProjectName}.rubyforge.org"
-  p.author          = "John Nunemaker"
-  p.email           = "nunemaker@gmail.com"
-  p.extra_deps      = [['crack', '>= 0.1.1']]
-  p.need_tar_gz     = false
-  p.docs_host       = WebsitePath
-end
-
-desc 'Upload website files to rubyforge'
-task :website do
-  sh %{rsync -av website/ #{WebsitePath}}
-  Rake::Task['website_docs'].invoke
-end
-
-task :website_docs do
-  Rake::Task['redocs'].invoke
-  sh %{rsync -av doc/ #{WebsitePath}/docs}
-end
-
-desc 'Preps the gem for a new release'
-task :prepare do
-  %w[manifest build_gemspec].each do |task|
-    Rake::Task[task].invoke
-  end
-end
-
-Rake::Task[:default].prerequisites.clear
-task :default => :spec
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList["spec/**/*_spec.rb"]
-end
-
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "--format pretty" 
-end
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+  gem.name = "httparty"
+  gem.summary = %Q{Makes http fun! Also, makes consuming restful web services dead easy.}
+  gem.description = %Q{Makes http fun! Also, makes consuming restful web services dead easy.}
+  gem.email = "nunemaker@gmail.com"
+  gem.homepage = "http://httparty.rubyforge.org"
+  gem.authors = ["John Nunemaker", "Sandro Turriate"]
+  gem.add_dependency 'crack', '>= 0.1.1'
+  gem.add_development_dependency "rspec", "1.2.8"
+  gem.post_install_message = "When you HTTParty, you must party hard!"
+  gem.rubyforge_project = 'httparty'
+  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+  rubyforge.doc_task = "rdoc"
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+spec.libs << 'lib' << 'spec'
+spec.spec_files = FileList['spec/**/*_spec.rb']
+spec.spec_opts = ['--options', 'spec/spec.opts']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+spec.libs << 'lib' << 'spec'
+spec.pattern = 'spec/**/*_spec.rb'
+spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+begin
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new(:features)
+  
+  task :features => :check_dependencies
+rescue LoadError
+  task :features do
+  abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
+  end
+end
+
+task :default => [:spec, :features]
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+if File.exist?('VERSION')
+  version = File.read('VERSION')
+else
+  version = ""
+end
+
+rdoc.rdoc_dir = 'rdoc'
+rdoc.title = "httparty #{version}"
+rdoc.rdoc_files.include('README*')
+rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+desc 'Upload website files to rubyforge'
+task :website do
+sh %{rsync -av website/ jnunemaker@rubyforge.org:/var/www/gforge-projects/httparty}
+end

data/VERSION

@@ -0,0 +1 @@
+0.4.5

data/bin/httparty

@@ -37,7 +37,7 @@ OptionParser.new do |o|
        "--data [BODY]",
        "Data to put in request body (prefix with '@' for file)") do |d|
     if d =~ /^@/
-      opts[:data] = open(d).read
+      opts[:data] = open(d[1..-1]).read
     else
       opts[:data] = d
     end

data/features/steps/env.rb

@@ -8,6 +8,7 @@ Before do
   @host_and_port = "0.0.0.0:#{port}"
   @server = Mongrel::HttpServer.new("0.0.0.0", port)
   @server.run
+  @request_options = {}
 end
 
 After do

data/features/steps/httparty_response_steps.rb

@@ -20,7 +20,7 @@ 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 raise an HTTParty::RedirectionTooDeep exception/ do
+Then /it should raise (?:an|a) ([\w:]+) exception/ do |exception|
   @exception_from_httparty.should_not be_nil
-  @exception_from_httparty.class.should eql(HTTParty::RedirectionTooDeep)
+  @exception_from_httparty.class.name.should eql(exception)
 end

data/features/steps/httparty_steps.rb

@@ -1,7 +1,11 @@
+When /^I set my HTTParty timeout option to (\d+)$/ do |timeout|
+  @request_options[:timeout] = timeout.to_i
+end
+
 When /I call HTTParty#get with '(.*)'$/ do |url|
   begin
-    @response_from_httparty = HTTParty.get("http://#{@host_and_port}#{url}")
-  rescue HTTParty::RedirectionTooDeep => e
+    @response_from_httparty = HTTParty.get("http://#{@host_and_port}#{url}", @request_options)
+  rescue HTTParty::RedirectionTooDeep, Timeout::Error => e
     @exception_from_httparty = e
   end
 end

data/features/steps/mongrel_helper.rb

@@ -1,6 +1,6 @@
 def basic_mongrel_handler
   Class.new(Mongrel::HttpHandler) do
-    attr_writer :content_type, :response_body, :response_code
+    attr_writer :content_type, :response_body, :response_code, :preprocessor
 
     def initialize
       @content_type = "text/html"
@@ -10,6 +10,7 @@ def basic_mongrel_handler
     end
 
     def process(request, response)
+      instance_eval &@preprocessor if @preprocessor
       reply_with(response, @response_code, @response_body)
     end
 

data/features/steps/remote_service_steps.rb

@@ -12,6 +12,11 @@ Given /that service is accessed at the path '(.*)'/ do |path|
   @server.register(path, @handler)
 end
 
+Given /^that service takes (\d+) seconds to generate a response$/ do |time|
+  preprocessor = lambda { sleep time.to_i }
+  @handler.preprocessor = preprocessor
+end
+
 Given /the response from the service has a Content-Type of '(.*)'/ do |content_type|
   @handler.content_type = content_type
 end

data/features/supports_timeout_option.feature

@@ -0,0 +1,12 @@
+Feature: Supports the timeout option
+  In order to handle inappropriately slow response times
+  As a developer
+  I want my request to raise an exception after my specified timeout as elapsed
+
+  Scenario: A long running response
+    Given a remote service that returns '<h1>Some HTML</h1>'
+    And that service is accessed at the path '/service.html'
+    And that service takes 2 seconds to generate a response
+    When I set my HTTParty timeout option to 1
+    And I call HTTParty#get with '/service.html'
+    Then it should raise a Timeout::Error exception

data/httparty.gemspec

@@ -1,26 +1,95 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{httparty}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-07-19}
+  s.date = %q{2009-09-12}
   s.default_executable = %q{httparty}
   s.description = %q{Makes http fun! Also, makes consuming restful web services dead easy.}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["httparty"]
-  s.extra_rdoc_files = ["bin/httparty", "lib/httparty/cookie_hash.rb", "lib/httparty/core_extensions.rb", "lib/httparty/exceptions.rb", "lib/httparty/module_inheritable_attributes.rb", "lib/httparty/request.rb", "lib/httparty/response.rb", "lib/httparty/version.rb", "lib/httparty.rb", "README.rdoc"]
-  s.files = ["bin/httparty", "cucumber.yml", "examples/aaws.rb", "examples/basic.rb", "examples/delicious.rb", "examples/google.rb", "examples/rubyurl.rb", "examples/twitter.rb", "examples/whoismyrep.rb", "features/basic_authentication.feature", "features/command_line.feature", "features/deals_with_http_error_codes.feature", "features/handles_multiple_formats.feature", "features/steps/env.rb", "features/steps/httparty_response_steps.rb", "features/steps/httparty_steps.rb", "features/steps/mongrel_helper.rb", "features/steps/remote_service_steps.rb", "features/supports_redirection.feature", "History", "httparty.gemspec", "lib/httparty/cookie_hash.rb", "lib/httparty/core_extensions.rb", "lib/httparty/exceptions.rb", "lib/httparty/module_inheritable_attributes.rb", "lib/httparty/request.rb", "lib/httparty/response.rb", "lib/httparty/version.rb", "lib/httparty.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README.rdoc", "spec/fixtures/delicious.xml", "spec/fixtures/empty.xml", "spec/fixtures/google.html", "spec/fixtures/twitter.json", "spec/fixtures/twitter.xml", "spec/fixtures/undefined_method_add_node_for_nil.xml", "spec/httparty/cookie_hash_spec.rb", "spec/httparty/request_spec.rb", "spec/httparty/response_spec.rb", "spec/httparty_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "website/css/common.css", "website/index.html"]
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "History",
+     "MIT-LICENSE",
+     "Manifest",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/httparty",
+     "cucumber.yml",
+     "examples/aaws.rb",
+     "examples/basic.rb",
+     "examples/delicious.rb",
+     "examples/google.rb",
+     "examples/rubyurl.rb",
+     "examples/twitter.rb",
+     "examples/whoismyrep.rb",
+     "features/basic_authentication.feature",
+     "features/command_line.feature",
+     "features/deals_with_http_error_codes.feature",
+     "features/handles_multiple_formats.feature",
+     "features/steps/env.rb",
+     "features/steps/httparty_response_steps.rb",
+     "features/steps/httparty_steps.rb",
+     "features/steps/mongrel_helper.rb",
+     "features/steps/remote_service_steps.rb",
+     "features/supports_redirection.feature",
+     "features/supports_timeout_option.feature",
+     "httparty.gemspec",
+     "lib/httparty.rb",
+     "lib/httparty/cookie_hash.rb",
+     "lib/httparty/core_extensions.rb",
+     "lib/httparty/exceptions.rb",
+     "lib/httparty/module_inheritable_attributes.rb",
+     "lib/httparty/request.rb",
+     "lib/httparty/response.rb",
+     "lib/httparty/version.rb",
+     "spec/fixtures/delicious.xml",
+     "spec/fixtures/empty.xml",
+     "spec/fixtures/google.html",
+     "spec/fixtures/twitter.json",
+     "spec/fixtures/twitter.xml",
+     "spec/fixtures/undefined_method_add_node_for_nil.xml",
+     "spec/httparty/cookie_hash_spec.rb",
+     "spec/httparty/request_spec.rb",
+     "spec/httparty/response_spec.rb",
+     "spec/httparty_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "website/css/common.css",
+     "website/index.html"
+  ]
   s.has_rdoc = true
   s.homepage = %q{http://httparty.rubyforge.org}
   s.post_install_message = %q{When you HTTParty, you must party hard!}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Httparty", "--main", "README.rdoc"]
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{httparty}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{Makes http fun! Also, makes consuming restful web services dead easy.}
+  s.test_files = [
+    "spec/httparty/cookie_hash_spec.rb",
+     "spec/httparty/request_spec.rb",
+     "spec/httparty/response_spec.rb",
+     "spec/httparty_spec.rb",
+     "spec/spec_helper.rb",
+     "examples/aaws.rb",
+     "examples/basic.rb",
+     "examples/delicious.rb",
+     "examples/google.rb",
+     "examples/rubyurl.rb",
+     "examples/twitter.rb",
+     "examples/whoismyrep.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -28,13 +97,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<crack>, [">= 0.1.1"])
-      s.add_development_dependency(%q<echoe>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["= 1.2.8"])
     else
       s.add_dependency(%q<crack>, [">= 0.1.1"])
-      s.add_dependency(%q<echoe>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["= 1.2.8"])
     end
   else
     s.add_dependency(%q<crack>, [">= 0.1.1"])
-    s.add_dependency(%q<echoe>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["= 1.2.8"])
   end
 end

data/lib/httparty.rb

@@ -1,13 +1,14 @@
-$:.unshift(File.dirname(__FILE__))
-
+require 'pathname'
 require 'net/http'
 require 'net/https'
-require 'httparty/module_inheritable_attributes'
 require 'rubygems'
-gem 'crack'
+gem 'crack', '>= 0.1.1'
 require 'crack'
 
-require 'httparty/cookie_hash'
+dir = Pathname(__FILE__).dirname.expand_path
+
+require dir + 'httparty/module_inheritable_attributes'
+require dir + 'httparty/cookie_hash'
 
 module HTTParty
   
@@ -109,6 +110,16 @@ module HTTParty
       default_options[:format] = f
     end
     
+    # Allows setting a custom parser for the response.
+    #
+    #   class Foo
+    #     include HTTParty
+    #     parser Proc.new {|data| ...}
+    #   end
+    def parser(customer_parser)
+      default_options[:parser] = customer_parser
+    end
+    
     # Allows making a get request to a url.
     #
     #   class Foo
@@ -155,16 +166,15 @@ module HTTParty
 
     private
       def perform_request(http_method, path, options) #:nodoc:
+        options = default_options.dup.merge(options)
         process_cookies(options)
-        Request.new(http_method, path, default_options.dup.merge(options)).perform
+        Request.new(http_method, path, options).perform
       end
 
       def process_cookies(options) #:nodoc:
-        return unless options[:cookies] || default_cookies
-        options[:headers] ||= {}
-        options[:headers]["cookie"] = cookies.merge(options[:cookies] || {}).to_cookie_string
-
-        options.delete(:cookies)
+        return unless options[:cookies] || default_cookies.any?
+        options[:headers] ||= headers.dup
+        options[:headers]["cookie"] = cookies.merge(options.delete(:cookies) || {}).to_cookie_string
       end
   end
 
@@ -200,7 +210,7 @@ module HTTParty
   end
 end
 
-require 'httparty/core_extensions'
-require 'httparty/exceptions'
-require 'httparty/request'
-require 'httparty/response'
+require dir + 'httparty/core_extensions'
+require dir + 'httparty/exceptions'
+require dir + 'httparty/request'
+require dir + 'httparty/response'

data/lib/httparty/cookie_hash.rb

@@ -1,9 +1,22 @@
 class HTTParty::CookieHash < Hash #:nodoc:
-  def add_cookies(hash)
-    merge!(hash)
+  
+  CLIENT_COOKIES = %w{path expires domain path secure HTTPOnly}
+  
+  def add_cookies(value)
+    case value
+    when Hash
+      merge!(value)
+    when String
+      value.split('; ').each do |cookie|
+        array = cookie.split('=')
+        self[array[0].to_sym] = array[1]
+      end
+    else
+      raise "add_cookies only takes a Hash or a String"
+    end
   end
 
   def to_cookie_string
-    collect { |k, v| "#{k}=#{v}" }.join("; ")
+    delete_if { |k, v| CLIENT_COOKIES.include?(k.to_s) }.collect { |k, v| "#{k}=#{v}" }.join("; ")
   end
 end

data/lib/httparty/core_extensions.rb

@@ -1,10 +1,6 @@
-if RUBY_VERSION.to_f == 1.8
-  class BlankSlate #:nodoc:
-    instance_methods.each { |m| undef_method m unless m =~ /^__|instance_eval|object_id/ }
-  end
-else
-  class BlankSlate < BasicObject; end
-end
+class BasicObject #:nodoc:
+  instance_methods.each { |m| undef_method m unless m =~ /^__|instance_eval/ }
+end unless defined?(BasicObject)
  
 # 1.8.6 has mistyping of transitive in if statement
 require "rexml/document"

data/lib/httparty/request.rb

@@ -41,10 +41,15 @@ module HTTParty
     end
 
     private
+
       def http
         http = Net::HTTP.new(uri.host, uri.port, options[:http_proxyaddr], options[:http_proxyport])
         http.use_ssl = (uri.port == 443)
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        if options[:timeout] && options[:timeout].is_a?(Integer)
+          http.open_timeout = options[:timeout]
+          http.read_timeout = options[:timeout]
+        end
         http
       end
 
@@ -98,6 +103,8 @@ module HTTParty
             options[:limit] -= 1
             self.path = response['location']
             @redirect = true
+            self.http_method = Net::HTTP::Get
+            capture_cookies(response)
             perform
           else
             parsed_response = parse_response(response.body)
@@ -105,18 +112,45 @@ module HTTParty
           end
       end
       
+      # HTTParty.const_get((self.format.to_s || 'text').capitalize)
       def parse_response(body)
         return nil if body.nil? or body.empty?
-        case format
-          when :xml
-            Crack::XML.parse(body)
-          when :json
-            Crack::JSON.parse(body)
-          when :yaml
-            YAML::load(body)
+        if options[:parser].blank?
+          case format
+            when :xml
+              Crack::XML.parse(body)
+            when :json
+              Crack::JSON.parse(body)
+            when :yaml
+              YAML::load(body)
+            else
+              body
+            end
+        else
+          if options[:parser].is_a?(Proc)
+            options[:parser].call(body)
           else
             body
           end
+        end
+      end
+            
+      def capture_cookies(response)
+        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'])
+        options[:headers] ||= {}
+        options[:headers]['Cookie'] = cookies_hash.to_cookie_string
+      end
+      
+      def capture_cookies(response)
+        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'])
+        options[:headers] ||= {}
+        options[:headers]['Cookie'] = cookies_hash.to_cookie_string
       end
   
       # Uses the HTTP Content-Type header to determine the format of the response

data/lib/httparty/response.rb

@@ -1,5 +1,5 @@
 module HTTParty
-  class Response < BlankSlate #:nodoc:
+  class Response < BasicObject #:nodoc:
     attr_accessor :body, :code, :message, :headers
     attr_reader :delegate
 

data/spec/httparty/cookie_hash_spec.rb

@@ -6,17 +6,44 @@ describe HTTParty::CookieHash do
   end
 
   describe "#add_cookies" do
-    it "should add new key/value pairs to the hash" do
-      @cookie_hash.add_cookies(:foo => "bar")
-      @cookie_hash.add_cookies(:rofl => "copter")
-      @cookie_hash.length.should eql(2)
+    
+    describe "with a hash" do
+      it "should add new key/value pairs to the hash" do
+        @cookie_hash.add_cookies(:foo => "bar")
+        @cookie_hash.add_cookies(:rofl => "copter")
+        @cookie_hash.length.should eql(2)
+      end
+
+      it "should overwrite any existing key" do
+        @cookie_hash.add_cookies(:foo => "bar")
+        @cookie_hash.add_cookies(:foo => "copter")
+        @cookie_hash.length.should eql(1)
+        @cookie_hash[:foo].should eql("copter")
+      end
     end
 
-    it "should overwrite any existing key" do
-      @cookie_hash.add_cookies(:foo => "bar")
-      @cookie_hash.add_cookies(:foo => "copter")
-      @cookie_hash.length.should eql(1)
-      @cookie_hash[:foo].should eql("copter")
+    describe "with a string" do
+      it "should add new key/value pairs to the hash" do
+        @cookie_hash.add_cookies("first=one; second=two; third")
+        @cookie_hash[:first].should == 'one'
+        @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")
+        @cookie_hash.length.should eql(1)
+        @cookie_hash[:foo].should eql("tar")
+      end
+    end
+    
+    describe 'with other class' do
+      it "should error" do
+        lambda {
+          @cookie_hash.add_cookies(Array.new)
+        }.should raise_error
+      end
     end
   end
 
@@ -34,5 +61,11 @@ 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
+      @s.should_not match(/path=\//)
+    end
   end
 end

data/spec/httparty/request_spec.rb

@@ -46,8 +46,26 @@ describe HTTParty::Request do
       @request.send(:setup_raw_request)
       @request.instance_variable_get(:@raw_request)['authorization'].should_not be_nil
     end
+
+    context "when setting timeout" do
+      it "does nothing if the timeout option is a string" do
+        http = mock("http", :null_object => true)
+        http.should_not_receive(:open_timeout=)
+        http.should_not_receive(:read_timeout=)
+        Net::HTTP.stub(:new => http)
+
+        request = HTTParty::Request.new(Net::HTTP::Get, 'https://foobar.com', {:timeout => "five seconds"})
+        request.send(:http)
+      end
+
+      it "sets the timeout to 5 seconds" do
+        @request.options[:timeout] = 5
+        @request.send(:http).open_timeout.should == 5
+        @request.send(:http).read_timeout.should == 5
+      end
+    end
   end
-  
+
   describe '#format_from_mimetype' do
     it 'should handle text/xml' do
       ["text/xml", "text/xml; charset=iso8859-1"].each do |ct|
@@ -176,6 +194,33 @@ describe HTTParty::Request do
         @request.http_method = Net::HTTP::Put
         @request.perform.should == {"hash" => {"foo" => "bar"}}
       end
+      
+      it "should keep track of cookies between redirects" do
+        @redirect['Set-Cookie'] = 'foo=bar; name=value; HTTPOnly'
+        @request.perform
+        @request.options[:headers]['Cookie'].should match(/foo=bar/)
+        @request.options[:headers]['Cookie'].should match(/name=value/)
+      end
+      
+      it 'should update cookies with rediects' do
+        @request.options[:headers] = {'Cookie'=> 'foo=bar;'}
+        @redirect['Set-Cookie'] = 'foo=tar;'
+        @request.perform
+        @request.options[:headers]['Cookie'].should match(/foo=tar/)
+      end
+      
+      it 'should keep cookies between rediects' do
+        @request.options[:headers] = {'Cookie'=> 'keep=me'}
+        @redirect['Set-Cookie'] = 'foo=tar;'
+        @request.perform
+        @request.options[:headers]['Cookie'].should match(/keep=me/)
+      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"}}
+        @request.http_method.should == Net::HTTP::Get
+      end
     end
 
     describe "infinitely" do

data/spec/httparty_spec.rb

@@ -51,15 +51,53 @@ describe HTTParty do
   end
   
   describe "headers" do
+    def expect_headers(header={})
+      HTTParty::Request.should_receive(:new) \
+        .with(anything, anything, hash_including({ :headers => header })) \
+        .and_return(mock("mock response", :perform => nil))
+    end
+
     it "should default to empty hash" do
       @klass.headers.should == {}
     end
-    
+
     it "should be able to be updated" do
       init_headers = {:foo => 'bar', :baz => 'spax'}
       @klass.headers init_headers
       @klass.headers.should == init_headers
     end
+
+    it "uses the class headers when sending a request" do
+      expect_headers(:foo => 'bar')
+      @klass.headers(:foo => 'bar')
+      @klass.get('')
+    end
+
+    it "overwrites class headers when passing in headers" do
+      expect_headers(:baz => 'spax')
+      @klass.headers(:foo => 'bar')
+      @klass.get('', :headers => {:baz => 'spax'})
+    end
+
+    context "with cookies" do
+      it 'utilizes the class-level cookies' do
+        expect_headers(:foo => 'bar', 'cookie' => 'type=snickerdoodle')
+        @klass.headers(:foo => 'bar')
+        @klass.cookies(:type => 'snickerdoodle')
+        @klass.get('')
+      end
+
+      it 'adds cookies to the headers' do
+        expect_headers(:foo => 'bar', 'cookie' => 'type=snickerdoodle')
+        @klass.headers(:foo => 'bar')
+        @klass.get('', :cookies => {:type => 'snickerdoodle'})
+      end
+
+      it 'adds optional cookies to the optional headers' do
+        expect_headers(:baz => 'spax', 'cookie' => 'type=snickerdoodle')
+        @klass.get('', :cookies => {:type => 'snickerdoodle'}, :headers => {:baz => 'spax'})
+      end
+    end
   end
 
   describe "cookies" do
@@ -287,4 +325,4 @@ describe HTTParty do
       result.should == nil
     end
   end
-end
+end

data/spec/spec.opts

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

data/spec/spec_helper.rb

@@ -1,7 +1,10 @@
-require 'rubygems'
-gem 'rspec', '>= 1.2.8'
-require 'spec'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'httparty')
+gem 'rspec', '1.2.8'
+gem 'fakeweb'
+require 'spec/autorun'
+require 'fakeweb'
+
+FakeWeb.allow_net_connect = false
 
 def file_fixture(filename)
   open(File.join(File.dirname(__FILE__), 'fixtures', "#{filename.to_s}")).read

data/website/index.html

@@ -1,32 +1,31 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
 <head> 
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
-	<title>HTTParty by John Nunemaker</title> 
-	<link rel="stylesheet" href="css/common.css" type="text/css" /> 
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
+  <title>HTTParty by John Nunemaker</title> 
+  <link rel="stylesheet" href="css/common.css" type="text/css" /> 
 </head> 
 <body> 
  
 <div id="wrapper"> 
-	<div id="header"> 
-		<h1>HTTParty</h1> 
-		<p>Tonight we're gonna HTTParty like it's 1999!</p> 
-		
-		<ul id="nav">
-			<li><a href="rdoc/">Docs</a></li> 
-			<li><a href="http://github.com/jnunemaker/httparty">Github</a></li>
-			<li><a href="http://jnunemaker.lighthouseapp.com/projects/14842-httparty/tickets">Lighthouse</a></li>
-			<li><a href="http://rubyforge.org/projects/httparty/">Rubyforge</a></li> 
-		</ul> 
-	</div> 
-	
-	<div id="content"> 
-		<h2>Install</h2> 
-		<pre><code>$ sudo gem install httparty</code></pre> 
-		
-		<h2>Some Quick Examples</h2>
-		
-		<p>The following is a simple example of wrapping Twitter's API for posting updates.</p>
+  <div id="header"> 
+    <h1>HTTParty</h1> 
+    <p>Tonight we're gonna HTTParty like it's 1999!</p> 
+    
+    <ul id="nav">
+      <li><a href="rdoc/">Docs</a></li> 
+      <li><a href="http://github.com/jnunemaker/httparty">Github</a></li>
+      <li><a href="http://rubyforge.org/projects/httparty/">Rubyforge</a></li> 
+    </ul> 
+  </div> 
+  
+  <div id="content"> 
+    <h2>Install</h2> 
+    <pre><code>$ sudo gem install httparty</code></pre> 
+    
+    <h2>Some Quick Examples</h2>
+    
+    <p>The following is a simple example of wrapping Twitter's API for posting updates.</p>
 
 <pre><code>class Twitter
   include HTTParty
@@ -36,9 +35,9 @@ end
 
 Twitter.post('/statuses/update.json', :query => {:status => "It's an HTTParty and everyone is invited!"})</code></pre>
 
-		<p>That is really it! The object returned is a ruby hash that is decoded from Twitter's json response. JSON parsing is used because of the .json extension in the path of the request. You can also explicitly set a format (see the examples). </p>
+    <p>That is really it! The object returned is a ruby hash that is decoded from Twitter's json response. JSON parsing is used because of the .json extension in the path of the request. You can also explicitly set a format (see the examples). </p>
 
-		<p>That works and all but what if you don't want to embed your username and password in the class? Below is an example to fix that:</p>
+    <p>That works and all but what if you don't want to embed your username and password in the class? Below is an example to fix that:</p>
 
 <pre><code>class Twitter
   include HTTParty
@@ -55,19 +54,19 @@ Twitter.post('/statuses/update.json', :query => {:status => "It's an HTTParty an
 end
 
 Twitter.new('username', 'password').post("It's an HTTParty and everyone is invited!")</code></pre>
-		
-		<p><strong>More Examples:</strong> There are <a href="http://github.com/jnunemaker/httparty/tree/master/examples/">several examples in the gem itself</a>.</p>
-		
-		<h2>Support</h2> 
-		<p>Conversations welcome in the <a href="http://groups.google.com/group/httparty-gem">google group</a> and bugs/features over at <a href="http://jnunemaker.lighthouseapp.com/projects/14842-httparty/overview">Lightouse</a>.</p> 
-		
-		
-	</div> 
+    
+    <p><strong>More Examples:</strong> There are <a href="http://github.com/jnunemaker/httparty/tree/master/examples/">several examples in the gem itself</a>.</p>
+    
+    <h2>Support</h2> 
+    <p>Conversations welcome in the <a href="http://groups.google.com/group/httparty-gem">google group</a> and bugs/features over at <a href="http://github.com/jnunemaker/httparty">Github</a>.</p> 
+    
+    
+  </div> 
  
-	<div id="footer"> 
-		<p>Created by <a href="http://addictedtonew.com/about/">John Nunemaker</a> | 
-		  <a href="http://orderedlist.com/">Hire Me at Ordered List</a></p> 
-	</div> 
+  <div id="footer"> 
+    <p>Created by <a href="http://addictedtonew.com/about/">John Nunemaker</a> | 
+      <a href="http://orderedlist.com/">Hire Me at Ordered List</a></p> 
+  </div> 
 </div> 
  
 </body> 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: httparty
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-19 00:00:00 -04:00
-default_executable: 
+date: 2009-09-12 00:00:00 -04:00
+default_executable: httparty
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: crack
@@ -23,14 +23,14 @@ dependencies:
         version: 0.1.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: echoe
+  name: rspec
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.2.8
     version: 
 description: Makes http fun! Also, makes consuming restful web services dead easy.
 email: nunemaker@gmail.com
@@ -39,17 +39,15 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- bin/httparty
-- lib/httparty/cookie_hash.rb
-- lib/httparty/core_extensions.rb
-- lib/httparty/exceptions.rb
-- lib/httparty/module_inheritable_attributes.rb
-- lib/httparty/request.rb
-- lib/httparty/response.rb
-- lib/httparty/version.rb
-- lib/httparty.rb
 - README.rdoc
 files: 
+- .gitignore
+- History
+- MIT-LICENSE
+- Manifest
+- README.rdoc
+- Rakefile
+- VERSION
 - bin/httparty
 - cucumber.yml
 - examples/aaws.rb
@@ -69,8 +67,9 @@ files:
 - features/steps/mongrel_helper.rb
 - features/steps/remote_service_steps.rb
 - features/supports_redirection.feature
-- History
+- features/supports_timeout_option.feature
 - httparty.gemspec
+- lib/httparty.rb
 - lib/httparty/cookie_hash.rb
 - lib/httparty/core_extensions.rb
 - lib/httparty/exceptions.rb
@@ -78,11 +77,6 @@ files:
 - lib/httparty/request.rb
 - lib/httparty/response.rb
 - lib/httparty/version.rb
-- lib/httparty.rb
-- Manifest
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
 - spec/fixtures/delicious.xml
 - spec/fixtures/empty.xml
 - spec/fixtures/google.html
@@ -99,14 +93,11 @@ files:
 - website/index.html
 has_rdoc: true
 homepage: http://httparty.rubyforge.org
+licenses: []
+
 post_install_message: When you HTTParty, you must party hard!
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Httparty
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -119,14 +110,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
+      version: "0"
   version: 
 requirements: []
 
-rubyforge_project: httparty
-rubygems_version: 1.3.1
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Makes http fun! Also, makes consuming restful web services dead easy.
-test_files: []
-
+test_files: 
+- spec/httparty/cookie_hash_spec.rb
+- spec/httparty/request_spec.rb
+- spec/httparty/response_spec.rb
+- spec/httparty_spec.rb
+- spec/spec_helper.rb
+- examples/aaws.rb
+- examples/basic.rb
+- examples/delicious.rb
+- examples/google.rb
+- examples/rubyurl.rb
+- examples/twitter.rb
+- examples/whoismyrep.rb