jasl_tenpay 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40b69167296fd37ae3156d644cc9385a83a8cd70
-  data.tar.gz: ae11063ac2e002a8cfd7702e2c2448ad7391c02e
+  metadata.gz: 0eb0ec6d4ae624fc3b537816fc80910ef7c0db30
+  data.tar.gz: 07c2159ab2d429a6b141904892a9b929b194d616
 SHA512:
-  metadata.gz: 49a87f61bec986be2b647ad42e19a5ff9ef0782f97c06e515d66f9141d77cb90a7e923e896825cd30388424c0a865ea60b7d7c5bb5fa976eefdfaf6ee5785c8c
-  data.tar.gz: 71ac45ccbfca7517a3e9c950131c7cd78315962a4edd644ba69690701c7b86e13eed82ab8fcca5e51c7a1bee3368e339701ff7a8830ca21002f40983bbc594b1
+  metadata.gz: f2117ae40e7525856791fcaab225aa94f335dc5fa3dcbf7b226aac4bf131a27608e1575e0f0a025ace0338c0098463eea06170e8f82fce20192d3d9ce1ac29f7
+  data.tar.gz: 8c7fe851802b2a3f201c927c70d078c9a35617ef2edc24a0871aeb66ec11f5fe65dc21b9b2de372fbca3e04ac8d2ac838e9c3309c90b8a222f71ff0015d7d1ca

data/lib/jasl_tenpay/notify.rb

@@ -1,10 +1,9 @@
 module JaslTenpay
-  class Notify
+  module 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, options = {})
+    def self.verify?(params)
       return false unless Sign.verify?(params)
 
       params = {
@@ -12,9 +11,8 @@ module JaslTenpay
           '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)
+      open("#{GATEWAY}?#{Utils.make_query_string(params)}").read.include?(SUCCESS_STR)
     end
   end
 end

data/lib/jasl_tenpay/version.rb

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

data/test/jasl_tenpay/notify_test.rb

@@ -7,7 +7,6 @@ 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>
@@ -28,19 +27,6 @@ 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',
@@ -58,14 +44,4 @@ class JaslTenpay::NotifyTest < Test::Unit::TestCase
     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,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: jasl_tenpay
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: An unofficial simple tenpay gem
@@ -59,15 +59,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- Rakefile
+- lib/jasl_tenpay.rb
 - lib/jasl_tenpay/notify.rb
 - lib/jasl_tenpay/service.rb
 - lib/jasl_tenpay/sign.rb
 - lib/jasl_tenpay/utils.rb
 - lib/jasl_tenpay/version.rb
-- lib/jasl_tenpay.rb
 - lib/tasks/jasl_tenpay_tasks.rake
-- MIT-LICENSE
-- Rakefile
 - test/jasl_tenpay/notify_test.rb
 - test/jasl_tenpay/service_test.rb
 - test/jasl_tenpay/sign_test.rb
@@ -83,17 +83,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: An unofficial simple tenpay gem