weixin_authorize 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dcf07084b174215116839f53e3933a8360cd975
-  data.tar.gz: 7e92dc7924d59e62f8f3f84f22b29947e2468c28
+  metadata.gz: a664fbdb47c8a23894a9fe8274f279e332b13152
+  data.tar.gz: b574af19ee28f8c01445b2ea886bcb727b4772f5
 SHA512:
-  metadata.gz: b42caf728256adac156fabb2c4ebfe62b37a1b7b3d3916713164c6ec761d4d2de5863904e38c96d2d4c23b6698551c35849abd79007c0a9586a5dafddd0c914b
-  data.tar.gz: 96acbc6e7563d3a44bdea2b9063e3b9fd1f43a00219cfe0d6ad91577c734a82dac144cec11fbb257917e1ca63396c515a5aa2f783c8815d2c33b867f0a09f6af
+  metadata.gz: 0062efdc2953202e3c42f3375421f00d81fee3586762cc1f231247daa7e1466adc7aa98f9511379d48a7b5a68cb3a535e5554bf723b58617ce24d13f6b7b52a2
+  data.tar.gz: 7060bc6ca0a181667f2be177b3b1ff750a566eb86c7adedf73d0dc572d47afe23a24ccc5875e619e32e8266808db21e58d911b00e2675260e404307b8ad5df27

data/README.md

@@ -11,6 +11,21 @@ Support using [Redis](http://redis.io) to store `access_token`
 
 [Getting-Started](https://github.com/lanrion/weixin_authorize/wiki/Getting-Started)
 
+[JS SDK](https://github.com/lanrion/weixin_authorize/wiki/js-sdk)
+
+## 已经完成API
+
+* 客服消息
+* 模板消息
+* 用户分组管理
+* 用户信息管理
+* Oauth 2授权
+* 二维码生成
+* 自定义菜单
+* 群发消息
+* 多媒体管理
+* JS SDK（ticket支持缓存）
+
 ## V2.0开发中： 
 https://github.com/lanrion/weixin_authorize/milestones/v2.0-dev
 
@@ -44,3 +59,9 @@ then run `rspec .`
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## 捐赠支持
+
+  如果你觉得我的gem对你有帮助，欢迎打赏支持，:smile:
+
+  ![](https://raw.githubusercontent.com/lanrion/my_config/master/imagex/donation_me.png)

data/lib/weixin_authorize/api.rb

@@ -1,9 +1,3 @@
-require "weixin_authorize/api/user"
-require "weixin_authorize/api/menu"
-require "weixin_authorize/api/custom"
-require "weixin_authorize/api/groups"
-require "weixin_authorize/api/qrcode"
-require "weixin_authorize/api/media"
-require "weixin_authorize/api/mass"
-require "weixin_authorize/api/oauth"
-require "weixin_authorize/api/template"
+Dir["#{File.dirname(__FILE__)}/api/*.rb"].each do |path|
+  require path
+end

data/lib/weixin_authorize/api/mass.rb

@@ -7,8 +7,8 @@ module WeixinAuthorize
 
       # 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")
-        group_option = {"filter" => {"group_id" => group_id.to_s}}
+      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}}
         media = generate_media(msgtype, media_info, group_option)
 
         mass_url = "#{mass_base_url}/sendall"

data/lib/weixin_authorize/api/qrcode.rb

@@ -6,20 +6,30 @@ module WeixinAuthorize
 
       # 临时二维码
       def create_qr_scene(scene_id, expire_seconds=1800)
-        post_url     = "#{qrcode_base_url}/create"
         qrcode_infos = {action_name: "QR_SCENE", expire_seconds: expire_seconds}
-        qrcode_infos = qrcode_infos.merge(action_info(scene_id))
-        http_post(post_url, qrcode_infos)
+        qrcode_infos.merge!(action_info(scene_id))
+        http_post(qrcode_base_url, qrcode_infos)
       end
 
       # 永久二维码
-      def create_qr_limit_scene(scene_id)
-        post_url     = "#{qrcode_base_url}/create"
+      # options: scene_id, scene_str
+      def create_qr_limit_scene(options)
+        scene_id = options[:scene_id]
         qrcode_infos = {action_name: "QR_LIMIT_SCENE"}
-        qrcode_infos = qrcode_infos.merge(action_info(scene_id))
-        http_post(post_url, qrcode_infos)
+        qrcode_infos.merge!(action_info(scene_id))
+        http_post(qrcode_base_url, qrcode_infos)
       end
 
+      # 为永久的字符串参数值
+      # options: scene_str
+      def create_qr_limit_str_scene(options)
+        scene_str = options[:scene_str]
+        qrcode_infos = {action_name: "QR_LIMIT_STR_SCENE"}
+        qrcode_infos.merge!(action_info(nil, scene_str))
+        http_post(qrcode_base_url, qrcode_infos)
+      end
+
+
       # 通过ticket换取二维码, 直接访问即可显示！
       def qr_code_url(ticket)
         WeixinAuthorize.mp_endpoint("/showqrcode?ticket=#{ticket}")
@@ -28,11 +38,14 @@ module WeixinAuthorize
       private
 
         def qrcode_base_url
-          "/qrcode"
+          "/qrcode/create"
         end
 
-        def action_info(scene_id)
-          {action_info: {scene: {scene_id: scene_id}}}
+        def action_info(scene_id, scene_str=nil)
+          scene_info = {}
+          scene_info[:scene_id] = scene_id if !scene_id.nil?
+          scene_info[:scene_str] = scene_str if !scene_str.nil?
+          {action_info: {scene: scene_info}}
         end
 
     end

data/lib/weixin_authorize/config.rb

@@ -15,6 +15,8 @@ module WeixinAuthorize
 
     # 可选配置: RestClient timeout, etc.
     # key 必须是符号
+    # 如果出现 RestClient::SSLCertificateNotVerified Exception: SSL_connect returned=1 errno=0 state=SSLv3 read server certificate B: certificate verify failed
+    # 这个错，除了改 verify_ssl: true，请参考：http://www.extendi.it/blog/2015/5/23/47-sslv3-read-server-certificate-b-certificate-verify-failed
     def rest_client_options
       if config.nil?
         return {timeout: 5, open_timeout: 5, verify_ssl: true}

data/lib/weixin_authorize/version.rb

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

data/spec/api/mass_spec.rb

@@ -49,6 +49,11 @@ describe WeixinAuthorize::Api::Mass do
     expect(response.code).to eq(WeixinAuthorize::OK_CODE)
   end
 
+  it "#mass_with_groug send to all" do
+    response = $client.mass_with_group("1", "mass_group_text_to_all", "text", true)
+    expect(response.code).to eq(WeixinAuthorize::OK_CODE)
+  end
+
   it "#mass_with_openids with mpnews and can delete message" do
     response = $client.mass_with_openids([ENV["OPENID"]], mass_media_id)
     expect(response.code).to eq(WeixinAuthorize::OK_CODE)

data/spec/api/qrcode_spec.rb

@@ -8,13 +8,13 @@ describe WeixinAuthorize::Api::Qrcode do
   end
 
   it "#create_qr_limit_scene" do
-    response = $client.create_qr_limit_scene("1234")
+    response = $client.create_qr_limit_scene(scene_id: 1234, scene_str: "wechat")
     expect(response.code).to eq(WeixinAuthorize::OK_CODE)
     expect(response.result.keys).to eq(["ticket", "url"])
   end
 
   it "#return_qr_url" do
-    response = $client.create_qr_limit_scene("1234")
+    response = $client.create_qr_limit_scene(scene_id: 1234, scene_str: "wechat")
     qr_url = $client.qr_code_url(response.result["ticket"])
     expect(response.code).to eq(WeixinAuthorize::OK_CODE)
     expect(qr_url).to match(/(\S+\.(com|net|org|edu|gov)(\/\S+)?)/)

data/spec/api/template_spec.rb

@@ -0,0 +1,40 @@
+describe WeixinAuthorize::Api::Template do
+  # {{first.DATA}}
+  # 项目名称：{{class.DATA}}
+  # 时间：{{time.DATA}}
+  # 地点：{{add.DATA}}
+  # {{remark.DATA}}
+  it "can send template msg" do
+    url = "http://www.baidu.com"
+    data = {
+      first: {
+        value: "报名结果通知",
+        color: "#173277"
+      },
+      class: {
+        value: "领导与管理课程培训/人格测评",
+        color: "#173177"
+      },
+      time: {
+        value: "11月6日—11月7日（周三—周五)",
+        color: "#274177"
+      },
+      add: {
+        value: "F302室",
+        color: "#274377"
+      },
+      remark: {
+        value: "您可点击【详情】查看详细信息。",
+        color: "#274377"
+      }
+    }
+    msg_result = $client.send_template_msg(
+      ENV["OPENID"],
+      ENV["TEMPLATE_ID"],
+      url,
+      "#173177",
+      data
+    )
+    expect(msg_result.code).to eq(WeixinAuthorize::OK_CODE)
+  end
+end

data/spec/spec_helper.rb

@@ -41,6 +41,7 @@ CodeClimate::TestReporter.start
 ENV["APPID"]="wx986f04063d341d04"
 ENV["APPSECRET"]="1a941cd88cb4579ba98ec06b6813af03"
 ENV["OPENID"]="o9k6BuB0kydAcPTc7sPxppB1GQqA"
+ENV["TEMPLATE_ID"]="-8ooXrOK3VD3HuSS8--nH154PO9Lw2E7T-RV1uTaGLc"
 
 # Comment to test for ClientStorage
 redis = Redis.new(host: "127.0.0.1", port: "6379", db: 15)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weixin_authorize
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - lanrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -159,6 +159,7 @@ files:
 - spec/api/medias/ruby-logo.jpg
 - spec/api/menu_spec.rb
 - spec/api/qrcode_spec.rb
+- spec/api/template_spec.rb
 - spec/api/user_spec.rb
 - spec/spec_helper.rb
 - weixin_authorize.gemspec
@@ -182,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: weixin api authorize access_token
@@ -197,5 +198,6 @@ test_files:
 - spec/api/medias/ruby-logo.jpg
 - spec/api/menu_spec.rb
 - spec/api/qrcode_spec.rb
+- spec/api/template_spec.rb
 - spec/api/user_spec.rb
 - spec/spec_helper.rb