wechat-sns 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a92efbc1fdf7b1a981c97cf0d85bfe256b4bf40
-  data.tar.gz: 04d5e4501e77a1c55a34d43b7b1e6f243d2cc97b
+  metadata.gz: fd7508abf1e7f1b78fac99e0625b09444804919e
+  data.tar.gz: 714405df61964939214c2164110d0765ec4cf987
 SHA512:
-  metadata.gz: a1f6c63d59de095cb308292e4a51b44e4fb931f44887c00efe07b1b04ca781be77ccad44ecb0f0384993ca939e1ca43208a21de8e6064a36d926550d0c749fa0
-  data.tar.gz: 398b25ff51baa781c278db2b7eda7eb7de8ee0ca6d6b1cf80494549b6241d847d68b5b7bb7385150471b8aac857fe627e152b1317c559e1e63569c7ba09b8bd6
+  metadata.gz: 9c0d04008964562a5fa1985b4da5047c0dccd36f47ba25293ac87ab3af31eb9ee70bf2ff21e95680ad0aa20e3dc7415ca7e7b338d56fff544c45726a2c41d436
+  data.tar.gz: 33f041fe075d26897d49bfa1cf6934ddd18fb2316d985139eb94761e177aa8e85b201e19ba54eabe565fe37ecf3f18b63f54dcb3d32a2cc32748b0b6111dda1d

data/CHANGELOG.md

@@ -21,3 +21,7 @@
 2. Improve the Access Token wrapper class for the argument validation & HTTP request
 3. Improve the Authorize Link class for the argument validation
 4. Improve the User Profile wrapper class for the argument validation & HTTP request
+
+## v1.0.2
+1. Improve the Access Token wrapper class for the HTTP request
+2. Improve the User Profile wrapper class for the HTTP request

data/Gemfile.lock

@@ -1,30 +1,42 @@
 PATH
   remote: .
   specs:
-    wechat-sns (1.0)
-      wechat-core (~> 0.3)
+    wechat-sns (1.0.1)
+      wechat-core (~> 0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.5)
-    httpclient (2.8.0)
+    activesupport (5.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    httpclient (2.8.3)
+    i18n (0.8.1)
+    minitest (5.10.1)
     rake (10.5.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    wechat-core (0.3)
-      httpclient (~> 2.7)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    wechat-core (0.4.1)
+      activesupport (>= 4.2)
+      httpclient (>= 2.8)
 
 PLATFORMS
   ruby
@@ -36,4 +48,4 @@ DEPENDENCIES
   wechat-sns!
 
 BUNDLED WITH
-   1.12.5
+   1.13.6

data/ROADMAP.md

@@ -21,3 +21,7 @@
 2. Improve the Access Token wrapper class for the argument validation & HTTP request
 3. Improve the Authorize Link class for the argument validation
 4. Improve the User Profile wrapper class for the argument validation & HTTP request
+
+## v1.0.2
+1. Improve the Access Token wrapper class for the HTTP request
+2. Improve the User Profile wrapper class for the HTTP request

data/lib/wechat/sns/access_token.rb

@@ -1,9 +1,13 @@
 require 'jsonclient'
 
+##
+# Access Token 是 SNS 统一登录访问令牌的封装类。
+# 不同于 Wechat::Common::AccessToken 。
 class Wechat::SNS::AccessToken
 
   extend Wechat::Core::Common
 
+  ##
   # 附：检验授权凭证（access_token）是否有效
   # http://mp.weixin.qq.com/wiki/9/01f711493b5a02f24b04365ac5d8fd95.html#.E9.99.84.EF.BC.9A.E6.A3.80.E9.AA.8C.E6.8E.88.E6.9D.83.E5.87.AD.E8.AF.81.EF.BC.88access_token.EF.BC.89.E6.98.AF.E5.90.A6.E6.9C.89.E6.95.88
   #
@@ -24,12 +28,11 @@ class Wechat::SNS::AccessToken
     assert_present! :opend_id,     opend_id
     #raise ArgumentError.new('The access_token argument is required.') if access_token.blank?
 
-    message = get_json 'https://api.weixin.qq.com/sns/auth', body:
+    get_json 'https://api.weixin.qq.com/sns/auth', body:
       {
         access_token: access_token,
         openid:       opend_id
       }
-    message.body
   end
 
   # 第三步：刷新access_token（如果需要）
@@ -55,13 +58,12 @@ class Wechat::SNS::AccessToken
     assert_present! :refresh_token, refresh_token
     # raise ArgumentError.new('The app_id argument is required.') if app_id.blank?
 
-    message = ::JSONClient.new.get 'https://api.weixin.qq.com/sns/oauth2/refresh_token',
+    get_json 'https://api.weixin.qq.com/sns/oauth2/refresh_token', body:
       {
         appid:         app_id,
         grant_type:    'refresh_token',
         refresh_token: refresh_token
       }
-    message.body
   end
 
   # 第二步：通过code换取网页授权access_token
@@ -84,18 +86,15 @@ class Wechat::SNS::AccessToken
   # }
   def self.create(app_id, app_secret, code, grant_type: 'authorization_code')
 
-    raise ArgumentError.new('The app_id argument is required.') if app_id.blank?
+    assert_present! :app_id, app_id
 
-    message = ::JSONClient.new.get 'https://api.weixin.qq.com/sns/oauth2/access_token',
+    get_json 'https://api.weixin.qq.com/sns/oauth2/access_token', body:
       {
         appid:      app_id,
         secret:     app_secret,
         code:       code,
         grant_type: grant_type
       }
-    message.body
-    #body = message.body
-    #body.is_a?(Hash) ? body : JSON.parse(body)
   end
 
 end

data/lib/wechat/sns/authorize_link.rb

@@ -1,3 +1,7 @@
+##
+# Authorize Link 是授权链接类。用于生成授权链接。如：
+# Wechat::SNS::AuthorizeLink.create wechat_app_id, redirect_link
+
 class Wechat::SNS::AuthorizeLink
 
   extend Wechat::Core::Common
@@ -6,6 +10,7 @@ class Wechat::SNS::AuthorizeLink
   SCOPE_BASE         = 'snsapi_base'.freeze
   SCOPE_FULL         = 'snsapi_userinfo'.freeze
 
+  ##
   # 第一步：用户同意授权，获取code
   # http://mp.weixin.qq.com/wiki/9/01f711493b5a02f24b04365ac5d8fd95.html#.E7.AC.AC.E4.B8.80.E6.AD.A5.EF.BC.9A.E7.94.A8.E6.88.B7.E5.90.8C.E6.84.8F.E6.8E.88.E6.9D.83.EF.BC.8C.E8.8E.B7.E5.8F.96code
   def self.create(wechat_app_id, redirect_link, response_type: Wechat::SNS::AuthorizeLink::RESPONSE_TYPE_CODE, scope: Wechat::SNS::AuthorizeLink::SCOPE_FULL, state: nil)

data/lib/wechat/sns/user_profile.rb

@@ -1,9 +1,12 @@
-require 'jsonclient'
+##
+# User Profile 是用户基本信息的封装类。如：
+# Wechat::SNS::UserProfile.load access_token, open_id
 
 class Wechat::SNS::UserProfile
 
   extend Wechat::Core::Common
 
+  ##
   # 第四步：拉取用户信息(需scope为 snsapi_userinfo)
   # http://mp.weixin.qq.com/wiki/9/01f711493b5a02f24b04365ac5d8fd95.html#.E7.AC.AC.E5.9B.9B.E6.AD.A5.EF.BC.9A.E6.8B.89.E5.8F.96.E7.94.A8.E6.88.B7.E4.BF.A1.E6.81.AF.28.E9.9C.80scope.E4.B8.BA_snsapi_userinfo.29
   #
@@ -29,17 +32,13 @@ class Wechat::SNS::UserProfile
 
     assert_present! :access_token, access_token
     assert_present! :open_id, open_id
-    #raise ArgumentError.new('The access_token argument is required.') if access_token.blank?
 
-    message = get_json 'https://api.weixin.qq.com/sns/userinfo', body:
+    get_json 'https://api.weixin.qq.com/sns/userinfo', body:
       {
         access_token: access_token,
         openid:       open_id,
         lang:         language
       }
-    message.body
-    #body = message.body
-    #body.is_a?(Hash) ? body : JSON.parse(body)
   end
 
 end

data/lib/wechat/sns/version.rb

@@ -1,5 +1,5 @@
 module Wechat
   module SNS
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.0.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat-sns
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler