tida_sina_weibo 0.0.8 → 0.0.9

data/lib/tida_sina_weibo/api_wrapper.rb

@@ -7,14 +7,12 @@ module TidaSinaWeibo
 
     attr_reader :access_token
     attr_reader :request_data
-    attr_reader :token_provider
     attr_reader :rest_client
     
-    def initialize(tp, rc = nil)
+    def initialize(token, rc = nil)
       rc = RestClientWrapper.new if rc.nil?
       @rest_client = rc
-      @token_provider = tp
-      @access_token = tp.token
+      @access_token = token
     end
     
     def status_update(content)
@@ -90,12 +88,6 @@ module TidaSinaWeibo
 
     def rest_request(url, data, method_post)
       result, code = do_request url, data, method_post
-
-      while code == -1
-        change_access_token
-        result, code = do_request url, data, method_post
-      end
-
       return result
     end
     
@@ -105,30 +97,25 @@ module TidaSinaWeibo
       rd[:params] = data[:params].merge(params)
 
       if method_post
-        r = rest_client.post(url, rd)
-        return r, 0
+        return rest_client.post(url, rd)
       else
-        r = rest_client.get(url, rd)
-        return r, 0
+        return rest_client.get(url, rd)
       end
     rescue RestClientException => e
       r = e.body
       api_error_code = r["error_code"].to_i
 
-      if invalid_access_token? api_error_code
-        return nil, -1
-      end
-
-      if reached_account_access_limit? api_error_code
-        return nil, -1
+      if invalid_access_token?(api_error_code) || reached_account_access_limit?(api_error_code)
+        ex = InvalidAccessTokenException.new self.access_token
+        raise ex
       end
 
       if reached_ip_access_limit? api_error_code
-        e = IPAccessLimitException.new self.access_token
-        raise e
+        ex = IPAccessLimitException.new
+        raise ex
       end
 
-      return nil, -2
+      raise e
     end
 
     def invalid_access_token?(error_code)
@@ -142,14 +129,5 @@ module TidaSinaWeibo
     def reached_ip_access_limit?(error_code)
       return error_code == 10022
     end
-
-    def change_access_token
-      self.token_provider.change
-      @access_token = self.token_provider.token
-      if @access_token.nil?
-        e = NoAccessTokenAvaiableException.new
-        raise e
-      end
-    end
   end
 end

data/lib/tida_sina_weibo/auto_token_switch_api_wrapper.rb

@@ -0,0 +1,155 @@
+require "rest-client"
+require 'tida_sina_weibo/api_settings'
+
+module TidaSinaWeibo
+
+  class AutoTokenSwitchApiWrapper
+
+    attr_reader :access_token
+    attr_reader :request_data
+    attr_reader :token_provider
+    attr_reader :rest_client
+    
+    def initialize(tp, rc = nil)
+      rc = RestClientWrapper.new if rc.nil?
+      @rest_client = rc
+      @token_provider = tp
+      @access_token = tp.token
+    end
+    
+    def status_update(content)
+      post_request(ApiSettings.api.status.update, :status => content)
+    end
+    
+    def status_upload(content, image_path)
+      post_request(ApiSettings.api.status.upload, :status => content, :pic => File.new(image_path, 'rb'))
+    end
+    
+    def status_user_timeline(uid, page = 1, count = 100)
+      get_request(ApiSettings.api.status.user_timeline, :params => {:uid => uid, :page => page, :count => count})
+    end
+    
+    def status_repost_timeline(post_id, page = 1)
+      get_request(ApiSettings.api.status.repost_timeline, :params => {:id => post_id, :page => page, :count => 50})
+    end
+
+    def comments_show(post_id, page = 1)
+      get_request(ApiSettings.api.comments.show, :params => {:id => post_id, :page => page, :count => 50})
+    end
+    
+    def status_show(wb_post_id)
+      get_request(ApiSettings.api.status.show, :params => {:id => wb_post_id})
+    end
+    
+    def user_show(uid, is_number_id = true)
+      if is_number_id
+        get_request(ApiSettings.api.user.show, {:params => {:uid => uid}})
+      else
+        get_request(ApiSettings.api.user.show, {:params => {:screen_name => uid}})
+      end
+    end
+
+    def user_domain_show(domain)
+      get_request(ApiSettings.api.user.domain_show, :params => {:domain => domain})
+    end
+
+    def friendships_followers(uid, cursor)
+      get_request(ApiSettings.api.friendships.followers, :params => {:uid => uid, :cursor => cursor})
+    end
+
+    def friendships_followers_ids(uid, cursor)
+      get_request(ApiSettings.api.friendships.followers_ids, :params => {:uid => uid, :cursor => cursor})
+    end
+    
+    def tags(uid)
+      get_request(ApiSettings.api.tags, :params => {:uid => uid})
+    end
+    
+    def queryid(mid)
+      get_request(ApiSettings.api.status.queryid, {:params => {:mid => mid, :type => 1, :isBase62 => 1}})
+    end
+
+    def querymid(id, batch = false)
+      get_request(ApiSettings.api.status.querymid, {:params => {:id => id, :type => 1, :is_batch => batch ? 1 : 0}})
+    end
+
+    def querymids(ids)
+      ids_str = ids.join(',')
+      querymid(ids_str, true)
+    end
+    
+    private
+    
+    def post_request(url, data)
+      rest_request(url, data, true)
+    end
+    
+    def get_request(url, data)
+      rest_request(url, data, false)
+    end
+
+    def rest_request(url, data, method_post)
+      result, code = do_request url, data, method_post
+
+      while code == -1
+        change_access_token
+        result, code = do_request url, data, method_post
+      end
+
+      return result
+    end
+    
+    def do_request(url, data, method_post)
+      rd  = data.clone
+      params = {:access_token => @access_token}
+      rd[:params] = data[:params].merge(params)
+
+      if method_post
+        r = rest_client.post(url, rd)
+        return r, 0
+      else
+        r = rest_client.get(url, rd)
+        return r, 0
+      end
+    rescue RestClientException => e
+      r = e.body
+      api_error_code = r["error_code"].to_i
+
+      if invalid_access_token? api_error_code
+        return nil, -1
+      end
+
+      if reached_account_access_limit? api_error_code
+        return nil, -1
+      end
+
+      if reached_ip_access_limit? api_error_code
+        e = IPAccessLimitException.new self.access_token
+        raise e
+      end
+
+      return nil, -2
+    end
+
+    def invalid_access_token?(error_code)
+      return error_code == 21332 || error_code == 21327
+    end
+
+    def reached_account_access_limit?(error_code)
+      return error_code == 10023 || error_code == 10024
+    end
+
+    def reached_ip_access_limit?(error_code)
+      return error_code == 10022
+    end
+
+    def change_access_token
+      self.token_provider.change
+      @access_token = self.token_provider.token
+      if @access_token.nil?
+        e = NoAccessTokenAvaiableException.new
+        raise e
+      end
+    end
+  end
+end

data/lib/tida_sina_weibo/exceptions.rb

@@ -25,8 +25,14 @@ module TidaSinaWeibo
   end
 
   class IPAccessLimitException < Exception
+    def initialize
+      super "IP access limit reached"
+    end
+  end
+
+  class InvalidAccessTokenException < Exception
     def initialize(token)
-      super "The access token #{token} reached IP access limit"
+      super "The access token #{token} is not valid"
     end
   end
 

data/lib/tida_sina_weibo/version.rb

@@ -1,3 +1,3 @@
 module TidaSinaWeibo
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tida_sina_weibo
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,6 +80,7 @@ files:
 - lib/tida_sina_weibo.rb
 - lib/tida_sina_weibo/api_settings.rb
 - lib/tida_sina_weibo/api_wrapper.rb
+- lib/tida_sina_weibo/auto_token_switch_api_wrapper.rb
 - lib/tida_sina_weibo/exceptions.rb
 - lib/tida_sina_weibo/rest_client_wrapper.rb
 - lib/tida_sina_weibo/version.rb