lib/alipay/notify.rb in alipay-0.0.4 vs lib/alipay/notify.rb in alipay-0.0.5

@@ -1,12 +1,30 @@
 module Alipay
-  class Notify
-    def self.verify?(params)
-      if Sign.verify?(params)
+  module Notify
+    module Wap
+      def self.verify?(params)
         params = Utils.stringify_keys(params)
-        open("https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=#{CGI.escape params['notify_id'].to_s}").read == 'true'
-      else
-        false
+        notify_id = params['notify_data'].scan(/\<notify_id\>(.*)\<\/notify_id\>/).flatten.first
+
+        Sign::Wap.verify?(params) && Notify.verify_notify_id?(notify_id)
       end
+    end
+
+    module App
+      def self.verify?(params)
+        params = Utils.stringify_keys(params)
+        Sign::App.verify?(params) && Notify.verify_notify_id?(params['notify_id'])
+      end
+    end
+
+    def self.verify?(params)
+      params = Utils.stringify_keys(params)
+      Sign.verify?(params) && verify_notify_id?(params['notify_id'])
+    end
+
+    private
+
+    def self.verify_notify_id?(notify_id)
+      open("https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=#{CGI.escape(notify_id.to_s)}").read == 'true'
     end
   end
 end