weixin_rails_middleware 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f864df00b4c607bd3d9c96217d8a448ca8d4b9ff
-  data.tar.gz: cf2e9c7be77b62d6e7bdb87c70eaad6351e2b00d
+  metadata.gz: 7f65d96d4e58350a83ec0fba14b711b4250e79c3
+  data.tar.gz: 21999d40da51005a1ad025473a6fd987a3e77af5
 SHA512:
-  metadata.gz: ae8b8f0bd47219fe7876db2d728334d7c269320ab3b2a71a77ce1290f46baf3046ab765d2f3226ce1ce807e1ea8f5929536d688fac6fb8fd75cbfe451300a5a0
-  data.tar.gz: a674a9bfa8f46348b62aaa51cc15613544449f82ac40a5c8c725f3bf2e42b431e03f042c51d3a0ff4553e6a12efc0ecdf3180dd675f6e37f933af53a79776950
+  metadata.gz: f7178de0133a47bf05e75c1bbc9d11bcab4a1b9b86b5bfad3cecb255f206c7b6638d5c2daa5dd09edae8bf1bb8fcda83068b91bb9ac126e6464a937f82b37ef6
+  data.tar.gz: 20d4da31eb5d6fce51b72f40bd7ce1ffc672d1e82c4d408efdd2f574091a1fda836239e39b2692546bcae5d5bdcbf817b05e2b821c14de83ca2919335898da06

data/app/controllers/weixin_rails_middleware/weixin_controller.rb

@@ -2,6 +2,7 @@ module WeixinRailsMiddleware
   class WeixinController < ActionController::Base
     include ReplyWeixinMessageHelper
     include ConfigurationHelpers
+    include WeixinAuthorizeHelper
 
     skip_before_action :verify_authenticity_token
     before_action :check_weixin_params, only: [:index, :reply]
@@ -16,37 +17,6 @@ module WeixinRailsMiddleware
 
     protected
 
-      def check_weixin_params
-        if check_weixin_token_valid? && !is_hexdigest?
-          render text: "Forbidden", status: 403
-        end
-      end
-
-      # check the token from Weixin Service is exist in local store.
-      def check_weixin_token_valid?
-        if token_string.blank?
-          if token_model_instance.blank?
-            render text: "Forbidden", status: 403
-            return false
-          end
-        else
-          if current_weixin_token != token_string
-            render text: "Forbidden", status: 403
-            return false
-          end
-        end
-        true
-      end
-
-      def is_hexdigest?
-        signature = params[:signature] || ''
-        timestamp = params[:timestamp] || ''
-        nonce     = params[:nonce]     || ''
-        current_signature = Digest::SHA1.hexdigest([current_weixin_token, timestamp, nonce].sort.join)
-        return true if current_signature == signature
-        false
-      end
-
       ## Callback
       # e.g. will generate +@weixin_public_account+
       def set_weixin_public_account
@@ -59,19 +29,5 @@ module WeixinRailsMiddleware
         @weixin_message ||= current_weixin_message
       end
 
-      def current_weixin_token
-        @weixin_token = params[:weixin_token]
-      end
-
-      def token_model_instance
-        token_model_instance = token_model_class.where("#{token_column}" => current_weixin_token).first
-        token_model_instance
-      end
-
-      # return a message class with current_weixin_params
-      def current_weixin_message
-        Message.factory(request.body.read)
-      end
-
   end
 end

data/config/routes.rb

@@ -1,4 +1,4 @@
 WeixinRailsMiddleware::Engine.routes.draw do
-  get  'weixin/:weixin_token', to: 'weixin#index'
-  post 'weixin/:weixin_token', to: 'weixin#reply'
+  get  'weixin/:weixin_token', to: 'weixin#index', as: :weixin_index
+  post 'weixin/:weixin_token', to: 'weixin#reply', as: :weixin_reply
 end

data/lib/weixin_rails_middleware.rb

@@ -5,7 +5,7 @@ require "weixin_rails_middleware/models/reply_message"
 require "weixin_rails_middleware/helpers/reply_weixin_message_helper"
 require "weixin_rails_middleware/helpers/weixin_token_form_helper"
 require "weixin_rails_middleware/helpers/unique_token_helper"
-require "weixin_rails_middleware/helpers/weixin_server_url"
+require "weixin_rails_middleware/helpers/weixin_authorize_helper"
 
 module WeixinRailsMiddleware
 

data/lib/weixin_rails_middleware/engine.rb

@@ -1,14 +1,7 @@
 module WeixinRailsMiddleware
   class Engine < ::Rails::Engine
-    include ConfigurationHelpers
-
     isolate_namespace WeixinRailsMiddleware
-
-    config.after_initialize do
-      if token_model_class.present?
-        token_model_class.send(:include, WeixinServerUrl::InstanceMethods)
-      end
-    end
+    engine_name :weixin_engine
 
   end
 end

data/lib/weixin_rails_middleware/helpers/weixin_authorize_helper.rb

@@ -0,0 +1,54 @@
+module WeixinRailsMiddleware
+  module WeixinAuthorizeHelper
+    extend ActiveSupport::Concern
+
+    protected
+
+      def check_weixin_params
+        if check_weixin_token_valid? && !is_hexdigest?
+          render text: "Forbidden", status: 403
+        end
+      end
+
+      # check the token from Weixin Service is exist in local store.
+      def check_weixin_token_valid?
+        if token_string.blank?
+          if token_model_instance.blank?
+            render text: "Forbidden", status: 403
+            return false
+          end
+        else
+          if current_weixin_token != token_string
+            render text: "Forbidden", status: 403
+            return false
+          end
+        end
+        true
+      end
+
+      def is_hexdigest?
+        signature = params[:signature] || ''
+        timestamp = params[:timestamp] || ''
+        nonce     = params[:nonce]     || ''
+        current_signature = Digest::SHA1.hexdigest([current_weixin_token, timestamp, nonce].sort.join)
+        return true if current_signature == signature
+        false
+      end
+
+      def current_weixin_token
+        @weixin_token = params[:weixin_token]
+      end
+
+      def token_model_instance
+        token_model_instance = token_model_class.where("#{token_column}" => current_weixin_token).first
+        token_model_instance
+      end
+
+      # return a message class with current_weixin_params
+      def current_weixin_message
+        Message.factory(request.body.read)
+      end
+
+  end
+end
+

data/lib/weixin_rails_middleware/version.rb

@@ -1,3 +1,3 @@
 module WeixinRailsMiddleware
-  VERSION = "1.0.4".freeze
+  VERSION = "1.0.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weixin_rails_middleware
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - lanrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -114,7 +114,7 @@ files:
 - lib/weixin_rails_middleware/engine.rb
 - lib/weixin_rails_middleware/helpers/reply_weixin_message_helper.rb
 - lib/weixin_rails_middleware/helpers/unique_token_helper.rb
-- lib/weixin_rails_middleware/helpers/weixin_server_url.rb
+- lib/weixin_rails_middleware/helpers/weixin_authorize_helper.rb
 - lib/weixin_rails_middleware/helpers/weixin_token_form_helper.rb
 - lib/weixin_rails_middleware/models/message.rb
 - lib/weixin_rails_middleware/models/reply_message.rb

data/lib/weixin_rails_middleware/helpers/weixin_server_url.rb

@@ -1,69 +0,0 @@
-# TODO: added weixin_server_url for User
-# if config +token_model+, e.g. user = User.first; user.weixin_server_url
-# if config +token_string+, e.g. weixin_server_url
-# a public url looks like: weixin_server_url
-module WeixinRailsMiddleware
-  module WeixinServerUrl
-
-    module Base
-
-      private
-
-        def weixin_server_url_with_public_account(public_account)
-          base_host_url + current_token(public_account)
-        end
-
-        def weixin_server_url_without_public_account
-          base_host_url + token_string
-        end
-
-        def current_token(public_account)
-          if public_account.blank?
-            token_string
-          else
-            public_account.try(token_column)
-          end
-        end
-
-        def base_host_url
-          host_url = request.base_url
-          if is_default_engine_path? # "/"
-            "#{host_url}/weixin/"
-          else
-            "#{host_url}/#{engine_path}/weixin/"
-          end
-        end
-    end
-
-    module ViewHelpers
-      extend ActiveSupport::Concern
-      include ConfigurationHelpers
-      include Base
-      included do
-        def weixin_server_url(public_account=nil)
-          raise "You need pass a public_account instance." if token_string.blank? && public_account.blank?
-          if public_account.present?
-            weixin_server_url_with_public_account(public_account)
-          else
-            weixin_server_url_without_public_account(public_account)
-          end
-        end
-      end
-
-    end
-
-    module InstanceMethods
-      extend ActiveSupport::Concern
-      include ConfigurationHelpers
-      include Base
-      included do
-        def weixin_server_url
-          # base_host_url + self.send(token_column)
-          warn "Hi, this method is Pending, please use view helper: +weixin_server_url+ :)"
-        end
-      end
-    end
-  end
-end
-
-ActionView::Base.send :include, WeixinRailsMiddleware::WeixinServerUrl::ViewHelpers