wechat 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8fc6b062fba978416473332b7eeb0ebe89a6bfd
-  data.tar.gz: 5b7c50450e9ca878520825678580aec7f2e7b4f0
+  metadata.gz: 15c91eb2d65ed9645ca79ace9245f8b37951dd04
+  data.tar.gz: ce52424a06ecbd344c18f4a2113dbf7af9507a9f
 SHA512:
-  metadata.gz: 0131981fbcfa43e241ec4151a004ec702185f41641e9a67ad8cf45adf59f9372586409ee0a34f5cc9f3141dd3c44a056fd6c13d906ae3abe8bdb5c171d08bda5
-  data.tar.gz: 40b6edfe0146f00d27cb41ce14c5dc612892d59569fc1469355ce52245e560893c936ec43b0a159e0838435968720f4f6b00750259c6b940c9b7c998f7383dca
+  metadata.gz: 7d7c44d220b7467482271b757dddc50e71f19df8a2d2bde28d6e2d3a3c8f9eaf2cebb70adaa6df73ad9b86c34314f013c0803d3def5cd47dd933e82d1d86408b
+  data.tar.gz: 988540c451e81e64e44c2959d46197e420bfe1ed32756e4a15b33b68ad523abf9a32afb50fd9ddeb3e117c98fd6bf16c83eb77b750161976fec40b0dec0f309a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.4.1 (released at 9/6/2015)
+
+* Limit news articles collection to 10, close #5
+* Resolve the conflict with gem "responders" by @seamon #45
+
 ## v0.4.0 (released at 9/5/2015)
 
 * Enable the verify SSL for enterprise mode by default, as security is more importent than speed, but still can switch off by configure

data/README.md

@@ -154,6 +154,8 @@ Wechat commands:
   wechat invite_user [USER_ID]                             # 邀请成员关注
   wechat material [MEDIA_ID, PATH]                         # 永久媒体下载
   wechat material_add [MEDIA_TYPE, PATH]                   # 永久媒体上传
+  wechat material_count                                    # 获取素材总数
+  wechat material_delete [MEDIA_ID]                        # 删除永久素材
   wechat media [MEDIA_ID, PATH]                            # 媒体下载
   wechat media_create [MEDIA_TYPE, PATH]                   # 媒体上传
   wechat menu                                              # 当前菜单
@@ -343,9 +345,10 @@ class WechatsController < ApplicationController
 
   # 当请求的文字信息内容为'<n>条新闻'时, 使用这个responder处理, 并将n作为第二个参数
   on :text, with: /^(\d+)条新闻$/ do |request, count|
-    articles_range = (0... [count.to_i, 10].min)
-    request.reply.news(articles_range) do |article, i| #回复"articles"
-      article.item title: "标题#{i}", description:"内容描述#{i}", pic_url: "http://www.baidu.com/img/bdlogo.gif", url:"http://www.baidu.com/"
+    # 微信最多显示10条新闻，大于10条将只取前10条
+    news = (1..count.to_i).each_with_object([]) { |n, memo| memo << {title: "新闻标题", content: "第#{n}条新闻的内容#{n.hash}"} }
+    request.reply.news(news) do |article, n, index| # 回复"articles"
+      article.item title: "#{index} #{n[:title]}", description: n[:content], pic_url: "http://www.baidu.com/img/bdlogo.gif", url:"http://www.baidu.com/"
     end
   end
 

data/bin/wechat

@@ -165,6 +165,16 @@ HELP
     puts Helper.with(options).material_add(type, file)
   end
 
+  desc 'material_delete [MEDIA_ID]', '删除永久素材'
+  def material_delete(media_id)
+    puts Helper.with(options).material_delete(media_id)
+  end
+
+  desc 'material_count', '获取素材总数'
+  def material_count
+    puts Helper.with(options).material_count
+  end
+
   desc 'message_send [OPENID, TEXT_MESSAGE]', '发送文字消息(仅企业号)'
   def message_send(openid, text_message)
     puts Helper.with(options).message_send openid, text_message

data/lib/wechat.rb

@@ -4,7 +4,7 @@ require 'action_controller/wechat_responder'
 
 module Wechat
   autoload :Message, 'wechat/message'
-  autoload :Responder, 'action_controller/responder'
+  autoload :Responder, 'wechat/responder'
   autoload :Cipher, 'wechat/cipher'
 
   class AccessTokenExpiredError < StandardError; end

data/lib/wechat/api.rb

@@ -75,10 +75,18 @@ module Wechat
       get 'material/get', params: { media_id: media_id }, base: FILE_BASE, as: :file
     end
 
+    def material_count
+      get 'material/get_materialcount'
+    end
+
     def material_add(type, file)
       post 'material/add_material', { upload: { media: file } }, params: { type: type }, base: FILE_BASE
     end
 
+    def material_delete(media_id)
+      post 'material/del_material', media_id: media_id
+    end
+
     def custom_message_send(message)
       post 'message/custom/send', message.to_json, content_type: :json
     end

data/lib/wechat/corp_api.rb

@@ -60,6 +60,10 @@ module Wechat
       get 'media/get', params: { media_id: media_id }, as: :file
     end
 
+    def material_count
+      get 'material/get_count', params: { agentid: agentid }
+    end
+
     def media_create(type, file)
       post 'media/upload', { upload: { media: file } }, params: { type: type }
     end
@@ -72,6 +76,10 @@ module Wechat
       post 'material/add_material', { upload: { media: file } }, params: { type: type, agentid: agentid }
     end
 
+    def material_delete(media_id)
+      get 'material/del', params: { media_id: media_id, agentid: agentid }
+    end
+
     def message_send(openid, message)
       post 'message/send', Message.to(openid).text(message).agent_id(agentid).to_json, content_type: :json
     end

data/lib/wechat/message.rb

@@ -94,7 +94,7 @@ module Wechat
     def news(collection, &block)
       if block_given?
         article = ArticleBuilder.new
-        collection.each { |item| yield(article, item) }
+        collection.take(10).each_with_index { |item, index| yield(article, item, index) }
         items = article.items
       else
         items = collection.collect do |item|

data/lib/{action_controller → wechat}/responder.rb

@@ -1,4 +1,5 @@
 require 'English'
+require 'wechat/signature'
 
 module Wechat
   module Responder
@@ -14,11 +15,11 @@ module Wechat
       attr_accessor :wechat, :token, :corpid, :agentid, :encrypt_mode, :skip_verify_ssl, :encoding_aes_key
 
       def on(message_type, with: nil, respond: nil, &block)
-        fail 'Unknow message type' unless message_type.in? [:text, :image, :voice, :video, :location, :link, :event, :fallback]
+        fail 'Unknow message type' unless [:text, :image, :voice, :video, :location, :link, :event, :fallback].include?(message_type)
         config = respond.nil? ? {} : { respond: respond }
         config.merge!(proc: block) if block_given?
 
-        if with.present? && !message_type.in?([:text, :event])
+        if with.present? && ![:text, :event].include?(message_type)
           fail 'Only text and event message can take :with parameters'
         else
           config.merge!(with: with) if with.present?
@@ -104,22 +105,14 @@ module Wechat
     def verify_signature
       signature = params[:signature] || params[:msg_signature]
 
-      render text: 'Forbidden', status: 403 if signature != Digest::SHA1.hexdigest(content_to_verify)
-    end
-
-    def content_to_verify
-      array = [self.class.token, params[:timestamp], params[:nonce]]
+      msg_encrypt = params[:echostr] if self.class.corpid.present?
 
-      # 默认使用明文方式验证, 企业号验证加密签名
-      if params[:signature].blank? && params[:msg_signature]
-        if params[:echostr].present?
-          array << params[:echostr]
-        else
-          array << request_encrypt_content
-        end
-      end
+      msg_encrypt ||= request_encrypt_content if self.class.encrypt_mode
 
-      array.compact.collect(&:to_s).sort.join
+      render text: 'Forbidden', status: 403 if signature != Signature.hexdigest(self.class.token,
+                                                                                params[:timestamp],
+                                                                                params[:nonce],
+                                                                                msg_encrypt)
     end
 
     def post_xml
@@ -155,7 +148,7 @@ module Wechat
     def process_response(response)
       msg = response.to_xml
 
-      if self.class.encrypt_mode && request_encrypt_content.present?
+      if self.class.encrypt_mode
         encrypt = Base64.strict_encode64(encrypt(pack(msg, @app_id), self.class.encoding_aes_key))
         msg = gen_msg(encrypt, params[:timestamp], params[:nonce])
       end
@@ -164,7 +157,7 @@ module Wechat
     end
 
     def gen_msg(encrypt, timestamp, nonce)
-      msg_sign = Digest::SHA1.hexdigest [self.class.token, encrypt, timestamp, nonce].compact.collect(&:to_s).sort.join
+      msg_sign = Signature.hexdigest(self.class.token, timestamp, nonce, encrypt)
 
       { Encrypt: encrypt,
         MsgSignature: msg_sign,

data/lib/wechat/signature.rb

@@ -0,0 +1,10 @@
+module Wechat
+  module Signature
+    def self.hexdigest(token, timestamp, nonce, msg_encrypt)
+      array = [token, timestamp, nonce]
+      array << msg_encrypt unless msg_encrypt.nil?
+      dev_msg_signature = array.compact.collect(&:to_s).sort.join
+      Digest::SHA1.hexdigest(dev_msg_signature)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Skinnyworm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-05 00:00:00.000000000 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -79,7 +79,6 @@ files:
 - README.md
 - Rakefile
 - bin/wechat
-- lib/action_controller/responder.rb
 - lib/action_controller/wechat_responder.rb
 - lib/wechat.rb
 - lib/wechat/access_token.rb
@@ -90,6 +89,8 @@ files:
 - lib/wechat/corp_api.rb
 - lib/wechat/jsapi_ticket.rb
 - lib/wechat/message.rb
+- lib/wechat/responder.rb
+- lib/wechat/signature.rb
 homepage: https://github.com/Eric-Guo/wechat
 licenses:
 - MIT