weixin_authorize 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 597087b2445885d7272fe48b6dfae8b4ade852e7
-  data.tar.gz: 091d7d77fa863078e05f9b0a86aa3adc45896723
+  metadata.gz: df74fa58c1890b6aa3ac5d5684b3542d368d521a
+  data.tar.gz: c296a7894161afd1bdda7240945da3529e1982cc
 SHA512:
-  metadata.gz: 0515f0d280d6e995e7857ab3d7f8311b16895e6424755b9f7cc55035d198e75a7687968c7bf816f6365adc59364bc2361e471e4ae0cf3a58feccc430dafe27f7
-  data.tar.gz: 8cea693671811943eb41fc4471d83d31a10f79ba3a86f5a937ef8752f766f223839c5ed5e47f0df28d434e06071d14358a14c60700eaacae1111c1a8ae68dc7e
+  metadata.gz: ba04e33192c97ce67831fe80dce94c472405aaaa670e0e70ee946dbd086a533ece2f202e852919d1c96d5233a6c31bfd0632025883a9bb57b81c1b29d695df33
+  data.tar.gz: b6c34f7484b0839220ea0353b63749796e5950bf9eb5455d1fbecc7399f83803e5af5dc51e46f7deb7adf19826024b913fa653730b11e2b9a55e858829bfb102

data/README.md

@@ -104,6 +104,10 @@ $client ||= WeixinAuthorize::Client.new(ENV["APPID"], ENV["APPSECRET"])
 
   `$client.send_news_custom(to_user, *articles)`
 
+##
+
+> 对于多用户微信营销平台的对接，需要把每次的expired_at, access_token保存在Redis中,每次使用，则可以从Redis中获取expired_at和access_token, 即 `@client = WeixinAuthorize::Client.new(appid, appsecret, expired_at, access_token)`, 获取access_token，则仍然是：`@client.get_access_token`来获取.
+
 ## Contributing
 
 1. Fork it

data/lib/weixin_authorize/api/custom.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 module WeixinAuthorize
   module Api
     module Custom
@@ -15,7 +14,7 @@ module WeixinAuthorize
       # }
       def send_text_custom(to_user, content)
         message = default_options(to_user).merge({text: {content: content}})
-        JSON.parse(RestClient.post(custom_base_url, MultiJson.dump(message)))
+        http_post(custom_base_url, MultiJson.dump(message))
       end
 
       # 发送图片消息
@@ -29,7 +28,7 @@ module WeixinAuthorize
       # }
       def send_image_custom(to_user, media_id)
         message = default_options(to_user).merge({msgtype: image, image: {media_id: media_id}})
-        JSON.parse(RestClient.post(custom_base_url, MultiJson.dump(message)))
+        http_post(custom_base_url, MultiJson.dump(message))
       end
 
       # 发送语音消息
@@ -43,7 +42,7 @@ module WeixinAuthorize
       # }
       def send_voice_custom(to_user, media_id)
         message = default_options(to_user).merge({msgtype: voice, voice: {media_id: media_id}})
-        JSON.parse(RestClient.post(custom_base_url, MultiJson.dump(message)))
+        http_post(custom_base_url, MultiJson.dump(message))
       end
 
       # 发送视频消息
@@ -55,10 +54,10 @@ module WeixinAuthorize
       #       "media_id":"MEDIA_ID"
       #     }
       # }
-      def send_video_custom(to_user, media_id, options)
+      def send_video_custom(to_user, media_id, options={})
         video_options = {media_id: media_id}.merge(options)
         message = default_options(to_user).merge({msgtype: video, video: video_options})
-        JSON.parse(RestClient.post(custom_base_url, MultiJson.dump(message)))
+        http_post(custom_base_url, MultiJson.dump(message))
       end
 
       # 发送音乐消息
@@ -74,11 +73,11 @@ module WeixinAuthorize
       #      "thumb_media_id":"THUMB_MEDIA_ID"
       #     }
       # }
-      def send_music_custom(to_user, media_id, musicurl, hqmusicurl, options)
+      def send_music_custom(to_user, media_id, musicurl, hqmusicurl, options={})
         music_options = { thumb_media_id: media_id, musicurl: musicurl,
                           hqmusicurl: hqmusicurl}.merge(options)
         message = default_options(to_user).merge({msgtype: music, music: music_options})
-        JSON.parse(RestClient.post(custom_base_url, MultiJson.dump(message)))
+        http_post(custom_base_url, MultiJson.dump(message))
       end
 
       # 发送图文消息
@@ -104,14 +103,14 @@ module WeixinAuthorize
       # }
       def send_news_custom(to_user, *articles)
         message = default_options(to_user).merge({msgtype: "news", news: {articles: articles}})
-        JSON.parse(RestClient.post(custom_base_url, MultiJson.dump(message)))
+        http_post(custom_base_url, MultiJson.dump(message))
       end
 
       private
 
         # https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token=ACCESS_TOKEN
         def custom_base_url
-          "#{endpoint}/message/custom/send?#{access_token_param}"
+          "/message/custom/send"
         end
 
         def default_options(to_user)

data/lib/weixin_authorize/api/groups.rb

@@ -6,46 +6,46 @@ module WeixinAuthorize
       # 创建分组
       # https://api.weixin.qq.com/cgi-bin/groups/create?access_token=ACCESS_TOKEN
       def create_group(group_name)
-        create_url = "#{group_base_url}/create?#{access_token_param}"
+        create_url = "#{group_base_url}/create"
         group = MultiJson.dump({group: {name: group_name}})
-        JSON.parse(RestClient.post(create_url, group))
+        http_post(create_url, group)
       end
 
       # 查询所有分组
       # https://api.weixin.qq.com/cgi-bin/groups/get?access_token=ACCESS_TOKEN
       def groups
-        groups_url = "#{group_base_url}/get?#{access_token_param}"
-        JSON.parse(RestClient.get(groups_url))
+        groups_url = "#{group_base_url}/get"
+        http_get(groups_url)
       end
 
       # 查询用户所在分组
       # https://api.weixin.qq.com/cgi-bin/groups/getid?access_token=ACCESS_TOKEN
       def get_group_for(openid)
-        group_url = "#{group_base_url}/getid?#{access_token_param}"
+        group_url = "#{group_base_url}/getid"
         openid = MultiJson.dump({openid: openid})
-        JSON.parse(RestClient.post(group_url, openid))
+        http_post(group_url, openid)
       end
 
       # 修改分组名
       # https://api.weixin.qq.com/cgi-bin/groups/update?access_token=ACCESS_TOKEN
       def update_group_name(group_id, new_group_name)
-        group_url = "#{group_base_url}/update?#{access_token_param}"
+        group_url = "#{group_base_url}/update"
         group = MultiJson.dump({group: {id: openid, name: new_group_name}})
-        JSON.parse(RestClient.post(group_url, group))
+        http_post(group_url, group)
       end
 
       # 移动用户分组
       # https://api.weixin.qq.com/cgi-bin/groups/members/update?access_token=ACCESS_TOKEN
       def update_group_for_openid(openid, to_groupid)
-        group_url = "#{group_base_url}/members/update?#{access_token_param}"
+        group_url = "#{group_base_url}/members/update"
         group = MultiJson.dump({openid: openid, to_groupid: to_groupid})
-        JSON.parse(RestClient.post(group_url, group))
+        http_post(group_url, group)
       end
 
       private
 
         def group_base_url
-          "#{endpoint}/groups"
+          "/groups"
         end
 
     end

data/lib/weixin_authorize/api/menu.rb

@@ -6,28 +6,28 @@ module WeixinAuthorize
       # 自定义菜单查询接口
       # https://api.weixin.qq.com/cgi-bin/menu/get?access_token=ACCESS_TOKEN
       def menu
-        get_menu_url = "#{menu_base_url}/get?#{access_token_param}"
-        JSON.parse(RestClient.get(get_menu_url))
+        get_menu_url = "#{menu_base_url}/get"
+        http_get(get_menu_url)
       end
 
       # 自定义菜单删除接口
       # https://api.weixin.qq.com/cgi-bin/menu/delete?access_token=ACCESS_TOKEN
       def delete_menu
-        delete_menu_url = "#{menu_base_url}/delete?#{access_token_param}"
-        JSON.parse(RestClient.get(delete_menu_url))
+        delete_menu_url = "#{menu_base_url}/delete"
+        http_get(delete_menu_url)
       end
 
       # 自定义菜单创建接口
       # https://api.weixin.qq.com/cgi-bin/menu/create?access_token=ACCESS_TOKEN
       def create_menu(menu)
-        create_menu_url = "#{menu_base_url}/create?#{access_token_param}"
-        JSON.parse(RestClient.post(create_menu_url, menu))
+        create_menu_url = "#{menu_base_url}/create"
+        http_post(create_menu_url, menu)
       end
 
       private
 
         def menu_base_url
-          "#{endpoint}/menu"
+          "/menu"
         end
 
     end

data/lib/weixin_authorize/api/user.rb

@@ -7,21 +7,21 @@ module WeixinAuthorize
       # https://api.weixin.qq.com/cgi-bin/user/info?access_token=ACCESS_TOKEN&openid=OPENID&lang=zh_CN
       # lang: zh_CN, zh_TW, en
       def user(openid, lang="zh_CN")
-        user_info_url = "#{user_base_url}/info?#{access_token_param}&openid=#{openid}&lang=#{lang}"
-        JSON.parse(RestClient.get(user_info_url))
+        user_info_url = "#{user_base_url}/info"
+        http_get(user_info_url, {openid: openid, lang: lang})
       end
 
-      # https://api.weixin.qq.com/cgi-bin/user/get?access_token=ACCESS_TOKEN&next_openid=NEXT_OPENID
       # 获取关注者列表
-      def followers(next_openid=nil)
-        users_url = "#{user_base_url}/get?#{access_token_param}&next_openid#{next_openid}"
-        JSON.parse(RestClient.get(users_url))
+      # https://api.weixin.qq.com/cgi-bin/user/get?access_token=ACCESS_TOKEN&next_openid=NEXT_OPENID
+      def followers(next_openid="")
+        followers_url = "#{user_base_url}/get"
+        http_get(followers_url, {next_openid: next_openid})
       end
 
       private
 
         def user_base_url
-          "#{endpoint}/user"
+          "/user"
         end
 
     end

data/lib/weixin_authorize/client.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 module WeixinAuthorize
 
   class Client
@@ -11,41 +10,72 @@ module WeixinAuthorize
     attr_accessor :app_id, :app_secret, :expired_at # Time.now + expires_in
     attr_accessor :access_token
 
-    def initialize(app_id="", app_secret="", expired_at=nil)
+    # 对于多用户微信营销平台的对接，需要把每次的expired_at, access_token保存在Redis中
+    # 每次使用，则可以从Redis中获取expired_at和access_token，即
+    # @client = WeixinAuthorize::Client.new(appid, appsecret, expired_at, access_token)
+    # 获取access_token，则仍然是：@client.get_access_token 来获取
+    def initialize(app_id="", app_secret="", expired_at=nil, access_token=nil)
       @app_id     = app_id
       @app_secret = app_secret
       @expired_at = (expired_at.to_i || Time.now.to_i)
+      @access_token = access_token
       yield self if block_given?
     end
 
     # return token
     def get_access_token
       # 如果当前token过期时间小于现在的时间，则重新获取一次
-      if @expired_at <= Time.now.to_i
-        authenticate
-      end
+      authenticate if token_expired?
       @access_token
     end
 
     # authenticate access_token
     def authenticate
-      hash_infos        = JSON.parse(RestClient.get(authenticate_url))
+      hash_infos        = http_get_without_token("/token", authenticate_options)
       self.access_token = hash_infos["access_token"]
       self.expired_at   = Time.now.to_i + hash_infos["expires_in"]
     end
 
+    def token_expired?
+      @expired_at <= Time.now.to_i
+    end
+
     private
 
-      def authenticate_url
-        "#{endpoint}/token?grant_type=client_credential&appid=#{app_id}&secret=#{app_secret}"
+      def authenticate_options
+        {grant_type: "client_credential", appid: app_id, secret: app_secret}
+      end
+
+      def access_token_param
+        {access_token: get_access_token}
+      end
+
+      def http_get_without_token(url, options={}, endpoint="plain")
+        get_api_url = endpoint_url(endpoint) + url
+        JSON.parse(RestClient.get(get_api_url, :params => options))
+      end
+
+      def http_get(url, options={})
+        options = options.merge(access_token_param)
+        http_get_without_token(url, options)
+      end
+
+      # Refactor
+      def http_post(url, options={}, endpoint="plain")
+        post_api_url = endpoint_url(endpoint) + url + "?access_token=#{get_access_token}"
+        JSON.parse(RestClient.post(post_api_url ,options))
+      end
+
+      def endpoint_url(endpoint)
+        send("#{endpoint}_endpoint")
       end
 
-      def endpoint
+      def plain_endpoint
         "https://api.weixin.qq.com/cgi-bin"
       end
 
-      def access_token_param
-        "access_token=#{get_access_token}"
+      def file_endpoint
+        "http://file.api.weixin.qq.com/cgi-bin"
       end
 
   end

data/lib/weixin_authorize/version.rb

@@ -1,3 +1,3 @@
 module WeixinAuthorize
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/api/groups_spec.rb

@@ -2,6 +2,11 @@ require "spec_helper"
 describe WeixinAuthorize::Api::Groups do
   it "create a group" do
     response = $client.create_group("test")
-    response
+    puts response
+  end
+
+  it "get groups" do
+    groups = $client.groups
+    puts groups
   end
 end

data/spec/api/menu_spec.rb

@@ -6,7 +6,9 @@ describe WeixinAuthorize::Api::Menu do
   it "can create a menu" do
     menu = '{"button":[{"type":"click","name":"今日歌曲","key":"V1001_TODAY_MUSIC"},{"type":"click","name":"歌手简介","key":"V1001_TODAY_SINGER"},{"name":"菜单","sub_button":[{"type":"view","name":"搜索","url":"http://www.soso.com/"},{"type":"view","name":"视频","url":"http://v.qq.com/"},{"type":"click","name":"赞一下我们","key":"V1001_GOOD"}]}]}'
     response = $client.create_menu(menu)
+    puts response
     expect(response["errcode"]).to eq(0)
+
   end
 
   it "can get a weixin Menu info" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weixin_authorize
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - lanrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -100,11 +100,11 @@ files:
 - lib/weixin_authorize/api/user.rb
 - lib/weixin_authorize/client.rb
 - lib/weixin_authorize/version.rb
+- spec/1_fetch_access_token_spec.rb
 - spec/api/custom_spec.rb
 - spec/api/groups_spec.rb
 - spec/api/menu_spec.rb
 - spec/api/user_spec.rb
-- spec/fetch_access_token_spec.rb
 - spec/spec_helper.rb
 - weixin_authorize.gemspec
 homepage: ''
@@ -132,9 +132,9 @@ signing_key:
 specification_version: 4
 summary: weixin api authorize access_token
 test_files:
+- spec/1_fetch_access_token_spec.rb
 - spec/api/custom_spec.rb
 - spec/api/groups_spec.rb
 - spec/api/menu_spec.rb
 - spec/api/user_spec.rb
-- spec/fetch_access_token_spec.rb
 - spec/spec_helper.rb