rubytter 1.3.1 → 1.3.2

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/lib/rubytter.rb

@@ -13,6 +13,9 @@ require 'rubytter/oauth_rubytter'
 class Rubytter
   VERSION = File.read(File.join(File.dirname(__FILE__), '../VERSION')).strip
 
+  HOST = 'api.twitter.com'
+  SEARCH_HOST = 'search.twitter.com'
+
   class APIError < StandardError
     attr_reader :response
     def initialize(msg, response = nil)
@@ -22,7 +25,7 @@ class Rubytter
   end
 
   attr_reader :login
-  attr_accessor :host, :header
+  attr_accessor :header
 
   def initialize(login = nil, password = nil, options = {})
     @login = login
@@ -31,7 +34,6 @@ class Rubytter
   end
 
   def setup(options)
-    @host = options[:host] || 'api.twitter.com'
     @header = {'User-Agent' => "Rubytter/#{VERSION} (http://github.com/jugyo/rubytter)"}
     @header.merge!(options[:header]) if options[:header]
     @app_name = options[:app_name]
@@ -167,21 +169,21 @@ class Rubytter
     param_str = '?' + to_param_str(params)
     path = path + param_str unless param_str.empty?
     req = create_request(Net::HTTP::Get.new(path))
-    structize(http_request(@host, req))
+    structize(http_request(HOST, req))
   end
 
   def post(path, params = {})
     path += '.json'
     param_str = to_param_str(params)
     req = create_request(Net::HTTP::Post.new(path))
-    structize(http_request(@host, req, param_str))
+    structize(http_request(HOST, req, param_str))
   end
 
   def delete(path, params = {})
     path += '.json'
     param_str = to_param_str(params)
     req = create_request(Net::HTTP::Delete.new(path))
-    structize(http_request(@host, req, param_str))
+    structize(http_request(HOST, req, param_str))
   end
 
   def search(query, params = {})
@@ -190,7 +192,7 @@ class Rubytter
     path = path + param_str unless param_str.empty?
     req = create_request(Net::HTTP::Get.new(path), false)
 
-    json_data = http_request("#{@host}", req, nil, @connection_for_search)
+    json_data = http_request(SEARCH_HOST, req, nil, @connection_for_search)
     structize(
       json_data['results'].map do |result|
         search_result_to_hash(result)
@@ -203,7 +205,7 @@ class Rubytter
     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))
-    structize(http_request(@host, req))
+    structize(http_request(HOST, req))
   end
 
   def search_result_to_hash(json)

data/spec/rubytter_spec.rb

@@ -20,87 +20,87 @@ class Rubytter
 
     it 'should get or post' do
       # TODO: split specs
-      @rubytter.should_receive(:get).with('/statuses/replies', {})
+      @rubytter.should_receive(:get).with('/1/statuses/replies', {})
       @rubytter.replies
 
-      @rubytter.should_receive(:get).with('/statuses/replies', {:page => 2})
+      @rubytter.should_receive(:get).with('/1/statuses/replies', {:page => 2})
       @rubytter.replies(:page => 2)
 
-      @rubytter.should_receive(:get).with('/statuses/user_timeline/1', {})
+      @rubytter.should_receive(:get).with('/1/statuses/user_timeline/1', {})
       @rubytter.user_timeline(1)
 
-      @rubytter.should_receive(:get).with('/users/show/1', {})
+      @rubytter.should_receive(:get).with('/1/users/show/1', {})
       @rubytter.user(1)
 
-      @rubytter.should_receive(:delete).with('/statuses/destroy/1', {})
+      @rubytter.should_receive(:delete).with('/1/statuses/destroy/1', {})
       @rubytter.remove_status(1)
     end
 
     # direct_messages
 
     it 'should respond to direct_messages' do
-      @rubytter.should_receive(:get).with('/direct_messages', {})
+      @rubytter.should_receive(:get).with('/1/direct_messages', {})
       @rubytter.direct_messages()
     end
 
     it 'should respond to sent_direct_messages' do
-      @rubytter.should_receive(:get).with('/direct_messages/sent', {})
+      @rubytter.should_receive(:get).with('/1/direct_messages/sent', {})
       @rubytter.sent_direct_messages()
     end
 
     it 'should respond to send_direct_message' do
-      @rubytter.should_receive(:post).with('/direct_messages/new', {})
+      @rubytter.should_receive(:post).with('/1/direct_messages/new', {})
       @rubytter.send_direct_message()
     end
 
     it 'should respond to destroy_direct_message' do
-      @rubytter.should_receive(:delete).with('/direct_messages/destroy/1', {})
+      @rubytter.should_receive(:delete).with('/1/direct_messages/destroy/1', {})
       @rubytter.remove_direct_message(1)
     end
 
     it 'should respond to direct_message' do
-      @rubytter.should_receive(:post).with('/direct_messages/new', {:user => 'test', :text => 'aaaaaaaaaaaaa'})
+      @rubytter.should_receive(:post).with('/1/direct_messages/new', {:user => 'test', :text => 'aaaaaaaaaaaaa'})
       @rubytter.direct_message('test', 'aaaaaaaaaaaaa')
     end
 
     # statuses
 
     it 'should respond to update' do
-      @rubytter.should_receive(:post).with('/statuses/update', {:status => 'test'})
+      @rubytter.should_receive(:post).with('/1/statuses/update', {:status => 'test'})
       @rubytter.update('test')
     end
 
     it 'should respond to update_status' do
-      @rubytter.should_receive(:post).with('/statuses/update', {:status => 'test'})
+      @rubytter.should_receive(:post).with('/1/statuses/update', {:status => 'test'})
       @rubytter.update_status(:status => 'test')
     end
 
     # friendship
 
     it 'should respond to follow' do
-      @rubytter.should_receive(:post).with('/friendships/create/test', {})
+      @rubytter.should_receive(:post).with('/1/friendships/create/test', {})
       @rubytter.follow('test')
     end
 
     it 'should respond to leave' do
-      @rubytter.should_receive(:delete).with('/friendships/destroy/test', {})
+      @rubytter.should_receive(:delete).with('/1/friendships/destroy/test', {})
       @rubytter.leave('test')
     end
 
     it 'should respond to friendship_exists' do
-      @rubytter.should_receive(:get).with('/friendships/exists', {:user_a => 'a', :user_b => 'b'})
+      @rubytter.should_receive(:get).with('/1/friendships/exists', {:user_a => 'a', :user_b => 'b'})
       @rubytter.friendship_exists(:user_a => 'a', :user_b => 'b')
     end
 
     # Social Graph Methods
 
     it 'should respond to followers_ids' do
-      @rubytter.should_receive(:get).with('/friends/ids/test', {})
+      @rubytter.should_receive(:get).with('/1/friends/ids/test', {})
       @rubytter.friends_ids('test')
     end
 
     it 'should respond to followers_ids' do
-      @rubytter.should_receive(:get).with('/followers/ids/test', {})
+      @rubytter.should_receive(:get).with('/1/followers/ids/test', {})
       @rubytter.followers_ids('test')
     end
 
@@ -143,7 +143,7 @@ class Rubytter
 
     it 'should set default header' do
       rubytter = Rubytter.new('test', 'test')
-      rubytter.header.should == {'User-Agent', "Rubytter/#{VERSION} (http://github.com/jugyo/rubytter)"}
+      rubytter.header.should == {'User-Agent' => "Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"}
     end
 
     it 'should able to set custom header 1' do
@@ -316,32 +316,32 @@ class Rubytter
     end
 
     it 'should POST /:user/list to create list' do
-      @rubytter.should_receive(:post).with("/test/lists", {:name=>"foo"})
+      @rubytter.should_receive(:post).with("/1/test/lists", {:name=>"foo"})
       @rubytter.create_list('foo')
     end
 
     it 'should PUT /:user/list to update list' do
-      @rubytter.should_receive(:put).with("/test/lists/foo", {})
+      @rubytter.should_receive(:put).with("/1/test/lists/foo", {})
       @rubytter.update_list('foo')
     end
 
     it 'should DELETE /:user/list to delete list' do
-      @rubytter.should_receive(:delete).with("/test/lists/foo", {})
+      @rubytter.should_receive(:delete).with("/1/test/lists/foo", {})
       @rubytter.delete_list('foo')
     end
 
     it 'should GET lists for specified user' do
-      @rubytter.should_receive(:get).with("/jugyo/lists", {})
+      @rubytter.should_receive(:get).with("/1/jugyo/lists", {})
       @rubytter.lists('jugyo')
     end
 
     it 'should add member to list' do
-      @rubytter.should_receive(:post).with("/test/foo/members", {:id=>"jugyo"})
+      @rubytter.should_receive(:post).with("/1/test/foo/members", {:id=>"jugyo"})
       @rubytter.add_member_to_list('foo', 'jugyo')
     end
 
     it 'should remove member to list' do
-      @rubytter.should_receive(:delete).with("/test/foo/members", {:id=>"jugyo"})
+      @rubytter.should_receive(:delete).with("/1/test/foo/members", {:id=>"jugyo"})
       @rubytter.remove_member_from_list('foo', 'jugyo')
     end
 
@@ -352,7 +352,7 @@ class Rubytter
       rubytter = OAuthRubytter.new(access_token)
       response = simple_mock(:body => '{}', :code => '200')
       access_token.should_receive(:post).with(
-        "/statuses/update.json",
+        "/1/statuses/update.json",
         {'status' => 'test'},
         {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"}
       ).and_return(response)
@@ -364,7 +364,7 @@ class Rubytter
       rubytter = OAuthRubytter.new(access_token)
       response = simple_mock(:body => '{}', :code => '200')
       access_token.should_receive(:get).with(
-        '/statuses/friends_timeline.json',
+        '/1/statuses/friends_timeline.json',
         {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"}
       ).and_return(response)
       rubytter.friends_timeline
@@ -375,7 +375,7 @@ class Rubytter
       rubytter = OAuthRubytter.new(access_token)
       response = simple_mock(:body => '{}', :code => '200')
       access_token.should_receive(:get).with(
-        '/statuses/friends_timeline.json?page=2',
+        '/1/statuses/friends_timeline.json?page=2',
         {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"}
       ).and_return(response)
       rubytter.friends_timeline(:page => 2)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - jugyo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 +09:00
+date: 2010-05-13 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency