weixin_rails_middleware 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd7bcc751768e004541fe3255c61e12ec9e82269
-  data.tar.gz: cf259c502985e73347a1c80cc59680adeaf09c2e
+  metadata.gz: 381fcd2eb890939d2b4cd3c6738aa2ef2ce38982
+  data.tar.gz: 1eaf214d92befdd0e3646eba489264526fabdf90
 SHA512:
-  metadata.gz: 88f952a9729b8622b6ac8473949c30b099317d27bb38335960b6aed4cca319e5ec4380ca83fbb870e18545ac1e701cd454be32967ddff1324ddf34c942347544
-  data.tar.gz: f7e1bb19106a7e0d89e9ddc110c87ba98dbacea640d98be4eb1a547fab1dafe1509b4e17bcf8fe3cd1028410a9b84d62d9ababcae4a2d4b7944e2baea4a29ec2
+  metadata.gz: 80698d8806763968e4c432b143c3229a67fd6740ff7b8b53596fe763d06cd668e5e34847151d5df6c04d485d460ed24eec3ddd8cf89ce7e326e81fb33a41cb50
+  data.tar.gz: 3b08680f1058874ec2f6e39798ad1cc05b5075abc998d6423398ef06afe098e40057068cafdfa9c657284793f589a16096779ed29ce2426bb4aad4645bf25d20

data/app/controllers/weixin_rails_middleware/weixin_controller.rb

@@ -1,10 +1,10 @@
 module WeixinRailsMiddleware
   class WeixinController < ApplicationController
-
     include WeixinMessageHelper
 
     skip_before_filter :verify_authenticity_token
     before_action :check_weixin_params, only: [:index, :reply]
+    before_action :set_weixin_public_account, :set_weixin_message, only: :reply
 
     def index
       render text: params[:echostr]
@@ -59,5 +59,26 @@ module WeixinRailsMiddleware
         token_model_instance
       end
 
+      # e.g. will generate +@weixin_public_account+
+      def set_weixin_public_account
+        return nil if WeixinRailsMiddleware.config.token_string.present?
+        @weixin_public_account ||= token_model_instance
+      end
+
+      def set_weixin_message
+        # Get the current_message
+        @weixin_message ||= current_weixin_message
+      end
+
+      # take the weixin params
+      def current_weixin_params
+        request.body.read
+      end
+
+      # return a message class with current_weixin_params
+      def current_weixin_message
+        Message.factory(current_weixin_params)
+      end
+
   end
 end

data/lib/generators/templates/weixin_controller.rb

@@ -1,27 +1,39 @@
 WeixinRailsMiddleware::WeixinController.class_eval do
 
+  # There are two instance: @weixin_message,
+  # @weixin_public_account(token_model instance if you setup, otherwise return nil)
   def reply
-    # Get the current_message
-    current_message = current_weixin_message
-
-    case current_message.MsgType
-    when 'text'
-      # text message handler
-      # render xml: reply_text_message("ToUserName", "FromUserName", "your Message")
-    when 'image'
+    render xml: send("response_#{@weixin_message.MsgType}_message", {})
+  end
+
+  private
+
+    def response_text_message(options={})
+      reply_text_message("Your Message: #{@weixin_message.Content}")
+
+    end
+
+    def response_location_message(options={})
+      reply_text_message("Your Location: #{@weixin_message.Location_X}, #{@weixin_message.Location_Y}")
+    end
+
+    def response_image_message(options={})
       # image message handler
-    when 'location'
-      # location message handler
-    when 'link'
+    end
+
+    def response_link_message(options={})
       # link message handler
-    when 'event'
+    end
+
+    def response_event_message(options={})
       # event messge handler
-    when 'voice'
+    end
+
+    def response_voice_message(options={})
       # voice message handler
-    when 'video'
+    end
+
+    def response_video_message(options={})
       # video message handler
-    else
-      render xml: reply_text_message(current_message.ToUserName, current_message.FromUserName, 'Unknow message')
     end
-  end
 end

data/lib/weixin_rails_middleware/configuration.rb

@@ -19,4 +19,4 @@ module WeixinRailsMiddleware
     end
 
   end
-end
+end

data/lib/weixin_rails_middleware/version.rb

@@ -1,3 +1,3 @@
 module WeixinRailsMiddleware
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/weixin_rails_middleware/weixin_message_helper.rb

@@ -1,10 +1,13 @@
 module WeixinRailsMiddleware
   module WeixinMessageHelper
 
-    def reply_text_message(from, to, content)
+    # e.g.
+    # reply_text_message(@weixin_message.ToUserName, @weixin_message.FromUserName, "Your Message: #{@weixin_message.Content}")
+    # Or reply_text_message("Your Message: #{@weixin_message.Content}")
+    def reply_text_message(from=nil, to=nil, content)
       message = TextReplyMessage.new
-      message.ToUserName   = to
-      message.FromUserName = from
+      message.FromUserName = from || @weixin_message.ToUserName
+      message.ToUserName   = to   || @weixin_message.FromUserName
       message.Content      = content
       message.to_xml
     end
@@ -19,10 +22,10 @@ module WeixinRailsMiddleware
     end
 
     # music = generate_music
-    def reply_music_message(from, to, music)
+    def reply_music_message(from=nil, to=nil, music)
       message = MusicReplyMessage.new
-      message.ToUserName   = to
-      message.FromUserName = from
+      message.FromUserName = from || @weixin_message.ToUserName
+      message.ToUserName   = to   || @weixin_message.FromUserName
       message.Music        = music
       message.to_xml
     end
@@ -37,10 +40,10 @@ module WeixinRailsMiddleware
     end
 
     # articles = [generate_article]
-    def reply_news_message(from, to, articles)
+    def reply_news_message(from=nil, to=nil, articles)
       message = NewsReplyMessage.new
-      message.ToUserName   = to
-      message.FromUserName = from
+      message.FromUserName = from || @weixin_message.ToUserName
+      message.ToUserName   = to   || @weixin_message.FromUserName
       message.Articles     = articles
       message.ArticleCount = articles.count
       message.to_xml
@@ -54,8 +57,10 @@ module WeixinRailsMiddleware
       vodeo
     end
 
-    def replay_video_message(video)
+    def replay_video_message(from=nil, to=nil, video)
       message = VideoReplyMessage.new
+      message.FromUserName = from || @weixin_message.ToUserName
+      message.ToUserName   = to   || @weixin_message.FromUserName
       message.Video = video
       message.to_xml
     end
@@ -66,8 +71,10 @@ module WeixinRailsMiddleware
       voice
     end
 
-    def reply_voice_message(voice)
+    def reply_voice_message(from=nil, to=nil, voice)
       message = VoiceReplyMessage.new
+      message.FromUserName = from || @weixin_message.ToUserName
+      message.ToUserName   = to   || @weixin_message.FromUserName
       message.Voice = voice
       message.to_xml
     end
@@ -78,20 +85,13 @@ module WeixinRailsMiddleware
       image
     end
 
-    def reply_imgage_message(image)
+    def reply_imgage_message(from=nil, to=nil, image)
       message = ImageReplyMessage.new
+      message.FromUserName = from || @weixin_message.ToUserName
+      message.ToUserName   = to   || @weixin_message.FromUserName
       message.Image = image
-    end
-
-    # take the weixin params
-    def current_weixin_params
-      request.body.read
-    end
-
-    # return a message class with current_weixin_params
-    def current_weixin_message
-       Message.factory(current_weixin_params)
+      message.to_xml
     end
 
   end
-end
+end

data/lib/weixin_rails_middleware/weixin_server_url.rb

@@ -0,0 +1,14 @@
+module WeixinRailsMiddleware
+  module WeixinServerUrl
+    extend ActiveSupport::Concern
+
+    included do
+      def weixin_server_url
+        "http test"
+      end
+    end
+  end
+end
+
+
+

data/lib/weixin_rails_middleware.rb

@@ -5,6 +5,7 @@ require "weixin_rails_middleware/reply_message"
 require "weixin_rails_middleware/weixin_message_helper"
 require "weixin_rails_middleware/weixin_token_form_helper"
 require "weixin_rails_middleware/unique_token_helper"
+require "weixin_rails_middleware/weixin_server_url"
 
 module WeixinRailsMiddleware
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weixin_rails_middleware
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - lanrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -101,6 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- Rakefile
 - app/controllers/weixin_rails_middleware/application_controller.rb
 - app/controllers/weixin_rails_middleware/weixin_controller.rb
 - config/routes.rb
@@ -108,6 +110,7 @@ files:
 - lib/generators/templates/weixin_controller.rb
 - lib/generators/weixin_rails_middleware/install_generator.rb
 - lib/tasks/weixin_rails_middleware_tasks.rake
+- lib/weixin_rails_middleware.rb
 - lib/weixin_rails_middleware/configuration.rb
 - lib/weixin_rails_middleware/engine.rb
 - lib/weixin_rails_middleware/message.rb
@@ -115,10 +118,8 @@ files:
 - lib/weixin_rails_middleware/unique_token_helper.rb
 - lib/weixin_rails_middleware/version.rb
 - lib/weixin_rails_middleware/weixin_message_helper.rb
+- lib/weixin_rails_middleware/weixin_server_url.rb
 - lib/weixin_rails_middleware/weixin_token_form_helper.rb
-- lib/weixin_rails_middleware.rb
-- MIT-LICENSE
-- Rakefile
 homepage: http://github.com/lanrion/weixin_rails_middleware
 licenses: []
 metadata: {}
@@ -138,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: weixin_rails_middleware for integration weixin