weixin_authorize 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df74fa58c1890b6aa3ac5d5684b3542d368d521a
-  data.tar.gz: c296a7894161afd1bdda7240945da3529e1982cc
+  metadata.gz: 46bd1a765537e643f77dd3b7a112160131f031e5
+  data.tar.gz: 40e96c73ebc3123b461986e673e504dc530e42c6
 SHA512:
-  metadata.gz: ba04e33192c97ce67831fe80dce94c472405aaaa670e0e70ee946dbd086a533ece2f202e852919d1c96d5233a6c31bfd0632025883a9bb57b81c1b29d695df33
-  data.tar.gz: b6c34f7484b0839220ea0353b63749796e5950bf9eb5455d1fbecc7399f83803e5af5dc51e46f7deb7adf19826024b913fa653730b11e2b9a55e858829bfb102
+  metadata.gz: 72fe71c1509bcdaa2d8d5f58f325f03df41f1d996c6ce008a6bbafeb38ebe8b4261f2745fc0832cd7f49cffa4607168a14af5e5e9edea30f31cca43f414963a9
+  data.tar.gz: 67f3c7642241afd83736d5702c93e3f5be1d4dbccaa13c2a78b59f985de0629f09f723ef70404952ee4b6a8dcadfe0853869637be519dcdc496943983ec16aa9

data/README.md

@@ -6,6 +6,10 @@ Add this line to your application's Gemfile:
 
   `gem 'weixin_authorize'`
 
+  Or
+
+  `gem 'weixin_authorize', git: "https://github.com/lanrion/weixin_authorize.git"`
+
 And then execute:
 
   `$ bundle`
@@ -68,7 +72,7 @@ $client ||= WeixinAuthorize::Client.new(ENV["APPID"], ENV["APPSECRET"])
 
 * [自定义菜单创建接口](http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单创建接口)
 
-  `response = $client.create_menu(menu)`
+  `response = $client.create_menu(menu) # Hash or Json`
 
 * [自定义菜单查询接口](http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单查询接口)
 
@@ -104,7 +108,18 @@ $client ||= WeixinAuthorize::Client.new(ENV["APPID"], ENV["APPSECRET"])
 
   `$client.send_news_custom(to_user, *articles)`
 
-##
+## How to test
+
+Go to https://github.com/lanrion/weixin_authorize/issues/2, apply a weixin sandbox test account and follow this account, then add them to your `~/.bash_profile`
+
+```
+export APPID="your test account weixin app_id"
+export APPSECRET="your test account weixin appsecret"
+export OPENID="your weixin openid"
+```
+Last, you have to **open a new terminal tag (Reload bash_profile)** , and run `rspec .`
+
+## 多用户微信营销平台的对接
 
 > 对于多用户微信营销平台的对接，需要把每次的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`来获取.
 

data/lib/weixin_authorize/api/custom.rb

@@ -14,7 +14,7 @@ module WeixinAuthorize
       # }
       def send_text_custom(to_user, content)
         message = default_options(to_user).merge({text: {content: content}})
-        http_post(custom_base_url, MultiJson.dump(message))
+        http_post(custom_base_url, message)
       end
 
       # 发送图片消息
@@ -27,8 +27,8 @@ module WeixinAuthorize
       #     }
       # }
       def send_image_custom(to_user, media_id)
-        message = default_options(to_user).merge({msgtype: image, image: {media_id: media_id}})
-        http_post(custom_base_url, MultiJson.dump(message))
+        message = default_options(to_user, "image").merge({image: {media_id: media_id}})
+        http_post(custom_base_url, message)
       end
 
       # 发送语音消息
@@ -41,8 +41,8 @@ module WeixinAuthorize
       #     }
       # }
       def send_voice_custom(to_user, media_id)
-        message = default_options(to_user).merge({msgtype: voice, voice: {media_id: media_id}})
-        http_post(custom_base_url, MultiJson.dump(message))
+        message = default_options(to_user, "voice").merge({voice: {media_id: media_id}})
+        http_post(custom_base_url, message)
       end
 
       # 发送视频消息
@@ -56,8 +56,8 @@ module WeixinAuthorize
       # }
       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})
-        http_post(custom_base_url, MultiJson.dump(message))
+        message = default_options(to_user, "video").merge({video: video_options})
+        http_post(custom_base_url, message)
       end
 
       # 发送音乐消息
@@ -74,10 +74,12 @@ module WeixinAuthorize
       #     }
       # }
       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})
-        http_post(custom_base_url, MultiJson.dump(message))
+        music_options = { thumb_media_id: media_id,
+                          musicurl: musicurl,
+                          hqmusicurl: hqmusicurl
+                        }.merge(options)
+        message = default_options(to_user, "music").merge({music: music_options})
+        http_post(custom_base_url, message)
       end
 
       # 发送图文消息
@@ -101,9 +103,9 @@ module WeixinAuthorize
       #         ]
       #    }
       # }
-      def send_news_custom(to_user, *articles)
-        message = default_options(to_user).merge({msgtype: "news", news: {articles: articles}})
-        http_post(custom_base_url, MultiJson.dump(message))
+      def send_news_custom(to_user, articles=[])
+        message = default_options(to_user, "news").merge({news: {articles: articles}})
+        http_post(custom_base_url, message)
       end
 
       private
@@ -113,8 +115,8 @@ module WeixinAuthorize
           "/message/custom/send"
         end
 
-        def default_options(to_user)
-          {touser: to_user, msgtype: "text"}
+        def default_options(to_user, msgtype="text")
+          {touser: to_user, msgtype: msgtype}
         end
 
     end

data/lib/weixin_authorize/api/groups.rb

@@ -7,8 +7,7 @@ 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"
-        group = MultiJson.dump({group: {name: group_name}})
-        http_post(create_url, group)
+        http_post(create_url, {group: {name: group_name}})
       end
 
       # 查询所有分组
@@ -22,24 +21,21 @@ module WeixinAuthorize
       # https://api.weixin.qq.com/cgi-bin/groups/getid?access_token=ACCESS_TOKEN
       def get_group_for(openid)
         group_url = "#{group_base_url}/getid"
-        openid = MultiJson.dump({openid: openid})
-        http_post(group_url, openid)
+        http_post(group_url, {openid: 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"
-        group = MultiJson.dump({group: {id: openid, name: new_group_name}})
-        http_post(group_url, group)
+        http_post(group_url, {group: {id: group_id, name: new_group_name}})
       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"
-        group = MultiJson.dump({openid: openid, to_groupid: to_groupid})
-        http_post(group_url, group)
+        http_post(group_url, {openid: openid, to_groupid: to_groupid})
       end
 
       private

data/lib/weixin_authorize/api/menu.rb

@@ -20,6 +20,7 @@ module WeixinAuthorize
       # 自定义菜单创建接口
       # https://api.weixin.qq.com/cgi-bin/menu/create?access_token=ACCESS_TOKEN
       def create_menu(menu)
+        menu = MultiJson.load(menu) if menu.is_a?(String)
         create_menu_url = "#{menu_base_url}/create"
         http_post(create_menu_url, menu)
       end

data/lib/weixin_authorize/client.rb

@@ -15,9 +15,9 @@ module WeixinAuthorize
     # @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)
+      @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
@@ -63,7 +63,8 @@ module WeixinAuthorize
       # 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))
+        options      = MultiJson.dump(options) # to json
+        JSON.parse(RestClient.post(post_api_url, options))
       end
 
       def endpoint_url(endpoint)

data/lib/weixin_authorize/version.rb

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

data/spec/api/custom_spec.rb

@@ -1,8 +1,50 @@
 require "spec_helper"
 
 describe WeixinAuthorize::Api::Custom do
-  it "can send a text Custom message" do
-    response = $client.send_text_custom(ENV["OPENID"], "test send Custom Message")
-    puts response
+  let(:text_message) do
+    "text Custom message"
   end
+
+  it "#send_text_custom" do
+    response = $client.send_text_custom(ENV["OPENID"], text_message)
+    expect(response["errcode"]).to eq(0)
+  end
+
+  it "#send_news_custom" do
+    articles = [{
+                  "title" => "Happy Day",
+                  "description" => "Is Really A Happy Day",
+                  "url"   => "http://www.baidu.com",
+                  "picurl" => "http://www.baidu.com/img/bdlogo.gif"
+                },
+                {
+                  "title" => "Happy Day",
+                  "description" => "Is Really A Happy Day",
+                  "url"  => "http://www.baidu.com",
+                  "picurl"=> "http://www.baidu.com/img/bdlogo.gif"
+                }]
+    response = $client.send_news_custom(ENV["OPENID"], articles)
+    expect(response["errcode"]).to eq(0)
+  end
+
+  it "#send_image_custom" do
+    pending("The test must have a media_id")
+    this_should_not_get_executed
+  end
+
+  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
+
 end

data/spec/api/groups_spec.rb

@@ -1,12 +1,45 @@
 require "spec_helper"
 describe WeixinAuthorize::Api::Groups do
+
+  let(:group_name) do
+    "test group_name"
+  end
+
+  let(:group_name_2) do
+    "test group_name_2"
+  end
+
   it "create a group" do
-    response = $client.create_group("test")
-    puts response
+    response = $client.create_group(group_name)
+    expect(response["group"]["name"]).to eq(group_name)
   end
 
   it "get groups" do
     groups = $client.groups
-    puts groups
+    expect(groups["groups"][-1]["name"]).to eq(group_name)
+  end
+
+  it "#get_group_for ENV['OPENID']" do
+    group = $client.get_group_for(ENV["OPENID"])
+    expect(group.keys).to eq(["groupid"])
+  end
+
+  it "#update_group_name" do
+    response = $client.create_group(group_name)
+    expect(response["group"]["name"]).to eq(group_name)
+    response = $client.update_group_name(response["group"]["id"], group_name_2)
+    expect(response["errcode"]).to eq(0)
+    groups = $client.groups
+    expect(groups["groups"][-1]["name"]).to eq(group_name_2)
   end
+
+  it "#update_group_for_openid" do
+    groups = $client.groups
+    last_group_id = groups["groups"][-1]["id"]
+    $client.update_group_for_openid(ENV["OPENID"], last_group_id)
+    group = $client.get_group_for(ENV["OPENID"])
+    expect(group["groupid"]).to eq(last_group_id)
+    $client.update_group_for_openid(ENV["OPENID"], 0)
+  end
+
 end

data/spec/api/menu_spec.rb

@@ -5,10 +5,8 @@ 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
+    response = $client.create_menu(MultiJson.load(menu)) # or Json string
     expect(response["errcode"]).to eq(0)
-
   end
 
   it "can get a weixin Menu info" do

data/spec/api/user_spec.rb

@@ -3,11 +3,11 @@ require "spec_helper"
 describe WeixinAuthorize::Api::User do
   it "can get a weixin User info" do
     user_info = $client.user(ENV["OPENID"])
-    puts user_info
+    expect(user_info["openid"]).to eq(ENV["OPENID"])
   end
 
   it "can get followers infos" do
     followers = $client.followers
-    puts followers
+    expect(followers.keys).to eq(["total", "count", "data", "next_openid"])
   end
 end

data/spec/spec_helper.rb

@@ -15,6 +15,9 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 require "rspec"
 require "weixin_authorize"
+require "multi_json"
+
+require "pry-rails"
 
 # $client ||= WeixinAuthorize.configure do |config|
 #   config.app_id     = ENV["APPID"]

data/weixin_authorize.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["huaitao-deng@foxmail.com"]
   spec.description   = %q{weixin api authorize access_token}
   spec.summary       = %q{weixin api authorize access_token}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/lanrion/weixin_authorize"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rest-client", ">= 1.6.7"
-  spec.add_runtime_dependency 'multi_json'  , "~> 1.7.2"
+  spec.add_dependency "multi_json", "~> 1.9.0"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weixin_authorize
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - lanrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ files:
 - spec/api/user_spec.rb
 - spec/spec_helper.rb
 - weixin_authorize.gemspec
-homepage: ''
+homepage: https://github.com/lanrion/weixin_authorize
 licenses:
 - MIT
 metadata: {}