wx_pay 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 982340d48955dd0cd2d30b9e494f3fd26b6df4dd
-  data.tar.gz: 2992d5cb8b0c572b85d0bacc25577468f559106a
+  metadata.gz: db7946c82422013bede3c2eb795c8f3752e7f738
+  data.tar.gz: 77a7c68125f7aafc8e66db14cab4adad35f24ae0
 SHA512:
-  metadata.gz: f5222caaabbc3aa43357a71c1392d7ce0c0e987e621c27064d0bc3fcabea91211f0d63b7cc4b0498b03802527904e48559ebf27e327334f4fc24c557cf81b0cd
-  data.tar.gz: 736c4e4567dd4ac180694cb63a602ab12f576efb28c68e9a96443e587e9341da40d51d831ac68f22593edc9c415be7a696cbf80e74f68a232464ce329acae311
+  metadata.gz: 1c71b47e51f0fd640662978e05aa228705885d578f9d76d3f47bbe2158870fa65b0eefc78d6a2be50f5f21c5e3739157ddeb8c8cb8fbce77f896d09d513d2f9f
+  data.tar.gz: 6496c0c1678c951d9c081e358283bc92955036826972004371503d906d8cfbd308758786d7c6937234175e11e836529ad7337a11c8b461d89f981e5b5e2ccb90

data/lib/wx_pay/result.rb

@@ -0,0 +1,19 @@
+module WxPay
+  class Result < ::Hash
+    SUCCESS_FLAG = 'SUCCESS'.freeze
+
+    def initialize(result)
+      super
+
+      if result['xml'].class == Hash
+        result['xml'].each_pair do |k, v|
+          self[k] = v
+        end
+      end
+    end
+
+    def success?
+      self['return_code'] == SUCCESS_FLAG && self['result_code'] == SUCCESS_FLAG
+    end
+  end
+end

data/lib/wx_pay/service.rb

@@ -8,14 +8,18 @@ module WxPay
     INVOKE_UNIFIEDORDER_REQUIRED_FIELDS = %i(body out_trade_no total_fee spbill_create_ip notify_url trade_type)
     def self.invoke_unifiedorder(params)
       params = {
-        app_id: WxPay.appid,
+        appid: WxPay.appid,
         mch_id: WxPay.mch_id,
         nonce_str: SecureRandom.uuid.tr('-', ''),
       }.merge(params)
 
       check_required_options(params, INVOKE_UNIFIEDORDER_REQUIRED_FIELDS)
 
-      WxPay::Utils.invoke_remote("#{GATEWAY_URL}/unifiedorder", WxPay::Utils.make_payload(params))
+      r = invoke_remote("#{GATEWAY_URL}/unifiedorder", make_payload(params))
+
+      yield r if block_given?
+
+      r
     end
 
     private
@@ -25,5 +29,26 @@ module WxPay
         warn("WxPay Warn: missing required option: #{name}") unless options.has_key?(name)
       end
     end
+
+    def self.make_payload(params)
+      "<xml>#{params.map { |k, v| "<#{k}>#{v}</#{k}>" }.join}<sign>#{WxPay::Sign.generate(params)}</sign></xml>"
+    end
+
+    def self.invoke_remote(url, payload)
+      r = RestClient::Request.execute(
+        {
+          method: :post,
+          url: url,
+          payload: payload,
+          headers: { content_type: 'application/xml' }
+        }.merge(WxPay.extra_rest_client_options)
+      )
+
+      if r
+        WxPay::Result.new Hash.from_xml(r)
+      else
+        nil
+      end
+    end
   end
 end

data/lib/wx_pay/sign.rb

@@ -11,8 +11,8 @@ module WxPay
     end
 
     def self.verify?(params)
-      params = Utils.stringify_keys(params)
-      sign = params.delete('sign')
+      params = params.dup
+      sign = params.delete('sign') || params.delete(:sign)
 
       generate(params) == sign
     end

data/lib/wx_pay/version.rb

@@ -1,3 +1,3 @@
 module WxPay
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/wx_pay.rb

@@ -1,7 +1,6 @@
-require 'wx_pay/utils'
+require 'wx_pay/result'
 require 'wx_pay/sign'
 require 'wx_pay/service'
-require 'wx_pay/notify'
 
 module WxPay
   class<< self

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/hash/conversions'
 require 'minitest/autorun'
 require 'wx_pay'
 require 'fakeweb'

data/test/wx_pay/result_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class WxPay::ResultTest < MiniTest::Test
+  def test_success_method_with_true
+    r = WxPay::Result.new(
+      Hash.from_xml(
+        <<-XML
+        <xml>
+          <return_code>SUCCESS</return_code>
+          <result_code>SUCCESS</result_code>
+        </xml>
+        XML
+      ))
+
+    assert_equal r.success?, true
+  end
+
+  def test_success_method_with_false
+    r = WxPay::Result.new(
+      Hash.from_xml(
+        <<-XML
+        <xml>
+        </xml>
+        XML
+      ))
+
+    assert_equal r.success?, false
+  end
+end

data/test/wx_pay/sign_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class WxPay::SignTest < MiniTest::Unit::TestCase
+class WxPay::SignTest < MiniTest::Test
   def setup
     @params = {
       appid: 'wxd930ea5d5a258f4f',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wx_pay
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -104,14 +104,13 @@ files:
 - MIT-LICENSE
 - Rakefile
 - lib/wx_pay.rb
-- lib/wx_pay/notify.rb
+- lib/wx_pay/result.rb
 - lib/wx_pay/service.rb
 - lib/wx_pay/sign.rb
-- lib/wx_pay/utils.rb
 - lib/wx_pay/version.rb
 - test/test_helper.rb
+- test/wx_pay/result_test.rb
 - test/wx_pay/sign_test.rb
-- test/wx_pay/utils_test.rb
 homepage: https://github.com/jasl/wx_pay
 licenses:
 - MIT
@@ -138,5 +137,5 @@ specification_version: 4
 summary: An unofficial simple wechat pay gem
 test_files:
 - test/test_helper.rb
+- test/wx_pay/result_test.rb
 - test/wx_pay/sign_test.rb
-- test/wx_pay/utils_test.rb

data/lib/wx_pay/notify.rb

@@ -1,18 +0,0 @@
-module WxPay
-  module Notify
-    GATEWAY = 'https://gw.tenpay.com/gateway/simpleverifynotifyid.xml'
-    SUCCESS_STR = '<retcode>0</retcode>'
-
-    def self.verify?(params)
-      return false unless Sign.verify?(params)
-
-      params = {
-          'input_charset' => 'UTF-8',
-          'partner' => WxPay.appid,
-          'notify_id' => CGI.escape(params[:notify_id].to_s)
-      }
-
-      open("#{GATEWAY}?#{Utils.make_query_string(params)}").read.include?(SUCCESS_STR)
-    end
-  end
-end

data/lib/wx_pay/utils.rb

@@ -1,27 +0,0 @@
-module WxPay
-  module Utils
-    def self.stringify_keys(hash)
-      new_hash = {}
-      hash.each do |key, value|
-        new_hash[(key.to_s rescue key) || key] = value
-      end
-      new_hash
-    end
-
-    def self.make_payload(params)
-      "<xml>#{params.map {|k, v| "<#{k}>#{v}</#{k}>"}.join}<sign>#{WxPay::Sign.generate(params)}</sign></xml>"
-    end
-
-    def self.invoke_remote(url, payload)
-      Hash.from_xml(
-        RestClient::Request.execute(
-          {
-            method: :post,
-            url: url,
-            payload: payload,
-            headers: {content_type: 'application/xml'}
-          }.merge(WxPay.extra_rest_client_options))
-      )
-    end
-  end
-end

data/test/wx_pay/utils_test.rb

@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class WxPay::UtilsTest < MiniTest::Unit::TestCase
-  def test_stringify_keys
-    hash = { 'a' => 1, :b => 2 }
-    assert_equal({ 'a' => 1, 'b' => 2 }.sort, WxPay::Utils.stringify_keys(hash).sort)
-  end
-end