jasl_tenpay 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 978e78088d3672cd1d0b6e37b8a51f6c9002a1b4
-  data.tar.gz: 9f402cc6683399d4c1f34f68f4c02178098fae1c
+  metadata.gz: 40b69167296fd37ae3156d644cc9385a83a8cd70
+  data.tar.gz: ae11063ac2e002a8cfd7702e2c2448ad7391c02e
 SHA512:
-  metadata.gz: ed7cff2b51e5956b7722aeb03e6dacbe229aa66eb41a3255da4e5f622cd3f5709ad2ec6c2e7dd77328fff194d6251280b69b227a6986ba639406ec5dc6958d67
-  data.tar.gz: aa09190134db6e38026334933fd1aba11642b03be9ccaf364bef736adfa1bb398e4efa9a8c0d59abbf60deb68212de85e8ccdd709ff16f0df1e0a861c64f8fd7
+  metadata.gz: 49a87f61bec986be2b647ad42e19a5ff9ef0782f97c06e515d66f9141d77cb90a7e923e896825cd30388424c0a865ea60b7d7c5bb5fa976eefdfaf6ee5785c8c
+  data.tar.gz: 71ac45ccbfca7517a3e9c950131c7cd78315962a4edd644ba69690701c7b86e13eed82ab8fcca5e51c7a1bee3368e339701ff7a8830ca21002f40983bbc594b1

data/lib/jasl_tenpay/notify.rb

@@ -2,19 +2,19 @@ module JaslTenpay
   class Notify
     GATEWAY = 'https://gw.tenpay.com/gateway/simpleverifynotifyid.xml'
     SUCCESS_STR = '<retcode>0</retcode>'
+    TRADE_STATE_SUCCESS_STR = '<trade_state>0</trade_state>'
 
-    def self.verify?(params)
-      if Sign.verify?(params)
-        params = {
-            'input_charset' => 'UTF-8',
-            'partner' => JaslTenpay.pid,
-            'notify_id' => CGI.escape(params[:notify_id].to_s)
-        }
+    def self.verify?(params, options = {})
+      return false unless Sign.verify?(params)
 
-        open("#{GATEWAY}?#{Utils.make_query_string(params)}").read.include? SUCCESS_STR
-      else
-        false
-      end
+      params = {
+          'input_charset' => 'UTF-8',
+          'partner' => JaslTenpay.pid,
+          'notify_id' => CGI.escape(params[:notify_id].to_s)
+      }
+      result = open("#{GATEWAY}?#{Utils.make_query_string(params)}").read
+
+      result.include?(SUCCESS_STR) && (options[:verify_trade_state] ? result.include?(TRADE_STATE_SUCCESS_STR) : true)
     end
   end
 end

data/lib/jasl_tenpay/service.rb

@@ -5,7 +5,7 @@ module JaslTenpay
   module Service
     GATEWAY_URL = 'https://gw.tenpay.com/gateway/pay.htm'
 
-    CREATE_INTERACTIVE_MODE_REQUIRED_OPTIONS = %w(body subject return_url notify_url partner out_trade_no total_fee fee_type spbill_create_ip)
+    CREATE_INTERACTIVE_MODE_REQUIRED_OPTIONS = %w(body return_url notify_url partner out_trade_no total_fee fee_type spbill_create_ip)
     def self.create_interactive_mode_url(options)
       options = {
           'input_charset' => 'UTF-8',

data/lib/jasl_tenpay/version.rb

@@ -1,3 +1,3 @@
 module JaslTenpay
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/jasl_tenpay/notify_test.rb

@@ -7,6 +7,7 @@ class JaslTenpay::NotifyTest < Test::Unit::TestCase
       <input_charset>UTF-8</input_charset>
       <partner>2000054321</partner>
       <retcode>0</retcode>
+      <trade_state>0</trade_state>
       <retmsg />
       <sign>1C58B3A778D9F49F3FA91D30E9A831D2</sign>
       <sign_key_index>1</sign_key_index>
@@ -27,6 +28,19 @@ class JaslTenpay::NotifyTest < Test::Unit::TestCase
     </root>
   XML
 
+  SUCCESS_BUT_TRADE_STATE_FAIL_RETURN = <<-XML
+    <?xml version="1.0" encoding="GBK"?>
+    <root>
+      <input_charset>UTF-8</input_charset>
+      <partner>2000054321</partner>
+      <retcode>0</retcode>
+      <retmsg />
+      <sign>1C58B3A778D9F49F3FA91D30E9A831D2</sign>
+      <sign_key_index>1</sign_key_index>
+      <sign_type>MD5</sign_type>
+    </root>
+  XML
+
   def setup
     @options = {
       :notify_id => '123456789012345678901234567890',
@@ -35,13 +49,23 @@ class JaslTenpay::NotifyTest < Test::Unit::TestCase
     @url = "https://gw.tenpay.com/gateway/simpleverifynotifyid.xml?input_charset=UTF-8&partner=#{JaslTenpay.pid}&notify_id=123456789012345678901234567890&sign=E040AFBCBC409EA0C62CF0F11CF0BAA4"
   end
 
-  def test_verify_notify_when_true
+  def test_verify_notify_when_success
     FakeWeb.register_uri(:get, @url, :body => SUCCESS_RETURN)
     assert JaslTenpay::Notify.verify?(@options)
   end
 
-  def test_verify_notify_when_false
+  def test_verify_notify_when_fail
     FakeWeb.register_uri(:get, @url, :body => FAIL_RETURN)
     assert !JaslTenpay::Notify.verify?(@options)
   end
+
+  def test_verify_notify_with_trade_state_when_success
+    FakeWeb.register_uri(:get, @url, :body => SUCCESS_RETURN)
+    assert JaslTenpay::Notify.verify?(@options, verify_trade_state: true)
+  end
+
+  def test_verify_notify_with_trade_state_when_fail
+    FakeWeb.register_uri(:get, @url, :body => SUCCESS_BUT_TRADE_STATE_FAIL_RETURN)
+    assert !JaslTenpay::Notify.verify?(@options, verify_trade_state: true)
+  end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jasl_tenpay
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: An unofficial simple tenpay gem