rubytter 0.9.1 → 0.9.2

data/lib/rubytter.rb

@@ -9,7 +9,7 @@ require 'rubytter/oauth_rubytter'
 
 class Rubytter
 
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 
   class APIError < StandardError
     attr_reader :response

data/lib/rubytter/oauth_rubytter.rb

@@ -9,16 +9,14 @@ class OAuthRubytter < Rubytter
 
   def get(path, params = {})
     path += '.json'
-    param_str = '?' + self.class.to_param_str(params)
-    path = path + param_str unless param_str.empty?
+    param_str = self.class.to_param_str(params)
+    path = path + '?' + param_str unless param_str.empty?
     structize(@access_token.get(path, @header))
   end
 
   def post(path, params = {})
     path += '.json'
-    param_str = '?' + self.class.to_param_str(params)
-    path = path + param_str unless param_str.empty?
-    structize(@access_token.post(path, @header))
+    structize(@access_token.post(path, params, @header))
   end
 
   def structize(res)

data/spec/rubytter_spec.rb

@@ -206,7 +206,6 @@ class Rubytter
     end
 
     it 'should convert struct to hash' do
-      pending
       hash = {
         :a => 'a',
         'b' => 1,
@@ -218,7 +217,14 @@ class Rubytter
         :e => [{:a => 1, :b => 2}, {:c => '"<>&'}]
       }
       struct = Rubytter.structize(hash)
-      struct.to_hash.should == {"a"=>"a", "b"=>1, "c"=>{"a"=>1, "b"=>2}, "d"=>{"a"=>{"a"=>1, "b"=>2}, "b"=>1}, "e"=>[{"a"=>1, "b"=>2}, {"c"=>"\"<>&"}]}
+      struct.to_hash.should == {
+        :a => "a",
+        "b" => 1,
+        :b => 1,
+        :c => {:b => 2, :a => 1},
+        :e => [{:b => 2, :a => 1}, {:c => "\"<>&"}],
+        :d => {:b => 1, :a => {:b => 2, :a => 1}}
+      }
     end
 
     it 'should convert struct to hash with escape as HTML' do
@@ -312,27 +318,45 @@ class Rubytter
     end
 
     it 'should post using access_token' do
-      pending('use mock')
       access_token = Object.new
       rubytter = OAuthRubytter.new(access_token)
-      access_token.should_receive(:post).with('/statuses/update.json?status=tset', {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"})
+      response = simple_mock(:body => '{}', :code => '200')
+      access_token.should_receive(:post).with(
+        "/statuses/update.json",
+        {:status => 'test'},
+        {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"}
+      ).and_return(response)
       rubytter.update('test')
     end
 
     it 'should get using access_token' do
-      pending('use mock')
       access_token = Object.new
       rubytter = OAuthRubytter.new(access_token)
-      access_token.should_receive(:get).with('/statuses/friends_timeline.json', {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"})
+      response = simple_mock(:body => '{}', :code => '200')
+      access_token.should_receive(:get).with(
+        '/statuses/friends_timeline.json',
+        {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"}
+      ).and_return(response)
       rubytter.friends_timeline
     end
 
     it 'should get with params using access_token' do
-      pending('use mock')
       access_token = Object.new
       rubytter = OAuthRubytter.new(access_token)
-      access_token.should_receive(:get).with('/statuses/friends_timeline.json?page=2', {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"})
+      response = simple_mock(:body => '{}', :code => '200')
+      access_token.should_receive(:get).with(
+        '/statuses/friends_timeline.json?page=2',
+        {"User-Agent"=>"Rubytter/#{Rubytter::VERSION} (http://github.com/jugyo/rubytter)"}
+      ).and_return(response)
       rubytter.friends_timeline(:page => 2)
     end
+
+    def simple_mock(options)
+      o = Object.new
+      options.each do |k, v|
+        o.should_receive(k).and_return(v)
+      end
+      o
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubytter
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - jugyo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-17 00:00:00 +09:00
+date: 2009-10-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,6 @@ files:
 - examples/follow.rb
 - examples/friends_timeline.rb
 - examples/limit.rb
-- examples/oauth.rb
 - examples/replies.rb
 - examples/search.rb
 - examples/update_status.rb

data/examples/oauth.rb

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-require 'rubygems'
-require 'rubytter'
-require 'oauth'
-
-consumer = OAuth::Consumer.new(
-            'O80mRgLxHgpzB5yVOnxmiA', 'jylXMjnIbfaNKpEQjgcVeZWJFTaKXFnj1RA4qTeEM', :site => 'http://twitter.com')
-access_token = OAuth::AccessToken.new(
-                consumer, '3748631-AD24zbOF7TifLl3aeetzrwguivUnhJOizw0BBOOTU', 'lRNx3DtHhJ8UTu3tneoDzPMUk99iZKBY8vz4Sj9VQ6A')
-client = OAuthRubytter.new(access_token)
-
-client.friends_timeline.each do |status|
-  puts "#{status.user.screen_name}: #{status.text}"
-end