pingpp 2.2.1 → 2.2.2

data/lib/pingpp/agreement.rb

@@ -0,0 +1,11 @@
+module Pingpp
+  class Agreement < APIResource
+    extend Pingpp::APIOperations::Create
+    extend Pingpp::APIOperations::List
+    include Pingpp::APIOperations::Update
+
+    def self.cancel(id, opts={})
+      update(id, {:status => 'canceled'}, opts)
+    end
+  end
+end

data/lib/pingpp/balance_settlement.rb

@@ -0,0 +1,9 @@
+module Pingpp
+  class BalanceSettlement < AppBasedResource
+    extend Pingpp::APIOperations::List
+
+    def self.object_name
+      'balance_settlement'
+    end
+  end
+end

data/lib/pingpp/card_info.rb

@@ -0,0 +1,14 @@
+module Pingpp
+  class CardInfo < APIResource
+    extend Pingpp::APIOperations::Create
+
+    def self.query(params={}, opts={})
+        create(params, opts)
+    end
+
+    def self.resource_url(opts={})
+      '/v1/card_info'
+    end
+
+  end
+end

data/lib/pingpp/version.rb

@@ -1,3 +1,3 @@
 module Pingpp
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end

data/lib/pingpp/wx_lite_oauth.rb

@@ -0,0 +1,42 @@
+module Pingpp
+  module WxLiteOauth
+    def self.get_openid(app_id, app_secret, code)
+      response = get_session(app_id, app_secret, code)
+      if response['openid'].nil? then
+        return nil, response
+      else
+        return response['openid'], nil
+      end
+    end
+
+    def self.get_session(app_id, app_secret, code)
+      url = create_oauth_url_for_openid(app_id, app_secret, code)
+      return get_request(url)
+    end
+
+    def self.create_oauth_url_for_openid(app_id, app_secret, code)
+      query_parts = {
+        'appid' => app_id,
+        'secret' => app_secret,
+        'js_code' => code,
+        'grant_type' => 'authorization_code'
+      }
+      query_str = Util.encode_parameters(query_parts)
+      'https://api.weixin.qq.com/sns/jscode2session?' + query_str
+    end
+
+    def self.get_request(url)
+      request_opts = {
+        :url => url,
+        :verify_ssl => false,
+        :ssl_version => 'TLSv1',
+        :method => 'GET',
+        :headers => false,
+        :open_timeout => 30,
+        :timeout => 30
+      }
+      response = RestClient::Request.execute(request_opts)
+      response = JSON.parse(response.body)
+    end
+  end
+end

data/lib/pingpp.rb

@@ -56,6 +56,9 @@ require 'pingpp/royalty_transaction'
 require 'pingpp/balance_transfer'
 require 'pingpp/balance_bonus'
 require 'pingpp/royalty_template'
+require 'pingpp/balance_settlement'
+require 'pingpp/card_info'
+require 'pingpp/agreement'
 
 # Errors
 require 'pingpp/errors/pingpp_error'
@@ -66,8 +69,9 @@ require 'pingpp/errors/authentication_error'
 require 'pingpp/errors/channel_error'
 require 'pingpp/errors/rate_limit_error'
 
-# WxPubOauth
+# WxOAuth
 require 'pingpp/wx_pub_oauth'
+require 'pingpp/wx_lite_oauth'
 
 module Pingpp
   DEFAULT_CA_BUNDLE_PATH = File.dirname(__FILE__) + '/data/ca-certificates.crt'
@@ -186,6 +190,14 @@ module Pingpp
     @max_network_retries = val.to_i
   end
 
+  def self.ca_bundle
+    @ca_bundle_path
+  end
+
+  def self.ca_bundle=(val)
+    @ca_bundle_path = val
+  end
+
   private
 
   def self.user_agent

data/test/agreement_test.rb

@@ -0,0 +1,36 @@
+require File.expand_path('../test_assistant', __FILE__)
+
+module Pingpp
+  class AgreementTest < Test::Unit::TestCase
+    should "execute should return a agreement list when passed correct parameters" do
+      l = Pingpp::Agreement.list(
+        :app => get_app_id,
+        :per_page => 3
+      )
+
+      assert l.object == 'list'
+      assert l.data.count <= 3
+    end
+
+    should "execute should return an exist agreement when passed correct agreement id" do
+      agr_id = get_agreement_id
+      c = Pingpp::Agreement.retrieve(agr_id)
+
+      assert c.object == 'agreement'
+      assert c.id == agr_id
+    end
+
+    should "execute should return an canceled agreement" do
+      begin
+        agr_id = get_agreement_id
+        o = Pingpp::Agreement.cancel(agr_id)
+
+        assert o.id == agr_id
+        assert o.status == 'canceled'
+      rescue => e
+        assert e.kind_of?(Pingpp::InvalidRequestError)
+        assert e.message.include?("该签约对象不能被更新状态")
+      end
+    end
+  end
+end

data/test/balance_settlement_test.rb

@@ -0,0 +1,19 @@
+require File.expand_path('../test_assistant', __FILE__)
+
+module Pingpp
+  class BalanceSettlementTest < Test::Unit::TestCase
+    should "execute should return a balance_settlement list when passed correct parameters" do
+      bss = Pingpp::BalanceSettlement.list({:per_page => 3})
+
+      assert bss.object == 'list'
+      assert bss.data.count <= 3
+    end
+
+    should "execute should return an exist balance_settlement when passed correct id" do
+      bs = Pingpp::BalanceSettlement.retrieve(get_bs_id)
+
+      assert bs.object == 'balance_settlement'
+      assert bs.id == get_bs_id
+    end
+  end
+end

data/test/card_info_test.rb

@@ -0,0 +1,18 @@
+require File.expand_path('../test_assistant', __FILE__)
+
+module Pingpp
+  class CardInfoTest < Test::Unit::TestCase
+    should "execute should return card info" do
+      # 该接口仅支持 live key
+      card_info = Pingpp::CardInfo.query({
+        :app => get_app_id,
+        :bank_account => '6222280012469823'
+      })
+
+      assert card_info.card_bin == '622228'
+      assert card_info.app == get_app_id
+      assert card_info.card_type == 2
+      assert card_info.open_bank_code == '0310'
+    end
+  end
+end

data/test/test_data.rb

@@ -187,5 +187,13 @@ module Pingpp
     def coupon_template_id_to_delete
       '300117090822195700031902'
     end
+
+    def get_bs_id
+      '670180130750711562240001'
+    end
+
+    def get_agreement_id
+      'agr_19EEE7QdgGMCoY'
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pingpp
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Xufeng Weng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -40,6 +40,7 @@ extra_rdoc_files: []
 files:
 - lib/data/ca-certificates.crt
 - lib/pingpp.rb
+- lib/pingpp/agreement.rb
 - lib/pingpp/api_operations/create.rb
 - lib/pingpp/api_operations/delete.rb
 - lib/pingpp/api_operations/list.rb
@@ -48,11 +49,13 @@ files:
 - lib/pingpp/api_resource.rb
 - lib/pingpp/app_based_resource.rb
 - lib/pingpp/balance_bonus.rb
+- lib/pingpp/balance_settlement.rb
 - lib/pingpp/balance_transaction.rb
 - lib/pingpp/balance_transfer.rb
 - lib/pingpp/batch_refund.rb
 - lib/pingpp/batch_transfer.rb
 - lib/pingpp/batch_withdrawal.rb
+- lib/pingpp/card_info.rb
 - lib/pingpp/channel.rb
 - lib/pingpp/charge.rb
 - lib/pingpp/coupon.rb
@@ -89,13 +92,17 @@ files:
 - lib/pingpp/version.rb
 - lib/pingpp/webhook.rb
 - lib/pingpp/withdrawal.rb
+- lib/pingpp/wx_lite_oauth.rb
 - lib/pingpp/wx_pub_oauth.rb
+- test/agreement_test.rb
 - test/balance_bonus_test.rb
+- test/balance_settlement_test.rb
 - test/balance_transaction_test.rb
 - test/balance_transfer_test.rb
 - test/batch_refund_test.rb
 - test/batch_transfer_test.rb
 - test/batch_withdrawal_test.rb
+- test/card_info_test.rb
 - test/charge_test.rb
 - test/coupon_template_test.rb
 - test/coupon_test.rb
@@ -145,14 +152,17 @@ test_files:
 - test/sub_app_test.rb
 - test/batch_refund_test.rb
 - test/sub_app_channel_test.rb
+- test/balance_settlement_test.rb
 - test/test_data.rb
 - test/royalty_transaction_test.rb
 - test/royalty_test.rb
 - test/charge_test.rb
+- test/agreement_test.rb
 - test/balance_bonus_test.rb
 - test/withdrawal_test.rb
 - test/coupon_test.rb
 - test/royalty_settlement_test.rb
+- test/card_info_test.rb
 - test/order_test.rb
 - test/recharge_test.rb
 - test/settle_account_test.rb