rubytter 1.3.2 → 1.4.0

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.4.0

data/lib/rubytter.rb

@@ -13,9 +13,6 @@ 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)
@@ -25,7 +22,7 @@ class Rubytter
   end
 
   attr_reader :login
-  attr_accessor :header
+  attr_accessor :host, :header, :path_prefix
 
   def initialize(login = nil, password = nil, options = {})
     @login = login
@@ -34,75 +31,77 @@ 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]
     @connection = Connection.new(options)
     @connection_for_search = Connection.new(options.merge({:enable_ssl => false}))
+    @path_prefix = options[:path_prefix] || '/1'
   end
 
   def self.api_settings
     # method name             path for API                    http method
     "
-      update_status           /1/statuses/update                post
-      remove_status           /1/statuses/destroy/%s            delete
-      public_timeline         /1/statuses/public_timeline
-      home_timeline           /1/statuses/home_timeline
-      friends_timeline        /1/statuses/friends_timeline
-      replies                 /1/statuses/replies
-      mentions                /1/statuses/mentions
-      user_timeline           /1/statuses/user_timeline/%s
-      show                    /1/statuses/show/%s
-      friends                 /1/statuses/friends/%s
-      followers               /1/statuses/followers/%s
-      retweet                 /1/statuses/retweet/%s            post
-      retweets                /1/statuses/retweets/%s
-      retweeted_by_me         /1/statuses/retweeted_by_me
-      retweeted_to_me         /1/statuses/retweeted_to_me
-      retweets_of_me          /1/statuses/retweets_of_me
-      user                    /1/users/show/%s
-      direct_messages         /1/direct_messages
-      sent_direct_messages    /1/direct_messages/sent
-      send_direct_message     /1/direct_messages/new            post
-      remove_direct_message   /1/direct_messages/destroy/%s     delete
-      follow                  /1/friendships/create/%s          post
-      leave                   /1/friendships/destroy/%s         delete
-      friendship_exists       /1/friendships/exists
-      followers_ids           /1/followers/ids/%s
-      friends_ids             /1/friends/ids/%s
-      favorites               /1/favorites/%s
-      favorite                /1/favorites/create/%s            post
-      remove_favorite         /1/favorites/destroy/%s           delete
-      verify_credentials      /1/account/verify_credentials     get
-      end_session             /1/account/end_session            post
-      update_delivery_device  /1/account/update_delivery_device post
-      update_profile_colors   /1/account/update_profile_colors  post
-      limit_status            /1/account/rate_limit_status
-      update_profile          /1/account/update_profile         post
-      enable_notification     /1/notifications/follow/%s        post
-      disable_notification    /1/notifications/leave/%s         post
-      block                   /1/blocks/create/%s               post
-      unblock                 /1/blocks/destroy/%s              delete
-      block_exists            /1/blocks/exists/%s               get
-      blocking                /1/blocks/blocking                get
-      blocking_ids            /1/blocks/blocking/ids            get
-      saved_searches          /1/saved_searches                 get
-      saved_search            /1/saved_searches/show/%s         get
-      create_saved_search     /1/saved_searches/create          post
-      remove_saved_search     /1/saved_searches/destroy/%s      delete
-      create_list             /1/:user/lists                    post
-      update_list             /1/:user/lists/%s                 put
-      delete_list             /1/:user/lists/%s                 delete
-      lists                   /1/%s/lists
-      lists_followers         /1/%s/lists/memberships
-      list_statuses           /1/%s/lists/%s/statuses
-      list                    /1/%s/lists/%s
-      list_members            /1/%s/%s/members
-      add_member_to_list      /1/:user/%s/members               post
-      remove_member_from_list /1/:user/%s/members               delete
-      list_following          /1/%s/%s/subscribers
-      follow_list             /1/%s/%s/subscribers              post
-      remove_list             /1/%s/%s/subscribers              delete
+      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
+      user_timeline           /statuses/user_timeline/%s
+      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
+      send_direct_message     /direct_messages/new            post
+      remove_direct_message   /direct_messages/destroy/%s     delete
+      follow                  /friendships/create/%s          post
+      leave                   /friendships/destroy/%s         delete
+      friendship_exists       /friendships/exists
+      followers_ids           /followers/ids/%s
+      friends_ids             /friends/ids/%s
+      favorites               /favorites/%s
+      favorite                /favorites/create/%s            post
+      remove_favorite         /favorites/destroy/%s           delete
+      verify_credentials      /account/verify_credentials     get
+      end_session             /account/end_session            post
+      update_delivery_device  /account/update_delivery_device post
+      update_profile_colors   /account/update_profile_colors  post
+      limit_status            /account/rate_limit_status
+      update_profile          /account/update_profile         post
+      enable_notification     /notifications/follow/%s        post
+      disable_notification    /notifications/leave/%s         post
+      block                   /blocks/create/%s               post
+      unblock                 /blocks/destroy/%s              delete
+      block_exists            /blocks/exists/%s               get
+      blocking                /blocks/blocking                get
+      blocking_ids            /blocks/blocking/ids            get
+      saved_searches          /saved_searches                 get
+      saved_search            /saved_searches/show/%s         get
+      create_saved_search     /saved_searches/create          post
+      remove_saved_search     /saved_searches/destroy/%s      delete
+      create_list             /:user/lists                    post
+      update_list             /:user/lists/%s                 put
+      delete_list             /:user/lists/%s                 delete
+      lists                   /%s/lists
+      lists_followers         /%s/lists/memberships
+      list_statuses           /%s/lists/%s/statuses
+      list                    /%s/lists/%s
+      list_members            /%s/%s/members
+      add_member_to_list      /:user/%s/members               post
+      remove_member_from_list /:user/%s/members               delete
+      list_following          /%s/%s/subscribers
+      follow_list             /%s/%s/subscribers              post
+      remove_list             /%s/%s/subscribers              delete
     ".strip.split("\n").map{|line| line.strip.split(/\s+/)}
   end
 
@@ -168,31 +167,31 @@ class Rubytter
     path += '.json'
     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))
+    req = create_request(Net::HTTP::Get.new(path_prefix + path))
+    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))
+    req = create_request(Net::HTTP::Post.new(path_prefix + path))
+    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))
+    req = create_request(Net::HTTP::Delete.new(path_prefix + path))
+    structize(http_request(@host, req, param_str))
   end
 
   def search(query, params = {})
     path = '/search.json'
     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)
+    req = create_request(Net::HTTP::Get.new(path_prefix + path), false)
 
-    json_data = http_request(SEARCH_HOST, req, nil, @connection_for_search)
+    json_data = http_request("#{@host}", req, nil, @connection_for_search)
     structize(
       json_data['results'].map do |result|
         search_result_to_hash(result)
@@ -201,11 +200,11 @@ class Rubytter
   end
 
   def search_user(query, params = {})
-    path = '/1/users/search.json'
+    path = '/users/search.json'
     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))
+    req = create_request(Net::HTTP::Get.new(path_prefix + path))
+    structize(http_request(@host, req))
   end
 
   def search_result_to_hash(json)
@@ -260,6 +259,13 @@ class Rubytter
           self[:id]
         end
 
+        def to_hash(obj = self)
+          obj.inject({}) {|memo, (key, value)|
+            memo[key] = (value.kind_of? obj.class) ? to_hash(value) : value
+            memo
+          }
+        end
+
         def method_missing(name, *args)
           self[name]
         end

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('/1/statuses/replies', {})
+      @rubytter.should_receive(:get).with('/statuses/replies', {})
       @rubytter.replies
 
-      @rubytter.should_receive(:get).with('/1/statuses/replies', {:page => 2})
+      @rubytter.should_receive(:get).with('/statuses/replies', {:page => 2})
       @rubytter.replies(:page => 2)
 
-      @rubytter.should_receive(:get).with('/1/statuses/user_timeline/1', {})
+      @rubytter.should_receive(:get).with('/statuses/user_timeline/1', {})
       @rubytter.user_timeline(1)
 
-      @rubytter.should_receive(:get).with('/1/users/show/1', {})
+      @rubytter.should_receive(:get).with('/users/show/1', {})
       @rubytter.user(1)
 
-      @rubytter.should_receive(:delete).with('/1/statuses/destroy/1', {})
+      @rubytter.should_receive(:delete).with('/statuses/destroy/1', {})
       @rubytter.remove_status(1)
     end
 
     # direct_messages
 
     it 'should respond to direct_messages' do
-      @rubytter.should_receive(:get).with('/1/direct_messages', {})
+      @rubytter.should_receive(:get).with('/direct_messages', {})
       @rubytter.direct_messages()
     end
 
     it 'should respond to sent_direct_messages' do
-      @rubytter.should_receive(:get).with('/1/direct_messages/sent', {})
+      @rubytter.should_receive(:get).with('/direct_messages/sent', {})
       @rubytter.sent_direct_messages()
     end
 
     it 'should respond to send_direct_message' do
-      @rubytter.should_receive(:post).with('/1/direct_messages/new', {})
+      @rubytter.should_receive(:post).with('/direct_messages/new', {})
       @rubytter.send_direct_message()
     end
 
     it 'should respond to destroy_direct_message' do
-      @rubytter.should_receive(:delete).with('/1/direct_messages/destroy/1', {})
+      @rubytter.should_receive(:delete).with('/direct_messages/destroy/1', {})
       @rubytter.remove_direct_message(1)
     end
 
     it 'should respond to direct_message' do
-      @rubytter.should_receive(:post).with('/1/direct_messages/new', {:user => 'test', :text => 'aaaaaaaaaaaaa'})
+      @rubytter.should_receive(:post).with('/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('/1/statuses/update', {:status => 'test'})
+      @rubytter.should_receive(:post).with('/statuses/update', {:status => 'test'})
       @rubytter.update('test')
     end
 
     it 'should respond to update_status' do
-      @rubytter.should_receive(:post).with('/1/statuses/update', {:status => 'test'})
+      @rubytter.should_receive(:post).with('/statuses/update', {:status => 'test'})
       @rubytter.update_status(:status => 'test')
     end
 
     # friendship
 
     it 'should respond to follow' do
-      @rubytter.should_receive(:post).with('/1/friendships/create/test', {})
+      @rubytter.should_receive(:post).with('/friendships/create/test', {})
       @rubytter.follow('test')
     end
 
     it 'should respond to leave' do
-      @rubytter.should_receive(:delete).with('/1/friendships/destroy/test', {})
+      @rubytter.should_receive(:delete).with('/friendships/destroy/test', {})
       @rubytter.leave('test')
     end
 
     it 'should respond to friendship_exists' do
-      @rubytter.should_receive(:get).with('/1/friendships/exists', {:user_a => 'a', :user_b => 'b'})
+      @rubytter.should_receive(:get).with('/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('/1/friends/ids/test', {})
+      @rubytter.should_receive(:get).with('/friends/ids/test', {})
       @rubytter.friends_ids('test')
     end
 
     it 'should respond to followers_ids' do
-      @rubytter.should_receive(:get).with('/1/followers/ids/test', {})
+      @rubytter.should_receive(:get).with('/followers/ids/test', {})
       @rubytter.followers_ids('test')
     end
 
@@ -111,8 +111,8 @@ class Rubytter
 
     it 'should respond to search (1)' do
       @rubytter.should_receive(:http_request) do |host, req, param_str|
-        req.path.should == '/search.json?q=test'
-        host.should == 'search.twitter.com'
+        req.path.should == '/1/search.json?q=test'
+        host.should == 'api.twitter.com'
         {'results' => []}
       end
       @rubytter.search('test')
@@ -193,6 +193,17 @@ class Rubytter
       struct.regex.should == nil
     end
 
+    it 'should convert to hash using to_hash' do
+      hash = {
+        :a => 'a',
+        'b' => 1,
+        :c => {:a => 1, :b => 2}
+      }
+      struct = @rubytter.structize(hash)
+      new_hash = struct.to_hash
+      new_hash.should == {:a=>"a", :b=>1, :c=>{:a=>1, :b=>2}}
+    end
+
     it 'should create struct from json(Array)' do
       data = [
         {"status" => {"text" => "foo", "user" => {"screen_name" => "jugyo_foo"}}},
@@ -316,32 +327,32 @@ class Rubytter
     end
 
     it 'should POST /:user/list to create list' do
-      @rubytter.should_receive(:post).with("/1/test/lists", {:name=>"foo"})
+      @rubytter.should_receive(:post).with("/test/lists", {:name=>"foo"})
       @rubytter.create_list('foo')
     end
 
     it 'should PUT /:user/list to update list' do
-      @rubytter.should_receive(:put).with("/1/test/lists/foo", {})
+      @rubytter.should_receive(:put).with("/test/lists/foo", {})
       @rubytter.update_list('foo')
     end
 
     it 'should DELETE /:user/list to delete list' do
-      @rubytter.should_receive(:delete).with("/1/test/lists/foo", {})
+      @rubytter.should_receive(:delete).with("/test/lists/foo", {})
       @rubytter.delete_list('foo')
     end
 
     it 'should GET lists for specified user' do
-      @rubytter.should_receive(:get).with("/1/jugyo/lists", {})
+      @rubytter.should_receive(:get).with("/jugyo/lists", {})
       @rubytter.lists('jugyo')
     end
 
     it 'should add member to list' do
-      @rubytter.should_receive(:post).with("/1/test/foo/members", {:id=>"jugyo"})
+      @rubytter.should_receive(:post).with("/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("/1/test/foo/members", {:id=>"jugyo"})
+      @rubytter.should_receive(:delete).with("/test/foo/members", {:id=>"jugyo"})
       @rubytter.remove_member_from_list('foo', 'jugyo')
     end
 
@@ -352,7 +363,7 @@ class Rubytter
       rubytter = OAuthRubytter.new(access_token)
       response = simple_mock(:body => '{}', :code => '200')
       access_token.should_receive(:post).with(
-        "/1/statuses/update.json",
+        "/statuses/update.json",
         {'status' => 'test'},
         {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"}
       ).and_return(response)
@@ -364,7 +375,7 @@ class Rubytter
       rubytter = OAuthRubytter.new(access_token)
       response = simple_mock(:body => '{}', :code => '200')
       access_token.should_receive(:get).with(
-        '/1/statuses/friends_timeline.json',
+        '/statuses/friends_timeline.json',
         {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"}
       ).and_return(response)
       rubytter.friends_timeline
@@ -375,7 +386,7 @@ class Rubytter
       rubytter = OAuthRubytter.new(access_token)
       response = simple_mock(:body => '{}', :code => '200')
       access_token.should_receive(:get).with(
-        '/1/statuses/friends_timeline.json?page=2',
+        '/statuses/friends_timeline.json?page=2',
         {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"}
       ).and_return(response)
       rubytter.friends_timeline(:page => 2)
@@ -403,7 +414,7 @@ class Rubytter
         connection_for_search.enable_ssl.should == false
 
         @ssl_rubytter.should_receive(:http_request).
-          with('search.twitter.com', anything, nil, connection_for_search).
+          with('api.twitter.com', anything, nil, connection_for_search).
           and_return({'results' => []})
         @ssl_rubytter.search('rubytter')
       end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubytter
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 2
-  version: 1.3.2
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - jugyo
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 +09:00
+date: 2010-06-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 1
@@ -35,9 +38,11 @@ dependencies:
   name: oauth
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 3
@@ -49,9 +54,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -102,23 +109,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rubytter
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple twitter client.