epics 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffb2fe355ff8d4811bff967cf20cf742cbd688a5
-  data.tar.gz: 5edb7d8ee8bbc115a97646fa10eb41eff0780a9c
+  metadata.gz: ecad438a0c8a714c21a37886e6acad344ed255a4
+  data.tar.gz: 3555440053e69ad6827ce80f2503b428696ffd21
 SHA512:
-  metadata.gz: 6d51f0ac477dac99702a10886ada30c5bb8bca9836cf4480b800a7717630d5b34183ef8246834e515e8e4a84753dbae11d0c031fe340c51e1af79c641e3ccd60
-  data.tar.gz: cc2220b2f3456e12e68cdc392873439a2ae634303276130a444ab9b504e081266db6924d31b83fc3544aa17f4efb6d538bd40d8b5555b5a3e595fb2d831c835f
+  metadata.gz: a94e3e00b5bd98e9237a0c0e2d6c1a6dbd9c0d0f2662d587245200add1aed0f115fc7cc5dc1ec1043606e29fcd0cfc17b3b8c82ae17ad8d0bd7d4f42575726f5
+  data.tar.gz: cbe1262312b000848dd14018b78214693eea72dc11b10ad9e331718364d8bd3b9699e00a390d10ef647eb1e1712a3dcb919eaaef99f98a8bb65b4c9b6e18777a

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 1.5.1
+
+  * [ENHANCEMENT] some banks are not returning the order_id in the second upload phase, we now fetch it already
+    from the first response to handle this different behaviour.
+  * [ENHANCEMENT] New order types: `AZV` (Auslandszahlungsverkehr). `CDS` and `CCS` for submitting SEPA credits/debits
+    as SRZ (Service Rechen Zentrum)
+
 ### 1.5.0
 
   * [ENHANCEMENT] support for fetching the C54 order type

data/lib/epics.rb

@@ -18,6 +18,7 @@ require "epics/middleware/xmlsig"
 require "epics/middleware/parse_ebics"
 require "epics/generic_request"
 require "epics/generic_upload_request"
+require "epics/azv"
 require "epics/hpb"
 require "epics/hkd"
 require "epics/htd"
@@ -32,8 +33,10 @@ require "epics/hac"
 require "epics/hpd"
 require "epics/cd1"
 require "epics/cct"
+require "epics/ccs"
 require "epics/cdb"
 require "epics/cdd"
+require "epics/cds"
 require "epics/hia"
 require "epics/ini"
 require "epics/signer"

data/lib/epics/azv.rb

@@ -0,0 +1,41 @@
+class Epics::AZV < Epics::GenericUploadRequest
+    def header
+      {
+        :@authenticate => true,
+        static: {
+          "HostID" => host_id,
+          "Nonce" => nonce,
+          "Timestamp" => timestamp,
+          "PartnerID" => partner_id,
+          "UserID" => user_id,
+          "Product" => {
+            :@Language => "de",
+            :content! => "EPICS - a ruby ebics kernel"
+          },
+          "OrderDetails" => {
+            "OrderType" => "AZV",
+            "OrderAttribute" => "OZHNN",
+            "StandardOrderParams/" => ""
+          },
+          "BankPubKeyDigests" => {
+            "Authentication" => {
+              :@Version => "X002",
+              :@Algorithm => "http://www.w3.org/2001/04/xmlenc#sha256",
+              :content! => client.bank_x.public_digest
+            },
+            "Encryption" => {
+              :@Version => "E002",
+              :@Algorithm => "http://www.w3.org/2001/04/xmlenc#sha256",
+              :content! => client.bank_e.public_digest
+            }
+          },
+          "SecurityMedium" => "0000",
+          "NumSegments" => 1
+       },
+        "mutable" => {
+          "TransactionPhase" => "Initialisation"
+        }
+      }
+    end
+
+  end

data/lib/epics/ccs.rb

@@ -0,0 +1,9 @@
+class Epics::CCS < Epics::CCT
+  def order_attribute
+    "DZHNN"
+  end
+
+  def order_type
+    'CCS'
+  end
+end

data/lib/epics/cdd.rb

@@ -1,4 +1,11 @@
 class Epics::CDD < Epics::GenericUploadRequest
+  def order_attribute
+    'OZHNN'
+  end
+
+  def order_type
+    'CDD'
+  end
 
   def header
     {
@@ -14,8 +21,8 @@ class Epics::CDD < Epics::GenericUploadRequest
           :content! => "EPICS - a ruby ebics kernel"
         },
         "OrderDetails" => {
-          "OrderType" => "CDD",
-          "OrderAttribute" => "OZHNN",
+          "OrderType" => order_type,
+          "OrderAttribute" => order_attribute,
           "StandardOrderParams/" => ""
         },
         "BankPubKeyDigests" => {

data/lib/epics/cds.rb

@@ -0,0 +1,9 @@
+class Epics::CDS < Epics::CDD
+  def order_attribute
+    "DZHNN"
+  end
+
+  def order_type
+    'CDS'
+  end
+end

data/lib/epics/client.rb

@@ -115,6 +115,10 @@ class Epics::Client
     [bank_x, bank_e]
   end
 
+  def AZV(document)
+    upload(Epics::AZV, document)
+  end
+
   def CD1(document)
     upload(Epics::CD1, document)
   end
@@ -123,10 +127,18 @@ class Epics::Client
     upload(Epics::CDD, document)
   end
 
+  def CDS(document)
+    upload(Epics::CDS, document)
+  end
+
   def CCT(document)
     upload(Epics::CCT, document)
   end
 
+  def CCS(document)
+    upload(Epics::CCS, document)
+  end
+
   def STA(from = nil, to = nil)
     download(Epics::STA, from, to)
   end
@@ -186,9 +198,11 @@ class Epics::Client
     res = post(url, order.to_xml).body
     order.transaction_id = res.transaction_id
 
+    order_id = res.order_id
+
     res = post(url, order.to_transfer_xml).body
 
-    return res.transaction_id, res.order_id
+    return res.transaction_id, [res.order_id, order_id].detect { |id| id.to_s.chars.any? }
   end
 
   def download(order_type, *args)

data/lib/epics/version.rb

@@ -1,3 +1,3 @@
 module Epics
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/spec/client_spec.rb

@@ -117,22 +117,39 @@ RSpec.describe Epics::Client do
 
       it { expect(subject.keys["SIZBN001.E002"].public_digest).to eq(e_key.public_digest) }
       it { expect(subject.keys["SIZBN001.X002"].public_digest).to eq(e_key.public_digest) }
-
     end
   end
 
   describe '#CD1' do
     let(:cd1_document) { File.read(File.join(File.dirname(__FILE__), 'fixtures', 'xml', 'cd1.xml')) }
-    before do
-      stub_request(:post, "https://194.180.18.30/ebicsweb/ebicsweb")
-        .with(:body => %r[<TransactionPhase>Initialisation</TransactionPhase>])
-        .to_return(status: 200, body: File.read(File.join(File.dirname(__FILE__), 'fixtures', 'xml', 'cd1_init_response.xml')))
-      stub_request(:post, "https://194.180.18.30/ebicsweb/ebicsweb")
-        .with(:body => %r[<TransactionPhase>Transfer</TransactionPhase>])
-        .to_return(status: 200, body: File.read(File.join(File.dirname(__FILE__), 'fixtures', 'xml', 'cd1_transfer_response.xml')))
+    describe 'normal behaviour' do
+      before do
+        stub_request(:post, "https://194.180.18.30/ebicsweb/ebicsweb")
+          .with(:body => %r[<TransactionPhase>Initialisation</TransactionPhase>])
+          .to_return(status: 200, body: File.read(File.join(File.dirname(__FILE__), 'fixtures', 'xml', 'cd1_init_response.xml')))
+        stub_request(:post, "https://194.180.18.30/ebicsweb/ebicsweb")
+          .with(:body => %r[<TransactionPhase>Transfer</TransactionPhase>])
+          .to_return(status: 200, body: File.read(File.join(File.dirname(__FILE__), 'fixtures', 'xml', 'cd1_transfer_response.xml')))
+      end
+
+      it { expect(subject.CD1(cd1_document)).to eq(["387B7BE88FE33B0F4B60AC64A63F18E2","N00L"]) }
     end
 
-    it { expect(subject.CD1(cd1_document)).to eq(["387B7BE88FE33B0F4B60AC64A63F18E2","N00L"]) }
+    describe 'special case' do
+      before do
+        stub_request(:post, "https://194.180.18.30/ebicsweb/ebicsweb")
+          .with(:body => %r[<TransactionPhase>Initialisation</TransactionPhase>])
+          .to_return(status: 200, body: File.read(File.join(File.dirname(__FILE__), 'fixtures', 'xml', 'cd1_init_response.xml')).sub('N00L', 'N11L'))
+        stub_request(:post, "https://194.180.18.30/ebicsweb/ebicsweb")
+          .with(:body => %r[<TransactionPhase>Transfer</TransactionPhase>])
+          .to_return(status: 200, body: File.read(File.join(File.dirname(__FILE__), 'fixtures', 'xml', 'cd1_transfer_response.xml')).sub('<OrderID>N00L</OrderID>', ''))
+      end
+
+      # happend on some handelsbank accounts
+      it 'can also try to fetch the order_id from the first transaction being made' do
+        expect(subject.CD1(cd1_document)).to eq(["387B7BE88FE33B0F4B60AC64A63F18E2","N11L"])
+      end
+    end
   end
 
   describe '#HTD' do

data/spec/middleware/parse_ebics_spec.rb

@@ -2,12 +2,12 @@ RSpec.describe Epics::ParseEbics do
 
   subject do
     Faraday.new do |builder|
+      builder.use Epics::ParseEbics
       builder.adapter :test, Faraday::Adapter::Test::Stubs.new do |stub|
         stub.post('/business_nok') {[ 200, {}, File.read( File.join( File.dirname(__FILE__), '..', 'fixtures', 'xml', 'ebics_business_nok.xml') )  ]}
         stub.post('/technical_nok') {[ 200, {}, File.read( File.join( File.dirname(__FILE__), '..', 'fixtures', 'xml', 'ebics_technical_nok.xml') )  ]}
         stub.post('/ok') {[ 200, {}, File.read( File.join( File.dirname(__FILE__), '..', 'fixtures', 'xml', 'hpb_response_ebics_ns.xml') )  ]}
       end
-      builder.use Epics::ParseEbics
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epics
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Lars Brillert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -178,13 +178,16 @@ files:
 - Rakefile
 - epics.gemspec
 - lib/epics.rb
+- lib/epics/azv.rb
 - lib/epics/c52.rb
 - lib/epics/c53.rb
 - lib/epics/c54.rb
+- lib/epics/ccs.rb
 - lib/epics/cct.rb
 - lib/epics/cd1.rb
 - lib/epics/cdb.rb
 - lib/epics/cdd.rb
+- lib/epics/cds.rb
 - lib/epics/client.rb
 - lib/epics/error.rb
 - lib/epics/generic_request.rb