@@ -1,9 +1,11 @@ class Twitter::Client alias :old_inspect :inspect + def inspect s = old_inspect s.gsub!(/@password=".*?"/, '@password="XXXX"') end + protected attr_accessor :login, :password @@ -34,8 +36,10 @@ class Twitter::Client @@http_header = nil def raise_rest_error(response, uri = nil) + map = JSON.parse(response.body) raise Twitter::RESTError.new(:code => response.code, :message => response.message, + :error => map["error"], :uri => uri) end @@ -90,4 +94,3 @@ class Twitter::Client Net::HTTP::Delete.new(path, http_header) end end - lib/twitter/client/base.rb @@ -1,6 +1,6 @@ class Twitter::Client @@USER_URIS = { - :info => '/users/show', + :info => '/users/show.json', :friends => '/statuses/friends.json', :followers => '/statuses/followers.json', } @@ -33,7 +33,8 @@ class Twitter::Client def user(id, action = :info, options = {}) raise ArgumentError, "Invalid user action: #{action}" unless @@USER_URIS.keys.member?(action) id = id.to_i if id.is_a?(Twitter::User) - params = options.merge(:id => id) + id_param = id.is_a?(String) ? :screen_name : :user_id + params = options.merge(id_param => id) response = http_connect {|conn| create_http_get_request(@@USER_URIS[action], params) } bless_models(Twitter::User.unmarshal(response.body)) end lib/twitter/client/user.rb @@ -101,8 +101,8 @@ module Twitter # /i_am_crap.json class RESTError < RuntimeError include ClassUtilMixin - @@ATTRIBUTES = [:code, :message, :uri] - attr_accessor :code, :message, :uri + @@ATTRIBUTES = [:code, :message, :uri, :error] + attr_accessor :code, :message, :uri, :error # Returns string in following format: # "HTTP #{@code}: #{@message} at #{@uri}" lib/twitter/core.rb @@ -21,12 +21,12 @@ describe Twitter::Client, "#user(id, :info)" do end it "should create expected HTTP GET request when giving numeric user id" do - @twitter.should_receive(:create_http_get_request).with(@uris[:info], {:id => @id}).and_return(@request) + @twitter.should_receive(:create_http_get_request).with(@uris[:info], {:user_id => @id}).and_return(@request) @twitter.user(@id) end it "should create expected HTTP GET request when giving screen name" do - @twitter.should_receive(:create_http_get_request).with(@uris[:info], {:id => @screen_name}).and_return(@request) + @twitter.should_receive(:create_http_get_request).with(@uris[:info], {:screen_name => @screen_name}).and_return(@request) @twitter.user(@screen_name) end @@ -68,7 +68,7 @@ describe Twitter::Client, "#user(id, :friends)" do end it "should create expected HTTP GET request when giving numeric user id" do - @twitter.should_receive(:create_http_get_request).with(@uris[:friends], {:id => @id}).and_return(@request) + @twitter.should_receive(:create_http_get_request).with(@uris[:friends], {:user_id => @id}).and_return(@request) @twitter.user(@id, :friends) end @@ -78,12 +78,12 @@ describe Twitter::Client, "#user(id, :friends)" do end it "should create expected HTTP GET request when giving Twitter::User object" do - @twitter.should_receive(:create_http_get_request).with(@uris[:friends], {:id => @user.to_i}).and_return(@request) + @twitter.should_receive(:create_http_get_request).with(@uris[:friends], {:user_id => @user.to_i}).and_return(@request) @twitter.user(@user, :friends) end it "should create expected HTTP GET request when giving screen name" do - @twitter.should_receive(:create_http_get_request).with(@uris[:friends], {:id => @screen_name}).and_return(@request) + @twitter.should_receive(:create_http_get_request).with(@uris[:friends], {:screen_name => @screen_name}).and_return(@request) @twitter.user(@screen_name, :friends) end spec/twitter/client/user_spec.rb 8be04bf057705cfe318134fb209da4daefcd8d39 76bdffffd2711109bf55dad446f0c91ac1c7d3db Susan Potter me@susanpotter.net http://github.com/mbbx6spp/twitter4r/commit/f5ea31d43a3e599983c440db7a35c75525a6b381 f5ea31d43a3e599983c440db7a35c75525a6b381 2009-09-19T14:33:55-07:00 2009-09-19T14:33:55-07:00 Merged upstread changes from twitter4r-0_3_2 branch 198599d85b47f27bd4d373ec63f26dfa5528d96c Susan Potter me@susanpotter.net