@@ -27,4 +27,5 @@ end twitter = Twitter.new(config['email'], config['password']) pp twitter.timeline # pp twitter.timeline(:friends, :query => {:since_id => 868482746}) +# pp twitter.timeline(:friends, :query => 'since_id=868482746') # pp twitter.post('this is a test') \ No newline at end of file examples/twitter.rb @@ -90,29 +90,32 @@ module HTTParty # FIXME: this method is doing way to much and needs to be split up # options can be any or all of: - # query => hash of keys/values to be converted to query string - # body => string for raw post data + # query => hash of keys/values or a query string (foo=bar&baz=poo) + # body => hash of keys/values or a query string (foo=bar&baz=poo) # headers => hash of headers to send request with # basic_auth => :username and :password to use as basic http authentication (overrides @auth class instance variable) def send_request(method, path, options={}) raise ArgumentError, 'only get, post, put and delete methods are supported' unless %w[get post put delete].include?(method.to_s) - raise ArgumentError, ':query must be a hash' if options[:query] && !options[:query].is_a?(Hash) raise ArgumentError, ':headers must be a hash' if options[:headers] && !options[:headers].is_a?(Hash) raise ArgumentError, ':basic_auth must be a hash' if options[:basic_auth] && !options[:basic_auth].is_a?(Hash) # we always want path that begins with / - path = path =~ /^(\/|https?:\/\/)/ ? path : "/#{path}" - @format ||= format_from_path(path) - uri = URI.parse("#{base_uri}#{path}") - current_qs = uri.query ? "#{uri.query}&" : '' - uri.query = current_qs + default_params.merge(options[:query] || {}).to_query - klass = Net::HTTP.const_get method.to_s.downcase.capitalize - request = klass.new(uri.request_uri) - request.body = options[:body] unless options[:body].blank? - basic_auth = options.delete(:basic_auth) || @auth + path = path =~ /^(\/|https?:\/\/)/ ? path : "/#{path}" + @format ||= format_from_path(path) + uri = URI.parse("#{base_uri}#{path}") + existing_query = uri.query ? "#{uri.query}&" : '' + uri.query = if options[:query].blank? + existing_query + else + existing_query + (options[:query].is_a?(Hash) ? default_params.merge(options[:query]).to_query : options[:query]) + end + klass = Net::HTTP.const_get method.to_s.downcase.capitalize + request = klass.new(uri.request_uri) + request.body = options[:body].is_a?(Hash) ? options[:body].to_query : options[:body] unless options[:body].blank? + basic_auth = options.delete(:basic_auth) || @auth request.initialize_http_header headers.merge(options[:headers] || {}) # note to self: self, do not put basic auth above headers because it removes basic auth request.basic_auth(basic_auth[:username], basic_auth[:password]) if basic_auth - response = http(uri).request(request) + response = http(uri).request(request) parse_response(response.body) end lib/httparty.rb @@ -130,12 +130,6 @@ describe HTTParty do end.should raise_error(ArgumentError) end - it 'should require that :query is a hash if present' do - lambda do - Foo.send(:send_request, 'get', '/foo', :query => 'string') - end.should raise_error(ArgumentError) - end - it 'should require that :headers is a hash if present' do lambda do Foo.send(:send_request, 'get', '/foo', :headers => 'string') spec/httparty_spec.rb 3a8ad1da073c5ae61a2687a250cb17bc04f9c7c9 John Nunemaker nunemaker@gmail.com http://github.com/jnunemaker/httparty/commit/9b423a22c9ebcfefa93db3e668ead5e92dc0bfea 9b423a22c9ebcfefa93db3e668ead5e92dc0bfea 2008-07-30T21:22:59-07:00 2008-07-30T21:22:59-07:00 :body and :query now both take either a hash or a query string [#4 state:resolved] c7f147b132670c1d8fa2ce7c66bf0d9dbcdfa77b John Nunemaker nunemaker@gmail.com