weixin_authorize 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a664fbdb47c8a23894a9fe8274f279e332b13152
-  data.tar.gz: b574af19ee28f8c01445b2ea886bcb727b4772f5
+  metadata.gz: 7c62ee0327cea856b56ef05e830a8f86ccf630b7
+  data.tar.gz: fbca80ea0873544e0ec14da9dec434546658cef1
 SHA512:
-  metadata.gz: 0062efdc2953202e3c42f3375421f00d81fee3586762cc1f231247daa7e1466adc7aa98f9511379d48a7b5a68cb3a535e5554bf723b58617ce24d13f6b7b52a2
-  data.tar.gz: 7060bc6ca0a181667f2be177b3b1ff750a566eb86c7adedf73d0dc572d47afe23a24ccc5875e619e32e8266808db21e58d911b00e2675260e404307b8ad5df27
+  metadata.gz: 3383868121cf735194d4b19df846f8f421329ddcd9f52ec079c888a1e7e38486e94a60055910f24a6548183ed07b4b0533beb21317a6c95c6e997581a6738d05
+  data.tar.gz: 6efe789d011da30d79986fd8110f93735265ae7897c6a585749e6212f1d29fd2b6026c812a404e3637634641dd0404f8de71ff0be831b94cbf120bbacff20052

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 *DS_Store
+.ruby-version

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-bundler_args: --without development
+bundler_args:
 rvm:
   - 2.0.0
 script:

data/Gemfile

@@ -1,17 +1,5 @@
 source 'https://rubygems.org'
 
-group :test, :development do
-  gem "rspec"
-  gem 'redis-namespace'
-  gem 'simplecov', '~> 0.7.1', :require => false
-  gem "codeclimate-test-reporter", require: nil
-  gem 'coveralls', require: false
-  # For debugger
-  gem "pry-rails"
-
-  gem "pry-byebug"
-end
-
 # Specify your gem's dependencies in weixin_authorize.gemspec
 gemspec
 

data/README.md

@@ -13,6 +13,10 @@ Support using [Redis](http://redis.io) to store `access_token`
 
 [JS SDK](https://github.com/lanrion/weixin_authorize/wiki/js-sdk)
 
+## 支持自助实现API
+
+详情见：https://github.com/lanrion/weixin_authorize/wiki/diy-your-api
+
 ## 已经完成API
 
 * 客服消息
@@ -25,8 +29,9 @@ Support using [Redis](http://redis.io) to store `access_token`
 * 群发消息
 * 多媒体管理
 * JS SDK（ticket支持缓存）
+* 更多请查看测试例子
 
-## V2.0开发中： 
+## V2.0开发中：
 https://github.com/lanrion/weixin_authorize/milestones/v2.0-dev
 
 1. 重构API实现，调用方式
@@ -42,7 +47,7 @@ Go to https://github.com/lanrion/weixin_authorize/issues/2, apply a weixin sandb
 
 https://github.com/lanrion/weixin_authorize/blob/master/spec/spec_helper.rb
 
-change your infos: 
+change your infos:
 
 ```ruby
 ENV["APPID"]="wxe371e0960de5426a"
@@ -64,4 +69,4 @@ then run `rspec .`
 
   如果你觉得我的gem对你有帮助，欢迎打赏支持，:smile:
 
-  ![](https://raw.githubusercontent.com/lanrion/my_config/master/imagex/donation_me.png)
+  ![](https://raw.githubusercontent.com/lanrion/my_config/master/imagex/donation_me_wx.jpg)

data/lib/weixin_authorize.rb

@@ -1,6 +1,11 @@
 require "rest-client"
 require "carrierwave"
-require 'yajl/json_gem'
+if defined? Yajl
+  require 'yajl/json_gem'
+else
+  require "json"
+end
+require "erb"
 
 require "weixin_authorize/carrierwave/weixin_uploader"
 require "weixin_authorize/config"
@@ -23,21 +28,26 @@ module WeixinAuthorize
     autoload(:RedisStore,  "weixin_authorize/js_ticket/redis_store")
   end
 
-  OK_MSG  = "ok"
-  OK_CODE = 0
-  GRANT_TYPE = "client_credential"
+  OK_MSG  = "ok".freeze
+  OK_CODE = 0.freeze
+  GRANT_TYPE = "client_credential".freeze
+  # 用于标记endpoint可以直接使用url作为完整请求API
+  CUSTOM_ENDPOINT = "custom_endpoint".freeze
 
   class << self
 
-    def http_get_without_token(url, headers={}, endpoint="plain")
+    def http_get_without_token(url, url_params={}, endpoint="plain")
       get_api_url = endpoint_url(endpoint, url)
-      load_json(resource(get_api_url).get(params: headers))
+      load_json(resource(get_api_url).get(params: url_params))
     end
 
-    def http_post_without_token(url, payload={}, headers={}, endpoint="plain")
+    def http_post_without_token(url, post_body={}, url_params={}, endpoint="plain")
       post_api_url = endpoint_url(endpoint, url)
-      payload = JSON.dump(payload) if endpoint == "plain" # to json if invoke "plain"
-      load_json(resource(post_api_url).post(payload, params: headers))
+      # to json if invoke "plain"
+      if endpoint == "plain" || endpoint == CUSTOM_ENDPOINT
+        post_body = JSON.dump(post_body)
+      end
+      load_json(resource(post_api_url).post(post_body, params: url_params))
     end
 
     def resource(url)
@@ -46,13 +56,15 @@ module WeixinAuthorize
 
     # return hash
     def load_json(string)
-      result_hash = JSON.parse(string)
+      result_hash = JSON.parse(string.force_encoding("UTF-8").gsub(/[\u0011-\u001F]/, ""))
       code   = result_hash.delete("errcode")
       en_msg = result_hash.delete("errmsg")
       ResultHandler.new(code, en_msg, result_hash)
     end
 
     def endpoint_url(endpoint, url)
+      # 此处为了应对第三方开发者如果自助对接接口时，URL不规范的情况下，可以直接使用URL当为endpoint
+      return url if endpoint == CUSTOM_ENDPOINT
       send("#{endpoint}_endpoint") + url
     end
 

data/lib/weixin_authorize/api/custom.rb

@@ -3,6 +3,8 @@ module WeixinAuthorize
   module Api
     module Custom
 
+      CUSTOM_SERVICE = "https://api.weixin.qq.com/customservice".freeze
+
       # 发送文本消息
       # {
       #     "touser":"OPENID",
@@ -108,6 +110,41 @@ module WeixinAuthorize
         http_post(custom_base_url, message)
       end
 
+      # 官方示例：{endtime: 1439571890, pageindex: 1, pagesize: 10, starttime: 1438707864}
+      # options:
+      # page_index: 查询第几页，从1开始
+      # page_size: 每页大小，每页最多拉取50条
+      CUSTOM_RECORD_URL = "#{CUSTOM_SERVICE}/msgrecord/getrecord".freeze
+      def get_custom_msg_record(start_time, end_time, options={})
+        start_time, end_time = start_time.to_i, end_time.to_i
+        page_index = options[:page_index] || 1
+        page_size  = options[:page_size]  || 50
+        option = {
+          endtime: end_time,
+          starttime: start_time,
+          pageindex: page_index,
+          pagesize: page_size
+        }
+        http_post(CUSTOM_RECORD_URL, option, {}, CUSTOM_ENDPOINT)
+      end
+
+      # 客服接口创建会话
+      # POST数据示例如下：
+      #  {
+      #     "kf_account" : "test1@test",
+      #     "openid" : "OPENID",
+      #     "text" : "这是一段附加信息"
+      #  }
+      KF_SESSION_URL = "#{CUSTOM_SERVICE}/kfsession/create".freeze
+      def create_kf_session(account, open_id, text)
+        post_body = {
+          kf_account: account,
+          openid: open_id,
+          text: text
+        }
+        http_post(KF_SESSION_URL, post_body, {}, CUSTOM_ENDPOINT)
+      end
+
       private
 
         # https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token=ACCESS_TOKEN

data/lib/weixin_authorize/api/groups.rb

@@ -38,6 +38,17 @@ module WeixinAuthorize
         http_post(group_url, {openid: openid, to_groupid: to_groupid})
       end
 
+      # 批量移动用户分组
+      def batch_update_group_for_openids(openids, group_id)
+        group_url = "#{group_base_url}/members/batchupdate"
+        http_post(group_url, {openid_list: openids, to_groupid: group_id})
+      end
+
+      def delete_group(group_id)
+        group_url = "#{group_base_url}/delete"
+        http_post(group_url, {group: {id: group_id}})
+      end
+
       private
 
         def group_base_url

data/lib/weixin_authorize/api/mass.rb

@@ -3,12 +3,12 @@ module WeixinAuthorize
   module Api
     module Mass
 
-      MSG_TYPE = ["mpnews", "image", "text", "voice", "mpvideo"]
+      MSG_TYPE = ["mpnews", "image", "text", "voice", "mpvideo"].freeze
 
       # media_info= {"media_id" media_id}
       # https://api.weixin.qq.com/cgi-bin/message/mass/sendall?access_token=ACCESS_TOKEN
       def mass_with_group(group_id, media_info, msgtype="mpnews", is_to_all=false)
-        group_option = {"filter" => {"group_id" => group_id.to_s, "is_to_all" => is_to_all}}
+        group_option = {filter: {group_id: group_id, is_to_all: is_to_all}}
         media = generate_media(msgtype, media_info, group_option)
 
         mass_url = "#{mass_base_url}/sendall"
@@ -19,7 +19,7 @@ module WeixinAuthorize
       # if mpvideo,
       # media_info= {"media_id" => media_id, "title" => "title", "description" => "description"}
       def mass_with_openids(openids, media_info, msgtype="mpnews")
-        openid_option = {"touser" => openids}
+        openid_option = {touser: openids}
         media = generate_media(msgtype, media_info, openid_option)
         mass_url = "#{mass_base_url}/send"
         http_post(mass_url, media)
@@ -29,13 +29,13 @@ module WeixinAuthorize
        # 另外，删除群发消息只能删除图文消息和视频消息，其他类型的消息一经发送，无法删除。
       def mass_delete_with_msgid(msg_id)
         mass_url = "#{mass_base_url}/delete"
-        http_post(mass_url, {"msg_id" => msg_id})
+        http_post(mass_url, {msg_id: msg_id})
       end
 
       # 预览接口【订阅号与服务号认证后均可用】
-      def mass_preview(openid, media_info, msgtype="mpnews")
-        openid_option = {"touser" => openid}
-        media = generate_media(msgtype, media_info, openid_option)
+      def mass_preview(openid, media_info, msg_type="mpnews")
+        openid_option = {touser: openid}
+        media = generate_media(msg_type, media_info, openid_option)
         mass_url = "#{mass_base_url}/preview"
         http_post(mass_url, media)
       end
@@ -52,22 +52,24 @@ module WeixinAuthorize
           "/message/mass"
         end
 
-        def generate_media(msgtype, media_info, option)
-          msgtype = msgtype.to_s
-          raise "#{msgtype} is a valid msgtype" if not MSG_TYPE.include?(msgtype)
+        def generate_media(msg_type, media_info, option)
+          msg_type = msg_type.to_s
+          if not MSG_TYPE.include?(msg_type)
+            raise MediaTypeException, "#{msg_type} is a invalid msg_type"
+          end
           {
-            msgtype   => convert_media_info(msgtype, media_info),
-            "msgtype" => msgtype
+            msg_type  => convert_media_info(msg_type, media_info),
+            "msgtype" => msg_type
           }.merge(option)
         end
 
         # 如果用户填写的media信息，是字符串，则转换来符合的数据结构，如果 是hash，则直接使用用户的结构。
-        def convert_media_info(msgtype, media_info)
+        def convert_media_info(msg_type, media_info)
           if media_info.is_a?(String)
-            if msgtype == "text"
-              return {"content" => media_info}
+            if msg_type == "text"
+              return {content: media_info}
             else
-              return {"media_id" => media_info}
+              return {media_id: media_info}
             end
           end
           media_info

data/lib/weixin_authorize/api/media.rb

@@ -68,6 +68,19 @@ module WeixinAuthorize
         http_post("#{media_base_url}/uploadvideo", video_msg)
       end
 
+      # 上传图文消息内的图片获取URL
+      # https://api.weixin.qq.com/cgi-bin/media/uploadimg?access_token=ACCESS_TOKEN
+      #
+      # return:
+      # {
+      #   "url":  "http://mmbiz.qpic.cn/mmbiz/gLO17UPS6FS2xsypf378iaNhWacZ1G1UplZYWEYfwvuU6Ont96b1roYs CNFwaRrSaKTPCUdBK9DgEHicsKwWCBRQ/0"
+      # }
+      def upload_image(image)
+        file = process_file(image)
+        upload_image_url = "#{media_base_url}/uploadimg"
+        http_post(upload_image_url, {media: file}, {type: 'image'}, 'file')
+      end
+
       private
 
         def media_base_url

data/lib/weixin_authorize/api/oauth.rb

@@ -3,6 +3,13 @@ module WeixinAuthorize
   module Api
     module Oauth
 
+      # 网站应用微信登录授权URL
+      # 文档：http://t.cn/RyZVWEY
+      def qrcode_authorize_url(redirect_uri, scope="snsapi_login", state="web_wx_login")
+        uri = encode_url(redirect_uri)
+        WeixinAuthorize.open_endpoint("/connect/qrconnect?appid=#{app_id}&redirect_uri=#{uri}&response_type=code&scope=#{scope}&state=#{state}#wechat_redirect")
+      end
+
       # 应用授权作用域: scope
       # snsapi_base （不弹出授权页面，直接跳转，只能获取用户openid），
       # snsapi_userinfo （弹出授权页面，可通过openid拿到昵称、性别、所在地。并且，即使在未关注的情况下，只要用户授权，也能获取其信息）
@@ -11,9 +18,8 @@ module WeixinAuthorize
 
       # 如果用户点击同意授权，页面将跳转至 redirect_uri/?code=CODE&state=STATE。若用户禁止授权，则重定向后不会带上code参数，仅会带上state参数redirect_uri?state=STATE
       def authorize_url(redirect_uri, scope="snsapi_base", state="weixin")
-        require "erb"
-        redirect_uri = ERB::Util.url_encode(redirect_uri)
-        WeixinAuthorize.open_endpoint("/connect/oauth2/authorize?appid=#{app_id}&redirect_uri=#{redirect_uri}&response_type=code&scope=#{scope}&state=#{state}#wechat_redirect")
+        uri = encode_url(redirect_uri)
+        WeixinAuthorize.open_endpoint("/connect/oauth2/authorize?appid=#{app_id}&redirect_uri=#{uri}&response_type=code&scope=#{scope}&state=#{state}#wechat_redirect")
       end
 
       # 首先请注意，这里通过code换取的网页授权access_token,与基础支持中的access_token不同。公众号可通过下述接口来获取网页授权access_token。如果网页授权的作用域为snsapi_base，则本步骤中获取到网页授权access_token的同时，也获取到了openid，snsapi_base式的网页授权流程即到此为止。
@@ -33,6 +39,12 @@ module WeixinAuthorize
         WeixinAuthorize.http_get_without_token("/sns/userinfo?access_token=#{oauth_token}&openid=#{openid}&lang=#{lang}", {}, "api")
       end
 
+      private
+
+        def encode_url(uri)
+          ERB::Util.url_encode(uri)
+        end
+
     end
   end
 end

data/lib/weixin_authorize/api/user.rb

@@ -29,11 +29,11 @@ module WeixinAuthorize
       # }
       def update_remark(openid, remark)
         update_url = "/user/info/updateremark"
-        payload = {
+        post_body = {
           openid: openid,
           remark: remark
         }
-        http_post(update_url, payload)
+        http_post(update_url, post_body)
       end
 
       private

data/lib/weixin_authorize/client.rb

@@ -1,9 +1,13 @@
 # encoding: utf-8
+require "monitor"
 require "redis"
 require 'digest/md5'
 module WeixinAuthorize
 
   class Client
+
+    include MonitorMixin
+
     include Api::User
     include Api::Menu
     include Api::Custom
@@ -15,24 +19,29 @@ module WeixinAuthorize
     include Api::Template
 
     attr_accessor :app_id, :app_secret, :expired_at # Time.now + expires_in
-    attr_accessor :access_token, :redis_key
+    attr_accessor :access_token, :redis_key, :custom_access_token
     attr_accessor :jsticket, :jsticket_expired_at, :jsticket_redis_key
 
-    def initialize(app_id, app_secret, redis_key=nil)
-      @app_id     = app_id
+    # options: redis_key, custom_access_token
+    def initialize(app_id, app_secret, options={})
+      @app_id = app_id
       @app_secret = app_secret
       @jsticket_expired_at = @expired_at = Time.now.to_i
-      @redis_key  = security_redis_key(redis_key || "weixin_#{app_id}")
+      @redis_key = security_redis_key(options[:redis_key] || "weixin_#{app_id}")
       @jsticket_redis_key = security_redis_key("js_sdk_#{app_id}")
+      @custom_access_token = options[:custom_access_token]
+      super() # Monitor#initialize
     end
 
     # return token
     def get_access_token
-      token_store.access_token
+      return custom_access_token if !custom_access_token.nil?
+      synchronize{ token_store.access_token }
     end
 
     # 检查appid和app_secret是否有效。
     def is_valid?
+      return true if !custom_access_token.nil?
       token_store.valid?
     end
 
@@ -62,14 +71,14 @@ module WeixinAuthorize
     end
 
     # 暴露出：http_get,http_post两个方法，方便第三方开发者扩展未开发的微信API。
-    def http_get(url, headers={}, endpoint="plain")
-      headers = headers.merge(access_token_param)
-      WeixinAuthorize.http_get_without_token(url, headers, endpoint)
+    def http_get(url, url_params={}, endpoint="plain")
+      url_params = url_params.merge(access_token_param)
+      WeixinAuthorize.http_get_without_token(url, url_params, endpoint)
     end
 
-    def http_post(url, payload={}, headers={}, endpoint="plain")
-      headers = access_token_param.merge(headers)
-      WeixinAuthorize.http_post_without_token(url, payload, headers, endpoint)
+    def http_post(url, post_body={}, url_params={}, endpoint="plain")
+      url_params = access_token_param.merge(url_params)
+      WeixinAuthorize.http_post_without_token(url, post_body, url_params, endpoint)
     end
 
     private

data/lib/weixin_authorize/handler/exceptions.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 module WeixinAuthorize
-
-class ValidAccessTokenException < RuntimeError
-end
-
+  class ValidAccessTokenException < RuntimeError;end
+  class MediaTypeException < RuntimeError;end
 end

data/lib/weixin_authorize/handler/global_code.rb

@@ -83,7 +83,45 @@ module WeixinAuthorize
     46004 => "不存在的用户",
     47001 => "解析JSON/XML内容错误",
     48001 => "api功能未授权",
-    50001 => "用户未授权该api"
+    50001 => "用户未授权该api",
+    50002 => "用户受限，可能是违规后接口被封禁",
+    61451 => "参数错误(invalid parameter)",
+    61452 => "无效客服账号(invalid kf_account)",
+    61453 => "客服帐号已存在(kf_account exsited)",
+    61454 => "客服帐号名长度超过限制(仅允许10个英文字符，不包括@及@后的公众号的微信号)(invalid kf_acount length)",
+    61455 => "客服帐号名包含非法字符(仅允许英文+数字)(illegal character in kf_account)",
+    61456 => "客服帐号个数超过限制(10个客服账号)(kf_account count exceeded)",
+    61457 => "无效头像文件类型(invalid file type)",
+    61450 => "系统错误(system error)",
+    61500 => "日期格式错误",
+    61501 => "日期范围错误",
+    9001001 => "POST数据参数不合法",
+    9001002 => "远端服务不可用",
+    9001003 => "Ticket不合法",
+    9001004 => "获取摇周边用户信息失败",
+    9001005 => "获取商户信息失败",
+    9001006 => "获取OpenID失败",
+    9001007 => "上传文件缺失",
+    9001008 => "上传素材的文件类型不合法",
+    9001009 => "上传素材的文件尺寸不合法",
+    9001010 => "上传失败",
+    9001020 => "帐号不合法",
+    9001021 => "已有设备激活率低于50%，不能新增设备",
+    9001022 => "设备申请数不合法，必须为大于0的数字",
+    9001023 => "已存在审核中的设备ID申请",
+    9001024 => "一次查询设备ID数量不能超过50",
+    9001025 => "设备ID不合法",
+    9001026 => "页面ID不合法",
+    9001027 => "页面参数不合法",
+    9001028 => "一次删除页面ID数量不能超过10",
+    9001029 => "页面已应用在设备中，请先解除应用关系再删除",
+    9001030 => "一次查询页面ID数量不能超过50",
+    9001031 => "时间区间不合法",
+    9001032 => "保存设备与页面的绑定关系参数错误",
+    9001033 => "门店ID不合法",
+    9001034 => "设备备注信息过长",
+    9001035 => "设备申请参数不合法",
+    9001036 => "查询起始值begin不合法"
   }unless defined?(GLOBAL_CODES)
 
 end

data/lib/weixin_authorize/token/redis_store.rb

@@ -14,8 +14,11 @@ module WeixinAuthorize
 
       def refresh_token
         super
-        weixin_redis.hmset(client.redis_key, "access_token", client.access_token,
-                                             "expired_at",   client.expired_at)
+        weixin_redis.hmset(
+          client.redis_key, "access_token",
+          client.access_token, "expired_at",
+          client.expired_at
+        )
         weixin_redis.expireat(client.redis_key, client.expired_at.to_i-10) # 提前10秒超时
       end
 

data/lib/weixin_authorize/version.rb

@@ -1,3 +1,3 @@
 module WeixinAuthorize
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
 end

data/spec/api/custom_spec.rb

@@ -42,17 +42,26 @@ describe WeixinAuthorize::Api::Custom do
 
   it "#send_video_custom" do
     pending("The test must have a media_id")
-    this_should_not_get_executed
   end
 
   it "#send_music_custom" do
     pending("The test must have a media_id")
-    this_should_not_get_executed
   end
 
   it "#send_voice_custom" do
     pending("The test must have a media_id")
-    this_should_not_get_executed
+  end
+
+  it "#get_custom_msg_record" do
+    option = {pageindex: 1, pagesize: 10}
+    response = $client.get_custom_msg_record(Time.now - 10.days, Time.now, option)
+    expect(response.code).to eq(WeixinAuthorize::OK_CODE)
+    expect(response.result.keys).to eq(["recordlist", "retcode"])
+  end
+
+  it "#create_kf_session" do
+    response = $client.create_kf_session("test1@test", ENV["APPID"], "test kfsession")
+    expect(response.code).to eq(WeixinAuthorize::OK_CODE)
   end
 
 end

data/spec/api/groups_spec.rb

@@ -8,18 +8,35 @@ describe WeixinAuthorize::Api::Groups do
     "test group_name_2"
   end
 
+  let(:groups) do
+    $client.groups
+  end
+
+  let(:last_group_id) do
+    groups.result["groups"][-1]["id"]
+  end
+
+  it "#delete all group step by step" do
+    group_ids = groups.result["groups"].collect{|group|group["id"]}
+    group_ids.each do |group_id|
+      res = $client.delete_group(group_id)
+      if res.code.to_s != "45009"
+        expect(res.code).to eq(WeixinAuthorize::OK_CODE)
+      end
+    end
+  end
+
   it "create a group" do
     response = $client.create_group(group_name)
     if response.code == WeixinAuthorize::OK_CODE
       expect(response.result["group"]["name"]).to eq(group_name)
     else
       expect(response.code).to eq(-1)
-      puts "SB WEIXIN says: system error"
+      puts "WEIXIN says: system error"
     end
   end
 
   it "get groups" do
-    groups = $client.groups
     expect(groups.result["groups"][-1]["name"]).to eq(group_name)
   end
 
@@ -32,7 +49,7 @@ describe WeixinAuthorize::Api::Groups do
     response = $client.create_group(group_name)
     if response.code != WeixinAuthorize::OK_CODE
       expect(response.code).to eq(-1)
-      puts "SB WEIXIN says: system error"
+      puts "WEIXIN says: system error"
     else
       expect(response.result["group"]["name"]).to eq(group_name)
       response = $client.update_group_name(response.result["group"]["id"], group_name_2)
@@ -43,12 +60,15 @@ describe WeixinAuthorize::Api::Groups do
   end
 
   it "#update_group_for_openid" do
-    groups = $client.groups
-    last_group_id = groups.result["groups"][-1]["id"]
     $client.update_group_for_openid(ENV["OPENID"], last_group_id)
     group = $client.get_group_for(ENV["OPENID"])
     expect(group.result["groupid"]).to eq(last_group_id)
     $client.update_group_for_openid(ENV["OPENID"], 0)
   end
 
+  it "#batch update group for openids" do
+    res = $client.batch_update_group_for_openids([ENV["OPENID"]], last_group_id)
+    expect(res.code).to eq(WeixinAuthorize::OK_CODE)
+  end
+
 end

data/spec/api/media_spec.rb

@@ -17,13 +17,25 @@ describe WeixinAuthorize::Api::Media do
   end
 
   let(:remote_png_path) do
-    "https://ruby-china-files.b0.upaiyun.com/user/big_avatar/273.jpg"
+    "https://ruby-china-files.b0.upaiyun.com/photo/5982eaaa64f467d9dbda03ad4f40ea27.png"
   end
 
   let(:remote_jpg_path) do
     "http://g.hiphotos.baidu.com/baike/c0%3Dbaike80%2C5%2C5%2C80%2C26/sign=ce55457e4334970a537e187df4a3baad/03087bf40ad162d99455ef4d13dfa9ec8b13632762d0ed14.jpg"
   end
 
+  it "can upload a jpg image and get url" do
+    response = $client.upload_image(image_jpg_file)
+    expect(response.code).to eq(WeixinAuthorize::OK_CODE)
+    expect(response.result.keys).to eq(["url"])
+  end
+
+  it "can upload a png image and get url" do
+    response = $client.upload_image(remote_png_path)
+    expect(response.code).to eq(WeixinAuthorize::OK_CODE)
+    expect(response.result.keys).to eq(["url"])
+  end
+
   it "can upload a jpg File image" do
     response = $client.upload_media(image_jpg_file, "image")
     expect(response.code).to eq(WeixinAuthorize::OK_CODE)

data/spec/spec_helper.rb

@@ -15,7 +15,6 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 require "rspec"
 require "weixin_authorize"
-require 'yajl/json_gem'
 require "redis"
 require "redis-namespace"
 
@@ -25,17 +24,17 @@ require "codeclimate-test-reporter"
 
 require "pry-rails"
 
-Coveralls.wear!
+# Coveralls.wear!
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
+# SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+#   SimpleCov::Formatter::HTMLFormatter,
+#   Coveralls::SimpleCov::Formatter
+# ]
 
-SimpleCov.start
+# SimpleCov.start
 
-ENV['CODECLIMATE_REPO_TOKEN'] = "c91fecbbd9e414e7cc3ad7a7d99207145de0ac65a3368de09e8c19295343d399"
-CodeClimate::TestReporter.start
+# ENV['CODECLIMATE_REPO_TOKEN'] = "c91fecbbd9e414e7cc3ad7a7d99207145de0ac65a3368de09e8c19295343d399"
+# CodeClimate::TestReporter.start
 
 # If you want test, change your weixin test profile
 ENV["APPID"]="wx986f04063d341d04"

data/weixin_authorize.gemspec

@@ -26,9 +26,23 @@ Gem::Specification.new do |spec|
 
   # A streaming JSON parsing and encoding library for Ruby (C bindings to yajl)
   # https://github.com/brianmario/yajl-ruby
-  spec.add_dependency "yajl-ruby", ">= 1.2.0"
+  # yajl-ruby 不支持 jruby
+  if RUBY_PLATFORM == 'java'
+    spec.add_dependency "json"
+  else
+    spec.add_dependency "yajl-ruby", ">= 1.2.0"
+  end
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "redis-namespace"
+  spec.add_development_dependency "codeclimate-test-reporter"
+  spec.add_development_dependency "simplecov", "~> 0.10.0"
+  spec.add_development_dependency 'coveralls', '~> 0.8.2'
+  spec.add_development_dependency 'pry-rails'
+  if RUBY_PLATFORM != 'java'
+    spec.add_development_dependency 'pry-byebug'
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weixin_authorize
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - lanrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -108,6 +108,104 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: pry-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: weixin api authorize access_token
 email:
 - huaitao-deng@foxmail.com
@@ -201,3 +299,4 @@ test_files:
 - spec/api/template_spec.rb
 - spec/api/user_spec.rb
 - spec/spec_helper.rb
+has_rdoc: