@@ -10,7 +10,7 @@ A gem for interacting with the Google Finance API GMoney::GFSession.login('google username', 'password') -portfolios = GMoney::Portfolio.all #or GMoney::Portfolio.all(:with_returns => true) +portfolios = GMoney::Portfolio.all #or GMoney::Portfolio.all(:returns => true) #wait for a minute or so README.rdoc @@ -27,7 +27,7 @@ module GMoney def self.retreive_portfolios(id, options = {}) url = GF_PORTFOLIO_FEED_URL url += "/#{id}" if id != :all - url += "?returns=true" if options[:with_returns] + url += "?returns=true" if options[:returns] portfolios = [] response = GFService.send_request(GFRequest.new(url, :headers => {"Authorization" => "GoogleLogin auth=#{GFSession.auth_token}"})) lib/gmoney/portfolio.rb @@ -20,7 +20,7 @@ module GMoney def self.find_by_url(url, options = {}) positions = [] - url += "?returns=true" if options[:with_returns] + url += "?returns=true" if options[:returns] response = GFService.send_request(GFRequest.new(url, :headers => {"Authorization" => "GoogleLogin auth=#{GFSession.auth_token}"})) lib/gmoney/position.rb @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='utf-8'?> <entry xmlns='http://www.w3.org/2005/Atom' xmlns:gf='http://schemas.google.com/finance/2007' xmlns:gd='http://schemas.google.com/g/2005'> - <id>http://finance.google.com/finance/feeds/jspradlin@gmail.com/portfolios/9/positions/NASDAQ:GOOG/transactions/2</id> + <id>http://finance.google.com/finance/feeds/user@example.com/portfolios/9/positions/NASDAQ:GOOG/transactions/2</id> <updated>2009-09-12T18:22:44.000Z</updated> <category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/finance/2007#transaction' /> <title type='text'>2</title> spec/fixtures/transaction_feed_for_GOOG_1.xml @@ -27,11 +27,11 @@ describe GMoney::Portfolio do portfolios.size.should be_eql(3) end - it "should return a portfolio with returns data is :with_returns == true" do + it "should return a portfolio with returns data is :returns == true" do @url = 'https://finance.google.com/finance/feeds/default/portfolios?returns=true' @gf_response.body = @feed_with_returns - portfolios = portfolio_helper(@url, :all, {:with_returns => true}) + portfolios = portfolio_helper(@url, :all, {:returns => true}) portfolios.size.should be_eql(3) portfolios[0].cost_basis.should be_eql(2500.00) spec/portfolio_spec.rb @@ -27,10 +27,10 @@ describe GMoney::Position do positions.size.should be_eql(5) end - it "should return a position with returns data is :with_returns == true" do + it "should return a position with returns data is :returns == true" do @gf_response.body = @feed_with_returns - positions = position_helper(@portfolio_id, {:with_returns => true}) + positions = position_helper(@portfolio_id, {:returns => true}) positions.size.should be_eql(5) positions[0].cost_basis.should be_eql(615.00) @@ -91,7 +91,7 @@ describe GMoney::Position do GMoney::GFSession.should_receive(:auth_token).and_return('toke') url = "#{GMoney::GF_PORTFOLIO_FEED_URL}/#{id.portfolio_id}/positions/#{id.position_id}" - send_url = options[:with_returns] ? (url + '?returns=true') : url + send_url = options[:returns] ? (url + '?returns=true') : url GMoney::GFRequest.should_receive(:new).with(send_url, :headers => {"Authorization" => "GoogleLogin auth=toke"}).and_return(@gf_request) spec/position_spec.rb 9fd290ddda8e5046ea1613c6c2366c483d432ed6 jspradlin jspradlin@gmail.com http://github.com/jspradlin/gmoney/commit/ed49c2e60ff1b81a3171eecb32a064336913a515 ed49c2e60ff1b81a3171eecb32a064336913a515 2009-10-01T15:37:49-07:00 2009-10-01T15:37:49-07:00 Minor code cleanup 7b27867d78375f21c87a7dc8b929f2162b4602ac jspradlin jspradlin@gmail.com