pingpp 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57f69b45561255dbb81e10ce5c1acf9ae1cf146b
-  data.tar.gz: b50c28aecb08597a94cd754281b86c9bcb756faa
+  metadata.gz: f8f53007b5dd51db5fd3d152e791d3cd7648b9d1
+  data.tar.gz: 416dde32d6e1fcabd2c6d0f1b0fa8d8ab44234a8
 SHA512:
-  metadata.gz: 88e6c66b9e4c8bbd22cff2143a6d7849c73f65be5829d925e762083435f197e0d2b44578531ed54213c194712c9b516fe776f24f9c7c92c8befa4f36db107266
-  data.tar.gz: c8b78fac1a6d2a2882eb4da2dde718caf72bc03a05e6e87f4a0854ad55ffd2dd88c57256b54eebc6fc90c8dd3d96620da488a07b347868eb04c11f2d50d22e95
+  metadata.gz: 047eec644d6721d68432edd081247649c053b72ced74689aca3220645a8cd3914ef4c5242ab9c97437fe8bb2d4989512fde1d6536d2900b7939e3dee3a1e95c7
+  data.tar.gz: 2601c98fc1e10ff69dc70fb149c707c5377110bac632d8e053918f0a81138f860266ae5fb7296bade6a7b45611c4a7fc1ef488b9dd491603cfdfea5f4dff8401

data/lib/pingpp/batch_transfer.rb

@@ -2,6 +2,7 @@ module Pingpp
   class BatchTransfer < APIResource
     extend Pingpp::APIOperations::Create
     extend Pingpp::APIOperations::List
+    include Pingpp::APIOperations::Update
 
     def self.object_name
       'batch_transfer'
@@ -10,5 +11,9 @@ module Pingpp
     def self.resource_url(opts={})
       '/v1/batch_transfers'
     end
+
+    def self.cancel(id, opts={})
+      update(id, {:status => 'canceled'}, opts)
+    end
   end
 end

data/lib/pingpp/version.rb

@@ -1,3 +1,3 @@
 module Pingpp
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/test/balance_test.rb

@@ -0,0 +1,34 @@
+require File.expand_path('../test_assistant', __FILE__)
+require "digest/md5"
+
+module Pingpp
+  class BalanceTest < Test::Unit::TestCase
+    should "execute should return a transfer balance_transaction" do
+      obj = Pingpp::Balance.create_transfer(
+        :user => 'test_user_001',
+        :recipient => 'test_user_004',
+        :description => 'Balance transfer description.',
+        :amount => 200
+      )
+
+      puts obj
+
+      assert obj.object == 'balance_transaction'
+    end
+
+    should "execute should return a receipts balance_transaction list" do
+      obj = Pingpp::Balance.create_receipts(
+        :type => 'receipts_earning',
+        :description => 'Balance receipts description.',
+        :receipts => [
+          { :user => 'test_user_001', :amount => 500 },
+          { :user => 'test_user_003', :amount => 700 }
+        ]
+      )
+
+      puts obj
+
+      assert obj.object == 'list'
+    end
+  end
+end

data/test/balance_transaction_test.rb

@@ -0,0 +1,20 @@
+require File.expand_path('../test_assistant', __FILE__)
+require "digest/md5"
+
+module Pingpp
+  class BalanceTransactionTest < Test::Unit::TestCase
+    should "execute should return a balance_transaction list when passed correct parameters" do
+      txns = Pingpp::BalanceTransaction.list({:per_page => 3}, {:user => get_user_id})
+
+      assert txns.object == 'list'
+      assert txns.data.count <= 3
+    end
+
+    should "execute should return an exist balance_transaction when passed correct id" do
+      txn = Pingpp::BalanceTransaction.retrieve(get_txn_id, {:user => get_user_id})
+
+      assert txn.object == 'balance_transaction'
+      assert txn.id == get_txn_id
+    end
+  end
+end

data/test/batch_refund_test.rb

@@ -0,0 +1,41 @@
+require File.expand_path('../test_assistant', __FILE__)
+require "digest/md5"
+
+module Pingpp
+  class BatchRefundTest < Test::Unit::TestCase
+    should "execute should return a new batch_refund when passed correct parameters" do
+      batch_no = Digest::MD5.hexdigest(Time.now.to_i.to_s)[0,12]
+
+      params = {
+        :app => get_app_id,
+        :batch_no => batch_no,
+        :charges => make_charges_for_batch_refund,
+        :description => 'This is a batch_refund test.',
+        :metadata => {
+          :custom_key => 'custom_content'
+        }
+      }
+
+      batre = Pingpp::BatchRefund.create(params)
+      assert batre.object == 'batch_refund'
+
+      assert batre.charges == params[:charges]
+      assert batre.batch_no = params[:batch_no]
+    end
+
+    should "execute should return a batch_refund list" do
+      batres = Pingpp::BatchRefund.list(:per_page => 3)
+
+      assert batres.object == 'list'
+      assert batres.url.start_with?('/v1/batch_refunds')
+      assert batres.data.length <= 3
+    end
+
+    should "execute should return an exist batch_refund when passed correct id" do
+      batre = Pingpp::BatchRefund.retrieve(get_bat_re_id)
+
+      assert batre.id == get_bat_re_id
+      assert batre.object == 'batch_refund'
+    end
+  end
+end

data/test/batch_transfer_test.rb

@@ -0,0 +1,71 @@
+require File.expand_path('../test_assistant', __FILE__)
+require "digest/md5"
+
+module Pingpp
+  class BatchTransferTest < Test::Unit::TestCase
+    should "execute should return a new batch_transfer when passed correct parameters" do
+      batch_no = Digest::MD5.hexdigest(Time.now.to_i.to_s)[0,12]
+
+      params = {
+        :app => get_app_id,
+        :batch_no => batch_no,
+        :channel => 'unionpay',
+        :amount => 700,
+        :type => 'b2c',
+        :description => 'This is a batch_transfer test.',
+        :metadata => {
+          :custom_key => 'custom_content'
+        },
+        :currency => 'cny',
+        :recipients => [
+          {
+            :amount => 300,
+            :name => 'name01',
+            :open_bank_code => '0102',
+            :account => '6226000022223333'
+          }, {
+            :amount => 400,
+            :name => 'name02',
+            :open_bank_code => '0102',
+            :account => '622600002222334'
+          }
+        ]
+      }
+
+      battr = Pingpp::BatchTransfer.create(params)
+
+      puts battr
+
+      assert battr.object == 'batch_transfer'
+      assert battr.amount == params[:amount]
+      assert battr.batch_no = params[:batch_no]
+      assert battr.app == params[:app]
+      assert battr.recipients.count == params[:recipients].count
+    end
+
+    should "execute should return a batch_transfer list" do
+      batres = Pingpp::BatchTransfer.list(:per_page => 3)
+
+      assert batres.object == 'list'
+      assert batres.url.start_with?('/v1/batch_transfers')
+      assert batres.data.count <= 3
+    end
+
+    should "execute should return an exist batch_transfer when passed correct id" do
+      batre = Pingpp::BatchTransfer.retrieve("1801612271223448888")
+puts batre
+
+      assert batre.id == get_bat_tr_id
+      assert batre.object == 'batch_transfer'
+    end
+
+    should "execute should return a canceled batch_transfer" do
+        # # batres = Pingpp::BatchTransfer.list(:per_page => 3)
+        # # puts batres
+        # batre = Pingpp::BatchTransfer.retrieve('1811612271212521002')
+        # puts batre
+        # batre = Pingpp::BatchTransfer.cancel('1811612271212521002')
+        # puts batre
+    end
+  end
+end

data/test/batch_withdrawal_test.rb

@@ -0,0 +1,20 @@
+require File.expand_path('../test_assistant', __FILE__)
+require "digest/md5"
+
+module Pingpp
+  class BatchWithdrawalTest < Test::Unit::TestCase
+    should "execute should return a batch_withdrawal object when passed correct parameters" do
+      params = {
+        :withdrawals  => [
+          '1701611160206541729',
+          '1701611160207110403'
+        ]
+      }
+      bw = Pingpp::BatchWithdrawal.create(params)
+
+      puts bw
+
+      assert bw.object == 'batch_withdrawal'
+    end
+  end
+end

data/test/charge_test.rb

@@ -0,0 +1,51 @@
+require File.expand_path('../test_assistant', __FILE__)
+require "digest/md5"
+
+module Pingpp
+  class ChargeTest < Test::Unit::TestCase
+    should "execute should return a new, fully executed charge when passed correct parameters" do
+      order_no = Digest::MD5.hexdigest(Time.now.to_i.to_s)[0,12]
+      channel = 'wx'
+
+      params = {
+        :order_no  => order_no,
+        :app       => { :id => get_app_id },
+        :channel   => channel, # 支付使用的第三方支付渠道取值，请参考：https://www.pingxx.com/api#api-c-new
+        :amount    => 128000, # 订单总金额, 人民币单位：分（如订单总金额为 1 元，此处请填 100）
+        :client_ip => "127.0.0.1", # 发起支付请求客户端的 IP 地址，格式为 IPV4，如: 127.0.0.1
+        :currency  => "cny",
+        :subject   => "Your Subject",
+        :body      => "Your Body",
+        :extra     => {}
+      }
+
+      c = Pingpp::Charge.create(params)
+
+      assert c.order_no == params[:order_no]
+      assert c.app == get_app_id
+      assert c.channel == params[:channel]
+      assert c.amount == params[:amount]
+      assert c.paid == false
+    end
+
+    should "execute should return a charge list when passed correct parameters" do
+      l = Pingpp::Charge.list(
+        :app => { :id => get_app_id },
+        :limit => 3,
+        :paid => true,
+        :refunded => false
+      )
+
+      assert l.object == 'list'
+      assert l.data.count <= 3
+    end
+
+    should "execute should return an exist charge when passed correct charge id" do
+      ch_id = get_charge_id # 'ch_0mLyb5KmffX5yrnb1OvLKKSO'
+      c = Pingpp::Charge.retrieve(ch_id)
+
+      assert c.object == 'charge'
+      assert c.id == ch_id
+    end
+  end
+end

data/test/coupon_template_test.rb

@@ -0,0 +1,34 @@
+require File.expand_path('../test_assistant', __FILE__)
+require "digest/md5"
+
+module Pingpp
+  class CouponTemplateTest < Test::Unit::TestCase
+    should "execute should return a coupon_template list when passed correct parameters" do
+      ctmpl = Pingpp::CouponTemplate.list({:per_page => 3})
+
+      assert ctmpl.object == 'list'
+      assert ctmpl.data.count <= 3
+    end
+
+    should "execute should return an exist coupon_template when passed correct id" do
+      ctmpl = Pingpp::CouponTemplate.retrieve(get_coupon_template_id)
+
+      assert ctmpl.object == 'coupon_template'
+      assert ctmpl.id == get_coupon_template_id
+    end
+
+    should "execute should return a coupon list made from coupon_template when passed correct coupon_template_id" do
+      coupons = Pingpp::CouponTemplate.list_coupons(get_coupon_template_id, {:per_page => 3})
+
+      assert coupons.object == 'list'
+      assert coupons.data.count <= 3
+    end
+
+    # should "execute should return a coupon list made from coupon_template when passed correct coupon_template_id and parameters" do
+    #   coupons = Pingpp::CouponTemplate.create_coupons(get_coupon_template_id, {:users => [get_user_id]})
+    #
+    #   assert coupons.object == 'list'
+    #   assert coupons.data.count <= 3
+    # end
+  end
+end

data/test/customs_test_bak.rb

@@ -0,0 +1,32 @@
+require File.expand_path('../test_assistant', __FILE__)
+require "digest/md5"
+
+module Pingpp
+  class CustomsTest < Test::Unit::TestCase
+    should "execute should return a new customs when passed correct parameters" do
+      order_no = Digest::MD5.hexdigest(Time.now.to_i.to_s)[0,12]
+      channel = 'upacp'
+
+      params = {
+        :app => get_app_id,
+        :charge => get_charge_id,
+        :channel => channel,
+        :trade_no => order_no,
+        :customs_code => 'GUANGZHOU',
+        :amount => 10,
+        :transport_amount => 1,
+        :is_split => true,
+        :sub_order_no => 'subord11010002',
+        :extra => {
+          :pay_account => '1234567890',
+          :certif_type => '02',
+          :customer_name => 'name',
+          :certif_id => '1234',
+          :tax_amount => 1
+        }
+      }
+      cu = Pingpp::Customs.create(params)
+      puts cu
+    end
+  end
+end

data/test/order_refund_test.rb

@@ -0,0 +1,19 @@
+require File.expand_path('../test_assistant', __FILE__)
+require "digest/md5"
+
+module Pingpp
+  class OrderRefundTest < Test::Unit::TestCase
+    should "execute should return a order_refund list when passed correct order id" do
+      l = Pingpp::OrderRefund.list('2001609130000002762')
+      puts l
+      assert l.object == 'list'
+      assert l.data.count <= 3
+    end
+
+    should "execute should return an exist order_refund when passed correct id" do
+      o = Pingpp::OrderRefund.retrieve('2001609130000002762', '2001609130000002763')
+
+      assert o.object == 'order_order'
+    end
+  end
+end

data/test/order_test.rb

@@ -0,0 +1,57 @@
+require File.expand_path('../test_assistant', __FILE__)
+require "digest/md5"
+
+module Pingpp
+  class OrderTest < Test::Unit::TestCase
+    should "execute should return a new, fully executed order when passed correct parameters" do
+      order_no = Digest::MD5.hexdigest(Time.now.to_i.to_s)[0,12]
+
+      params = {
+        :merchant_order_no  => order_no,
+        :app       => get_app_id,
+        :amount    => 100, # 订单总金额, 人民币单位：分（如订单总金额为 1 元，此处请填 100）
+        :client_ip => "127.0.0.1", # 发起支付请求客户端的 IP 地址，格式为 IPV4，如: 127.0.0.1
+        :currency  => "cny",
+        :subject   => "Your Subject",
+        :body      => "Your Body",
+        :uid       => get_user_id
+      }
+
+      o = Pingpp::Order.create(params)
+
+      assert o.merchant_order_no == params[:merchant_order_no]
+      assert o.app == get_app_id
+      assert o.amount == 100
+      assert o.paid == false
+    end
+
+    should "execute should return an order list when passed correct parameters" do
+      l = Pingpp::Order.list(:app => get_app_id, :per_page => 3, :paid => true)
+
+      assert l.object == 'list'
+      assert l.data.count <= 3
+    end
+
+    should "execute should return an canceled order when passed correct id" do
+      o = Pingpp::Order.cancel(get_unpaid_order_id)
+      
+      assert o.object == 'order'
+      assert o.status == 'canceled'
+    end
+
+    should "execute should return an exist order when passed correct id" do
+      o = Pingpp::Order.retrieve('2001609130000002762')
+
+      assert o.object == 'order'
+    end
+
+    should "execute should return an order with credential when passed correct id and parameters" do
+      o = Pingpp::Order.pay('2001609130000002762', {:balance_amount => 0,
+                                                    :charge_amount => 10,
+                                                    :channel => 'alipay'})
+
+      assert o.object == 'order'
+      assert o.has_key?('charge_essentials')
+    end
+  end
+end

data/test/refund_test.rb

@@ -0,0 +1,33 @@
+require File.expand_path('../test_assistant', __FILE__)
+require "digest/md5"
+
+module Pingpp
+  class RefundTest < Test::Unit::TestCase
+    should "execute should return a refund list when passed correct parameters" do
+      l = Pingpp::Refund.list(get_charge_id, {:limit => 3})
+
+      assert l.object == 'list'
+      assert l.data.count <= 3
+    end
+
+    should "execute should return a refund when passed correct parameters" do
+      ch_id = get_charge_id
+
+      r = Pingpp::Refund.create(ch_id, {:amount => 1, :description => 'Refund amount test.'})
+
+      assert r.object == 'refund'
+      assert r.charge == ch_id
+    end
+
+    should "execute should return an exist refund when passed correct charge id and refund id" do
+      re_id = get_refund_id
+      ch_id = get_charge_id
+
+      r = Pingpp::Refund.retrieve(ch_id, re_id)
+
+      assert r.object == 'refund'
+      assert r.id == re_id
+      assert r.charge == ch_id
+    end
+  end
+end

data/test/ruby_version_test.rb

@@ -0,0 +1,9 @@
+require File.expand_path('../test_assistant', __FILE__)
+
+module Pingpp
+  class RubyVersionTest < Test::Unit::TestCase
+    should "Ruby version number test" do
+      puts RUBY_VERSION
+    end
+  end
+end

data/test/test_assistant.rb

@@ -0,0 +1,34 @@
+require 'pingpp'
+require 'test/unit'
+require 'mocha/setup'
+require 'stringio'
+require 'shoulda/context'
+require File.expand_path('../test_data', __FILE__)
+
+module Pingpp
+  @mock_rest_client = nil
+
+  def self.mock_rest_client=(mock_client)
+    @mock_rest_client = mock_client
+  end
+end
+
+class Test::Unit::TestCase
+  include Pingpp::TestData
+  include Mocha
+
+  setup do
+    @mock = mock
+    # Pingpp.mock_rest_client = @mock
+    Pingpp.api_base = 'https://apidev.afon.ninja'
+    Pingpp.api_key = get_api_key_live
+    Pingpp.app_id = get_app_id
+
+    Pingpp.private_key_path = File.expand_path('../rsa_private_key.pem', __FILE__)
+  end
+
+  teardown do
+    Pingpp.mock_rest_client = nil
+    Pingpp.api_key = nil
+  end
+end

data/test/test_data.rb

@@ -0,0 +1,61 @@
+module Pingpp
+  module TestData
+    @charge_id_created = nil
+
+    def get_api_key
+      'sk_test_ibbTe5jLGCi5rzfH4OqPW9KC'
+    end
+
+    def get_api_key_live
+      'sk_live_vjfr90jj1q985KuPO84iP8KO'
+    end
+
+    def get_app_id
+      # 'app_1Gqj58ynP0mHeX1q'
+      'app_LibTW1n1SOq9Pin1'
+    end
+
+    def set_charge_id(ch_id)
+      @charge_id_created = ch_id
+    end
+
+    def get_charge_id
+      'ch_rXvbvHyfLmWD0aSGKG488WnT'
+    end
+
+    def get_refund_id
+      're_iXrDb5qF54OCz9mnH0844G0S'
+    end
+
+    def get_bat_re_id
+      '1501611031340575011'
+    end
+
+    def get_bat_tr_id
+      '1801611031338284973'
+    end
+
+    def get_user_id
+      'test_user_001'
+    end
+
+    def get_txn_id
+      '310216101213443000003501'
+    end
+
+    def get_coupon_template_id
+      '300116082416033500000800'
+    end
+
+    def get_unpaid_order_id
+      '2001611040000002171'
+    end
+
+    def make_charges_for_batch_refund
+      [
+        'ch_PyfLSGLiHKS0rDunTO4W9y18',
+        'ch_bfbjr5TaPG8CarLyHG1eHGK0'
+      ]
+    end
+  end
+end

data/test/transaction_statistics_test.rb

@@ -0,0 +1,14 @@
+require File.expand_path('../test_assistant', __FILE__)
+
+module Pingpp
+  class TransactionStatisticsTest < Test::Unit::TestCase
+    should "execute should return a transaction_statistics object" do
+      ts = Pingpp::TransactionStatistics.retrieve(
+        :time_start => Time.now.to_i - 86400 * 60,
+        :time_end => Time.now.to_i - 86400 * 30
+      )
+
+      assert ts.object == 'transaction_statistics'
+    end
+  end
+end

data/test/user_test.rb

@@ -0,0 +1,33 @@
+require File.expand_path('../test_assistant', __FILE__)
+require "digest/md5"
+
+module Pingpp
+  class UserTest < Test::Unit::TestCase
+    # should "execute should return a new user when passed correct parameters" do
+    #   user_id = Digest::MD5.hexdigest(Time.now.to_i.to_s)[0,12]
+    #
+    #   params = {
+    #     :id  => user_id
+    #   }
+    #
+    #   u = Pingpp::User.create(params)
+    #
+    #   assert u.object == 'user'
+    #   assert u.id == user_id
+    # end
+
+    should "execute should return an exist user when passed correct id" do
+      u = Pingpp::User.retrieve(get_user_id)
+
+      assert u.object == 'user'
+      assert u.id == get_user_id
+    end
+
+    should "execute should return a list of users when passed correct parameters" do
+      u = Pingpp::User.list(:per_page => 3)
+
+      assert u.object == 'list'
+      assert u.data.count <= 3
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pingpp
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Xufeng Weng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2016-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -69,6 +69,22 @@ files:
 - lib/pingpp/version.rb
 - lib/pingpp/webhook.rb
 - lib/pingpp/wx_pub_oauth.rb
+- test/balance_test.rb
+- test/balance_transaction_test.rb
+- test/batch_refund_test.rb
+- test/batch_transfer_test.rb
+- test/batch_withdrawal_test.rb
+- test/charge_test.rb
+- test/coupon_template_test.rb
+- test/customs_test_bak.rb
+- test/order_refund_test.rb
+- test/order_test.rb
+- test/refund_test.rb
+- test/ruby_version_test.rb
+- test/test_assistant.rb
+- test/test_data.rb
+- test/transaction_statistics_test.rb
+- test/user_test.rb
 homepage: https://www.pingxx.com/api
 licenses:
 - MIT
@@ -89,8 +105,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the PingPlusPlus API
-test_files: []
+test_files:
+- test/balance_test.rb
+- test/balance_transaction_test.rb
+- test/batch_refund_test.rb
+- test/batch_transfer_test.rb
+- test/batch_withdrawal_test.rb
+- test/charge_test.rb
+- test/coupon_template_test.rb
+- test/customs_test_bak.rb
+- test/order_refund_test.rb
+- test/order_test.rb
+- test/refund_test.rb
+- test/ruby_version_test.rb
+- test/test_assistant.rb
+- test/test_data.rb
+- test/transaction_statistics_test.rb
+- test/user_test.rb