xi_wechat_corp 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c1aa27990d8c3bc1126d1bb0834499278e13bf9
-  data.tar.gz: ff85e7794cd9ecb49222cf67026b636e743ac8e8
+  metadata.gz: ea696c0f425a8c09f218831490f7066e0b1a8be6
+  data.tar.gz: cd8160b093ab9e98023d9a518bd98e6e0dbb1a5a
 SHA512:
-  metadata.gz: 2458e53ca6922f28df0b621b400464c58c6474feec8a033e9041e0b5480282832dc9cab419072e9fabfdc3a33d1f4650b3314341354b949d732eb3003cd51f32
-  data.tar.gz: 09a61afcb3804a7f58721c8c613692ca8324a2cceb9e271546124cb4cd03e17d82ee2bcb9ad4795f86f419f25dc82f764a2deb91f4ed4a09d0008999cb7f4c7b
+  metadata.gz: 4f279c4577eefb16d2e8810a29001e7b9d9868ca4e19568ebdc49ba5fce29cdbbae889be8488e28a0c3cb41cdc08a44a91aff9bf6d4a389df268edd2902d0e7f
+  data.tar.gz: ac876379962b1bd3195be9bf17a9df6c0803c7f27aec20af5be6ce994f5e57b9f67b1eef3c58fe1931dff3602e7562302a024266e1dfa93abb2588e56d40619f

data/README.md

@@ -39,6 +39,20 @@ logic for `POST` requests. All post params can be get through rack env
 `xi_wechat_corp.params`, including decrypted params. The handler just return
 the plain XML, The middleware will encrypt response and sign it.
 
+### Used in Grape
+
+    require 'xi_wechat_corp'
+    class MyAPI < Grape::API
+      use XiWechatCorp::Callback::Rack do |req|
+        corp_id 'wx1234'
+        token 'secret'
+        aes_key 'secret'
+      end
+
+      parser :xml, XiWechatCorp::Callback::Grape::Parser
+      formatter :xml, XiWechatCorp::Callback::Grape::Formatter
+    end
+
 ### Handle Callback Manually
 
 Verify and decrypt Request

data/lib/xi_wechat_corp/callback.rb

@@ -3,6 +3,9 @@ module XiWechatCorp
     autoload :Request, 'xi_wechat_corp/callback/request'
     autoload :Response, 'xi_wechat_corp/callback/response'
     autoload :Rack, 'xi_wechat_corp/callback/rack'
-    autoload :GrapeXmlParser, 'xi_wechat_corp/callback/grape_xml_parser'
+    module Grape
+      autoload :Parser, 'xi_wechat_corp/callback/grape'
+      autoload :Formatter, 'xi_wechat_corp/callback/grape'
+    end
   end
 end

data/lib/xi_wechat_corp/callback/grape.rb

@@ -0,0 +1,28 @@
+module XiWechatCorp
+  module Callback
+    module Grape
+      # Ensure that XiWechatCorp::Callback::Rack middleware has bee added.
+      #
+      #     parser :xml, XiWechatCorp::Callback::Grape::Parser
+      module Parser
+        def self.call(object, env)
+          if env['xi_wechat_corp.params']
+            env['xi_wechat_corp.params']
+          else
+            Grape::Parser::Xml.call(object, env)
+          end
+        end
+      end
+
+      # Set this as the default XML formater in Grape
+      #
+      #     formatter :xml, XiWechatCorp::Callback::Grape::Formatter
+      module Formatter
+        def self.call(object, env)
+          return object.to_xml(root: 'xml', skip_instruct: true, indent: 0) if object.respond_to?(:to_xml)
+          fail Grape::Exceptions::InvalidFormatter.new(object.class, 'xml')
+        end
+      end
+    end
+  end
+end

data/lib/xi_wechat_corp/version.rb

@@ -1,3 +1,3 @@
 module XiWechatCorp
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xi_wechat_corp
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ian Yang
@@ -186,7 +186,7 @@ files:
 - lib/xi_wechat_corp/api/connection.rb
 - lib/xi_wechat_corp/callback.rb
 - lib/xi_wechat_corp/callback/config.rb
-- lib/xi_wechat_corp/callback/grape_xml_parser.rb
+- lib/xi_wechat_corp/callback/grape.rb
 - lib/xi_wechat_corp/callback/rack.rb
 - lib/xi_wechat_corp/callback/request.rb
 - lib/xi_wechat_corp/callback/response.rb

data/lib/xi_wechat_corp/callback/grape_xml_parser.rb

@@ -1,18 +0,0 @@
-module XiWechatCorp
-  module Callback
-    # Ensure that XiWechatCorp::Callback::Rack middleware has bee added.
-    #
-    #     parser :xml, XiWechatCorp::Callback::GrapeXmlParser     
-    module GrapeXmlParser
-      class << self
-        def call(object, env)
-          if env['xi_wechat_corp.params']
-            env['xi_wechat_corp.params']
-          else
-            Grape::Parser::Xml.call(object, env)
-          end
-        end
-      end
-    end
-  end
-end