weixin_rails_middleware 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c106f4f5b4f9a69155ebed8496650fea9e818c5e
-  data.tar.gz: 5e14b1dcb4fb846396a93d2e243fd1591310f645
+  metadata.gz: 328982300f97b4e56ae76baac5df06ae9b8e5605
+  data.tar.gz: 330a98f5c4c6b13cd86a0740b2a91cf6f2a3c4cb
 SHA512:
-  metadata.gz: 7cf5f89774e7659dffe2b12be128348b0fb34e12afd73cf9cb9db80c230ced3996ec37033cd62a492969f727aefed648a29b86be905043f0237cddac07adf349
-  data.tar.gz: 140ce490d0704183158f44112cb2cb9460a99628a0e462507ae820cefc49ac4c95794b45f50a12a58d0a2820f01c7a4422c44e179af19fb094bd5aae361fd49c
+  metadata.gz: 999b82f09d4bf3cc3731e6ab1bf7dd7ad19b3183e2cbb0aef72c49c688e53065b4b201407ed28e4720e0bfd7d1f7792c6180ff20438b35aba771d239e0b646a9
+  data.tar.gz: 9f5ae33310059880dda908ad38bb7faf4aebce6763e5df0c04eb0da65cbc4c5c689a213206dc0017eb4ec2e4ecfdec3fc9cd09b088174fe029abf8efa667476d

data/lib/generators/templates/install_weixin_rails_middleware.rb

@@ -16,8 +16,4 @@ WeixinRailsMiddleware.configure do |config|
   # using to weixin server url to validate the token can be trusted.
   # config.weixin_secret_string = '<%= WeiXinUniqueToken.generate(generator: :urlsafe_base64, size: 24) %>'
 
-  ## Router configure ##
-  # Default is "/", and recommend you use default directly.
-  # config.engine_path = "/"
-
 end

data/lib/generators/templates/weixin_controller.rb

@@ -1,7 +1,11 @@
+# encoding: utf-8
+# 1: get weixin xml params
+# @weixin_message
+# 2: public_account_class instance if you setup, otherwise return nil
+# @weixin_public_account
 WeixinRailsMiddleware::WeixinController.class_eval do
+  before_filter :set_keyword, only: :reply
 
-  # There are two instance: @weixin_message,
-  # @weixin_public_account(token_model instance if you setup, otherwise return nil)
   def reply
     render xml: send("response_#{@weixin_message.MsgType}_message", {})
   end
@@ -9,30 +13,92 @@ WeixinRailsMiddleware::WeixinController.class_eval do
   private
 
     def response_text_message(options={})
-      reply_text_message("Your Message: #{@weixin_message.Content}")
+      reply_text_message("Your Message: #{@keyword}")
     end
 
+    # <Location_X>23.134521</Location_X>
+    # <Location_Y>113.358803</Location_Y>
+    # <Scale>20</Scale>
+    # <Label><![CDATA[位置信息]]></Label>
     def response_location_message(options={})
-      reply_text_message("Your Location: #{@weixin_message.Location_X}, #{@weixin_message.Location_Y}")
+      @lx    = @weixin_message.Location_X
+      @ly    = @weixin_message.Location_Y
+      @scale = @weixin_message.Scale
+      @label = @weixin_message.Label
+      reply_text_message("Your Location: #{@lx}, #{@ly}, #{@scale}, #{@label}")
     end
 
+    # <PicUrl><![CDATA[this is a url]]></PicUrl>
+    # <MediaId><![CDATA[media_id]]></MediaId>
     def response_image_message(options={})
-      # image message handler
+      @pic_url  = @weixin_message.PicUrl
+      @media_id = @weixin_message.MediaId # 可以调用多媒体文件下载接口拉取数据。
+      reply_text_message("回复图片信息")
     end
 
+    # <Title><![CDATA[公众平台官网链接]]></Title>
+    # <Description><![CDATA[公众平台官网链接]]></Description>
+    # <Url><![CDATA[url]]></Url>
     def response_link_message(options={})
-      # link message handler
+      @title = @weixin_message.Title
+      @desc  = @weixin_message.Description
+      @url   = @weixin_message.Url
+      reply_text_message("回复链接信息")
     end
 
     def response_event_message(options={})
-      # event messge handler
+      event_type = @weixin_message.Event
+      case event_type
+      when "subscribe"   # 关注公众账号
+        if @keyword.present?
+          # 扫描带参数二维码事件: 1. 用户未关注时，进行关注后的事件推送
+          reply_text_message("扫描带参数二维码事件: 1. 用户未关注时，进行关注后的事件推送, keyword: #{@keyword}")
+        end
+        reply_text_message("关注公众账号")
+      when "unsubscribe" # 取消关注
+        reply_text_message("取消关注")
+      when "SCAN"        # 扫描带参数二维码事件: 2用户已关注时的事件推送
+        reply_text_message("扫描带参数二维码事件: 2用户已关注时的事件推送, keyword: #{@keyword}")
+      when "LOCATION"    # 上报地理位置事件
+        @lat = @weixin_message.Latitude
+        @lgt = @weixin_message.Longitude
+        @precision = @weixin_message.Precision
+        reply_text_message("Your Location: #{@lat}, #{@lgt}, #{@precision}")
+      when "CLICK"       # 点击菜单拉取消息时的事件推送
+        reply_text_message("你点击了: #{@keyword}")
+      when "VIEW"        # 点击菜单跳转链接时的事件推送
+        reply_text_message("你点击了: #{@keyword}")
+      else
+        reply_text_message("处理无法识别的事件")
+      end
+
     end
 
+    # <MediaId><![CDATA[media_id]]></MediaId>
+    # <Format><![CDATA[Format]]></Format>
     def response_voice_message(options={})
-      # voice message handler
+      @media_id = @weixin_message.MediaId # 可以调用多媒体文件下载接口拉取数据。
+      @format   = @weixin_message.format
+      reply_text_message("回复语音信息: #{@keyword}")
     end
 
+    # <MediaId><![CDATA[media_id]]></MediaId>
+    # <ThumbMediaId><![CDATA[thumb_media_id]]></ThumbMediaId>
     def response_video_message(options={})
-      # video message handler
+      @media_id = @weixin_message.MediaId # 可以调用多媒体文件下载接口拉取数据。
+      # 视频消息缩略图的媒体id，可以调用多媒体文件下载接口拉取数据。
+      @thumb_media_id = @weixin_message.ThumbMediaId
+      reply_text_message("回复视频信息")
+    end
+
+    def set_keyword
+      @keyword = @weixin_message.Content    || # 文本消息
+                 @weixin_message.EventKey   || # 事件推送
+                 @weixin_message.Recognition # 接收语音识别结果
+    end
+
+    # http://apidock.com/rails/ActionController/Base/default_url_options
+    def default_url_options(options={})
+      { weichat_id: @weixin_message.FromUserName }
     end
 end

data/lib/generators/weixin_rails_middleware/install_generator.rb

@@ -8,7 +8,7 @@ module WeixinRailsMiddleware
       desc 'Creates a WeixinRailsMiddleware initializer for your application.'
 
       def install
-        route 'mount WeixinRailsMiddleware::Engine, at: WeixinRailsMiddleware.config.engine_path'
+        route 'mount WeixinRailsMiddleware::Engine, at: "/"'
       end
 
       def copy_initializer

data/lib/weixin_rails_middleware.rb

@@ -9,7 +9,6 @@ require "weixin_rails_middleware/helpers/weixin_authorize_helper"
 module WeixinRailsMiddleware
 
   DEFAULT_TOKEN_COLUMN_NAME = "weixin_token".freeze
-  DEFAULT_ENGINE_PATH       = "/".freeze
   DEFAULT_WEIXIN_SECRET_KEY = "weixin_secret_key".freeze
 
 end

data/lib/weixin_rails_middleware/configuration.rb

@@ -18,20 +18,12 @@ module WeixinRailsMiddleware
     # use 'public_account_class': if the token is saved in SomeModel, then find token by it
     # use 'weixin_token': if the token is a String, just use it,
     attr_accessor :public_account_class, :weixin_token_string, :weixin_secret_string
-    attr_accessor :engine_path
-
-    def initialize
-      @engine_path = DEFAULT_ENGINE_PATH
-    end
 
   end
 
   module ConfigurationHelpers
     extend ActiveSupport::Concern
 
-    def engine_path
-      @engine_path ||= WeixinRailsMiddleware.config.engine_path
-    end
 
     def weixin_token_string
       @weixin_token_string ||= WeixinRailsMiddleware.config.weixin_token_string.to_s
@@ -45,10 +37,6 @@ module WeixinRailsMiddleware
       @weixin_secret_string ||= WeixinRailsMiddleware.config.weixin_secret_string.to_s
     end
 
-    def is_default_engine_path?
-      engine_path == DEFAULT_ENGINE_PATH # "/"
-    end
-
     def token_model_class
       if token_model.blank?
         raise "You need to config `public_account_class` in 'config/initializers/weixin_rails_middleware.rb'"

data/lib/weixin_rails_middleware/helpers/weixin_authorize_helper.rb

@@ -5,34 +5,49 @@ module WeixinRailsMiddleware
     protected
 
       def check_weixin_params
-        if is_weixin_secret_key_valid? && is_signature_invalid?
-          render text: "Forbidden", status: 403
-        end
-      end
 
-      # check the token from Weixin Service is exist in local store.
-      def is_weixin_secret_key_valid?
-        if weixin_token_string.blank?
-          if current_weixin_public_account.blank?
-            render text: "Forbidden", status: 403
+        # if config weixin token string
+        if weixin_token_string.present?
+          if !is_weixin_secret_string_valid?
+            puts "WeixinSecretStringNotMatch"
+            render text: "WeixinSecretStringNotMatch", status: 403
             return false
           end
+        # if use database to store public_account
         else
-          if current_weixin_secret_key != weixin_secret_string
-            render text: "Forbidden", status: 403
+          if !is_weixin_secret_key_valid?
+            puts "RecordNotFound"
+            render text: "RecordNotFound - Couldn't find #{token_model} with weixin_secret_key=#{current_weixin_secret_key} ", status: 404
             return false
           end
         end
+
+        if !is_signature_valid?
+          puts "WeixinSignatureNotMatch"
+          render text: "WeixinSignatureNotMatch", status: 403
+          return false
+        end
         true
       end
 
-      def is_signature_invalid?
+      # check the token from Weixin Service is exist in local store.
+      def is_weixin_secret_key_valid?
+        if weixin_token_string.blank?
+          current_weixin_public_account.present?
+        end
+      end
+
+      def is_weixin_secret_string_valid?
+        current_weixin_secret_key == weixin_secret_string
+      end
+
+      def is_signature_valid?
         signature   = params[:signature] || ''
         timestamp   = params[:timestamp] || ''
         nonce       = params[:nonce]     || ''
         sort_params = [current_weixin_token, timestamp, nonce].sort.join
         current_signature = Digest::SHA1.hexdigest(sort_params)
-        return true if current_signature != signature
+        return true if current_signature == signature
         false
       end
 

data/lib/weixin_rails_middleware/version.rb

@@ -1,3 +1,3 @@
 module WeixinRailsMiddleware
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weixin_rails_middleware
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - lanrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties