class private method should place in engine class

jasl
1 parent 1cf50501
Showing 1 changed file with 28 additions and 26 deletions Show diff stats
lib/wx_pay/service.rb
@@ -158,36 +158,38 @@ module WxPay
       r
     end
  
-    private
+    class << self
+      private
  
-    def self.check_required_options(options, names)
-      names.each do |name|
-        warn("WxPay Warn: missing required option: #{name}") unless options.has_key?(name)
+      def check_required_options(options, names)
+        names.each do |name|
+          warn("WxPay Warn: missing required option: #{name}") unless options.has_key?(name)
+        end
       end
-    end
  
-    def self.make_payload(params)
-      sign = WxPay::Sign.generate(params)
-      params.delete(:key) if params[:key]
-      "<xml>#{params.map { |k, v| "<#{k}>#{v}</#{k}>" }.join}<sign>#{sign}</sign></xml>"
-    end
+      def make_payload(params)
+        sign = WxPay::Sign.generate(params)
+        params.delete(:key) if params[:key]
+        "<xml>#{params.map { |k, v| "<#{k}>#{v}</#{k}>" }.join}<sign>#{sign}</sign></xml>"
+      end
  
-    def self.invoke_remote(url, payload, options = {})
-      options = WxPay.extra_rest_client_options.merge(options)
-
-      r = RestClient::Request.execute(
-        {
-          method: :post,
-          url: url,
-          payload: payload,
-          headers: { content_type: 'application/xml' }
-        }.merge(options)
-      )
-
-      if r
-        WxPay::Result[Hash.from_xml(r)]
-      else
-        nil
+      def invoke_remote(url, payload, options = {})
+        options = WxPay.extra_rest_client_options.merge(options)
+
+        r = RestClient::Request.execute(
+          {
+            method: :post,
+            url: url,
+            payload: payload,
+            headers: { content_type: 'application/xml' }
+          }.merge(options)
+        )
+
+        if r
+          WxPay::Result[Hash.from_xml(r)]
+        else
+          nil
+        end
       end
     end
   end
...	...	@@ -158,36 +158,38 @@ module WxPay
158	158	r
159	159	end
160	160
161		- private
	161	+ class << self
	162	+ private
162	163
163		- def self.check_required_options(options, names)
164		- names.each do \|name\|
165		- warn("WxPay Warn: missing required option: #{name}") unless options.has_key?(name)
	164	+ def check_required_options(options, names)
	165	+ names.each do \|name\|
	166	+ warn("WxPay Warn: missing required option: #{name}") unless options.has_key?(name)
	167	+ end
166	168	end
167		- end
168	169
169		- def self.make_payload(params)
170		- sign = WxPay::Sign.generate(params)
171		- params.delete(:key) if params[:key]
172		- "<xml>#{params.map { \|k, v\| "<#{k}>#{v}</#{k}>" }.join}<sign>#{sign}</sign></xml>"
173		- end
	170	+ def make_payload(params)
	171	+ sign = WxPay::Sign.generate(params)
	172	+ params.delete(:key) if params[:key]
	173	+ "<xml>#{params.map { \|k, v\| "<#{k}>#{v}</#{k}>" }.join}<sign>#{sign}</sign></xml>"
	174	+ end
174	175
175		- def self.invoke_remote(url, payload, options = {})
176		- options = WxPay.extra_rest_client_options.merge(options)
177		-
178		- r = RestClient::Request.execute(
179		- {
180		- method: :post,
181		- url: url,
182		- payload: payload,
183		- headers: { content_type: 'application/xml' }
184		- }.merge(options)
185		- )
186		-
187		- if r
188		- WxPay::Result[Hash.from_xml(r)]
189		- else
190		- nil
	176	+ def invoke_remote(url, payload, options = {})
	177	+ options = WxPay.extra_rest_client_options.merge(options)
	178	+
	179	+ r = RestClient::Request.execute(
	180	+ {
	181	+ method: :post,
	182	+ url: url,
	183	+ payload: payload,
	184	+ headers: { content_type: 'application/xml' }
	185	+ }.merge(options)
	186	+ )
	187	+
	188	+ if r
	189	+ WxPay::Result[Hash.from_xml(r)]
	190	+ else
	191	+ nil
	192	+ end
191	193	end
192	194	end
193	195	end
...	...