weibo_2 0.0.4 → 0.0.5

data/README.md

@@ -1,3 +1,80 @@
+Note: I got a lot of inspiration from [this gem](https://github.com/ballantyne/weibo) and [this gem](https://github.com/acenqiu/weibo2). The first one will soon be deprecated since weibo is planning to switch to oauth2. The second one has not been fully implemented and is still lacking some features (but a nice try nevertheless). Thanks Scott and acenqiu.
+
 # WeiboOAuth2
 
-WAIT, let me have a beer first.
+WeioOAuth2 is a Ruby gem that provides a wrapper for interacting with sina weibo's v2 [API](http://open.weibo.com/wiki/API%E6%96%87%E6%A1%A3_V2), which is currently the latest version. Check out the link if you are interested in browsing the details. The output data format is Hashie::Mash, check out [here](https://github.com/intridea/hashie#mash). If you are not familiar with oauth2, I recommend that you read this [article](http://open.weibo.com/wiki/Oauth2).
+
+## Requirements
+
+1.  weibo account
+2.  weibo app API key
+3.  weibo app API secret
+
+## Installation
+        
+I call it weibo_2 because someone else took the name weibo_oauth2.
+
+```bash
+$ gem install weibo_2
+```
+
+## Basic Usage
+
+The example written with sinatra in this directory shows how to ask for oauth2 permission, get the token and send status with picture. It should cover basic usage in all ruby apps. You can visit http://weibo-oauth2-example.herokuapp.com/ to see the demo.
+
+update: Sorry, the api key I used for this demo is still in the process of auditing by weibo side, it's not available now for connecting. But you can apply your own api key, clone the example in this directory, then type
+
+```bash
+$ KEY=change_this_to_your_key SECRET=change_this_to_your_secret REDIR_URI=change_this_to_your_redir_uri ruby example.rb
+```
+It should work.
+
+
+1.  How to get the token?
+
+    OAuth2 is simpler than its first version. In order to get the access token, you first need to get an Authorization Code through a callback request. Now use the following code to get the token.
+
+    ```ruby
+    WeiboOAuth2::Config.api_key = YOUR_KEY
+    WeiboOAuth2::Config.api_secret = YOUR_SECRET
+    WeiboOAuth2::Config.redirect_uri = YOUR_CALLBACK_URL   
+    ```
+
+    If you are developing in your localhost, you can set YOUR_CALLBACK_URL as 'http://127.0.0.1/callback' something. Then set your weibo app account's callback URL as this URL too. Weibo will call the URL using GET method, which will then enable you to retrieve the authorization code.
+    
+    ```ruby
+    client = WeiboOAuth2::Client.new  
+    ```
+    
+    Or you can pass the key and secret to new a client if you did not set WeiboOAuth2::Config
+    
+    Redirect to this URL. If user grants you permission, then you will get the authorization code.
+    
+    ```ruby
+    client.authorize_url
+    ```
+    
+    In your callback handling method, you should add something like the following, 
+    
+    ```ruby
+    client.auth_code.get_token(params[:code])
+    ```
+    
+    which will give permission to your client.
+    
+2.  How to post a status with picture? (or call other interfaces)
+    
+    Simply update a status
+        
+    ```ruby
+    client.statuses.update(params[:status])
+    ```
+    
+    Upload a picture
+        
+    ```ruby
+    tmpfile = params[:file][:tempfile]
+    pic = File.open(tmpfile.path)
+    client.statuses.upload(params[:status], pic)
+    ```
+        

data/example/Gemfile

@@ -3,4 +3,5 @@ source :rubygems
 gem 'sinatra'
 gem "haml"
 gem "sass"
-gem 'weibo_2'
+gem 'weibo_2'
+gem 'time-ago-in-words'

data/example/example.rb

@@ -1,4 +1,5 @@
 require 'weibo_2'
+require 'time-ago-in-words'
 
 %w(rubygems bundler).each { |dependency| require dependency }
 Bundler.setup
@@ -12,11 +13,21 @@ WeiboOAuth2::Config.redirect_uri = ENV['REDIR_URI']
 client = WeiboOAuth2::Client.new
 
 get '/' do
+  puts '* ' * 80
+  puts session.inspect
+  puts !client.authorized?
   if session[:access_token] && !client.authorized?
-    client.get_token_from_hash({:access_token => session[:access_token], :expires_at => session[:expires_at]}) 
+    token = client.get_token_from_hash({:access_token => session[:access_token], :expires_at => session[:expires_at]}) 
+    puts token.inspect
+    if token.expired?
+      reset_session
+      redirect 'connect'
+      return
+    end
   end
   if session[:uid]
     @user = client.users.show_by_uid(session[:uid]) 
+    @statuses = client.statuses
   end
   haml :index
 end
@@ -30,21 +41,37 @@ get '/callback' do
   session[:uid] = access_token.params["uid"]
   session[:access_token] = access_token.token
   session[:expires_at] = access_token.expires_at
-  puts access_token.params
-  puts access_token.inspect
-  puts session[:uid]
   @user = client.users.show_by_uid(session[:uid].to_i)
   redirect '/'
 end
 
 get '/logout' do
-  session[:uid] = nil
-  session[:access_token] = nil
-  session[:expires_at] = nil
+  reset_session
   redirect '/'
 end 
 
 get '/screen.css' do
   content_type 'text/css'
   sass :screen
+end
+
+post '/update' do
+  statuses = client.statuses
+
+  unless params[:file] && (tmpfile = params[:file][:tempfile]) && (name = params[:file][:filename])
+    statuses.update(params[:status])
+  else
+    pic = File.open(tmpfile.path)
+    statuses.upload(params[:status], pic)
+  end
+
+  redirect '/'
+end
+
+helpers do 
+  def reset_session
+    session[:uid] = nil
+    session[:access_token] = nil
+    session[:expires_at] = nil
+  end
 end

data/example/views/index.haml

@@ -4,4 +4,39 @@
       hello! you are 
       =@user.screen_name
       
-      
+  %h3
+    make a weibo!
+  %form{:action => "/update", :method => "POST", :enctype => "multipart/form-data"}
+    %textarea{:id => 'status', :name => "status", :cols => "62", :rows => "5"}
+    %br
+    %input{:id => 'file', :name => 'file',  :type => 'file'}
+    %br
+    %input{:type => "submit", :value => "Send"}
+    
+  %br
+  %br
+  %br  
+  %h3
+    home timeline
+  .statuses
+    -@statuses.friends_timeline.statuses.each do |status|
+      .status
+        %p.text
+          =status.text
+          
+            
+        %br
+        -if status.bmiddle_pic
+          %img{:src => status.bmiddle_pic,  :alt => "", :class => 'pic'}
+          %br
+        .time_and_by
+          =Time.parse(status.created_at).ago_in_words
+          by
+          =status.user.screen_name
+          from
+          =status.source
+        %br
+        %br
+        %br
+        %br
+        

data/example/views/screen.sass

@@ -0,0 +1,13 @@
+.statuses
+  background-color: #CECECE
+  padding: 20px
+  
+  .status
+    background-color: white
+    margin: 10px
+    padding: 20px
+    font-size: 12px
+    
+    .time_and_by
+      margin-top: 10px
+      color: #8F8F8F

data/lib/weibo_2/access_token.rb

@@ -0,0 +1,10 @@
+module WeiboOAuth2
+  module Strategy
+    class AccessToken < OAuth2::AccessToken
+      
+      def validated?
+        !!@expires_at && !expired?
+      end
+    end
+  end
+end

data/lib/weibo_2/api/v2/statuses.rb

@@ -28,12 +28,12 @@ module WeiboOAuth2
           hashie get("statuses/user_timeline/ids.json", :params => opt)
         end
         
-        def repost_timeline(opt={})
-          hashie get("statuses/repost_timeline.json", :params => opt)
+        def repost_timeline(id, opt={})
+          hashie get("statuses/repost_timeline.json", :params => {:id => id}.merge(opt))
         end
         
-        def repost_timeline_ids(opt={})
-          hashie get("statuses/repost_timeline/ids.json", :params => opt)
+        def repost_timeline_ids(id, opt={})
+          hashie get("statuses/repost_timeline/ids.json", :params => {:id => id}.merge(opt))
         end
         
         def repost_by_me(opt={})

data/lib/weibo_2/client.rb

@@ -35,7 +35,7 @@ module WeiboOAuth2
               :header_format => "OAuth2 %s",
               :param_name => "access_token"}
 
-      @access_token = OAuth2::AccessToken.new(self, access_token, opts)
+      @access_token = WeiboOAuth2::AccessToken.new(self, access_token, opts)
     end
     
     def authorized?

data/lib/weibo_2/version.rb

@@ -1,3 +1,3 @@
 module WeiboOAuth2
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/weibo_2.rb

@@ -2,17 +2,18 @@ require "weibo_2/version"
 require "weibo_2/config"
 require "weibo_2/base"
 require "weibo_2/client"
-require "weibo_2/api/v2/base.rb"
-require "weibo_2/api/v2/statuses.rb"
-require "weibo_2/api/v2/users.rb"
-require "weibo_2/api/v2/comments.rb"
-require "weibo_2/api/v2/friendships.rb"
-require "weibo_2/api/v2/account.rb"
-require "weibo_2/api/v2/favorites.rb"
-require "weibo_2/api/v2/trends.rb"
-require "weibo_2/api/v2/tags.rb"
-require "weibo_2/api/v2/register.rb"
-require "weibo_2/api/v2/search.rb"
-require "weibo_2/api/v2/suggestions.rb"
-require "weibo_2/api/v2/remind.rb"
-require "weibo_2/strategy/auth_code.rb"
+require "weibo_2/access_token"
+require "weibo_2/api/v2/base"
+require "weibo_2/api/v2/statuses"
+require "weibo_2/api/v2/users"
+require "weibo_2/api/v2/comments"
+require "weibo_2/api/v2/friendships"
+require "weibo_2/api/v2/account"
+require "weibo_2/api/v2/favorites"
+require "weibo_2/api/v2/trends"
+require "weibo_2/api/v2/tags"
+require "weibo_2/api/v2/register"
+require "weibo_2/api/v2/search"
+require "weibo_2/api/v2/suggestions"
+require "weibo_2/api/v2/remind"
+require "weibo_2/strategy/auth_code"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weibo_2
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -96,6 +96,7 @@ files:
 - example/views/layout.haml
 - example/views/screen.sass
 - lib/weibo_2.rb
+- lib/weibo_2/access_token.rb
 - lib/weibo_2/api/v2/account.rb
 - lib/weibo_2/api/v2/base.rb
 - lib/weibo_2/api/v2/comments.rb