twitter4r 0.3.1 → 0.3.2

data/README

@@ -13,6 +13,8 @@ Code:
 * Adam Stiles <adam at stilesoft dot com> - URI.encode => CGI.escape fix
 * Carl Crawley <cwcrawley at gmail dot com> - Friendship get => post fix
 * Christian Johansen <christian at cjohansen dot no> - in_reply_to attributes in Twitter::Status
+* Harry Love <harrylove at gmail dot com> - added attributes to Twitter::Status
+* Filipe Giusti <filipegiusti at gmail dot com> - fixed users/show issue that Twitter.com changed from under us
 
 Design Suggestions:
 * Bosco So <rubymeetup at boscoso dot com> - making Twitter::Error a RuntimeError instead of an Exception to prevent irb from crashing out.

data/lib/twitter/client/base.rb

@@ -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
-

data/lib/twitter/client/user.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

data/lib/twitter/core.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}"

data/lib/twitter/model.rb

@@ -225,7 +225,7 @@ module Twitter
   # Represents a status posted to <tt>Twitter</tt> by a <tt>Twitter</tt> user.
   class Status
     include ModelMixin
-    @@ATTRIBUTES = [:id, :text, :source, :truncated, :created_at, :user, 
+    @@ATTRIBUTES = [:id, :text, :source, :truncated, :created_at, :user, :from_user, :to_user,
                     :favorited, :in_reply_to_status_id, :in_reply_to_user_id,
                     :in_reply_to_screen_name]
     attr_accessor *@@ATTRIBUTES
@@ -311,7 +311,7 @@ module Twitter
       # For example:
       #  status = Twitter::Message.create(
       #    :text => 'I am shopping for flip flops',
-      #    :receipient => 'anotherlogin',
+      #    :recipient => 'anotherlogin',
       #    :client => client)
       # 
       # An <tt>ArgumentError</tt> will be raised if no valid client context

data/lib/twitter/version.rb

@@ -4,7 +4,7 @@
 module Twitter::Version #:nodoc:
   MAJOR = 0
   MINOR = 3
-  REVISION = 1
+  REVISION = 2
   class << self
     # Returns X.Y.Z formatted version string
     def to_version

data/spec/twitter/client/user_spec.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
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twitter4r
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Susan Potter
@@ -9,7 +9,7 @@ autorequire: twitter
 bindir: bin
 cert_chain: []
 
-date: 2009-05-11 00:00:00 -05:00
+date: 2009-10-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,7 +110,7 @@ requirements:
 - json gem, version 0.4.3 or higher
 - jcode (for unicode support)
 rubyforge_project: twitter4r
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A clean Twitter client API in pure Ruby. Will include Twitter add-ons also in Ruby.