gleuch-twitter_oauth 0.1.21 → 0.2.1

data/lib/twitter_oauth/client.rb

@@ -1,5 +1,6 @@
+require 'twitter_oauth/timeline'
+require 'twitter_oauth/status'
 require 'twitter_oauth/account'
-require 'twitter_oauth/statuses'
 require 'twitter_oauth/direct_messages'
 require 'twitter_oauth/search'
 require 'twitter_oauth/notifications'
@@ -28,11 +29,6 @@ module TwitterOAuth
       @secret = @access_token.secret
       @access_token
     end
-    
-    def authentication_request_token
-      consumer.options[:authorize_path] = '/oauth/authenticate'
-      request_token
-    end
   
     def show(username)
       oauth_response = access_token.get("/users/show/#{username}.json")
@@ -43,6 +39,11 @@ module TwitterOAuth
       consumer.get_request_token(options)
     end
     
+    def authentication_request_token(options={})
+      consumer.options[:authorize_path] = '/oauth/authenticate'
+      request_token(options)
+    end
+    
     private
       def consumer
         @consumer ||= OAuth::Consumer.new(

data/lib/twitter_oauth/friendships.rb

@@ -1,16 +1,14 @@
 module TwitterOAuth
   class Client
     
-    def friends_ids(args={})
-      allowed = %w(page cursor)
-      args = args.reject{|k,v| !allowed.include?(k.to_s.downcase)}.map{|k,v| "#{k}=#{v}"}.join('&')
+    def friends_ids(options={})
+      args = options.map{|k,v| "#{k}=#{v}"}.join('&')
       oauth_response = access_token.get("/friends/ids.json?#{args}")
       JSON.parse(oauth_response.body)
     end
     
-    def followers_ids(args={})
-      allowed = %w(page cursor)
-      args = args.reject{|k,v| !allowed.include?(k.to_s.downcase)}.map{|k,v| "#{k}=#{v}"}.join('&')
+    def followers_ids(options={})
+      args = options.map{|k,v| "#{k}=#{v}"}.join('&')
       oauth_response = access_token.get("/followers/ids.json?#{args}")
       JSON.parse(oauth_response.body)
     end

data/lib/twitter_oauth/search.rb

@@ -4,8 +4,10 @@ require 'ostruct'
 module TwitterOAuth
   class Client
     
-    def search(q, page = 1, per_page = 20)
-      response = open("http://search.twitter.com/search.json?q=#{URI.escape(q)}&page=#{page}&rpp=#{per_page}")
+    def search(q, options={})
+      options[:page] ||= 1
+      options[:per_page] ||= 20
+      response = open("http://search.twitter.com/search.json?q=#{URI.escape(q)}&page=#{options[:page]}&rpp=#{options[:per_page]}&since_id=#{options[:since_id]}")
       search_result = JSON.parse(response.read)
       search_result = OpenStruct.new(search_result)
       search_result.results = search_result.results.collect{|x| OpenStruct.new(x)}

data/lib/twitter_oauth/status.rb

@@ -0,0 +1,29 @@
+module TwitterOAuth
+  class Client
+    
+    # Returns a single status, specified by the id parameter below.
+    def status(id)
+      oauth_response = access_token.get("/statuses/show/#{id}.json")
+      JSON.parse(oauth_response.body)
+    end
+    
+    # Updates the authenticating user's status.
+    def update(message, options={})
+      oauth_response = access_token.post('/statuses/update.json', options.merge(:status => message))
+      JSON.parse(oauth_response.body)
+    end
+
+    # Destroys the status specified by the required ID parameter
+    def status_destroy(id)
+      oauth_response = access_token.post("/statuses/destroy/#{id}.json")
+      JSON.parse(oauth_response.body)
+    end
+    
+    # Retweets the tweet specified by the id parameter. Returns the original tweet with retweet details embedded.
+    def retweet(id)
+      oauth_response = access_token.post("/statuses/retweet/#{id}.json")
+      JSON.parse(oauth_response.body)
+    end
+    
+  end
+end

data/lib/twitter_oauth/timeline.rb

@@ -0,0 +1,64 @@
+module TwitterOAuth
+  class Client
+    
+    # Returns the 20 most recent statuses from non-protected users who have set a custom user icon.
+    def public_timeline(options={})
+      args = options.map{|k,v| "#{k}=#{v}"}.join('&')
+      oauth_response = access_token.get("/statuses/public_timeline.json?#{args}")
+      JSON.parse(oauth_response.body)
+    end
+    
+    # Returns the 20 most recent statuses, including retweets, posted by the authenticating user and that user's friends. 
+    # This is the equivalent of /timeline/home on the Web.
+    def home_timeline(options={})
+      args = options.map{|k,v| "#{k}=#{v}"}.join('&')
+      oauth_response = access_token.get("/statuses/home_timeline.json?#{args}")
+      JSON.parse(oauth_response.body)
+    end
+    
+    # Returns the 20 most recent statuses posted by the authenticating user and that user's friends.
+    def friends_timeline(options={})
+      args = options.map{|k,v| "#{k}=#{v}"}.join('&')
+      oauth_response = access_token.get("/statuses/friends_timeline.json?#{args}")
+      JSON.parse(oauth_response.body)
+    end
+    
+    # Returns the 20 most recent statuses posted from the authenticating user.
+    def user_timeline(options={})
+      args = options.map{|k,v| "#{k}=#{v}"}.join('&')
+      oauth_response = access_token.get("/statuses/user_timeline.json?#{args}")
+      JSON.parse(oauth_response.body)
+    end
+    alias :user :user_timeline
+    
+    # Returns the 20 most recent @replies (status updates prefixed with @username) for the authenticating user.
+    def mentions(options={})
+      args = options.map{|k,v| "#{k}=#{v}"}.join('&')
+      oauth_response = access_token.get("/statuses/mentions.json?#{args}")
+      JSON.parse(oauth_response.body)
+    end
+    alias :replies :mentions
+    
+    # Returns the 20 most recent retweets posted by the authenticating user
+    def retweeted_by_me(options={})
+      args = options.map{|k,v| "#{k}=#{v}"}.join('&')
+      oauth_response = access_token.get("/statuses/retweeted_by_me.json?#{args}")
+      JSON.parse(oauth_response.body)
+    end
+    
+    # Returns the 20 most recent retweets posted by the authenticating user's friends.
+    def retweeted_to_me(options={})
+      args = options.map{|k,v| "#{k}=#{v}"}.join('&')
+      oauth_response = access_token.get("/statuses/retweeted_to_me.json?#{args}")
+      JSON.parse(oauth_response.body)
+    end
+    
+    # Returns the 20 most recent tweets of the authenticated user that have been retweeted by others.
+    def retweets_of_me(options={})
+      args = options.map{|k,v| "#{k}=#{v}"}.join('&')
+      oauth_response = access_token.get("/statuses/retweets_of_me.json?#{args}")
+      JSON.parse(oauth_response.body)
+    end
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gleuch-twitter_oauth
 version: !ruby/object:Gem::Version 
-  version: 0.1.21
+  version: 0.2.1
 platform: ruby
 authors: 
 - Richard Taylor
@@ -44,7 +44,7 @@ dependencies:
         version: "1.15"
     version: 
 description: twitter_oauth is a Ruby library for talking to twitter using the new oauth method.
-email: contact@gleuch.com
+email: moomerman@gmail.com
 executables: []
 
 extensions: []
@@ -56,8 +56,9 @@ files:
 - lib/twitter_oauth
 - lib/twitter_oauth.rb
 - lib/twitter_oauth/client.rb
+- lib/twitter_oauth/timeline.rb
 - lib/twitter_oauth/account.rb
-- lib/twitter_oauth/statuses.rb
+- lib/twitter_oauth/status.rb
 - lib/twitter_oauth/direct_messages.rb
 - lib/twitter_oauth/search.rb
 - lib/twitter_oauth/blocks.rb

data/lib/twitter_oauth/statuses.rb

@@ -1,52 +0,0 @@
-module TwitterOAuth
-  class Client
-    
-    # Returns the 20 most recent statuses from non-protected users who have set a custom user icon.
-    def public_timeline
-      oauth_response = access_token.get('/statuses/public_timeline.json')
-      JSON.parse(oauth_response.body)
-    end
-    
-    # Returns the 20 most recent statuses posted by the authenticating user and that user's friends.
-    def friends_timeline(rpp=20, page=1)
-      oauth_response = access_token.get("/statuses/friends_timeline.json?count=#{rpp}&page=#{page}")
-      JSON.parse(oauth_response.body)
-    end
-    
-    # Returns the 20 most recent statuses posted from the authenticating user.
-    def user(page=1)
-      oauth_response = access_token.get("/statuses/user_timeline.json?page=#{page}")
-      JSON.parse(oauth_response.body)
-    end
-    
-    # Returns a single status, specified by the id parameter below.
-    def status(id)
-      oauth_response = access_token.get("/statuses/show/#{id}.json")
-      JSON.parse(oauth_response.body)
-    end
-    
-    # Updates the authenticating user's status.
-    def update(message)
-      oauth_response = access_token.post('/statuses/update.json', :status => message)
-      JSON.parse(oauth_response.body)
-    end
-    
-    # Returns the 20 most recent @replies (status updates prefixed with @username) for the authenticating user.
-    def replies(page=1)
-      oauth_response = access_token.get("/statuses/mentions.json?page=#{page}")
-      JSON.parse(oauth_response.body)
-    end
-    
-    # alias
-    def mentions
-      replies
-    end
-    
-    # Destroys the status specified by the required ID parameter
-    def status_destroy(id)
-      oauth_response = access_token.post("/statuses/destroy/#{id}.json")
-      JSON.parse(oauth_response.body)
-    end
-    
-  end
-end