wechat-shake_around 0.9 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ade87fe6c471bbbcec03f1ae4cb4543234dc88ff
-  data.tar.gz: 77271b546768163e25bdad157f387d334787f2d0
+  metadata.gz: 5270efec3abd0ac53118428e68c3142f3ac0694e
+  data.tar.gz: 7e9172ab08dde86672339fc1bf81912be998d7fc
 SHA512:
-  metadata.gz: c1d06babbf659b2c1fbe8a102266ff33cec371d62fe44e3c575af3557b2dc73c829e521cdc20e965318c70470d94736b4d88b1f5c0491b9519f41c7b5a9d98d0
-  data.tar.gz: 39bd730d7716ce4955f762f758330eb24d238ea8e7e1103bbb33dbe38ad9849eabe59ae2fdd65782dd4c1a393b0b85dc5fd9ba3528ece42abc6e7eaa5fbecfb7
+  metadata.gz: a7ce0edef4fa1f9b935fba765d541814096680727b1a4fe0f6c7e9de9d73a2c37d751249e58a1e3479e8b8170a4cc5be5d028967b39ff16084138a455863cc68
+  data.tar.gz: 1451363f97346acd16639704433fa11a7565e2a25a1e7ae163bf30debe3f46d72e078d363ba1efb96a6d3e4fd7a779f23f94f8bc2cd17829a1b47182e597472a

data/.gitignore

@@ -1,10 +1,35 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
+*.gem
+*.rbc
+/.config
 /coverage/
-/doc/
+/InstalledFiles
 /pkg/
 /spec/reports/
+/test/tmp/
+/test/version_tmp/
 /tmp/
-*.gem
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalisation:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc

data/CHANGELOG.md

@@ -34,3 +34,22 @@
 
 ## v0.9
 1. Registration wrapper class
+
+## v0.9.1
+1. Improve the Ruby Gem Specification to depend on [wechat-core](https://github.com/topbitdu/wechat-core) v0.4
+2. Improve the Apply wrapper class for the argument validation & HTTP request
+3. Improve the Beacon wrapper class for the argument validation & HTTP request
+4. Improve the Beacon Page Relation wrapper class for the argument validation & HTTP request
+5. Improve the Beacon PoI Relation wrapper class for the argument validation & HTTP request
+6. Improve the Device Daily Report wrapper class for the argument validation & HTTP request
+7. Improve the Device Group Relation wrapper class for the argument validation & HTTP request
+8. Improve the Device Report wrapper class for the argument validation & HTTP request
+9. Improve the Group wrapper class for the argument validation & HTTP request
+10. Improve the Icon wrapper class for the argument validation
+11. Improve the License wrapper class for the argument validation
+12. Improve the Material module for the argument validation
+13. Improve the Page wrapper class for the argument validation & HTTP request
+14. Improve the Page Daily Report wrapper class for the argument validation & HTTP request
+15. Improve the Page Report wrapper class for the argument validation & HTTP request
+16. Improve the Registration wrapper class for the argument validation & HTTP request
+17. Improve the Shaking wrapper class for the argument validation & HTTP request

data/Gemfile.lock

@@ -0,0 +1,37 @@
+PATH
+  remote: .
+  specs:
+    wechat-shake_around (0.9)
+      httpclient (>= 2.8)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    httpclient (2.8.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.1)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.11)
+  rake (~> 11.0)
+  rspec (~> 3.0)
+  wechat-shake_around!
+
+BUNDLED WITH
+   1.12.5

data/README.md

@@ -1,11 +1,22 @@
 # Wechat Shake Around 微信摇周边库
 
+[![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/gems/wechat-shake_around/frames)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](http://opensource.org/licenses/MIT)
+
 [![Gem Version](https://badge.fury.io/rb/wechat-shake_around.svg)](https://badge.fury.io/rb/wechat-shake_around)
+[![Dependency Status](https://gemnasium.com/badges/github.com/topbitdu/wechat-shake_around.svg)](https://gemnasium.com/github.com/topbitdu/wechat-shake_around)
 
 The Wechat Shake Around Library is a code base to call the Wechat Shake Around APIs.
 微信摇周边库用于调用[微信摇周边API](http://mp.weixin.qq.com/wiki/19/9fe9fdbb50fee9f9660438c551142ccf.html)。
 
+
+
+## Recent Update
+Check out the [Road Map](ROADMAP.md) to find out what's the next.
+Check out the [Change Log](CHANGELOG.md) to find out what's new.
+
+
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -22,6 +33,8 @@ Or install it yourself as:
 
     $ gem install wechat-shake_around
 
+
+
 ## Usage
 
 
@@ -57,6 +70,29 @@ end
 
 
 
+### Material 上传素材
+[Upload License 上传许可证素材](http://mp.weixin.qq.com/wiki/5/e997428269ff189d8f9a4b9e177be2d9.html)
+```ruby
+response = Wechat::ShakeAround::License.create(access_token, Pathname.new('var/ftp/license.jpg'))
+if response.present? && 0==response['errcode'].to_i
+  license_link = response['data']['pic_url']
+else
+  # Show response['errmsg']
+end
+```
+
+[Upload Icon 上传图标素材](http://mp.weixin.qq.com/wiki/5/e997428269ff189d8f9a4b9e177be2d9.html)
+```ruby
+response = Wechat::ShakeAround::Icon.create(access_token, Pathname.new('var/ftp/article-icon.jpg'))
+if response.present? && 0==response['errcode'].to_i
+  icon_link = response['data']['pic_url']
+else
+  # Show response['errmsg']
+end
+```
+
+
+
 ### Handle the Callback of Shaking 处理摇周边行为的回调
 [Get Beacon & PoI & Page & Shaker 获取摇周边的设备及用户信息](http://mp.weixin.qq.com/wiki/3/34904a5db3d0ec7bb5306335b8da1faf.html)
 ```ruby
@@ -84,7 +120,8 @@ quantity = 500
 reason   = 'Test Purpose'
 comment  = 'Some Mall' # optional
 poi_id   = nil         # optional Some PoI ID
-response = Wechat::ShakeAround::Apply.create access_token, quantity, apply_reason, comment, poi_id
+response = Wechat::ShakeAround::Apply.create access_token, quantity, apply_reason, comment: comment, poi_id: poi_id
+# or for short: Wechat::ShakeAround::Apply.create access_token, quantity, apply_reason
 if response.present? && 0==response['errcode'].to_i
   apply_id      = response['data']['apply_id']
   audit_status  = response['data']['audit_status']
@@ -130,7 +167,7 @@ if response.present? && 0==response['errcode'].to_i
     status           = device['status']
                        # 0：未激活，1：已激活
     last_active_time = device['last_active_time']
-                       # 设备最近一次被摇到的日期（最早只能获取前一天的数据）；新申请的设备该字段值为0 
+                       # 设备最近一次被摇到的日期（最早只能获取前一天的数据）；新申请的设备该字段值为0
     poi_id           = device['poi_id']
                        # 设备关联的门店ID，关联门店后，在门店1KM的范围内有优先摇出信息的机会
   end
@@ -153,7 +190,7 @@ if response.present? && 0==response['errcode'].to_i
     status           = device['status']
                        # 0：未激活，1：已激活
     last_active_time = device['last_active_time']
-                       # 设备最近一次被摇到的日期（最早只能获取前一天的数据）；新申请的设备该字段值为0 
+                       # 设备最近一次被摇到的日期（最早只能获取前一天的数据）；新申请的设备该字段值为0
     poi_id           = device['poi_id']
                        # 设备关联的门店ID，关联门店后，在门店1KM的范围内有优先摇出信息的机会
   end
@@ -275,7 +312,7 @@ if response.present? && 0==response['errcode'].to_i
     comment     = page['comment']     # 页面的备注信息
     description = page['description'] # 在摇一摇页面展示的副标题
     icon_url    = page['icon_url']    # 在摇一摇页面展示的图片
-    page_id     = page['page_id']     # 摇周边页面唯一ID 
+    page_id     = page['page_id']     # 摇周边页面唯一ID
     page_url    = page['page_url']    # 跳转链接
     title       = page['title']       # 在摇一摇页面展示的主标题
   end
@@ -293,7 +330,7 @@ if response.present? && 0==response['errcode'].to_i
   comment     = page['comment']     # 页面的备注信息
   description = page['description'] # 在摇一摇页面展示的副标题
   icon_url    = page['icon_url']    # 在摇一摇页面展示的图片
-  page_id     = page['page_id']     # 摇周边页面唯一ID 
+  page_id     = page['page_id']     # 摇周边页面唯一ID
   page_url    = page['page_url']    # 跳转链接
   title       = page['title']       # 在摇一摇页面展示的主标题
 else

data/ROADMAP.md

@@ -34,3 +34,26 @@
 
 ## v0.9
 1. Registration wrapper class
+
+## v0.9.1
+1. Improve the Ruby Gem Specification to depend on [wechat-core](https://github.com/topbitdu/wechat-core) v0.4
+2. Improve the Apply wrapper class for the argument validation & HTTP request
+3. Improve the Beacon wrapper class for the argument validation & HTTP request
+4. Improve the Beacon Page Relation wrapper class for the argument validation & HTTP request
+5. Improve the Beacon PoI Relation wrapper class for the argument validation & HTTP request
+6. Improve the Device Daily Report wrapper class for the argument validation & HTTP request
+7. Improve the Device Group Relation wrapper class for the argument validation & HTTP request
+8. Improve the Device Report wrapper class for the argument validation & HTTP request
+9. Improve the Group wrapper class for the argument validation & HTTP request
+10. Improve the Icon wrapper class for the argument validation
+11. Improve the License wrapper class for the argument validation
+12. Improve the Material module for the argument validation
+13. Improve the Page wrapper class for the argument validation & HTTP request
+14. Improve the Page Daily Report wrapper class for the argument validation & HTTP request
+15. Improve the Page Report wrapper class for the argument validation & HTTP request
+16. Improve the Registration wrapper class for the argument validation & HTTP request
+17. Improve the Shaking wrapper class for the argument validation & HTTP request
+
+## v1.0
+1. Improve the wrapper classes to support the Keyword Arguments
+2. Improve the wrapper classes for argument validation

data/_config.yml

@@ -0,0 +1 @@
+markdown: kramdown

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "wechat/shake_around"
+require 'bundler/setup'
+require 'wechat/shake_around'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "wechat/shake_around"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/lib/wechat/shake_around/apply.rb

@@ -1,8 +1,7 @@
-require 'jsonclient'
-
 class Wechat::ShakeAround::Apply
 
-  extend ::Wechat::ShakeAround::Common
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
 
   # 查询设备ID申请审核状态
   # http://mp.weixin.qq.com/wiki/15/b9e012f917e3484b7ed02771156411f3.html#.E6.9F.A5.E8.AF.A2.E8.AE.BE.E5.A4.87ID.E7.94.B3.E8.AF.B7.E5.AE.A1.E6.A0.B8.E7.8A.B6.E6.80.81
@@ -20,7 +19,10 @@ class Wechat::ShakeAround::Apply
   #   errmsg:  'success.'
   # }
   def self.load(access_token, apply_id)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/applystatus?access_token=#{access_token}", { apply_id: apply_id.to_i }
+    assert_present! :access_token, access_token
+    assert_present! :apply_id,     apply_id
+
+    message = post_json "https://api.weixin.qq.com/shakearound/device/applystatus?access_token=#{access_token}", body: { apply_id: apply_id.to_i }
     message.body
   end
 
@@ -42,11 +44,16 @@ class Wechat::ShakeAround::Apply
   # quantity: 申请的设备ID的数量，单次新增设备超过500个，需走人工审核流程。
   # reason:   申请理由，不超过100个汉字或200个英文字母。
   # comment:  备注，不超过15个汉字或30个英文字母。
-  def self.create(access_token, quantity, reason, comment = nil, poi_id = nil)
+  def self.create(access_token, quantity, reason, comment: nil, poi_id: nil)
+
+    assert_present! :access_token, access_token
+    assert_present! :quantity,     quantity
+    assert_present! :reason,       reason
+
     options = { quantity: quantity, apply_reason: reason }
     options[:comment] = comment if comment.present?
     options[:poi_id]  = poi_id  if poi_id.present?
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/applyid?access_token=#{access_token}", options
+    message = post_json "https://api.weixin.qq.com/shakearound/device/applyid?access_token=#{access_token}", body: options
     message.body
   end
 

data/lib/wechat/shake_around/beacon.rb

@@ -1,8 +1,7 @@
-require 'jsonclient'
-
 class Wechat::ShakeAround::Beacon
 
-  extend ::Wechat::ShakeAround::Common
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
 
   # 查询设备列表
   # http://mp.weixin.qq.com/wiki/15/b9e012f917e3484b7ed02771156411f3.html#.E6.9F.A5.E8.AF.A2.E8.AE.BE.E5.A4.87.E5.88.97.E8.A1.A8
@@ -19,7 +18,7 @@ class Wechat::ShakeAround::Beacon
   #         major:            <MAJOR>,
   #         minor:            <MINOR>,
   #         status:           <STATUS>,           // 激活状态，0：未激活，1：已激活
-  #         last_active_time: <LAST_ACTIVE_TIME>, // 设备最近一次被摇到的日期（最早只能获取前一天的数据）；新申请的设备该字段值为0 
+  #         last_active_time: <LAST_ACTIVE_TIME>, // 设备最近一次被摇到的日期（最早只能获取前一天的数据）；新申请的设备该字段值为0
   #         poi_id:           <POI_ID>,           // 设备关联的门店ID，关联门店后，在门店1KM的范围内有优先摇出信息的机会。门店相关信息具体可查看门店相关的接口文档
   #         uuid:             <UUID>
   #       }
@@ -29,7 +28,12 @@ class Wechat::ShakeAround::Beacon
   #   errcode: 0,
   #   errmsg:  'success.'
   # }
-  def self.index(access_token, offset, limit, apply_id = nil)
+  def self.index(access_token, offset, limit, apply_id: nil)
+
+    assert_present! :access_token, access_token
+    assert_present! :offset,       offset
+    assert_present! :limit,        limit
+
     options = { begin: offset, count: limit }
     if apply_id.present?
       options[:apply_id] = apply_id
@@ -37,7 +41,7 @@ class Wechat::ShakeAround::Beacon
     else
       options[:type]     = 2
     end
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/search?access_token=#{access_token}", options
+    message = post_json "https://api.weixin.qq.com/shakearound/device/search?access_token=#{access_token}", body: options
     message.body
   end
 
@@ -56,7 +60,7 @@ class Wechat::ShakeAround::Beacon
   #         major:            <MAJOR>,
   #         minor:            <MINOR>,
   #         status:           <STATUS>,           // 激活状态，0：未激活，1：已激活
-  #         last_active_time: <LAST_ACTIVE_TIME>, // 设备最近一次被摇到的日期（最早只能获取前一天的数据）；新申请的设备该字段值为0 
+  #         last_active_time: <LAST_ACTIVE_TIME>, // 设备最近一次被摇到的日期（最早只能获取前一天的数据）；新申请的设备该字段值为0
   #         poi_id:           <POI_ID>,           // 设备关联的门店ID，关联门店后，在门店1KM的范围内有优先摇出信息的机会。门店相关信息具体可查看门店相关的接口文档
   #         uuid:             <UUID>
   #       }
@@ -69,8 +73,12 @@ class Wechat::ShakeAround::Beacon
   #
   # device_id is an integer or a hash like { uuid: <UUID>, major: <MAJOR>, minor: <MINOR> }.
   def self.load(access_token, device_id)
+
+    assert_present! :access_token, access_token
+    assert_present! :device_id,    device_id
+
     device_identifier = self.normalize_device_id device_id
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/search?access_token=#{access_token}",
+    message = post_json "https://api.weixin.qq.com/shakearound/device/search?access_token=#{access_token}", body:
       {
         type:               1,
         device_identifiers: [ device_identifier ]
@@ -90,8 +98,13 @@ class Wechat::ShakeAround::Beacon
   #
   # device_id is an integer or a hash like { uuid: <UUID>, major: <MAJOR>, minor: <MINOR> }.
   def self.update(access_token, device_id, comment)
+
+    assert_present! :access_token, access_token
+    assert_present! :device_id,    device_id
+    assert_present! :comment,      comment
+
     device_identifier = self.normalize_device_id device_id
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/update?access_token=#{access_token}",
+    message = post_json "https://api.weixin.qq.com/shakearound/device/update?access_token=#{access_token}",
       {
         device_identifier: device_identifier,
         comment:           comment

data/lib/wechat/shake_around/beacon_page_relation.rb

@@ -1,8 +1,7 @@
-require 'jsonclient'
-
 class Wechat::ShakeAround::BeaconPageRelation
 
-  extend ::Wechat::ShakeAround::Common
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
 
   # 删除设备与页面的关联关系
   # http://mp.weixin.qq.com/wiki/12/c8120214ec0ba08af5dfcc0da1a11400.html
@@ -20,13 +19,17 @@ class Wechat::ShakeAround::BeaconPageRelation
   # append 新增操作标志位，0为覆盖，1为新增
   def self.destroy(access_token, device_id, page_id)
 
+    assert_present! :access_token, access_token
+    assert_present! :device_id,    device_id
+    assert_present! :page_id,      page_id
+
     device_identifier = normalize_device_id device_id
     page_ids          = normalize_page_ids  page_id
 
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/bindpage?access_token=#{access_token}",
+    message = post_json "https://api.weixin.qq.com/shakearound/device/bindpage?access_token=#{access_token}", body:
       {
         device_identifier: device_identifier,
-        page_ids:          page_ids, 
+        page_ids:          page_ids,
         bind:              0,
         append:            0
       }
@@ -49,13 +52,17 @@ class Wechat::ShakeAround::BeaconPageRelation
   # append 新增操作标志位，0为覆盖，1为新增
   def self.create(access_token, device_id, page_id)
 
+    assert_present! :access_token, access_token
+    assert_present! :device_id,    device_id
+    assert_present! :page_id,      page_id
+
     device_identifier = normalize_device_id device_id
     page_ids          = normalize_page_ids  page_id
 
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/bindpage?access_token=#{access_token}",
+    message = post_json "https://api.weixin.qq.com/shakearound/device/bindpage?access_token=#{access_token}", body:
       {
         device_identifier: device_identifier,
-        page_ids:          page_ids, 
+        page_ids:          page_ids,
         bind:              1,
         append:            1
       }

data/lib/wechat/shake_around/beacon_poi_relation.rb

@@ -1,8 +1,7 @@
-require 'jsonclient'
-
 class Wechat::ShakeAround::BeaconPoiRelation
 
-  extend ::Wechat::ShakeAround::Common
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
 
   # 配置设备与门店的关联关系
   # http://mp.weixin.qq.com/wiki/15/b9e012f917e3484b7ed02771156411f3.html#.E9.85.8D.E7.BD.AE.E8.AE.BE.E5.A4.87.E4.B8.8E.E9.97.A8.E5.BA.97.E7.9A.84.E5.85.B3.E8.81.94.E5.85.B3.E7.B3.BB
@@ -16,8 +15,13 @@ class Wechat::ShakeAround::BeaconPoiRelation
   #
   # device_id is an integer or a hash like { uuid: <UUID>, major: <MAJOR>, minor: <MINOR> }.
   def self.create(access_token, device_id, poi_id)
+
+    assert_present! :access_token, access_token
+    assert_present! :device_id,    device_id
+    assert_present! :poi_id,       poi_id
+
     device_identifier = self.normalize_device_id device_id
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/bindlocation?access_token=#{access_token}",
+    message = post_json "https://api.weixin.qq.com/shakearound/device/bindlocation?access_token=#{access_token}", body:
       {
         device_identifier: device_identifier,
         poi_id:            poi_id.to_i

data/lib/wechat/shake_around/common.rb

@@ -81,7 +81,6 @@ module Wechat::ShakeAround::Common
   def normalize_date(date)
     date = Date.parse date if date.is_a? String
     date.to_time.to_i
-    # date.to_datetime
   end
 
   def normalize_device_id(device_id)

data/lib/wechat/shake_around/device_daily_report.rb

@@ -1,8 +1,7 @@
-require 'jsonclient'
-
 class Wechat::ShakeAround::DeviceDailyReport
 
-  extend ::Wechat::ShakeAround::Common
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
 
   # 以设备为维度的数据统计接口
   # http://mp.weixin.qq.com/wiki/0/8a24bcacad40fe7ee98d1573cb8a6764.html#.E4.BB.A5.E8.AE.BE.E5.A4.87.E4.B8.BA.E7.BB.B4.E5.BA.A6.E7.9A.84.E6.95.B0.E6.8D.AE.E7.BB.9F.E8.AE.A1.E6.8E.A5.E5.8F.A3
@@ -28,9 +27,13 @@ class Wechat::ShakeAround::DeviceDailyReport
   # date_range is a string range like 'yyyy-mm-dd'..'yyyy-mm-dd'.
   def self.index(access_token, device_id, date_range)
 
+    assert_present! :access_token, access_token
+    assert_present! :device_id,    device_id
+    assert_present! :date_range,   date_range
+
     device_identifier = normalize_device_id device_id
 
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/statistics/device?access_token=#{access_token}",
+    message = post_json "https://api.weixin.qq.com/shakearound/statistics/device?access_token=#{access_token}", body:
       {
         device_identifier: device_identifier,
         begin_date:        normalize_date(date_range.min), 

data/lib/wechat/shake_around/device_group_relation.rb

@@ -1,8 +1,7 @@
-require 'jsonclient'
-
 class Wechat::ShakeAround::DeviceGroupRelation
 
-  extend ::Wechat::ShakeAround::Common
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
 
   # 从分组中移除设备
   # http://mp.weixin.qq.com/wiki/10/9f6b498b6aa0eb5ef6b9ab5a70cc8fba.html#.E4.BB.8E.E5.88.86.E7.BB.84.E4.B8.AD.E7.A7.BB.E9.99.A4.E8.AE.BE.E5.A4.87
@@ -16,8 +15,13 @@ class Wechat::ShakeAround::DeviceGroupRelation
   #
   # device_id is an integer or a hash like { uuid: <UUID>, major: <MAJOR>, minor: <MINOR> }.
   def self.destroy(access_token, device_id, group_id)
+
+    assert_present! :access_token, access_token
+    assert_present! :device_id,    device_id
+    assert_present! :group_id,     group_id
+
     device_identifier = normalize_device_id device_id
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/group/deletedevice?access_token=#{access_token}",
+    message = post_json "https://api.weixin.qq.com/shakearound/device/group/deletedevice?access_token=#{access_token}", body:
       {
         group_id:           group_id.to_i,
         device_identifiers: [ device_identifier ]
@@ -38,8 +42,13 @@ class Wechat::ShakeAround::DeviceGroupRelation
   # device_id is an integer or a hash like { uuid: <UUID>, major: <MAJOR>, minor: <MINOR> }.
   # 每个分组能够持有的设备上限为10000，并且每次添加操作的添加上限为1000。
   def self.create(access_token, device_id, group_id)
+
+    assert_present! :access_token, access_token
+    assert_present! :device_id,    device_id
+    assert_present! :group_id,     group_id
+
     device_identifier = normalize_device_id device_id
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/group/adddevice?access_token=#{access_token}",
+    message = post_json "https://api.weixin.qq.com/shakearound/device/group/adddevice?access_token=#{access_token}", body:
       {
         group_id:           group_id.to_i,
         device_identifiers: [ device_identifier ]

data/lib/wechat/shake_around/device_report.rb

@@ -1,8 +1,7 @@
-require 'jsonclient'
-
 class Wechat::ShakeAround::DeviceReport
 
-  extend ::Wechat::ShakeAround::Common
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
 
   # 批量查询设备统计数据接口
   # http://mp.weixin.qq.com/wiki/0/8a24bcacad40fe7ee98d1573cb8a6764.html#.E6.89.B9.E9.87.8F.E6.9F.A5.E8.AF.A2.E8.AE.BE.E5.A4.87.E7.BB.9F.E8.AE.A1.E6.95.B0.E6.8D.AE.E6.8E.A5.E5.8F.A3
@@ -36,7 +35,12 @@ class Wechat::ShakeAround::DeviceReport
   # date:       指定查询日期时间戳，单位为秒。
   # page_index: 指定查询的结果页序号；返回结果按摇周边人数降序排序，每50条记录为一页，从1开始。
   def self.index(access_token, date, page_index = 1)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/statistics/devicelist?access_token=#{access_token}",
+
+    assert_present! :access_token, access_token
+    assert_present! :date,         date
+    assert_present! :page_index,   page_index
+
+    message = post_json "https://api.weixin.qq.com/shakearound/statistics/devicelist?access_token=#{access_token}", body:
       {
         date:       normalize_date(date), 
         page_index: page_index.to_i

data/lib/wechat/shake_around/group.rb

@@ -1,8 +1,7 @@
-require 'jsonclient'
-
 class Wechat::ShakeAround::Group
 
-  extend ::Wechat::ShakeAround::Common
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
 
   # 查询分组列表
   # http://mp.weixin.qq.com/wiki/10/9f6b498b6aa0eb5ef6b9ab5a70cc8fba.html#.E6.9F.A5.E8.AF.A2.E5.88.86.E7.BB.84.E5.88.97.E8.A1.A8
@@ -27,8 +26,11 @@ class Wechat::ShakeAround::Group
   #
   # offset: 分组列表的起始索引值
   # limit: 待查询的分组数量，不能超过1000个
-  def self.index(access_token, offset = 0, limit = 1000)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/group/getlist?access_token=#{access_token}",
+  def self.index(access_token, offset: 0, limit: 1000)
+
+    assert_present! :access_token, access_token
+
+    message = post_json "https://api.weixin.qq.com/shakearound/device/group/getlist?access_token=#{access_token}", body:
       {
         begin: offset.to_i,
         count: limit.to_i
@@ -66,8 +68,12 @@ class Wechat::ShakeAround::Group
   # group_id: 分组唯一标识，全局唯一
   # offset: 分组里设备的起始索引值
   # limit: 待查询的分组里设备的数量，不能超过1000个
-  def self.load(access_token, group_id, offset = 0, limit = 1000)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/group/getdetail?access_token=#{access_token}",
+  def self.load(access_token, group_id, offset: 0, limit: 1000)
+
+    assert_present! :access_token, access_token
+    assert_present! :group_id,     group_id
+
+    message = post_json "https://api.weixin.qq.com/shakearound/device/group/getdetail?access_token=#{access_token}", body:
       {
         group_id: group_id.to_i,
         begin:    offset.to_i,
@@ -88,7 +94,11 @@ class Wechat::ShakeAround::Group
   #
   # group_id: 分组唯一标识，全局唯一
   def self.destroy(access_token, group_id)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/group/delete?access_token=#{access_token}", { group_id: group_id.to_i }
+
+    assert_present! :access_token, access_token
+    assert_present! :group_id,     group_id
+
+    message = post_json "https://api.weixin.qq.com/shakearound/device/group/delete?access_token=#{access_token}", body: { group_id: group_id.to_i }
     message.body
   end
 
@@ -105,7 +115,12 @@ class Wechat::ShakeAround::Group
   # group_id: 分组唯一标识，全局唯一
   # name: 分组名称，不超过100汉字或200个英文字母
   def self.update(access_token, group_id, name)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/group/update?access_token=#{access_token}",
+
+    assert_present! :access_token, access_token
+    assert_present! :group_id,     group_id
+    assert_present! :name,         name
+
+    message = post_json "https://api.weixin.qq.com/shakearound/device/group/update?access_token=#{access_token}", body:
       {
         group_id:   group_id.to_i,
         group_name: name
@@ -129,7 +144,11 @@ class Wechat::ShakeAround::Group
   #
   # name: 分组名称，不超过100汉字或200个英文字母
   def self.create(access_token, name)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/device/group/add?access_token=#{access_token}", { group_name: name }
+
+    assert_present! :access_token, access_token
+    assert_present! :name,         name
+
+    message = post_json "https://api.weixin.qq.com/shakearound/device/group/add?access_token=#{access_token}", body: { group_name: name }
     message.body
   end
 

data/lib/wechat/shake_around/icon.rb

@@ -1,7 +1,8 @@
 class Wechat::ShakeAround::Icon
 
-  extend ::Wechat::ShakeAround::Common
-  extend ::Wechat::ShakeAround::Material
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
+  extend Wechat::ShakeAround::Material
 
   # 上传图片素材
   # http://mp.weixin.qq.com/wiki/5/e997428269ff189d8f9a4b9e177be2d9.html
@@ -15,6 +16,10 @@ class Wechat::ShakeAround::Icon
   #
   # media 图片完整路径。
   def self.create(access_token, media)
+
+    assert_present! :access_token, access_token
+    assert_present! :media,        media
+
     upload access_token, media, 'icon'
   end
 

data/lib/wechat/shake_around/license.rb

@@ -1,20 +1,25 @@
 class Wechat::ShakeAround::License
 
-  extend ::Wechat::ShakeAround::Common
-  extend ::Wechat::ShakeAround::Material
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
+  extend Wechat::ShakeAround::Material
 
   # 上传图片素材
   # http://mp.weixin.qq.com/wiki/5/e997428269ff189d8f9a4b9e177be2d9.html
   #
   # Return hash format if success:
   # {
-  #   data:    { pic_url: <ICON_LINK> },
+  #   data:    { pic_url: <LICENSE_LINK> },
   #   errcode: 0,
   #   errmsg:  'success.'
   # }
   #
   # media 图片完整路径。
   def self.create(access_token, media)
+
+    assert_present! :access_token, access_token
+    assert_present! :media,        media
+
     upload access_token, media, 'license'
   end
 

data/lib/wechat/shake_around/material.rb

@@ -15,6 +15,11 @@ module Wechat::ShakeAround::Material
   # media 图片完整路径。
   # type 是icon或者license。
   def upload(access_token, media, type)
+
+    assert_present! :access_token, access_token
+    assert_present! :media,        media
+    assert_present! :type, type
+
     message = nil
     File.open(media) do |io|
       message = ::HTTPClient.new.post "https://api.weixin.qq.com/shakearound/material/add?access_token=#{access_token}&type=#{type}", { media: io }

data/lib/wechat/shake_around/page.rb

@@ -1,8 +1,7 @@
-require 'jsonclient'
-
 class Wechat::ShakeAround::Page
 
-  extend ::Wechat::ShakeAround::Common
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
 
   # 查询页面列表
   # http://mp.weixin.qq.com/wiki/5/6626199ea8757c752046d8e46cf13251.html#.E6.9F.A5.E8.AF.A2.E9.A1.B5.E9.9D.A2.E5.88.97.E8.A1.A8
@@ -29,7 +28,12 @@ class Wechat::ShakeAround::Page
   #   errmsg:      'success.'
   # }
   def self.index(access_token, offset, limit)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/page/search?access_token=#{access_token}",
+
+    assert_present! :access_token, access_token
+    assert_present! :offset,       offset
+    assert_present! :limit,        limit
+
+    message = post_json "https://api.weixin.qq.com/shakearound/page/search?access_token=#{access_token}", body:
       {
         type:  2, 
         begin: offset.to_i,
@@ -65,7 +69,11 @@ class Wechat::ShakeAround::Page
   #
   # page_id 可以是数字、整数或者它们的数组。
   def self.load(access_token, page_id)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/page/search?access_token=#{access_token}",
+
+    assert_present! :access_token, access_token
+    assert_present! :page_id,      page_id
+
+    message = post_json "https://api.weixin.qq.com/shakearound/page/search?access_token=#{access_token}", body:
       {
         type:     1,
         page_ids: normalize_page_ids(page_id)
@@ -83,7 +91,11 @@ class Wechat::ShakeAround::Page
   #   errmsg:  'success.'
   # }
   def self.destroy(access_token, page_id)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/page/delete?access_token=#{access_token}", { page_id: page_id.to_i }
+
+    assert_present! :access_token, access_token
+    assert_present! :page_id,      page_id
+
+    message = post_json "https://api.weixin.qq.com/shakearound/page/delete?access_token=#{access_token}", body: { page_id: page_id.to_i }
     message.body
   end
 
@@ -102,7 +114,16 @@ class Wechat::ShakeAround::Page
   # comment     页面的备注信息，不超过15个汉字或30个英文字母。
   # icon_link   在摇一摇页面展示的图片。图片需先上传至微信侧服务器，用“素材管理-上传图片素材”接口上传图片，返回的图片URL再配置在此处。 
   def self.update(access_token, page_id, title, description, comment, page_link, icon_link)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/page/update?access_token=#{access_token}",
+
+    assert_present! :access_token, access_token
+    assert_present! :page_id,      page_id
+    assert_present! :title,        title
+    assert_present! :description,  description
+    assert_present! :comment,      comment
+    assert_present! :page_link,    page_link
+    assert_present! :icon_link,    icon_link
+
+    message = post_json "https://api.weixin.qq.com/shakearound/page/update?access_token=#{access_token}", body:
       {
         page_id:     page_id.to_i,
         title:       title,
@@ -129,7 +150,15 @@ class Wechat::ShakeAround::Page
   # comment     页面的备注信息，不超过15个汉字或30个英文字母。
   # icon_link   在摇一摇页面展示的图片。图片需先上传至微信侧服务器，用“素材管理-上传图片素材”接口上传图片，返回的图片URL再配置在此处。 
   def self.create(access_token, title, description, comment, page_link, icon_link)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/page/add?access_token=#{access_token}",
+
+    assert_present! :access_token, access_token
+    assert_present! :title,        title
+    assert_present! :description,  description
+    assert_present! :comment,      comment
+    assert_present! :page_link,    page_link
+    assert_present! :icon_link,    icon_link
+
+    message = post_json "https://api.weixin.qq.com/shakearound/page/add?access_token=#{access_token}", body:
       {
         title:       title,
         description: description,

data/lib/wechat/shake_around/page_daily_report.rb

@@ -1,8 +1,7 @@
-require 'jsonclient'
-
 class Wechat::ShakeAround::PageDailyReport
 
-  extend ::Wechat::ShakeAround::Common
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
 
   # 以页面为维度的数据统计接口
   # http://mp.weixin.qq.com/wiki/0/8a24bcacad40fe7ee98d1573cb8a6764.html#.E4.BB.A5.E9.A1.B5.E9.9D.A2.E4.B8.BA.E7.BB.B4.E5.BA.A6.E7.9A.84.E6.95.B0.E6.8D.AE.E7.BB.9F.E8.AE.A1.E6.8E.A5.E5.8F.A3
@@ -28,7 +27,11 @@ class Wechat::ShakeAround::PageDailyReport
   # date_range is a string range like 'yyyy-mm-dd'..'yyyy-mm-dd'.
   def self.index(access_token, page_id, date_range)
 
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/statistics/page?access_token=#{access_token}",
+    assert_present! :access_token, access_token
+    assert_present! :page_id,      page_id
+    assert_present! :date_range,   date_range
+
+    message = post_json "https://api.weixin.qq.com/shakearound/statistics/page?access_token=#{access_token}", body:
       {
         page_id:    page_id.to_i,
         begin_date: normalize_date(date_range.min), 

data/lib/wechat/shake_around/page_report.rb

@@ -1,8 +1,7 @@
-require 'jsonclient'
-
 class Wechat::ShakeAround::PageReport
 
-  extend ::Wechat::ShakeAround::Common
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
 
   # 批量查询页面统计数据接口
   # http://mp.weixin.qq.com/wiki/0/8a24bcacad40fe7ee98d1573cb8a6764.html#.E6.89.B9.E9.87.8F.E6.9F.A5.E8.AF.A2.E9.A1.B5.E9.9D.A2.E7.BB.9F.E8.AE.A1.E6.95.B0.E6.8D.AE.E6.8E.A5.E5.8F.A3
@@ -32,8 +31,13 @@ class Wechat::ShakeAround::PageReport
   #
   # date:       指定查询日期时间戳，单位为秒。
   # page_index: 指定查询的结果页序号；返回结果按摇周边人数降序排序，每50条记录为一页 ，从1开始。
-  def self.index(access_token, date, page_index = 1)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/statistics/pagelist?access_token=#{access_token}",
+  def self.index(access_token, date, page_index: 1)
+
+    assert_present! :access_token, access_token
+    assert_present! :date,         date
+    assert_present! :page_index,   page_index
+
+    message = post_json "https://api.weixin.qq.com/shakearound/statistics/pagelist?access_token=#{access_token}", body:
       {
         date:       normalize_date(date), 
         page_index: page_index.to_i

data/lib/wechat/shake_around/registration.rb

@@ -1,8 +1,7 @@
-require 'jsonclient'
-
 class Wechat::ShakeAround::Registration
 
-  extend ::Wechat::ShakeAround::Common
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
 
   # 查询审核状态
   # http://mp.weixin.qq.com/wiki/13/025f1d471dc999928340161c631c6635.html#.E6.9F.A5.E8.AF.A2.E5.AE.A1.E6.A0.B8.E7.8A.B6.E6.80.81
@@ -24,7 +23,10 @@ class Wechat::ShakeAround::Registration
   # audit_status:  0：审核未通过、1：审核中、2：审核已通过
   # audit_time:    确定审核结果的时间戳；若状态为审核中，则该时间值为0
   def self.load(access_token)
-    message = ::JSONClient.new.get "https://api.weixin.qq.com/shakearound/account/auditstatus?access_token=#{access_token}"
+
+    assert_present! :access_token, access_token
+
+    message = get_json "https://api.weixin.qq.com/shakearound/account/auditstatus?access_token=#{access_token}"
     message.body
   end
 
@@ -42,7 +44,13 @@ class Wechat::ShakeAround::Registration
   #   errmsg:  'success.'
   # }
   def self.create(access_token, name, phone_number, email, industry_id, qualification_links, apply_reason)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/account/register?access_token=#{access_token}",
+
+    assert_present! :access_token, access_token
+    assert_present! :name,         name
+    assert_present! :phone_number, phone_number
+    assert_present! :email,        email
+
+    message = post_json "https://api.weixin.qq.com/shakearound/account/register?access_token=#{access_token}", body:
       {
         name:                    name,
         phone_number:            phone_number,

data/lib/wechat/shake_around/shaking.rb

@@ -1,8 +1,10 @@
-require 'jsonclient'
+##
+# 微信摇一摇周边的摇动封装类。
 
 class Wechat::ShakeAround::Shaking
 
-  extend ::Wechat::ShakeAround::Common
+  extend Wechat::Core::Common
+  extend Wechat::ShakeAround::Common
 
   # 获取摇周边的设备及用户信息
   # http://mp.weixin.qq.com/wiki/3/34904a5db3d0ec7bb5306335b8da1faf.html
@@ -26,7 +28,11 @@ class Wechat::ShakeAround::Shaking
   #   errmsg:  'success.'
   # }
   def self.load(access_token, ticket)
-    message = ::JSONClient.new.post "https://api.weixin.qq.com/shakearound/user/getshakeinfo?access_token=#{access_token}",
+
+    assert_present! :access_token, access_token
+    assert_present! :ticket,       ticket
+
+    message = post_json "https://api.weixin.qq.com/shakearound/user/getshakeinfo?access_token=#{access_token}", body:
       {
         ticket:   ticket,
         need_poi: 1

data/lib/wechat/shake_around/version.rb

@@ -1,5 +1,5 @@
 module Wechat
   module ShakeAround
-    VERSION = '0.9'.freeze
+    VERSION = '0.9.1'.freeze
   end
 end

data/wechat-shake_around.gemspec

@@ -27,9 +27,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = [ 'lib' ]
 
   spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rake',    '~> 11.0'
+  spec.add_development_dependency 'rspec',   '~> 3.0'
 
-  spec.add_dependency 'httpclient', '~> 2.7'
+  spec.add_dependency 'httpclient', '>= 2.8'
+  spec.add_dependency 'wechat-core', '~> 0.4'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat-shake_around
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: 0.9.1
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -54,18 +54,32 @@ dependencies:
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: wechat-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0.4'
 description: Wechat Shake Around Library is a wrapper for calling the Shake Around
   APIs. 微信摇周边库封装了微信摇周边API的调用。
 email:
@@ -80,10 +94,12 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - ROADMAP.md
 - Rakefile
+- _config.yml
 - bin/console
 - bin/setup
 - lib/wechat/shake_around.rb
@@ -126,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Wechat Shake Around Library 微信摇周边库