@@ -43,6 +43,8 @@ module Halcyon USER_AGENT = "JSON/#{JSON::VERSION} Compatible (en-US) Halcyon::Client/#{Halcyon.version}".freeze CONTENT_TYPE = "application/x-www-form-urlencoded".freeze + ACCEPT = "application/json, */*".freeze + DEFAULT_OPTIONS = { :raise_exceptions => false, :encode_post_body_as_json => false @@ -183,6 +185,7 @@ module Halcyon def request(req, headers={}) # set default headers req["User-Agent"] = USER_AGENT + req["Accept"] = ACCEPT req["Content-Type"] = CONTENT_TYPE unless req.body.nil? req["Content-Length"] = req.body unless req.body.nil? lib/halcyon/client.rb @@ -31,6 +31,21 @@ end # Tests #++ +module Halcyon + class Client + private + def prepare_server(serv) + class << serv + alias :request_without_header_inspection :request + def request(req, body = nil, &block) + $accept = req["Accept"] + request_without_header_inspection(req, body, &block) + end + end + end + end +end + describe "Halcyon::Client" do before do @@ -101,4 +116,9 @@ describe "Halcyon::Client" do @client.post('/returner', body)[:body][:key].should == "value" end + it "should set the Accept header to the appropriate type" do + @client.get('/returner')[:status].should == 200 + $accept.should == Halcyon::Client::ACCEPT + end + end spec/halcyon/client_spec.rb 6ab98d687d760e932b2063a2579292066c0b64c5 Matt Todd chiology@gmail.com http://github.com/mtodd/halcyon/commit/e32e2c11efd76730ddffd1749326310781d29238 e32e2c11efd76730ddffd1749326310781d29238 2008-09-18T23:19:27-07:00 2008-09-18T23:19:27-07:00 Clients now include the Accept header field, set to prefer application/json but will fail to anything. [#62 state:resolved] d0f744f5565c33c57a3540b7bac384b39a3ec48c Matt Todd chiology@gmail.com