rubytter 0.11.0 → 1.0.0

data/README.rdoc

@@ -13,66 +13,38 @@ Rubytter is simple twitter library.
 === implemented API methods:
 
 - /statuses/update
-- /statuses/destroy/%s
+- /statuses/destroy/id
 - /statuses/public_timeline
-- /statuses/home_timeline
 - /statuses/friends_timeline
 - /statuses/replies
-- /statuses/mentions
-- /statuses/user_timeline/%s
-- /statuses/show/%s
-- /statuses/friends/%s
-- /statuses/followers/%s
-- /statuses/retweet/%s
-- /statuses/retweets/%s
-- /statuses/retweeted_by_me
-- /statuses/retweeted_to_me
-- /statuses/retweets_of_me
-- /users/show/%s
+- /statuses/user_timeline/id
+- /statuses/show/id
+- /statuses/friends/id
+- /statuses/followers/id
+- /users/show/id
 - /direct_messages
 - /direct_messages/sent
 - /direct_messages/new
-- /direct_messages/destroy/%s
-- /friendships/create/%s
-- /friendships/destroy/%s
+- /direct_messages/destroy/id
+- /friendships/create/id
+- /friendships/destroy/id
 - /friendships/exists
-- /followers/ids/%s
-- /friends/ids/%s
-- /favorites/%s
-- /favorites/create/%s
-- /favorites/destroy/%s
+- /followers/ids/id
+- /friends/ids/id
+- /favorites
+- /favorites/create/id
+- /favorites/destroy/id
 - /account/verify_credentials
 - /account/end_session
 - /account/update_delivery_device
 - /account/update_profile_colors
 - /account/rate_limit_status
 - /account/update_profile
-- /notifications/follow/%s
-- /notifications/leave/%s
-- /blocks/create/%s
-- /blocks/destroy/%s
-- /blocks/exists/%s
-- /blocks/blocking
-- /blocks/blocking/ids
-- /saved_searches
-- /saved_searches/show/%s
-- /saved_searches/create
-- /saved_searches/destroy/%s
-- /:user/lists (create)
-- /:user/lists/%s (update)
-- /:user/lists/%s (delete)
-- /:user/lists
-- /:user/lists/memberships
-- /:user/lists/%s/statuses
-- /:user/lists/%s
-- /%s/%s/members
-- /:user/%s/members
-- /:user/%s/members
-- /%s/%s/subscribers
-- /%s/%s/subscribers
-- /%s/%s/subscribers
+- /notifications/follow/id
+- /notifications/leave/id
+- /blocks/create/id
+- /blocks/destroy/id
 - (search.twitter.com)/search
-- (api.twitter.com)/1/users/search
 
 == SYNOPSIS:
 

data/VERSION

@@ -1 +1 @@
-0.11.0
+1.0.0

data/examples/use_oauth.rb

@@ -0,0 +1,28 @@
+$:.unshift File.join(File.dirname(__FILE__), '../lib')
+require 'rubygems'
+require 'rubytter'
+require 'oauth'
+
+key = "httN2PgAfeEuOywgw4m2g"
+secret = "qunvnx27QC98380PUHQ0YUhSoMFMA2HJQZisWKDOgI"
+
+consumer = OAuth::Consumer.new(key, secret, :site => "http://twitter.com")
+
+request_token = consumer.get_request_token
+system('open', request_token.authorize_url) || puts("Access here: #{request_token.authorize_url}\nand...")
+
+print "Enter PIN: "
+pin = gets.strip
+
+access_token = request_token.get_access_token(
+  :oauth_token => request_token.token,
+  :oauth_verifier => pin
+)
+
+client = OAuthRubytter.new(access_token)
+client.friends_timeline.each do |status|
+  puts "#{status.user.screen_name}: #{status.text}"
+end
+
+require 'irby'
+client.irb

data/lib/rubytter/core_ext.rb

@@ -0,0 +1,26 @@
+class Hash
+  def stringify_keys
+    inject({}) do |options, (key, value)|
+      options[key.to_s] = value
+      options
+    end
+  end
+
+  def stringify_keys!
+    keys.each do |key|
+      self[key.to_s] = delete(key)
+    end
+    self
+  end
+
+  def symbolize_keys
+    inject({}) do |options, (key, value)|
+      options[(key.to_sym rescue key) || key] = value
+      options
+    end
+  end
+
+  def symbolize_keys!
+    self.replace(self.symbolize_keys)
+  end
+end

data/lib/rubytter/oauth_rubytter.rb

@@ -9,33 +9,23 @@ class OAuthRubytter < Rubytter
 
   def get(path, params = {})
     path += '.json'
-    param_str = self.class.to_param_str(params)
+    param_str = to_param_str(params)
     path = path + '?' + param_str unless param_str.empty?
-    structize(@access_token.get(path, @header))
+    parse_response(@access_token.get(path, @header))
   end
 
   def post(path, params = {})
     path += '.json'
-    structize(@access_token.post(path, params, @header))
+    parse_response(@access_token.post(path, params.stringify_keys, @header))
   end
 
-  def put(path, params = {})
-    path += '.json'
-    structize(@access_token.put(path, params, @header))
-  end
-
-  def delete(path, params = {})
-    path += '.json'
-    param_str = self.class.to_param_str(params)
-    path = path + '?' + param_str unless param_str.empty?
-    structize(@access_token.delete(path, @header))
-  end
+  private
 
-  def structize(res)
+  def parse_response(res)
     json_data = JSON.parse(res.body)
     case res.code
     when "200"
-      self.class.structize(json_data)
+      structize(json_data)
     else
       raise APIError.new(json_data['error'], res)
     end

data/lib/rubytter.rb

@@ -1,4 +1,3 @@
-
 # -*- coding: utf-8 -*-
 require 'rubygems'
 require 'json'
@@ -7,6 +6,7 @@ require 'cgi'
 
 require 'rubytter/connection'
 require 'rubytter/oauth_rubytter'
+require 'rubytter/core_ext'
 
 class Rubytter
   VERSION = File.read(File.join(File.dirname(__FILE__), '../VERSION')).strip
@@ -39,7 +39,6 @@ class Rubytter
       update_status           /statuses/update                post
       remove_status           /statuses/destroy/%s            delete
       public_timeline         /statuses/public_timeline
-      home_timeline           /statuses/home_timeline
       friends_timeline        /statuses/friends_timeline
       replies                 /statuses/replies
       mentions                /statuses/mentions
@@ -47,11 +46,6 @@ class Rubytter
       show                    /statuses/show/%s
       friends                 /statuses/friends/%s
       followers               /statuses/followers/%s
-      retweet                 /statuses/retweet/%s            post
-      retweets                /statuses/retweets/%s
-      retweeted_by_me         /statuses/retweeted_by_me
-      retweeted_to_me         /statuses/retweeted_to_me
-      retweets_of_me          /statuses/retweets_of_me
       user                    /users/show/%s
       direct_messages         /direct_messages
       sent_direct_messages    /direct_messages/sent
@@ -62,7 +56,7 @@ class Rubytter
       friendship_exists       /friendships/exists
       followers_ids           /followers/ids/%s
       friends_ids             /friends/ids/%s
-      favorites               /favorites/%s
+      favorites               /favorites
       favorite                /favorites/create/%s            post
       remove_favorite         /favorites/destroy/%s           delete
       verify_credentials      /account/verify_credentials     get
@@ -106,9 +100,7 @@ class Rubytter
         def #{method}(*args)
           path = login ? '#{path}'.gsub(':user', login) :'#{path}'
           params = args.last.kind_of?(Hash) ? args.pop : {}
-          path = path % args
-          path.sub!(/\\/\\z/, '')
-          #{http_method}(path, params)
+          #{http_method}(path % args, params)
         end
       EOS
     else
@@ -158,49 +150,41 @@ class Rubytter
 
   def get(path, params = {})
     path += '.json'
-    param_str = '?' + self.class.to_param_str(params)
+    param_str = '?' + to_param_str(params)
     path = path + param_str unless param_str.empty?
     req = create_request(Net::HTTP::Get.new(path))
-    self.class.structize(http_request(@host, req))
+    structize(http_request(@host, req))
   end
 
   def post(path, params = {})
     path += '.json'
-    param_str = self.class.to_param_str(params)
+    param_str = to_param_str(params)
     req = create_request(Net::HTTP::Post.new(path))
-    self.class.structize(http_request(@host, req, param_str))
+    structize(http_request(@host, req, param_str))
   end
 
   def delete(path, params = {})
     path += '.json'
-    param_str = self.class.to_param_str(params)
+    param_str = to_param_str(params)
     req = create_request(Net::HTTP::Delete.new(path))
-    self.class.structize(http_request(@host, req, param_str))
+    structize(http_request(@host, req, param_str))
   end
 
   def search(query, params = {})
     path = '/search.json'
-    param_str = '?' + self.class.to_param_str(params.merge({:q => query}))
+    param_str = '?' + to_param_str(params.merge({:q => query}))
     path = path + param_str unless param_str.empty?
     req = create_request(Net::HTTP::Get.new(path), false)
 
     json_data = http_request("search.#{@host}", req, nil, @connection_for_search)
-    self.class.structize(
+    structize(
       json_data['results'].map do |result|
-        self.class.search_result_to_hash(result)
+        search_result_to_hash(result)
       end
     )
   end
 
-  def search_user(query, params = {})
-    path = '/1/users/search.json'
-    param_str = '?' + self.class.to_param_str(params.merge({:q => query}))
-    path = path + param_str unless param_str.empty?
-    req = create_request(Net::HTTP::Get.new(path))
-    self.class.structize(http_request("api.#{@host}", req))
-  end
-
-  def self.search_result_to_hash(json)
+  def search_result_to_hash(json)
     {
       'id' => json['id'],
       'text' => json['text'],
@@ -242,7 +226,7 @@ class Rubytter
     req
   end
 
-  def self.structize(data)
+  def structize(data)
     case data
     when Array
       data.map{|i| structize(i)}
@@ -283,7 +267,7 @@ class Rubytter
     end
   end
 
-  def self.to_param_str(hash)
+  def to_param_str(hash)
     raise ArgumentError, 'Argument must be a Hash object' unless hash.is_a?(Hash)
     hash.to_a.map{|i| i[0].to_s + '=' + CGI.escape(i[1].to_s) }.join('&')
   end

data/spec/rubytter_spec.rb

@@ -129,16 +129,16 @@ class Rubytter
     end
 
     it 'should respond to to_param_str' do
-      param_str = Rubytter.to_param_str(:page => 2, :foo => 'bar')
+      param_str = @rubytter.to_param_str(:page => 2, :foo => 'bar')
       param_str.should =~ /^.+?=.+?&.+?=.+?$/
       param_str.should =~ /page=2/
       param_str.should =~ /foo=bar/
     end
 
     it 'should raise when call to_param_str with invalid arg' do
-      lambda { Rubytter.to_param_str(nil) }.should raise_error(ArgumentError)
-      lambda { Rubytter.to_param_str('foo') }.should raise_error(ArgumentError)
-      lambda { Rubytter.to_param_str(:bar) }.should raise_error(ArgumentError)
+      lambda { @rubytter.to_param_str(nil) }.should raise_error(ArgumentError)
+      lambda { @rubytter.to_param_str('foo') }.should raise_error(ArgumentError)
+      lambda { @rubytter.to_param_str(:bar) }.should raise_error(ArgumentError)
     end
 
     it 'should set default header' do
@@ -180,7 +180,7 @@ class Rubytter
         :d => {:a => {:a => 1, :b => 2}, :b => 1},
         :e => [{:a => 1, :b => 2}, {:c => '"<>&'}]
       }
-      struct = Rubytter.structize(hash)
+      struct = @rubytter.structize(hash)
       struct.a.should == 'a'
       struct.b.should == 1
       struct.c.a.should == 1
@@ -198,7 +198,7 @@ class Rubytter
         {"status" => {"text" => "foo", "user" => {"screen_name" => "jugyo_foo"}}},
         {"status" => {"text" => "bar", "user" => {"screen_name" => "jugyo_bar"}}},
       ]
-      struct = Rubytter.structize(data)
+      struct = @rubytter.structize(data)
       struct[0].status.text.should == 'foo'
       struct[0].status.user.screen_name.should == 'jugyo_foo'
       struct[1].status.text.should == 'bar'
@@ -216,7 +216,7 @@ class Rubytter
         :d => {:a => {:a => 1, :b => 2}, :b => 1},
         :e => [{:a => 1, :b => 2}, {:c => '"<>&'}]
       }
-      struct = Rubytter.structize(hash)
+      struct = @rubytter.structize(hash)
       struct.to_hash.should == {
         :a => "a",
         "b" => 1,
@@ -232,7 +232,7 @@ class Rubytter
       hash = {
         :e => [{:a => 1, :b => 2}, {:c => '"<>&'}]
       }
-      struct = Rubytter.structize(hash)
+      struct = @rubytter.structize(hash)
       struct.to_hash(true).should == {"e"=>[{"a"=>1, "b"=>2}, {"c"=>""<>&"}]}
     end
 
@@ -248,7 +248,7 @@ class Rubytter
         :d => {:a => {:a => 1, :b => 2}, :b => 1},
         :e => [{:a => 1, :b => 2}, {:c => '"<>&'}]
       }
-      struct = Rubytter.structize(hash)
+      struct = @rubytter.structize(hash)
       struct.to_json.should == '{"a":"a","b":1,"c":{"a":1,"b":2},"d":{"a":{"a":1,"b":2},"b":1},"e":[{"a":1,"b":2},{"c":"\"<>&"}]}'
     end
 
@@ -262,9 +262,9 @@ class Rubytter
     end
 
     it 'should create same structs from same datas' do
-      Rubytter.structize({:a => 'a'}).should == Rubytter.structize({:a => 'a'})
-      Rubytter.structize({:a => 'a', :b => {:c => 'c'}}).should == 
-        Rubytter.structize({:a => 'a', :b => {:c => 'c'}})
+      @rubytter.structize({:a => 'a'}).should == @rubytter.structize({:a => 'a'})
+      @rubytter.structize({:a => 'a', :b => {:c => 'c'}}).should ==
+        @rubytter.structize({:a => 'a', :b => {:c => 'c'}})
     end
 
     it 'should be set app_name' do
@@ -285,8 +285,7 @@ class Rubytter
         'from_user' => 'jugyo',
         'profile_image_url' => 'http://s3.amazonaws.com/twitter_production/profile_images/63467667/megane2_normal.png'
       }
-      rubytter = Rubytter.new('test', 'teat')
-      result = Rubytter.search_result_to_hash(json_data)
+      result = @rubytter.search_result_to_hash(json_data)
       result['id'].should == '123'
       result['text'].should == 'foo foo bar bar'
       result['created_at'].should == 'Sat, 21 Mar 2009 09:48:20 +0000'
@@ -355,7 +354,7 @@ class Rubytter
       response = simple_mock(:body => '{}', :code => '200')
       access_token.should_receive(:post).with(
         "/statuses/update.json",
-        {:status => 'test'},
+        {'status' => 'test'},
         {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"}
       ).and_return(response)
       rubytter.update('test')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubytter
 version: !ruby/object:Gem::Version 
-  version: 0.11.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - jugyo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-26 00:00:00 +09:00
+date: 2010-01-31 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,15 +49,16 @@ files:
 - examples/favorite.rb
 - examples/follow.rb
 - examples/friends_timeline.rb
-- examples/home_timeline.rb
 - examples/limit.rb
 - examples/lists.rb
 - examples/replies.rb
 - examples/search.rb
 - examples/update_status.rb
+- examples/use_oauth.rb
 - examples/user.rb
 - lib/rubytter.rb
 - lib/rubytter/connection.rb
+- lib/rubytter/core_ext.rb
 - lib/rubytter/oauth_rubytter.rb
 - spec/rubytter_spec.rb
 - spec/search.json
@@ -97,10 +98,10 @@ test_files:
 - examples/favorite.rb
 - examples/follow.rb
 - examples/friends_timeline.rb
-- examples/home_timeline.rb
 - examples/limit.rb
 - examples/lists.rb
 - examples/replies.rb
 - examples/search.rb
 - examples/update_status.rb
+- examples/use_oauth.rb
 - examples/user.rb

data/examples/home_timeline.rb

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-require 'rubygems'
-require 'rubytter'
-
-if ARGV.size < 2
-  puts "Usage: ruby #{File.basename(__FILE__)} user_id password"
-  exit
-end
-
-client = Rubytter.new(ARGV[0], ARGV[1])
-client.home_timeline.each do |status|
-  puts "#{status.user.screen_name}: #{status.text}"
-end