lib/httparty/xml.rb lib/module_level_inheritable_attributes.rb spec/fixtures/delicious.xml spec/fixtures/google.html spec/fixtures/twitter.json spec/fixtures/twitter.xml @@ -7,34 +7,9 @@ require 'active_support' dir = File.dirname(__FILE__) $:.unshift(dir) unless $:.include?(dir) || $:.include?(File.expand_path(dir)) +require 'module_level_inheritable_attributes' require 'httparty/request' -module ModuleLevelInheritableAttributes - def self.included(base) - base.extend(ClassMethods) - end - - module ClassMethods - def mattr_inheritable(*args) - @mattr_inheritable_attrs ||= [:mattr_inheritable_attrs] - @mattr_inheritable_attrs += args - args.each do |arg| - module_eval %( - class << self; attr_accessor :#{arg} end - ) - end - @mattr_inheritable_attrs - end - - def inherited(subclass) - @mattr_inheritable_attrs.each do |inheritable_attribute| - instance_var = "@#{inheritable_attribute}" - subclass.instance_variable_set(instance_var, instance_variable_get(instance_var)) - end - end - end -end - module HTTParty class UnsupportedFormat < StandardError; end class RedirectionTooDeep < StandardError; end @@ -53,13 +28,6 @@ module HTTParty @default_options end - # - # Set an http proxy - # - # class Twitter - # include HTTParty - # http_proxy 'http://myProxy', 1080 - # .... def http_proxy(addr=nil, port = nil) default_options[:http_proxyaddr] = addr default_options[:http_proxyport] = port @@ -132,5 +100,4 @@ module HTTParty def self.delete(*args) Basement.delete(*args) end - end lib/httparty.rb @@ -32,6 +32,10 @@ module HTTParty uri end + def format + options[:format] + end + def perform validate! handle_response!(get_response(uri)) @@ -47,10 +51,18 @@ module HTTParty def get_response(uri) #:nodoc: request = http_method.new(uri.request_uri) - request.set_form_data(options[:query]) if post? && options[:query] + + if post? && options[:query] + request.set_form_data(options[:query]) + end + request.body = options[:body].is_a?(Hash) ? options[:body].to_query : options[:body] unless options[:body].blank? request.initialize_http_header options[:headers] - request.basic_auth(options[:basic_auth][:username], options[:basic_auth][:password]) if options[:basic_auth] + + if options[:basic_auth] + request.basic_auth(options[:basic_auth][:username], options[:basic_auth][:password]) + end + response = http(uri).request(request) options[:format] ||= format_from_mimetype(response['content-type']) response @@ -88,7 +100,7 @@ module HTTParty def parse_response(body) #:nodoc: return nil if body.nil? or body.empty? - case options[:format] + case format when :xml Hash.from_xml(body) when :json lib/httparty/request.rb @@ -116,4 +116,45 @@ describe HTTParty do GRest.default_options.should == {:base_uri => 'grest.com', :default_params => {:one => 'two'}} end end + + describe "#get" do + it "should be able to get html" do + stub_http_response_with('google.html') + HTTParty.get('http://www.google.com').should == file_fixture('google.html') + end + + it "should be able parse response type json automatically" do + stub_http_response_with('twitter.json') + tweets = HTTParty.get('http://twitter.com/statuses/public_timeline.json') + tweets.size.should == 20 + tweets.first['user'].should == { + "name" => "Pyk", + "url" => nil, + "id" => "7694602", + "description" => nil, + "protected" => false, + "screen_name" => "Pyk", + "followers_count" => 1, + "location" => "Opera Plaza, California", + "profile_image_url" => "http://static.twitter.com/images/default_profile_normal.png" + } + end + + it "should be able parse response type xml automatically" do + stub_http_response_with('twitter.xml') + tweets = HTTParty.get('http://twitter.com/statuses/public_timeline.xml') + tweets['statuses'].size.should == 20 + tweets['statuses'].first['user'].should == { + "name" => "Magic 8 Bot", + "url" => nil, + "id" => "17656026", + "description" => "ask me a question", + "protected" => "false", + "screen_name" => "magic8bot", + "followers_count" => "90", + "profile_image_url" => "http://s3.amazonaws.com/twitter_production/profile_images/65565851/8ball_large_normal.jpg", + "location" => nil + } + end + end end spec/httparty_spec.rb @@ -6,4 +6,24 @@ rescue LoadError require 'spec' end -require File.join(File.dirname(__FILE__), '..', 'lib', 'httparty') \ No newline at end of file +require File.join(File.dirname(__FILE__), '..', 'lib', 'httparty') + +def file_fixture(filename) + open(File.join(File.dirname(__FILE__), 'fixtures', "#{filename.to_s}")).read +end + +def stub_http_response_with(fixture_name) + format = fixture_name.split('.').last.intern + data = file_fixture(fixture_name) + http = Net::HTTP.new('localhost', 80) + + response = Net::HTTPOK.new("1.1", 200, "Content for you") + response.stub!(:body).and_return(data) + http.stub!(:request).and_return(response) + + http_request = HTTParty::Request.new(Net::HTTP::Get, '') + http_request.stub!(:get_response).and_return(response) + http_request.stub!(:format).and_return(format) + + HTTParty::Request.should_receive(:new).and_return(http_request) +end \ No newline at end of file spec/spec_helper.rb e72ec5a483538eb8e133fc7c0536051b90060e18 John Nunemaker nunemaker@gmail.com http://github.com/jnunemaker/httparty/commit/aa09eb4c656ea124f2ce75eaefc4ffdaea5fe74c aa09eb4c656ea124f2ce75eaefc4ffdaea5fe74c 2008-12-06T16:43:31-08:00 2008-12-06T16:41:23-08:00 Moved module inheritable attributes to it's own file. Added specs for HTTParty.get. 577479da6e059bd02a00174327eb87f507b48dc1 John Nunemaker nunemaker@gmail.com