wechat_pay 0.0.1 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1de3b364757da264d21ac3b5bbbebf2b76f1ea78
+  data.tar.gz: ef2ffe65e34a698dec0ac6c43a103ed9c17b916f
+SHA512:
+  metadata.gz: 91e1f4d712eeb7dae91c8622fbfd367f3e0ca30faff807bb067d36d411ef4adbd0473ad0d6c0430f6a839dd4fd62a915e32352a732155f888976211b3a6ccd12
+  data.tar.gz: 217fa61b7ee54d66db3b7af8faed2dac69d134b7bd56a01312b87ef6a19d55e85670905bdcb456908c6e2a1eac501aad863e291b40dcace5e61db5fa08c02a74

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Change Log
+
+## Version 0.1.0
+
+### Breaking Change
+
+* 修改 `WechatPay::App.payment` 返回值 [c10c1c](https://github.com/HungYuHei/wechat_pay/commit/c10c1cc40ff54c584f3855d0d3264207e45778d0)

data/README.md

@@ -11,7 +11,7 @@ It contains:
 
 Add this line to your application's Gemfile:
 
-    gem 'wechat_pay'
+    gem 'wechat_pay', '~> 0.1.0'
 
 And then execute:
 
@@ -44,7 +44,7 @@ Your should cache the `access_token`, see [http://mp.weixin.qq.com/wiki...](http
 You may wanna do something like this in Rails:
 
 ```ruby
-Rails.cache.fetch(:wechat_pay_access_token, expires: 7200.seconds raw: true) do
+Rails.cache.fetch(:wechat_pay_access_token, expires_in: 7200.seconds raw: true) do
   WechatPay::AccessToken.generate[:access_token]
 end
 ```
@@ -65,8 +65,12 @@ params = {
 WechatPay::App.payment('ACCESS_TOKEN', params)
 # =>
 #   {
-#     prepay_id: 'PREPAY_ID',
-#     pay_sign: 'PAY_SIGN'
+#     nonce_str:  'noncestr',
+#     package:    'Sign=WXpay',
+#     partner_id: 'partner_id',
+#     prepay_id:  'prepay_id',
+#     timestamp:  '1407165191',
+#     sign:       'sign'
 #   }
 ```
 

data/lib/wechat_pay/app.rb

@@ -30,7 +30,7 @@ module WechatPay
         app_signature: app_signature
       )
 
-      pay_sign = Sign.generate(
+      attrs = {
         appid:     WechatPay.app_id,
         appkey:    WechatPay.pay_sign_key,
         noncestr:  noncestr,
@@ -38,9 +38,17 @@ module WechatPay
         partnerid: WechatPay.partner_id,
         prepayid:  prepay_id,
         timestamp: timestamp
-      )
-
-      { prepay_id: prepay_id, pay_sign: pay_sign }
+      }
+      sign = Sign.generate(attrs)
+
+      {
+        sign:       sign,
+        package:    attrs[:package],
+        nonce_str:  attrs[:noncestr],
+        prepay_id:  attrs[:prepayid],
+        timestamp:  attrs[:timestamp],
+        partner_id: attrs[:partnerid]
+      }
     end
 
     private

data/lib/wechat_pay/version.rb

@@ -1,3 +1,3 @@
 module WechatPay
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/wechat_pay/app_spec.rb

@@ -21,7 +21,11 @@ describe WechatPay::App do
 
     payment = WechatPay::App.payment('access_token', prepay_params)
 
+    payment[:partner_id].must_equal WechatPay.partner_id
+    payment[:nonce_str].wont_be_empty
+    payment[:package].wont_be_empty
     payment[:prepay_id].must_equal prepay_id
-    payment[:pay_sign].wont_be_empty
+    payment[:timestamp].wont_be_empty
+    payment[:sign].wont_be_empty
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: wechat_pay
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - HungYuHei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -102,33 +94,26 @@ files:
 homepage: https://github.com/HungYuHei/wechat_pay
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3477914996839962559
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3477914996839962559
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Wechat pay
 test_files:
 - spec/spec_helper.rb