tida_sina_weibo 0.0.1 → 0.0.2

data/Gemfile

@@ -2,6 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in tida_sina_weibo.gemspec
 gemspec
-
-gem 'settingslogic'
-gem 'rest-client'

data/lib/tida_sina_weibo/api_wrapper.rb

@@ -1,71 +1,96 @@
 require "rest-client"
-require "api_settings"
 
 module TidaSinaWeibo
+
+  API = {}
+  API[:status]                        = {}
+  API[:status][:update]               = 'https://api.weibo.com/2/statuses/update.json'
+  API[:status][:upload]               = 'https://upload.api.weibo.com/2/statuses/upload.json'
+  API[:status][:user_timeline]        = 'https://api.weibo.com/2/statuses/user_timeline.json'
+  API[:status][:user_timeline_ids]    = 'https://api.weibo.com/2/statuses/user_timeline/ids.json'
+  API[:status][:show]                 = 'https://api.weibo.com/2/statuses/show.json'
+  API[:status][:repost_timeline]      = 'https://api.weibo.com/2/statuses/repost_timeline.json'
+  API[:status][:repost_timeline_ids]  = 'https://api.weibo.com/2/statuses/repost_timeline/ids.json'
+  API[:status][:queryid]              = 'https://api.weibo.com/2/statuses/queryid.json'
+  API[:status][:querymid]             = 'https://api.weibo.com/2/statuses/querymid.json'
+  API[:comments]                      = {}
+  API[:comments][:show]               = 'https://api.weibo.com/2/comments/show.json'
+  API[:user]                          = {}
+  API[:user][:show]                   = 'https://api.weibo.com/2/users/show.json'
+  API[:user][:domain_show]            = 'https://api.weibo.com/2/users/domain_show.json'
+  API[:tags]                          = 'https://api.weibo.com/2/tags.json'
+  API[:friendships]                   = {}
+  API[:friendships][:followers]       = 'https://api.weibo.com/2/friendships/followers.json'
+  API[:friendships][:followers_ids]   = 'https://api.weibo.com/2/friendships/followers/ids.json'
+  API[:friendships][:show]            = 'https://api.weibo.com/2/friendships/show.json'
+
   class ApiWrapper
+
     attr_reader :access_token
-    attr_reader :token_provider
     attr_reader :request_data
+    attr_reader :token_provider
+    attr_reader :rest_client
     
-    def initialize(token_prvdr)
-      @token_provider = token_prvdr
-      @access_token = @token_provider.token
+    def initialize(rest_client, tp)
+      @rest_client = rest_client
+      @token_provider = tp
+      @access_token = tp.token
     end
     
     def status_update(content)
-      post_request(Settings.weibo.api.status.update, :status => content)
+      post_request(API[:status][:update], :status => content)
     end
     
     def status_upload(content, image_path)
-      post_request(Settings.weibo.api.status.upload, :status => content, :pic => File.new(image_path, 'rb'))
+      post_request(API[:status][:upload], :status => content, :pic => File.new(image_path, 'rb'))
     end
     
     def status_user_timeline(uid, page = 1, count = 100)
-      get_request(Settings.weibo.api.status.user_timeline, :params => {:uid => uid, :page => page, :count => count})
+      get_request(API[:status][:user_timeline], :params => {:uid => uid, :page => page, :count => count})
     end
     
     def status_repost_timeline(post_id, page = 1)
-      get_request(Settings.weibo.api.status.repost_timeline, :params => {:id => post_id, :page => page, :count => 50})
+      get_request(API[:status][:repost_timeline], :params => {:id => post_id, :page => page, :count => 50})
     end
 
     def comments_show(post_id, page = 1)
-      get_request(Settings.weibo.api.comments.show, :params => {:id => post_id, :page => page, :count => 50})
+      get_request(API[:comments][:show], :params => {:id => post_id, :page => page, :count => 50})
     end
     
     def status_show(wb_post_id)
-      get_request(Settings.weibo.api.status.show, :params => {:id => wb_post_id})
+      get_request(API[:status][:show], :params => {:id => wb_post_id})
     end
     
     def user_show(uid, is_number_id = true)
       if is_number_id
-        get_request(Settings.weibo.api.user.show, {:params => {:uid => uid}})
+        get_request(API[:user][:show], {:params => {:uid => uid}})
       else
-        get_request(Settings.weibo.api.user.show, {:params => {:screen_name => uid}})
+        get_request(API[:user][:show], {:params => {:screen_name => uid}})
       end
     end
 
     def user_domain_show(domain)
-      get_request(Settings.weibo.api.user.domain_show, :params => {:domain => domain})
+      get_request(API[:user][:domain_show], :params => {:domain => domain})
     end
 
     def friendships_followers(uid, cursor)
-      get_request(Settings.weibo.api.friendships.followers, :params => {:uid => uid, :cursor => cursor})
+      get_request(API[:friendships][:followers], :params => {:uid => uid, :cursor => cursor})
     end
 
     def friendships_followers_ids(uid, cursor)
-      get_request(Settings.weibo.api.friendships.followers_ids, :params => {:uid => uid, :cursor => cursor})
+      get_request(API[:friendships][:followers_ids], :params => {:uid => uid, :cursor => cursor})
     end
     
     def tags(uid)
-      get_request(Settings.weibo.api.tags, :params => {:uid => uid})
+      get_request(API[:tags], :params => {:uid => uid})
     end
     
     def queryid(mid)
-      data = get_request(Settings.weibo.api.status.queryid, {:params => {:mid => mid, :type => 1, :isBase62 => 1}})
+      get_request(API[:status][:queryid], {:params => {:mid => mid, :type => 1, :isBase62 => 1}})
     end
 
     def querymid(id, batch = false)
-      data = get_request(Settings.weibo.api.status.querymid, {:params => {:id => id, :type => 1, :is_batch => batch ? 1 : 0}})
+      get_request(API[:status][:querymid], {:params => {:id => id, :type => 1, :is_batch => batch ? 1 : 0}})
     end
 
     def querymids(ids)
@@ -80,8 +105,7 @@ module TidaSinaWeibo
     end
     
     def get_request(url, data)
-      r = rest_request(url, data, false)
-      return r
+      rest_request(url, data, false)
     end
 
     def rest_request(url, data, method_post)
@@ -99,23 +123,16 @@ module TidaSinaWeibo
       rd  = data.clone
       params = {:access_token => @access_token}
       rd[:params] = data[:params].merge(params)
-      Rails.logger.debug "Request params hash is #{rd}"
-
-      parse_response do
-        if method_post
-          r = JSON.parse RestClient.post(url, rd)
-          Rails.logger.debug "- Request response: #{r}"
-          return r, 0
-        else
-          r = JSON.parse RestClient.get(url, rd)
-          Rails.logger.debug "- Request response: #{r}"
-          return r, 0
-        end
+
+      if method_post
+        r = rest_client.post(url, rd)
+        return r, 0
+      else
+        r = rest_client.get(url, rd)
+        return r, 0
       end
-    rescue RestClient::Exception => e
-      Rails.logger.error "! Request Failed #{e.to_s}"
-      r = JSON.parse e.http_body
-      Rails.logger.error "! Sina Weibo API Error Code: #{r["error_code"]} Error: #{r["error"]}"
+    rescue RestClientException => e
+      r = e.body
       api_error_code = r["error_code"].to_i
 
       if invalid_access_token? api_error_code
@@ -127,15 +144,12 @@ module TidaSinaWeibo
       end
 
       if reached_ip_access_limit? api_error_code
-        raise IPAccessLimitException.new
+        e = IPAccessLimitException.new self.access_token
+        raise e
       end
 
       return nil, -2
     end
-    
-    def parse_response(&block)
-      JSON.parse(block.call)
-    end
 
     def invalid_access_token?(error_code)
       return error_code == 21332 || error_code == 21327
@@ -150,13 +164,11 @@ module TidaSinaWeibo
     end
 
     def change_access_token
-      Rails.logger.info "* Changing access token}"
-      Rails.logger.info "- Old access token is #{@access_token}"
       self.token_provider.change
       @access_token = self.token_provider.token
-      Rails.logger.info "- New access token is #{@access_token}"
       if @access_token.nil?
-        raise NoAccessTokenAvaiableException.new
+        e = NoAccessTokenAvaiableException.new
+        raise e
       end
     end
   end

data/lib/tida_sina_weibo/exceptions.rb

@@ -0,0 +1,41 @@
+require 'rest-client'
+
+module TidaSinaWeibo
+
+  class Exception < RuntimeError
+    attr_accessor :message
+
+    def initialize message = nil
+      @message = message
+    end
+
+    def inspect
+      self.message
+    end
+
+    def to_s
+      inspect
+    end
+  end
+
+  class NoAccessTokenAvaiableException < Exception
+    def initialize
+      super "There is not any valid access token"
+    end 
+  end
+
+  class IPAccessLimitException < Exception
+    def initialize(token)
+      super "The access token #{token} reached IP access limit"
+    end
+  end
+
+  class RestClientException < RestClient::Exception
+    attr_reader :body
+
+    def initialize(rest_client_exception)
+      @body = ::JSON.parse rest_client_exception.http_body if rest_client_exception
+    end
+  end
+  
+end

data/lib/tida_sina_weibo/rest_client_wrapper.rb

@@ -0,0 +1,21 @@
+require 'rest-client'
+
+module TidaSinaWeibo
+
+  class RestClientWrapper
+    def get(url, data)
+      JSON.parse RestClient.get(url, data)
+    rescue RestClient::Exception => e
+      ex = RestClientException.new e
+      raise ex
+    end
+
+    def post(url, data)
+      JSON.parse RestClient.post(url, data)
+    rescue RestClient::Exception => e
+      ex = RestClientException.new e
+      raise ex
+    end
+  end
+
+end

data/lib/tida_sina_weibo/version.rb

@@ -1,3 +1,3 @@
 module TidaSinaWeibo
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/tida_sina_weibo.rb

@@ -1,3 +1,14 @@
+
 require "tida_sina_weibo/version"
+require 'tida_sina_weibo/exceptions'
 require 'tida_sina_weibo/api_wrapper'
+require 'tida_sina_weibo/rest_client_wrapper'
+
+module TidaSinaWeibo
+
+  def api_wrapper(tp)
+    ApiWrapper.new RestClientWrapper.new, tp
+  end
+
+end
 

data/spec/api_wrapper_spec.rb

@@ -0,0 +1,61 @@
+require 'tida_sina_weibo'
+
+describe TidaSinaWeibo::ApiWrapper do
+  it 'get setting property' do
+    TidaSinaWeibo::API[:status][:update].should eql('https://api.weibo.com/2/statuses/update.json')
+  end
+
+  it 'get request success' do
+    request_wrapper = double('request_wrapper')
+    request_wrapper.stub(:get) {{'result' => 'ok'}}
+
+    token_provider = double('token_provider')
+    token_provider.stub(:token) { 'token'}
+
+    target = TidaSinaWeibo::ApiWrapper.new request_wrapper, token_provider
+    result = target.status_show '1'
+    result.should eql({'result' =>'ok'})
+  end
+
+  it 'get request raise invalid_access_token exception' do
+    rest_client_exception = TidaSinaWeibo::RestClientException.new nil
+
+    request_wrapper = double('request_wrapper')
+    request_wrapper.should_receive(:get).and_raise(rest_client_exception)
+
+    rest_client_exception.stub(:body) { {'error_code' => '21332'} }
+
+    token_provider = double('token_provider')
+    token_provider.stub(:token) { 'token' }
+    token_provider.stub(:change)
+    token_provider.stub(:token) { nil }
+
+    target = TidaSinaWeibo::ApiWrapper.new request_wrapper, token_provider
+    begin
+      result = target.status_show '1'
+      raise 'Expect exception raise'
+    rescue TidaSinaWeibo::NoAccessTokenAvaiableException
+    end
+  end
+
+  it 'get request raise reached_account_access_limit exception' do
+    rest_client_exception = TidaSinaWeibo::RestClientException.new nil
+
+    request_wrapper = double('request_wrapper')
+    request_wrapper.should_receive(:get).and_raise(rest_client_exception)
+
+    rest_client_exception.stub(:body) { {'error_code' => '10023'} }
+
+    token_provider = double('token_provider')
+    token_provider.stub(:token) { 'token' }
+    token_provider.stub(:change)
+    token_provider.stub(:token) { nil }
+
+    target = TidaSinaWeibo::ApiWrapper.new request_wrapper, token_provider
+    begin
+      result = target.status_show '1'
+      raise 'Expect exception raise'
+    rescue TidaSinaWeibo::NoAccessTokenAvaiableException
+    end
+  end
+end

data/tida_sina_weibo.gemspec

@@ -16,4 +16,9 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_development_dependency "rspec", "~> 2.6"
+
+  gem.add_dependency "settingslogic"
+  gem.add_dependency "rest-client"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tida_sina_weibo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-01-08 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: settingslogic
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: SinaWeibo API gem
 email:
 - babaru.trinit@gmail.com
@@ -24,10 +72,11 @@ files:
 - README.md
 - Rakefile
 - lib/tida_sina_weibo.rb
-- lib/tida_sina_weibo/api_settings.rb
-- lib/tida_sina_weibo/api_settings.yml
 - lib/tida_sina_weibo/api_wrapper.rb
+- lib/tida_sina_weibo/exceptions.rb
+- lib/tida_sina_weibo/rest_client_wrapper.rb
 - lib/tida_sina_weibo/version.rb
+- spec/api_wrapper_spec.rb
 - tida_sina_weibo.gemspec
 homepage: ''
 licenses: []
@@ -53,4 +102,5 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: SinaWeibo API gem
-test_files: []
+test_files:
+- spec/api_wrapper_spec.rb

data/lib/tida_sina_weibo/api_settings.rb

@@ -1,8 +0,0 @@
-module TidaSinaWeibo
-
-  class ApiSettings < Settingslogic
-    source "#{Rails.root}/config/application.yml"
-    namespace Rails.env
-  end
-
-end

data/lib/tida_sina_weibo/api_settings.yml

@@ -1,32 +0,0 @@
-defaults: &defaults
-  api:
-    status:
-      update: 'https://api.weibo.com/2/statuses/update.json'
-      upload: 'https://upload.api.weibo.com/2/statuses/upload.json'
-      user_timeline: 'https://api.weibo.com/2/statuses/user_timeline.json'
-      user_timeline_ids: 'https://api.weibo.com/2/statuses/user_timeline/ids.json'
-      show: 'https://api.weibo.com/2/statuses/show.json'
-      repost_timeline: 'https://api.weibo.com/2/statuses/repost_timeline.json'
-      repost_timeline_ids: 'https://api.weibo.com/2/statuses/repost_timeline/ids.json'
-      queryid: 'https://api.weibo.com/2/statuses/queryid.json'
-      querymid: 'https://api.weibo.com/2/statuses/querymid.json'
-    comments:
-      show: 'https://api.weibo.com/2/comments/show.json'
-    user:
-      show: 'https://api.weibo.com/2/users/show.json'
-      domain_show: 'https://api.weibo.com/2/users/domain_show.json'
-    tags: 'https://api.weibo.com/2/tags.json'
-    friendships:
-      followers: 'https://api.weibo.com/2/friendships/followers.json'
-      followers_ids: 'https://api.weibo.com/2/friendships/followers/ids.json'
-      show: 'https://api.weibo.com/2/friendships/show.json'
-
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
-
-production:
-  <<: *defaults