unionpay 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f48073a80b07c6fd61921bcc1388898f84833fb2
-  data.tar.gz: 245748a08af3eb86f98742e091ba53fb2b26ad68
+  metadata.gz: c330478dd7bddd9619bcd800e66926d355d20ca1
+  data.tar.gz: 8f3f0baa67df1ee8943f61e9956e4ea36f2cf406
 SHA512:
-  metadata.gz: e5b7b187138754c8aa138d81a9df4e0abe98e07f4fa878a85881930896124e134bf176fdc8ddb16575a2e85b69f39552f32c792940bcc6379045c895e2b6fa37
-  data.tar.gz: 409320bf75366b6353b76cffe8dada0a365d72b1c4b62e1e64f303279dd3447d88285fb078ee99c3c465685efa3bc1394703b154369c62c70ab051c588c5bcdd
+  metadata.gz: e1aefe1ba238eb936e61337dd8884f8ccbd034d95f6825954a7d9c84acfbb997d36bc31143f661bb66e85b98b26a5d989cf9ab614f3c62f3c46f47efec297c5f
+  data.tar.gz: 75e0ad1e18b10857592377d592c2ceadb20ad6ccd9003984363cb4fa65fbabf4c44b580538a81d619602852695e6aca3ddba9bfab32d8ff746e0df8708410441

data/README.md

@@ -60,8 +60,6 @@ def unionpay_notify
 end
 ```
 
-
-
 ### Generate back payment post params
 
 ```ruby
@@ -71,8 +69,7 @@ param = {}
 param['transType']        = UnionPay::REFUND
 param['origQid']          = '201110281442120195882' #原交易返回的qid, 从数据库中获取
 param['orderAmount']      = 11000        #交易金额
-param['orderNumber']      = '20131220151706'
-param['orderTime']        = '20131220151706'
+param['orderNumber']      = '20131220151706'   #订单号，必须唯一(不能与原交易相同)
 param['customerIp']       = '127.0.0.1'  #用户IP
 param['frontEndUrl']      = ""     #前台回调URL, 后台交易可为空
 param['backEndUrl']       = "http://www.example.com/sdk/utf8/back_notify.php"    #后台回调URL
@@ -81,3 +78,29 @@ service = UnionPay::Service.back_pay(param)
 service.args   ## get args
 service.post   ## do post
 ```
+
+### Query
+
+```ruby
+param = {}
+param['transType'] = UnionPay::CONSUME
+param['orderNumber'] = "20111108150703852"
+param['orderTime'] = "20111108150703"
+query = UnionPay::Service.query(param)
+res = query.post
+responce = UnionPay::Service.responce res.body_str
+
+query_result = responce['queryResult']
+resp_code = responce['respCode']
+
+if query_result == UnionPay::QUERY_FAIL
+  puts "交易失败[respCode:#{resp_code}]!"
+elsif query_result == UnionPay::QUERY_INVALID
+  puts "不存在此交易!"
+elsif resp_code==UnionPay::RESP_SUCCESS && query_result == UnionPay::QUERY_SUCCESS
+  puts '交易成功!'
+elsif resp_code==UnionPay::RESP_SUCCESS && query_result == UnionPay::QUERY_WAIT
+  puts '交易处理中，下次再查!'
+end
+#
+```

data/lib/unionpay/service.rb

@@ -44,7 +44,7 @@ module UnionPay
             raise('consume OR pre_auth transactions need cardNumber!')
           end
         else
-          raise('origQid is not provided') if self.args['origQid'] !~ /[^[:space:]]/
+          raise('origQid is not provided') if UnionPay.empty? self.args['origQid']
         end
         service
       end
@@ -52,8 +52,17 @@ module UnionPay
 
     def self.responce(param)
       new.instance_eval do
-        cup_reserved = (param['cupReserved'] ||= '')
-        cup_reserved = Rack::Utils.parse_nested_query cup_reserved[1..-2]
+        if param.is_a? String
+          pattern = /cupReserved=(\{.*?\})/
+          cup_reserved = pattern.match(param)
+          if cup_reserved
+            cup_reserved = cup_reserved[1]
+            param.sub! pattern, 'cupReserved='
+          end
+          param = Rack::Utils.parse_nested_query param
+        end
+        cup_reserved ||= (param['cupReserved'] ||= '')
+        arr_reserved = Rack::Utils.parse_nested_query cup_reserved[1..-2]
         if !param['signature'] || !param['signMethod']
           raise('No signature Or signMethod set in notify data!')
         end
@@ -62,13 +71,35 @@ module UnionPay
         if param.delete('signature') != Service.sign(param)
           raise('Bad signature returned!')
         end
-        param.merge! cup_reserved
-        param.delete 'cupReserved'
-        self.args = param
+        self.args = param.merge arr_reserved
+        self.args.delete 'cupReserved'
         self
       end
     end
 
+    def self.query(param)
+      new.instance_eval do
+        @api_url = UnionPay.query_url
+        param['version'] = UnionPay::PayParams['version']
+        param['charset'] = UnionPay::PayParams['charset']
+        param['merId'] = UnionPay::PayParams['merId']
+
+        if UnionPay.empty?(UnionPay::PayParams['merId']) && UnionPay.empty?(UnionPay::PayParams['acqCode'])
+          raise('merId and acqCode can\'t be both empty')
+        end
+        if !UnionPay.empty?(UnionPay::PayParams['acqCode'])
+          acqCode = UnionPay::PayParams['acqCode']
+          param['merReserved'] = "{acqCode=#{acqCode}}"
+        else
+          param['merReserved'] = ''
+        end
+
+        self.args = param
+        @param_check = UnionPay::QueryParamsCheck
+
+        service
+      end
+    end
 
     def self.sign(args)
       sign_str = args.sort.map do |k,v|

data/lib/unionpay/utils.rb

@@ -0,0 +1,7 @@
+module UnionPay
+  class << self
+    def empty? str
+      str !~ /[^[:space:]]/
+    end
+  end
+end

data/lib/unionpay/version.rb

@@ -1,3 +1,3 @@
 module UnionPay
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/lib/unionpay.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/unionpay/conf'
 require File.dirname(__FILE__) + '/unionpay/service'
 require File.dirname(__FILE__) + '/unionpay/version'
+require File.dirname(__FILE__) + '/unionpay/utils'
 
 module UnionPay
   class << self

data/test/unionpay/service_test.rb

@@ -19,18 +19,13 @@ class UnionPay::ServiceTest < Test::Unit::TestCase
     #  PRE_AUTH_VOID(预授权撤销), PRE_AUTH_COMPLETE(预授权完成), PRE_AUTH_VOID_COMPLETE(预授权完成撤销)
     param = {}
     param['transType']             = UnionPay::REFUND
-
     param['origQid']               = '201110281442120195882'; #原交易返回的qid, 从数据库中获取
-
     param['orderAmount']           = 11000;        #交易金额
     param['orderNumber']           = '20131220151706'
-    param['orderTime']             = '20131220151706'
-
     param['customerIp']            = '127.0.0.1';  #用户IP
     param['frontEndUrl']           = ""     #前台回调URL, 后台交易可为空
     param['backEndUrl']            = "http://www.example.com/sdk/utf8/back_notify.php"    #后台回调URL
     UnionPay::Service.back_pay(param)
-
   end
 
   def test_generate_form
@@ -47,8 +42,7 @@ class UnionPay::ServiceTest < Test::Unit::TestCase
 
   def test_back_pay_service
     dev_form = generate_back_pay_service
-    p dev_form.args
-    assert dev_form.post
+    assert_not_nil dev_form.post
   end
   def test_responce
     test = {
@@ -65,4 +59,17 @@ class UnionPay::ServiceTest < Test::Unit::TestCase
     assert UnionPay::Service.responce(test).args['respCode'] == UnionPay::RESP_SUCCESS
   end
 
+  def test_query
+    assert_raise_message 'Bad signature returned!' do
+      param = {}
+      param['transType'] = UnionPay::CONSUME
+      param['orderNumber'] = "20111108150703852"
+      param['orderTime'] = "20111108150703"
+      UnionPay.environment = :production
+      query = UnionPay::Service.query(param)
+      res = query.post
+      responce = UnionPay::Service.responce res.body_str
+    end
+  end
+
 end

data/unionpay.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "curb"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: unionpay
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-25 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -45,12 +59,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
 - README.md
 - Rakefile
 - lib/unionpay.rb
 - lib/unionpay/conf.rb
 - lib/unionpay/service.rb
+- lib/unionpay/utils.rb
 - lib/unionpay/version.rb
 - test/test_helper.rb
 - test/unionpay/service_test.rb

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-gem 'curb'