alipay_global 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eddedc835b2bfbb0f10a759faea33ab63e9afd95
-  data.tar.gz: 04033f489681672e64d7e653bc312683eaf21d7c
+  metadata.gz: 7e25a163c6a105f882363330ab4c883b76dcd9cc
+  data.tar.gz: d87038772fa03ac173230766ea799f3a4d801938
 SHA512:
-  metadata.gz: f8706e2ede93062f2472978a777ada9277870d729ec802d5b288428e53dfd0ba2b7bacfff76d2aca4be00a9c57879c3762f012539e6bf3d0be6f4ec261e3bebc
-  data.tar.gz: 44cfecd9b76dd39396e98b2ec8c165244da4023fd8e55463be7da28d491452d36b4c0b466a997f232ace4257eee59e87a763309a2fe5f9ceabe653be5d5a6917
+  metadata.gz: 4203de1fbf2710247b042217ba1021c88614a38218f26eb18c20cfcf7b1cad31d6169ef7ffcab73ef8746509b543f8f4eab5998c1f2872b21d3583fd89a17f47
+  data.tar.gz: 47c2678c31ef89aacaca21fd6535ff2ffd67278b490409e307771747d1d275c9a6ba42f9c3a9f4383d3faf82b6a3ab92a5f29c7c071d34fa67d5df1fda520c64

data/lib/alipay_global.rb

@@ -10,6 +10,7 @@ require 'alipay_global/service/trade'
 require 'alipay_global/service/exchange'
 require 'alipay_global/service/notification'
 require 'alipay_global/service/reconciliation'
+require 'alipay_global/service/settlement'
 
 module AlipayGlobal
   

data/lib/alipay_global/service/settlement.rb

@@ -0,0 +1,75 @@
+require 'open-uri'
+
+module AlipayGlobal
+  module Service
+    module Settlement
+
+      RequestError = Class.new(RuntimeError)
+
+      SETTLEMENT_REQUIRED_PARAMS = %w( start_date end_date )
+
+      SETTLEMENT_ERROR_MESSAGES = [
+        "Over 10 days to Date period",
+        "Over limit balance amount record",
+        "System exception",
+        "No balance amount data in the period",
+        "<alipay><is_success>F</is_success><error>ILLEGAL_PARTNER</error></alipay>",
+        "Finish date not ahead of today",
+        "Finish date ahead of begin date",
+        "Illegal Date period!",
+        "Date format incorrect YYYYMMDD",
+        "Internet connected exception ,please try later"
+      ]
+
+      def self.request(params)
+        settlement_resp = []
+        open(build_request(params)) do |data|
+          results = data.read
+
+          return false if results.include? "No balance account data in the period"
+          raise RequestError, "#{results}" if error_check(results)
+
+          results.each_line do |line|
+            transaction = line.strip.split("|")
+
+            settlement_resp << {
+              partner_transaction_id: transaction[0],
+              amount: transaction[1],
+              currency: transaction[2],
+              payment_time: valid_alipay_date(transaction[3]) ? DateTime.strptime(transaction[3],"%Y%m%d%H%M%S") : '',
+              settlement_time: valid_alipay_date(transaction[4]) ? DateTime.strptime(transaction[4],"%Y%m%d%H%M%S") : '',
+              transaction_type: transaction[5],
+              service_charge: transaction[6],
+              status: transaction[7],
+              remarks: transaction[8] ? transaction[8] : ''
+            }
+          end
+
+        end
+        settlement_resp
+      end
+
+      def self.build_request(params)
+        AlipayGlobal::Service.check_required_params(params, SETTLEMENT_REQUIRED_PARAMS)
+
+        params = AlipayGlobal::Utils.stringify_keys(params)
+
+        params = {
+          'service'         => 'forex_liquidation_file',
+          'partner'         => AlipayGlobal.api_partner_id,
+        }.merge(params)
+
+        AlipayGlobal::Service.request_uri(params).to_s
+      end
+
+      def self.error_check(data)
+        SETTLEMENT_ERROR_MESSAGES.any? { |w| data =~ /#{w}/ }
+      end
+
+      def self.valid_alipay_date(raw_date)
+        raw_date && raw_date.length > 0
+      end
+      
+    end
+  end
+end

data/lib/alipay_global/service/trade.rb

@@ -84,8 +84,6 @@ module AlipayGlobal
         alipay_resp = Nokogiri::XML(resp.body)
 
         alipay_results = alipay_resp.at_xpath('//alipay')
-        #puts "success   = " + alipay_results.at_xpath('//is_success').content
-        #puts "error = " + alipay_results.at_xpath('//error').content
 
         file.unlink
       end

data/lib/alipay_global/version.rb

@@ -1,3 +1,3 @@
 module AlipayGlobal
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/service/settlement_test.rb

@@ -0,0 +1,72 @@
+require 'test_config'
+
+describe "AlipayGlobal::Service::Settlement", "Settlement request check" do
+  
+  before do
+    @alipay = AlipayGlobal
+    @alipay.api_partner_id = '2088101122136241'
+    @alipay.api_secret_key = '760bdzec6y9goq7ctyx96ezkz78287de'
+
+    @params = {
+      'start_date'=> '20120202',
+      'end_date'=> '20120205'
+    }
+  end
+
+  describe "#build_request" do
+    it "should get params correctly" do
+      assert_equal "https://mapi.alipay.net/gateway.do?service=forex_liquidation_file&partner=2088101122136241&start_date=20120202&end_date=20120205&sign_type=MD5&sign=68c26fcba73dc3134bc88bb04a8be865", @alipay::Service::Settlement.build_request(@params)
+    end
+  end
+
+  describe "#request" do
+    describe "Error scenarios" do
+
+      it "return false for no records in period" do
+        assert_equal false, @alipay::Service::Settlement.request(@params)
+      end
+
+      it "should throw an AlipayGlobal::Service::Settlement::RequestError for date range > 10 days" do
+        proc{ (@alipay::Service::Settlement.request({
+          'start_date'=> '20120202',
+          'end_date'=> '20120305'
+        })).call }.must_raise(AlipayGlobal::Service::Settlement::RequestError)
+      end
+
+      it "should throw an AlipayGlobal::Service::Settlement::RequestError for an errorneous date range" do
+        proc{ (@alipay::Service::Settlement.request({
+          'start_date'=> '20130202',
+          'end_date'=> '20120305'
+        })).call }.must_raise(AlipayGlobal::Service::Settlement::RequestError)
+      end
+
+      it "should throw an AlipayGlobal::Service::Settlement::RequestError for no dates supplied (or nil)" do
+        proc{ (@alipay::Service::Settlement.request({})).call }.must_raise(AlipayGlobal::Service::Settlement::RequestError)
+        proc{ (@alipay::Service::Settlement.request(nil)).call }.must_raise(NoMethodError)
+      end
+
+      it "should throw an AlipayGlobal::Service::Settlement::RequestError for finish date ahead of today" do
+        proc{ (@alipay::Service::Settlement.request({
+          'start_date'=> '20151300',
+          'end_date'=> '20151333'
+        })).call }.must_raise(AlipayGlobal::Service::Settlement::RequestError)
+      end
+
+      describe "Incorrect Merchant" do
+        before do
+          @alipay.api_partner_id = 'daftpunk'
+        end
+
+        it "should throw an AlipayGlobal::Service::Settlement::RequestError for Merchant ID incorrect" do
+          proc{ (@alipay::Service::Settlement.request(@params)).call }.must_raise(AlipayGlobal::Service::Settlement::RequestError)
+        end
+
+        after do
+          @alipay.api_partner_id = '2088101122136241'
+        end
+      end
+
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alipay_global
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Melvrick Goh, Ng Junyang, Grzegorz Witek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,6 +114,7 @@ files:
 - lib/alipay_global/service/exchange.rb
 - lib/alipay_global/service/notification.rb
 - lib/alipay_global/service/reconciliation.rb
+- lib/alipay_global/service/settlement.rb
 - lib/alipay_global/service/trade.rb
 - lib/alipay_global/sign.rb
 - lib/alipay_global/sign/dsa.rb
@@ -125,6 +126,7 @@ files:
 - test/service/exchange_test.rb
 - test/service/notification_test.rb
 - test/service/reconciliation_test.rb
+- test/service/settlement_test.rb
 - test/service/trade_test.rb
 - test/service_test.rb
 - test/sign/dsa_test.rb
@@ -153,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An unofficial simple global.alipay gem
@@ -162,6 +164,7 @@ test_files:
 - test/service/exchange_test.rb
 - test/service/notification_test.rb
 - test/service/reconciliation_test.rb
+- test/service/settlement_test.rb
 - test/service/trade_test.rb
 - test/service_test.rb
 - test/sign/dsa_test.rb