oauth2_china 0.0.4 → 0.0.5

data/README.md

@@ -1,6 +1,7 @@
 # Oauth2China
 
-TODO: Write a gem description
+Weibo OAuth2 API Ruby wrapper. 
+Currently support Sina and Tencent Weibo APIs.
 
 ## Installation
 
@@ -18,7 +19,8 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Oauth2China::Sina.new("ACCESS_TOKEN").statuses_update "hello world"
+
 
 ## Contributing
 

data/examples/Gemfile

@@ -1,3 +1,3 @@
 source "http://ruby.taobao.org"
 
-gem 'oauth2_china', path: "/Users/mike/dev/workspace/oauth2_china/"
+gem 'oauth2_china'

data/examples/test.rb

@@ -0,0 +1,7 @@
+#coding: utf-8
+require 'oauth2_china'
+
+sina = Oauth2China::Sina.new 'SINA_ACCESS_TOKEN'
+res = sina.get_uid
+
+puts res

data/lib/oauth2_china/strategies/sina.rb

@@ -0,0 +1,135 @@
+module Oauth2China
+  class Sina < Oauth2China::Base
+    def initialize(access_token)
+      @access_token = access_token
+
+      @tmpl = Hashie::Mash.new({
+        access_token: access_token,
+      })
+
+      @conn = Faraday.new(:url => 'https://api.weibo.com') do |faraday|
+        faraday.request  :multipart
+        faraday.request  :url_encoded             # form-encode POST params
+        #faraday.response :logger                  # log requests to STDOUT
+        faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
+      end
+    end
+
+    def statuses_update(status, latitude = nil, longitutde = nil, annotation = nil)
+      params            = @tmpl.clone
+      params.status     = status
+      params.lat        = latitude if latitude
+      params.long       = longitutde if longitutde
+      params.annotation = annotation if annotation
+
+      res = @conn.post("/2/statuses/update.json", params).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    def statuses_upload(status, picture, latitude = nil, longitutde = nil, annotation = nil)
+      params            = @tmpl.clone
+      params.pic        = Faraday::UploadIO.new(picture, 'image/jpeg')
+      params.status     = status
+      params.lat        = latitude if latitude
+      params.long       = longitutde if longitutde
+      params.annotation = annotation if annotation
+
+      res = @conn.post("/2/statuses/upload.json", params).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    def friendships_create(uid)
+      params = @tmpl.clone
+
+      if uid.is_a? String
+        params.uid = uid
+      else
+        params.screen_name = uid
+      end
+
+      res = @conn.post("/2/friendships/create.json", params).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    def users_show(uid)
+      params     = @tmpl.clone
+      params.uid = uid
+      res = @conn.get("/2/users/show.json", params).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    def get_uid
+      params = @tmpl.clone
+      res = @conn.get("/2/account/get_uid.json", params).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    def comments_create(id, comment, comment_ori = 0)
+      params             = @tmpl.clone
+
+      params.id          = id
+      params.comment     = comment
+      params.comment_ori = comment_ori
+
+      res = @conn.post("/2/comments/create.json", params).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    # since_id         	 false 	 int64 	 若指定此参数，则返回ID比since_id大的微博（即比since_id时间晚的微博），默认为0。
+    # max_id           	 false 	 int64 	 若指定此参数，则返回ID小于或等于max_id的微博，默认为0。
+    # count            	 false 	 int   	 单页返回的记录条数，默认为50。
+    # page             	 false 	 int   	 返回结果的页码，默认为1。
+    # filter_by_author 	 false 	 int   	 作者筛选类型，0：全部、1：我关注的人、2：陌生人，默认为0。
+    # filter_by_source 	 false 	 int   	 来源筛选类型，0：全部、1：来自微博、2：来自微群，默认为0。
+    # filter_by_type   	 false 	 int   	 原创筛选类型，0：全部微博、1：原创的微博，默认为0。
+    # trim_user        	 false 	 int   	 返回值中user字段开关，0：返回完整user字段、1：user字段仅返回user_id，默认为0。
+    def statuses_mentions(options = {})
+      params = @tmpl.clone.merge(options)
+      res = @conn.get("/2/statuses/mentions.json", params).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    # since_id     	 false 	 int64  	 若指定此参数，则返回ID比since_id大的微博（即比since_id时间晚的微博），默认为0。
+    # max_id       	 false 	 int64  	 若指定此参数，则返回ID小于或等于max_id的微博，默认为0。
+    # count        	 false 	 int    	 单页返回的记录条数，默认为50。
+    # page         	 false 	 int    	 返回结果的页码，默认为1。
+    # base_app     	 false 	 int    	 是否只获取当前应用的数据。0为否（所有数据），1为是（仅当前应用），默认为0。
+    # feature      	 false 	 int    	 过滤类型ID，0：全部、1：原创、2：图片、3：视频、4：音乐，默认为0。
+    # trim_user    	 false 	 int    	 返回值中user字段开关，0：返回完整user字段、1：user字段仅返回user_id，默认为0。
+    def statuses_friends_timeline(options = {})
+      params = @tmpl.clone.merge(options)
+      res = @conn.get("/2/statuses/friends_timeline.json", params).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    # since_id     	 false 	 int64  	 若指定此参数，则返回ID比since_id大的微博（即比since_id时间晚的微博），默认为0。
+    # max_id       	 false 	 int64  	 若指定此参数，则返回ID小于或等于max_id的微博，默认为0。
+    # count        	 false 	 int    	 单页返回的记录条数，默认为50。
+    # page         	 false 	 int    	 返回结果的页码，默认为1。
+    # base_app     	 false 	 int    	 是否只获取当前应用的数据。0为否（所有数据），1为是（仅当前应用），默认为0。
+    # feature      	 false 	 int    	 过滤类型ID，0：全部、1：原创、2：图片、3：视频、4：音乐，默认为0。
+    # trim_user    	 false 	 int    	 返回值中user字段开关，0：返回完整user字段、1：user字段仅返回user_id，默认为0。
+    def home_timeline(options = {})
+      params = @tmpl.clone.merge(options)
+      res = @conn.get("/2/home/timeline.json", params).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    def place_pois_add_checkin(poiid, status, options = {})
+      params = @tmpl.clone.merge(options)
+
+      params.poiid  = poiid
+      params.status = status
+
+      res = @conn.post("/2/place/pois/add_checkin.json", params).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    # 互粉好友ID列表
+    def mutual_friends_ids(count=1000,options = {})
+      params = @tmpl.clone.merge(options)
+      res = @conn.get("/2/friendships/friends/bilateral/ids.json", params).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+  end
+end

data/lib/oauth2_china/strategies/tencent.rb

@@ -0,0 +1,78 @@
+module Oauth2China
+  class Tencent < Oauth2China::Base
+    def initialize(access_token, clientid, openid)
+      @conn = Faraday.new(:url => 'https://open.t.qq.com') do |faraday|
+        faraday.request  :multipart
+        faraday.request  :url_encoded             # form-encode POST params
+        #faraday.response :logger                  # log requests to STDOUT
+        faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
+      end
+
+      @tmpl = Hashie::Mash.new({
+        oauth_consumer_key: clientid,
+        access_token: access_token,
+        openid: openid,
+        clientip: '202.102.154.3',
+        oauth_version: '2.a',
+        format: "json"
+      })
+    end
+
+    def statuses_update(status, latitude = nil, longitutde = nil, annotation = nil)
+      params         = @tmpl.clone
+      params.content = status
+      params.jing    = latitude if latitude
+      params.wei     = longitutde if longitutde
+
+      res = @conn.post("/api/t/add", params.to_hash).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    def statuses_upload(status, picture, latitude = nil, longitutde = nil, annotation = nil)
+      params         = @tmpl.clone
+      params.content = status
+      params.pic     = Faraday::UploadIO.new(picture, 'image/jpeg')
+      params.jing    = latitude if latitude
+      params.wei     = longitutde if longitutde
+
+      res = @conn.post("/api/t/add_pic", params.to_hash).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    def statuses_mentions(options={})
+      params = @tmpl.clone.merge(options)
+      res = @conn.get("/api/statuses/mentions_timeline", params.to_hash).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    def users_show(name)
+      params      = @tmpl.clone
+      params.name = name
+
+      res = @conn.post("/api/user/other_info", params.to_hash).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    def get_uid
+      params = @tmpl.clone
+      res = @conn.post("/api/user/info", params.to_hash).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    def friendships_create(name)
+      params = @tmpl.clone
+      params.name = name
+      res = @conn.post("/api/friends/add", params.to_hash).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+
+    # 互粉好友ID列表
+    def mutual_friends_ids(start=1, reqnum=30, options = {})
+      params = @tmpl.clone.merge(options)
+      params.startindex = start
+      params.reqnum = reqnum
+      res = @conn.get("/api/friends/mutual_list", params.to_hash).body
+      Hashie::Mash.new(JSON.parse res)
+    end
+  end
+end

data/lib/oauth2_china/version.rb

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

data/lib/oauth2_china.rb

@@ -6,194 +6,6 @@ require "json"
 module Oauth2China
   class Base
   end
-
-  class Sina < Oauth2China::Base
-    def initialize(access_token)
-      @access_token = access_token
-
-      @tmpl = Hashie::Mash.new({
-        access_token: access_token,
-      })
-
-      @conn = Faraday.new(:url => 'https://api.weibo.com') do |faraday|
-        faraday.request  :multipart
-        faraday.request  :url_encoded             # form-encode POST params
-        #faraday.response :logger                  # log requests to STDOUT
-        faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
-      end
-    end
-
-    def statuses_update(status, latitude = nil, longitutde = nil, annotation = nil)
-      params            = @tmpl.clone
-      params.status     = status
-      params.lat        = latitude if latitude
-      params.long       = longitutde if longitutde
-      params.annotation = annotation if annotation
-
-      res = @conn.post("/2/statuses/update.json", params).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-
-    def statuses_upload(status, picture, latitude = nil, longitutde = nil, annotation = nil)
-      params            = @tmpl.clone
-      params.pic        = Faraday::UploadIO.new(picture, 'image/jpeg')
-      params.status     = status
-      params.lat        = latitude if latitude
-      params.long       = longitutde if longitutde
-      params.annotation = annotation if annotation
-
-      res = @conn.post("/2/statuses/upload.json", params).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-
-    def friendships_create(uid)
-      params = @tmpl.clone
-
-      if uid.is_a? String
-        params.uid = uid
-      else
-        params.screen_name = uid
-      end
-
-      res = @conn.post("/2/friendships/create.json", params).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-
-    def users_show(uid)
-      params     = @tmpl.clone
-      params.uid = uid
-      res = @conn.get("/2/users/show.json", params).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-
-    def get_uid
-      params = @tmpl.clone
-      res = @conn.get("/2/account/get_uid.json", params).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-
-    def comments_create(id, comment, comment_ori = 0)
-      params             = @tmpl.clone
-
-      params.id          = id
-      params.comment     = comment
-      params.comment_ori = comment_ori
-
-      res = @conn.post("/2/comments/create.json", params).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-
-    # since_id         	 false 	 int64 	 若指定此参数，则返回ID比since_id大的微博（即比since_id时间晚的微博），默认为0。
-    # max_id           	 false 	 int64 	 若指定此参数，则返回ID小于或等于max_id的微博，默认为0。
-    # count            	 false 	 int   	 单页返回的记录条数，默认为50。
-    # page             	 false 	 int   	 返回结果的页码，默认为1。
-    # filter_by_author 	 false 	 int   	 作者筛选类型，0：全部、1：我关注的人、2：陌生人，默认为0。
-    # filter_by_source 	 false 	 int   	 来源筛选类型，0：全部、1：来自微博、2：来自微群，默认为0。
-    # filter_by_type   	 false 	 int   	 原创筛选类型，0：全部微博、1：原创的微博，默认为0。
-    # trim_user        	 false 	 int   	 返回值中user字段开关，0：返回完整user字段、1：user字段仅返回user_id，默认为0。
-    def statuses_mentions(options = {})
-      params = @tmpl.clone.merge(options)
-      res = @conn.get("/2/statuses/mentions.json", params).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-
-    # since_id     	 false 	 int64  	 若指定此参数，则返回ID比since_id大的微博（即比since_id时间晚的微博），默认为0。
-    # max_id       	 false 	 int64  	 若指定此参数，则返回ID小于或等于max_id的微博，默认为0。
-    # count        	 false 	 int    	 单页返回的记录条数，默认为50。
-    # page         	 false 	 int    	 返回结果的页码，默认为1。
-    # base_app     	 false 	 int    	 是否只获取当前应用的数据。0为否（所有数据），1为是（仅当前应用），默认为0。
-    # feature      	 false 	 int    	 过滤类型ID，0：全部、1：原创、2：图片、3：视频、4：音乐，默认为0。
-    # trim_user    	 false 	 int    	 返回值中user字段开关，0：返回完整user字段、1：user字段仅返回user_id，默认为0。
-    def statuses_friends_timeline(options = {})
-      params = @tmpl.clone.merge(options)
-      res = @conn.get("/2/statuses/friends_timeline.json", params).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-
-    # since_id     	 false 	 int64  	 若指定此参数，则返回ID比since_id大的微博（即比since_id时间晚的微博），默认为0。
-    # max_id       	 false 	 int64  	 若指定此参数，则返回ID小于或等于max_id的微博，默认为0。
-    # count        	 false 	 int    	 单页返回的记录条数，默认为50。
-    # page         	 false 	 int    	 返回结果的页码，默认为1。
-    # base_app     	 false 	 int    	 是否只获取当前应用的数据。0为否（所有数据），1为是（仅当前应用），默认为0。
-    # feature      	 false 	 int    	 过滤类型ID，0：全部、1：原创、2：图片、3：视频、4：音乐，默认为0。
-    # trim_user    	 false 	 int    	 返回值中user字段开关，0：返回完整user字段、1：user字段仅返回user_id，默认为0。
-    def home_timeline(options = {})
-      params = @tmpl.clone.merge(options)
-      res = @conn.get("/2/home/timeline.json", params).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-
-    def place_pois_add_checkin(poiid, status, options = {})
-      params = @tmpl.clone.merge(options)
-
-      params.poiid  = poiid
-      params.status = status
-
-      res = @conn.post("/2/place/pois/add_checkin.json", params).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-  end
-
-  class Tencent < Oauth2China::Base
-    def initialize(access_token, clientid, openid)
-      @conn = Faraday.new(:url => 'https://open.t.qq.com') do |faraday|
-        faraday.request  :multipart
-        faraday.request  :url_encoded             # form-encode POST params
-        #faraday.response :logger                  # log requests to STDOUT
-        faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
-      end
-
-      @tmpl = Hashie::Mash.new({
-        oauth_consumer_key: clientid,
-        access_token: access_token,
-        openid: openid,
-        clientip: '202.102.154.3',
-        oauth_version: '2.a',
-        format: "json"
-      })
-    end
-
-    def statuses_update(status, latitude = nil, longitutde = nil, annotation = nil)
-      params         = @tmpl.clone
-      params.content = status
-      params.jing    = latitude if latitude
-      params.wei     = longitutde if longitutde
-
-      res = @conn.post("/api/t/add", params.to_hash).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-
-    def statuses_upload(status, picture, latitude = nil, longitutde = nil, annotation = nil)
-      params         = @tmpl.clone
-      params.content = status
-      params.pic     = Faraday::UploadIO.new(picture, 'image/jpeg')
-      params.jing    = latitude if latitude
-      params.wei     = longitutde if longitutde
-
-      res = @conn.post("/api/t/add_pic", params.to_hash).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-
-    def users_show(name)
-      params      = @tmpl.clone
-      params.name = name
-
-      res = @conn.post("/api/user/other_info", params.to_hash).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-
-    def get_uid
-      params = @tmpl.clone
-      res = @conn.post("/api/user/info", params.to_hash).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-
-    def friendships_create(name)
-      params = @tmpl.clone
-      params.name = name
-      res = @conn.post("/api/friends/add", params.to_hash).body
-      Hashie::Mash.new(JSON.parse res)
-    end
-  end
-
+  autoload :Sina,    'oauth2_china/strategies/sina'
+  autoload :Tencent, 'oauth2_china/strategies/tencent'
 end

data/oauth2_china.gemspec

@@ -3,9 +3,9 @@ require File.expand_path('../lib/oauth2_china/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Chagel"]
-  gem.email         = ["chagel@gmail.com"]
-  gem.description   = %q{weibo client for china.}
-  gem.summary       = %q{weibo client for china. Currently support sina and qq apis.}
+  gem.email         = ["mike@gmail.com"]
+  gem.description   = %q{Weibo OAuth2 API Ruby wrapper.}
+  gem.summary       = %q{Weibo OAuth2 API Ruby wrapper. Currently support Sina and Tencent Weibo APIs.}
   gem.homepage      = ""
 
   gem.files         = `git ls-files`.split($\)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth2_china
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70344330196040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70344330196040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70344330195600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70344330195600
-description: weibo client for china.
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Weibo OAuth2 API Ruby wrapper.
 email:
-- chagel@gmail.com
+- mike@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -45,11 +55,11 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- examples/016.gif
 - examples/Gemfile
-- examples/img.jpeg
-- examples/tester.rb
+- examples/test.rb
 - lib/oauth2_china.rb
+- lib/oauth2_china/strategies/sina.rb
+- lib/oauth2_china/strategies/tencent.rb
 - lib/oauth2_china/version.rb
 - oauth2_china.gemspec
 homepage: ''
@@ -72,9 +82,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: weibo client for china. Currently support sina and qq apis.
+summary: Weibo OAuth2 API Ruby wrapper. Currently support Sina and Tencent Weibo APIs.
 test_files: []
 has_rdoc: 

data/examples/tester.rb

@@ -1,13 +0,0 @@
-#coding: utf-8
-require 'oauth2_china'
-
-#sina = Oauth2China::Sina.new "2.00PvDQzBee3piCd9690cd4fcq5DwtB"
-##res = sina.statuses_update("ello wd")
-##p res
-#res = sina.statuses_upload("come on gif", "./016.gif")
-#p res
-
-qq = Oauth2China::Tencent.new "88f6c1b65ff3dbd0ebdda3db123f791a", "7547D743583717EA820A834BE4B50255"
-#qq = Oauth2China::Tencent.new "a92e335ad63b4d7dbf9ac9d299fe7817", "565f61c64aa43838af462b355022c562"
-res = qq.statuses_update "hello world"
-p res