weibo_2 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76c83529ec3abf408b0fd354bec9abec0a3101d8
-  data.tar.gz: 183779d694ee70ca0193ad1ee490f4831e04e4ab
+  metadata.gz: ccf4842b4765614e661c44d6da2708cff3d598aa
+  data.tar.gz: 73225359bbf7d3505761ba4ae1721fa4a8dc9703
 SHA512:
-  metadata.gz: c4e794b6f20cbebd642b55f2e4ac4dfece4b020a0747f62e1b06b3c45194a22ac7915466935c0cad01d4ed39ef53a3c3d731bf7d39d788b80a60ee992f4aa99e
-  data.tar.gz: d0357417f3eeb28f299cf3c9544352c0e7790c57eaaf219e30456f71e8199f596b3c57deda2903244f6058e960299d271c1630df6ab1e00f1277eb2d3a15aafc
+  metadata.gz: e0eb62b30ba56090a4903405d603db120c03772bb73c04cde9e2071a7ed997d397cd51c068372ad30a1f360e67fb40a3d1f9e85020990c43cfd3eae8abac8190
+  data.tar.gz: 7ff4b89a4d248d0713d68ac2540906405ea40737adf072d034b28bf3465ec4f24bb83d739800c129adb193f3d12f1401652615b6cb29f12761341641924f3e86

data/README.md

@@ -11,7 +11,7 @@ WeioOAuth2 is a Ruby gem that provides a wrapper for interacting with sina weibo
 3.  weibo app API secret
 
 ## Installation
-        
+
 I call it weibo_2 because someone else took the name weibo_oauth2.
 
 ```bash
@@ -37,41 +37,41 @@ It should work.
     ```ruby
     WeiboOAuth2::Config.api_key = YOUR_KEY
     WeiboOAuth2::Config.api_secret = YOUR_SECRET
-    WeiboOAuth2::Config.redirect_uri = YOUR_CALLBACK_URL   
+    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, 
-    
+
+    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
     pic = params[:file].delete(:tempfile)
     client.statuses.upload(params[:status], pic, params[:file])
@@ -80,10 +80,10 @@ It should work.
     pass params[:file] into upload method as options could help weibo_2 to build post body, useful options as:
     *   filename, filename with extension of the uploading file, example 'pic.jpg'
     *   type, mime type of the uploading file, example 'image/jpeg'
-    
+
 ## Setting up SSL certificates
-    
-This gem using [faraday](https://github.com/technoweenie/faraday) for connection, which supports ssl. According to [this article](https://github.com/technoweenie/faraday/wiki/Setting-up-SSL-certificates), you can do as following to support ssl connection.
+
+This gem using [faraday](https://github.com/technoweenie/faraday) for connection, which supports ssl. According to [this article](https://github.com/lostisland/faraday/wiki/Setting-up-SSL-certificates), you can do as following to support ssl connection.
 
 ### Ubuntu
 
@@ -108,7 +108,7 @@ For Fedora and CentOS, use the path and file `/etc/pki/tls/certs/ca-bundle.crt`
 ## Integrate with Devise and omniauth
 
 1. Install gems in Gemfile
-   
+
    ```ruby
    	 gem 'devise'
    	 gem 'omniauth'
@@ -122,8 +122,8 @@ For Fedora and CentOS, use the path and file `/etc/pki/tls/certs/ca-bundle.crt`
    ```ruby
      config.omniauth :weibo, 'key', 'secret', :scope => 'user,public_repo'
    ```
-        
-3. Then you should handle omini callback controller by yourself, there is sample project show how to integrate devise and omniauth you can follow [devise-omniauth-example](https://github.com/holden/devise-omniauth-example) 
+
+3. Then you should handle omini callback controller by yourself, there is sample project show how to integrate devise and omniauth you can follow [devise-omniauth-example](https://github.com/holden/devise-omniauth-example)
 
 4. After get the callback data, you will see `env['omniauth.auth']['credentials']` has the value `token` and `expires_at`, store them into session or record,now you can use WeiboOAuth2 in anywhere:
 

data/lib/weibo_2.rb

@@ -2,6 +2,7 @@ require "weibo_2/version"
 require "weibo_2/config"
 require "weibo_2/base"
 require "weibo_2/client"
+require "weibo_2/errors"
 require "weibo_2/access_token"
 require "weibo_2/api/v2/base"
 require "weibo_2/api/v2/statuses"

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

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

data/lib/weibo_2/client.rb

@@ -4,7 +4,7 @@ module WeiboOAuth2
   class Client < OAuth2::Client
 
     attr_accessor :access_token
-    
+
     def initialize(client_id='', client_secret='', opts={}, &block)
       client_id = WeiboOAuth2::Config.api_key if client_id.empty?
       client_secret = WeiboOAuth2::Config.api_secret if client_secret.empty?
@@ -26,7 +26,23 @@ module WeiboOAuth2
       client.get_token_from_hash(hash)
 
       client
-    end    
+    end
+
+    def request(verb, url, opts = {})
+      super
+    rescue OAuth2::Error => e
+      error_code = e.response.parsed["error_code"]
+      case error_code
+      when 21315, 21316, 21317, 21327, 21332
+        raise WeiboOAuth2::Errors::UnauthorizedError.new(e.response.parsed)
+      when 10022, 10023, 10024, 20016, 20505
+        raise WeiboOAuth2::Errors::RateLimitedError.new(e.response.parsed)
+      when 10013, 10014, 20508, 21301
+        raise WeiboOAuth2::Errors::PermissionError.new(e.response.parsed)
+      else
+        raise WeiboOAuth2::Errors::GeneralError.new(e.response.parsed)
+      end
+    end
 
     def authorize_url(params={})
       params[:client_id] = @id unless params[:client_id]
@@ -34,78 +50,78 @@ module WeiboOAuth2
       params[:redirect_uri] = WeiboOAuth2::Config.redirect_uri unless params[:redirect_uri]
       super
     end
-    
+
     def get_token(params, access_token_opts={})
       params = params.merge({:parse => :json})
       access_token_opts = access_token_opts.merge({:header_format => "OAuth2 %s", :param_name => "access_token"})
       super
     end
-    
+
     def get_and_restore_token(params, access_token_opts={})
       @access_token = get_token(params, access_token_opts={})
     end
-    
+
     def get_token_from_hash(hash)
       access_token = hash.delete(:access_token) || hash.delete('access_token')
       @access_token = WeiboOAuth2::AccessToken.new( self, access_token, hash.merge(:header_format => 'OAuth2 %s', :param_name => 'access_token') )
     end
-    
+
     def authorized?
       @access_token && @access_token.validated?
     end
-    
+
     def users
       @users ||= WeiboOAuth2::Api::V2::Users.new(@access_token) if @access_token
     end
-    
+
     def statuses
       @statues ||= WeiboOAuth2::Api::V2::Statuses.new(@access_token) if @access_token
     end
-    
+
     def comments
       @comments ||= WeiboOAuth2::Api::V2::Comments.new(@access_token) if @access_token
     end
-    
+
     def friendships
       @friendships ||= WeiboOAuth2::Api::V2::Friendships.new(@access_token) if @access_token
     end
-    
+
     def account
-      @account ||= WeiboOAuth2::Api::V2::Account.new(@access_token) if @access_token      
+      @account ||= WeiboOAuth2::Api::V2::Account.new(@access_token) if @access_token
     end
-    
+
     def favorites
-      @favorites ||= WeiboOAuth2::Api::V2::Favorites.new(@access_token) if @access_token      
+      @favorites ||= WeiboOAuth2::Api::V2::Favorites.new(@access_token) if @access_token
     end
-    
+
     def trends
-      @trends ||= WeiboOAuth2::Api::V2::Trends.new(@access_token) if @access_token      
+      @trends ||= WeiboOAuth2::Api::V2::Trends.new(@access_token) if @access_token
     end
-    
+
     def tags
-      @tags ||= WeiboOAuth2::Api::V2::Tags.new(@access_token) if @access_token      
+      @tags ||= WeiboOAuth2::Api::V2::Tags.new(@access_token) if @access_token
     end
-    
+
     def register
-      @register ||= WeiboOAuth2::Api::V2::Register.new(@access_token) if @access_token      
+      @register ||= WeiboOAuth2::Api::V2::Register.new(@access_token) if @access_token
     end
-    
+
     def search
-      @search ||= WeiboOAuth2::Api::V2::Search.new(@access_token) if @access_token      
+      @search ||= WeiboOAuth2::Api::V2::Search.new(@access_token) if @access_token
     end
-    
+
     def short_url
-      @short_url ||= WeiboOAuth2::Api::V2::ShortUrl.new(@access_token) if @access_token      
+      @short_url ||= WeiboOAuth2::Api::V2::ShortUrl.new(@access_token) if @access_token
     end
-    
+
     def suggestions
-      @suggestions ||= WeiboOAuth2::Api::V2::Suggestions.new(@access_token) if @access_token      
+      @suggestions ||= WeiboOAuth2::Api::V2::Suggestions.new(@access_token) if @access_token
     end
-    
+
     def remind
-      @remind ||= WeiboOAuth2::Api::V2::Remind.new(@access_token) if @access_token      
+      @remind ||= WeiboOAuth2::Api::V2::Remind.new(@access_token) if @access_token
     end
-    
+
     def auth_code
       @auth_code ||= WeiboOAuth2::Strategy::AuthCode.new(self)
     end
@@ -117,6 +133,6 @@ module WeiboOAuth2
     def location
       @location ||= WeiboOAuth2::Api::V2::Location.new(@access_token) if @access_token
     end
-    
-  end 
+
+  end
 end

data/lib/weibo_2/errors.rb

@@ -0,0 +1,20 @@
+module WeiboOAuth2
+  module Errors
+    class WeiboError < StandardError
+      attr_reader :data
+      def initialize(data)
+        @data = data
+        super
+      end
+    end
+
+    class GeneralError < WeiboError
+    end
+
+    class RateLimitedError < WeiboError
+    end
+
+    class UnauthorizedError < WeiboError
+    end
+  end
+end

data/lib/weibo_2/version.rb

@@ -3,7 +3,7 @@ module WeiboOAuth2
   class Version
     MAJOR = 0 unless defined? MAJOR
     MINOR = 1 unless defined? MINOR
-    PATCH = 6 unless defined? PATCH
+    PATCH = 7 unless defined? PATCH
     PRE = nil unless defined? PRE
 
     class << self

data/spec/client_spec.rb

@@ -15,23 +15,23 @@ describe WeiboOAuth2::Client do
   end
 
   it 'should get authorize_url' do
-    authorize_url = 'https://api.weibo.com/oauth2/authorize?client_id=abc&response_type=code&redirect_uri=https%3A%2F%2Fexample.com%2Fcallback'
+    authorize_url = 'https://api.weibo.com/oauth2/authorize?client_id=abc&redirect_uri=https%3A%2F%2Fexample.com%2Fcallback&response_type=code'
     subject.authorize_url.should == authorize_url
   end
 
   it 'should leave Faraday::Connection#ssl unset' do
-    subject.connection.ssl.should == {}
+    subject.connection.ssl.empty?.should be_truthy
   end
 
   it "defaults raise_errors to true" do
-    subject.options[:raise_errors].should be_true
+    subject.options[:raise_errors].should be_truthy
   end
 
   it "allows true/false for raise_errors option" do
     client = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com', :raise_errors => false)
-    client.options[:raise_errors].should be_false
+    client.options[:raise_errors].should be_falsey
     client = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com', :raise_errors => true)
-    client.options[:raise_errors].should be_true
+    client.options[:raise_errors].should be_truthy
   end
 
   it "allows get/post for access_token_method option" do
@@ -40,5 +40,5 @@ describe WeiboOAuth2::Client do
     client = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com', :access_token_method => :post)
     client.options[:access_token_method].should == :post
   end
-  
-end
+
+end

data/weibo_2.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'oauth2', "~> 0.9.1"
   gem.add_runtime_dependency 'hashie', "~> 2.0.4"
   gem.add_runtime_dependency 'multi_json'  , "~> 1"
-  gem.add_runtime_dependency 'rest-client', "~> 1.6.7"
+  gem.add_runtime_dependency 'rest-client', "~> 1.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weibo_2
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - simsicon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.7.3
 description: |-
   WeioOAuth2 is a Ruby gem that provides a wrapper for interacting with sina weibo's v2 API,
                            which is currently the latest version. The output data format is Hashie::Mash
@@ -117,6 +117,7 @@ files:
 - lib/weibo_2/base.rb
 - lib/weibo_2/client.rb
 - lib/weibo_2/config.rb
+- lib/weibo_2/errors.rb
 - lib/weibo_2/oauth.rb
 - lib/weibo_2/strategy/auth_code.rb
 - lib/weibo_2/version.rb
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A oauth2 gem for weibo