jugyo-rubytter 0.4.0 → 0.4.1

data/README.rdoc

@@ -8,7 +8,7 @@ Rubytter is simple twitter library.
 
 == FEATURES/PROBLEMS:
 
-implemented methods:
+implemented API methods:
 
 - /statuses/update
 - /statuses/destroy/id
@@ -73,7 +73,6 @@ or
 == TODO:
 
 - search
-- favorite
 
 == LICENSE:
 

data/lib/rubytter.rb

@@ -6,8 +6,11 @@ require 'cgi'
 require 'rubytter/connection'
 
 class Rubytter
+
+  class APIError < StandardError; end
+
   APP_NAME = 'Rubytter'
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
   HOMEPAGE = 'http://github.com/jugyo/rubytter'
 
   def initialize(login, password, options = {})
@@ -85,26 +88,33 @@ class Rubytter
     path += '.json'
     param_str = '?' + params.to_a.map{|i| i[0].to_s + '=' + CGI.escape(i[1].to_s) }.join('&')
     path = path + param_str unless param_str.empty?
-    req = prepare_request(Net::HTTP::Get.new(path))
-    res_body = @connection.start(@host) do |http|
-      http.request(req).body
-    end
-    json_to_struct(JSON.parse(res_body))
+    req = create_request(Net::HTTP::Get.new(path))
+    http_request(req)
   end
 
   def post(path, params = {})
     path += '.json'
     param_str = params.to_a.map{|i| i[0].to_s + '=' + CGI.escape(i[1].to_s) }.join('&')
-    req = prepare_request(Net::HTTP::Post.new(path))
-    res_body = @connection.start(@host) do |http|
-      http.request(req, param_str).body
-    end
-    json_to_struct(JSON.parse(res_body))
+    req = create_request(Net::HTTP::Post.new(path))
+    http_request(req)
   end
 
   alias delete post
 
-  def prepare_request(req)
+  def http_request(req)
+    res = @connection.start(@host) do |http|
+      http.request(req)
+    end
+    struct = json_to_struct(JSON.parse(res.body))
+    case res.code
+    when "200"
+      struct
+    else
+      raise APIError, struct.error
+    end
+  end
+
+  def create_request(req)
     req.add_field('User-Agent', "#{APP_NAME} #{HOMEPAGE}")
     req.basic_auth(@login, @password)
     return req

data/spec/rubytter_spec.rb

@@ -77,14 +77,14 @@ class Rubytter
 
     # friendship
 
-    it 'should respond to create_friendship' do
+    it 'should respond to follow' do
       @rubytter.should_receive(:post).with('/friendships/create/test', {})
       @rubytter.follow('test')
     end
 
-    it 'should respond to destroy_friendship' do
+    it 'should respond to leave' do
       @rubytter.should_receive(:delete).with('/friendships/destroy/test', {})
-      @rubytter.remove_follow('test')
+      @rubytter.leave('test')
     end
 
     it 'should respond to friendship_exists' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-rubytter
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - jugyo