httparty 0.5.2 → 0.6.0

data/spec/httparty/response_spec.rb

@@ -1,62 +1,83 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe HTTParty::Response do
+  before do
+    @last_modified = Date.new(2010, 1, 15).to_s
+    @content_length = '1024'
+    @response_object = {'foo' => 'bar'}
+    @response_object = Net::HTTPOK.new('1.1', 200, 'OK')
+    @response_object.stub(:body => "{foo:'bar'}")
+    @response_object['last-modified'] = @last_modified
+    @response_object['content-length'] = @content_length
+    @parsed_response = {"foo" => "bar"}
+    @response = HTTParty::Response.new(@response_object, @parsed_response)
+  end
+
   describe "initialization" do
-    before do
-      @response_object = {'foo' => 'bar'}
-      @body = "{foo:'bar'}"
-      @code = '200'
-      @message = 'OK'
-      @response = HTTParty::Response.new(@response_object, @body, @code, @message)
-    end
-    
-    it "should set delegate" do
-      @response.delegate.should == @response_object
+    it "should set the Net::HTTP Response" do
+      @response.response.should == @response_object
     end
-    
+
     it "should set body" do
-      @response.body.should == @body
+      @response.body.should == @response_object.body
     end
-    
+
     it "should set code" do
-      @response.code.should.to_s == @code
+      @response.code.should.to_s == @response_object.code
     end
 
     it "should set code as a Fixnum" do
       @response.code.should be_an_instance_of(Fixnum)
     end
-    
-    it "should set body" do
-      @response.body.should == @body
-    end
   end
-  
-  it "should be able to set headers during initialization" do
-    response = HTTParty::Response.new({'foo' => 'bar'}, "{foo:'bar'}", 200, 'OK', {'foo' => 'bar'})
-    response.headers.should == {'foo' => 'bar'}
+
+  it "returns response headers" do
+    response = HTTParty::Response.new(@response_object, @parsed_response)
+    response.headers.should == {'last-modified' => [@last_modified], 'content-length' => [@content_length]}
   end
-  
+
   it "should send missing methods to delegate" do
-    response = HTTParty::Response.new({'foo' => 'bar'}, "{foo:'bar'}", 200, 'OK')
+    response = HTTParty::Response.new(@response_object, {'foo' => 'bar'})
     response['foo'].should == 'bar'
   end
-  
-  it "should be able to iterate delegate if it is array" do
-    response = HTTParty::Response.new([{'foo' => 'bar'}, {'foo' => 'baz'}], "[{foo:'bar'}, {foo:'baz'}]", 200, 'OK')
+
+  it "should be able to iterate if it is array" do
+    response = HTTParty::Response.new(@response_object, [{'foo' => 'bar'}, {'foo' => 'baz'}])
     response.size.should == 2
-    lambda {
+    expect {
       response.each { |item| }
-    }.should_not raise_error
+    }.to_not raise_error
+  end
+
+  it "allows headers to be accessed by mixed-case names in hash notation" do
+    response = HTTParty::Response.new(@response_object, @parsed_response)
+    response.headers['Content-LENGTH'].should == @content_length
+  end
+
+  it "returns a comma-delimited value when multiple values exist" do
+    @response_object.add_field 'set-cookie', 'csrf_id=12345; path=/'
+    @response_object.add_field 'set-cookie', '_github_ses=A123CdE; path=/'
+    response = HTTParty::Response.new(@response_object, @parsed_response)
+    response.headers['set-cookie'].should == "csrf_id=12345; path=/, _github_ses=A123CdE; path=/"
   end
-  
+
+  # Backwards-compatibility - previously, #headers returned a Hash
+  it "responds to hash methods" do
+    response = HTTParty::Response.new(@response_object, @parsed_response)
+    hash_methods = {}.methods - response.headers.methods
+    hash_methods.each do |method_name|
+      response.headers.respond_to?(method_name).should be_true
+    end
+  end
+
   xit "should allow hashes to be accessed with dot notation" do
     response = HTTParty::Response.new({'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({'foo' => {'bar' => 'baz'}}, "{foo: {bar:'baz'}}", 200, 'OK')
     response.foo.should == {'bar' => 'baz'}
     response.foo.bar.should == 'baz'
   end
-end
+end

data/spec/httparty_spec.rb

@@ -203,6 +203,17 @@ describe HTTParty do
     end
   end
 
+  describe "default timeout" do
+    it "should default to nil" do
+      @klass.default_options[:timeout].should == nil
+    end
+
+    it "should support updating" do
+      @klass.default_timeout 10
+      @klass.default_options[:timeout].should == 10
+    end
+  end
+
   describe "debug_output" do
     it "stores the given stream as a default_option" do
       @klass.debug_output $stdout
@@ -222,6 +233,13 @@ describe HTTParty do
     end
   end
 
+  describe "digest http authentication" do
+    it "should work" do
+      @klass.digest_auth 'foobar', 'secret'
+      @klass.default_options[:digest_auth].should == {:username => 'foobar', :password => 'secret'}
+    end
+  end
+
   describe "parser" do
     let(:parser) do
       Proc.new{ |data, format| CustomParser.parse(data) }
@@ -243,7 +261,7 @@ describe HTTParty do
       @klass.format :json
       class MyParser < HTTParty::Parser
         SupportedFormats = {}
-      end
+      end unless defined?(MyParser)
       expect do
         @klass.parser MyParser
       end.to raise_error(HTTParty::UnsupportedFormat)
@@ -316,6 +334,18 @@ describe HTTParty do
     end
   end
 
+  describe "#maintain_method_across_redirects" do
+    it "sets maintain_method_across_redirects to true by default" do
+      @klass.maintain_method_across_redirects
+      @klass.default_options[:maintain_method_across_redirects].should be_true
+    end
+
+    it "sets the maintain_method_across_redirects option to false" do
+      @klass.maintain_method_across_redirects false
+      @klass.default_options[:maintain_method_across_redirects].should be_false
+    end
+  end
+
   describe "with explicit override of automatic redirect handling" do
     before do
       @request = HTTParty::Request.new(Net::HTTP::Get, 'http://api.foo.com/v1', :format => :xml, :no_follow => true)

data/spec/spec_helper.rb

@@ -2,8 +2,6 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'httparty')
 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
 end
@@ -12,4 +10,10 @@ Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].e
 
 Spec::Runner.configure do |config|
   config.include HTTParty::StubResponse
+  config.before(:suite) do
+    FakeWeb.allow_net_connect = false
+  end
+  config.after(:suite) do
+    FakeWeb.allow_net_connect = true
+  end
 end

data/spec/support/stub_response.rb

@@ -14,7 +14,7 @@ module HTTParty
     end
 
     def stub_response(body, code = 200)
-      unless @http
+      unless defined?(@http) && @http
         @http = Net::HTTP.new('localhost', 80)
         @request.stub!(:http).and_return(@http)
         @request.stub!(:uri).and_return(URI.parse("http://foo.com/foobar"))

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: httparty
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -10,69 +15,88 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-31 00:00:00 -05:00
+date: 2010-06-13 00:00:00 -04:00
 default_executable: httparty
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: crack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.6
-    version: 
+        segments: 
+        - 0
+        - 1
+        - 7
+        version: 0.1.7
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
         version: "2.3"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.4"
-    version: 
+        segments: 
+        - 0
+        - 7
+        version: "0.7"
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: fakeweb
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
         version: "1.2"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mongrel
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
         version: "1.1"
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :development
+  version_requirements: *id006
 description: Makes http fun! Also, makes consuming restful web services dead easy.
 email: nunemaker@gmail.com
 executables: 
@@ -102,6 +126,8 @@ files:
 - features/basic_authentication.feature
 - features/command_line.feature
 - features/deals_with_http_error_codes.feature
+- features/digest_authentication.feature
+- features/handles_compressed_responses.feature
 - features/handles_multiple_formats.feature
 - features/steps/env.rb
 - features/steps/httparty_response_steps.rb
@@ -116,6 +142,7 @@ files:
 - lib/httparty/core_extensions.rb
 - lib/httparty/exceptions.rb
 - lib/httparty/module_inheritable_attributes.rb
+- lib/httparty/net_digest_auth.rb
 - lib/httparty/parser.rb
 - lib/httparty/request.rb
 - lib/httparty/response.rb
@@ -148,18 +175,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: httparty
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Makes http fun! Also, makes consuming restful web services dead easy.