epics 2.1.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f91eb25c88880d2a09b23003cffc9601350a5c980e618945186177108917fdcb
-  data.tar.gz: aea9b65df7b8773a324cc8a8e457b96036e35f5cba7bf2aebc424183d9053b43
+  metadata.gz: '0235859714f452d06af25055ba018845fb391e71b95813951422d851b274974e'
+  data.tar.gz: 699de0520f011d9755685e222e64a563ef8a7fac3558cc0520b156b0e5232bfd
 SHA512:
-  metadata.gz: 2559bbcbb940f957f21ec202d1fd67f766017426868c3413bba616aa438b904bbd8980e6f716274142e72707ca5166c34f8ac5ff23b4b996c4d49accc948ec07
-  data.tar.gz: '081d8491005d6c146b002d22c0a0f3fc90feb4c09d67cc406383ea8825c47e28d6579012d3e7b4ec754909ba60c65e5fbcdb6f7e145961a545160b89f53f84d9'
+  metadata.gz: 8ed0c386749155a12c1b88d1b3fea266a9a2d99dad01fcbc8e5eecefa6af8a2dc0708b7ce9591b23a50d244451c05c456c31774690911dc0c96247a023a90aba
+  data.tar.gz: f03bab54f984eaa5ee3515854753f78b2e9c4e5b5347f4c40b762c829e174edfe8139c6f7328d2d703be3864f81c4345d7fb954d3245136d4ab047363d2780b9

data/.semaphore/semaphore.yml

@@ -3,7 +3,7 @@ name: Test
 agent:
   machine:
     type: e1-standard-2
-    os_image: ubuntu1804
+    os_image: ubuntu2004
 blocks:
   - name: Setup
     task:
@@ -21,7 +21,7 @@ blocks:
             - checkout
             - sem-version ruby 3.0
             - cache restore
-            - gem install bundler:2.4.12
+            - gem install bundler:2.4.22
             - bundle install
             - cache store
             - bundle exec rspec
@@ -30,7 +30,7 @@ blocks:
             - checkout
             - sem-version ruby 3.1
             - cache restore
-            - gem install bundler:2.4.12
+            - gem install bundler:2.4.22
             - bundle install
             - cache store
             - bundle exec rspec
@@ -39,7 +39,16 @@ blocks:
             - checkout
             - sem-version ruby 3.2
             - cache restore
-            - gem install bundler:2.4.12
+            - gem install bundler:2.4.22
+            - bundle install
+            - cache store
+            - bundle exec rspec
+        - name: "3.3"
+          commands:
+            - checkout
+            - sem-version ruby 3.3
+            - cache restore
+            - gem install bundler:2.4.22
             - bundle install
             - cache store
             - bundle exec rspec

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### Unreleased
+
+### 2.3.0
+
+- [ENHANCEMENT]  Adds Z52, Z53, Z54 order type (C52, C53, C54 for swiss banks)
+
+### 2.2.0
+
+- [ENHANCEMENT]  Adds C2S order type
+- [HOUSEKEEPING] updates nokogiri dependency
+- [HOUSEKEEPING] updates rexml dependency
+- [HOUSEKEEPING] adds Ruby 3.3 to CI
+
 ### 2.1.2
 
 - [BUGFIX] Fix order data encryption for OpenSSL 3

data/epics.gemspec

@@ -41,9 +41,9 @@ Gem::Specification.new do |spec|
   spec.post_install_message += "\e[32m" + ('*' * 60) + "\n\e[0m"
 
   spec.add_dependency 'faraday',  '>= 1.10.0'
-  spec.add_dependency 'nokogiri', '>= 1.14.0'
+  spec.add_dependency 'nokogiri', '>= 1.16.5'
   spec.add_dependency 'rubyzip',  '>= 2.3.2'
-  spec.add_dependency 'rexml',    '>= 3.2.5'
+  spec.add_dependency 'rexml',    '>= 3.2.8'
 
   spec.add_development_dependency 'bundler', '>= 2.4.12'
   spec.add_development_dependency 'equivalent-xml'

data/lib/epics/c2s.rb

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

data/lib/epics/cdb.rb

@@ -1,4 +1,12 @@
 class Epics::CDB < Epics::GenericUploadRequest
+  def order_attribute
+    'OZHNN'
+  end
+
+  def order_type
+    'CDB'
+  end
+
   def header
     Nokogiri::XML::Builder.new do |xml|
       xml.header(authenticate: true) {
@@ -10,8 +18,8 @@ class Epics::CDB < Epics::GenericUploadRequest
           xml.UserID user_id
           xml.Product("EPICS - a ruby ebics kernel", 'Language' => 'de')
           xml.OrderDetails {
-            xml.OrderType 'CDB'
-            xml.OrderAttribute 'OZHNN'
+            xml.OrderType order_type
+            xml.OrderAttribute order_attribute
             xml.StandardOrderParams
           }
           xml.BankPubKeyDigests {

data/lib/epics/client.rb

@@ -129,6 +129,10 @@ class Epics::Client
     upload(Epics::CDB, document)
   end
 
+  def C2S(document)
+    upload(Epics::C2S, document)
+  end
+
   def CDD(document)
     upload(Epics::CDD, document)
   end
@@ -181,6 +185,18 @@ class Epics::Client
     download_and_unzip(Epics::C54, from, to)
   end
 
+  def Z52(from, to)
+    download_and_unzip(Epics::Z52, from, to)
+  end
+
+  def Z53(from, to)
+    download_and_unzip(Epics::Z53, from, to)
+  end
+
+  def Z54(from, to)
+    download_and_unzip(Epics::Z54, from, to)
+  end
+
   def HAA
     Nokogiri::XML(download(Epics::HAA)).at_xpath("//xmlns:OrderTypes", xmlns: "urn:org:ebics:H004").content.split(/\s/)
   end

data/lib/epics/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Epics
-  VERSION = '2.1.2'
+  VERSION = '2.3.0'
 end

data/lib/epics/z52.rb

@@ -0,0 +1,42 @@
+class Epics::Z52 < Epics::GenericRequest
+  attr_accessor :from, :to
+
+  def initialize(client, from, to)
+    super(client)
+    self.from = from
+    self.to = to
+  end
+
+  def header
+    Nokogiri::XML::Builder.new do |xml|
+      xml.header(authenticate: true) {
+        xml.static {
+          xml.HostID host_id
+          xml.Nonce nonce
+          xml.Timestamp timestamp
+          xml.PartnerID partner_id
+          xml.UserID user_id
+          xml.Product("EPICS - a ruby ebics kernel", 'Language' => 'de')
+          xml.OrderDetails {
+            xml.OrderType 'Z52'
+            xml.OrderAttribute 'DZHNN'
+            xml.StandardOrderParams {
+              xml.DateRange {
+                xml.Start from
+                xml.End to
+              }
+            }
+          }
+          xml.BankPubKeyDigests {
+            xml.Authentication(client.bank_x.public_digest, Version: 'X002', Algorithm: "http://www.w3.org/2001/04/xmlenc#sha256")
+            xml.Encryption(client.bank_e.public_digest, Version: 'E002', Algorithm: "http://www.w3.org/2001/04/xmlenc#sha256" )
+          }
+          xml.SecurityMedium '0000'
+        }
+        xml.mutable {
+          xml.TransactionPhase 'Initialisation'
+        }
+      }
+    end.doc.root
+  end
+end

data/lib/epics/z53.rb

@@ -0,0 +1,42 @@
+class Epics::Z53 < Epics::GenericRequest
+  attr_accessor :from, :to
+
+  def initialize(client, from, to)
+    super(client)
+    self.from = from
+    self.to = to
+  end
+
+  def header
+    Nokogiri::XML::Builder.new do |xml|
+      xml.header(authenticate: true) {
+        xml.static {
+          xml.HostID host_id
+          xml.Nonce nonce
+          xml.Timestamp timestamp
+          xml.PartnerID partner_id
+          xml.UserID user_id
+          xml.Product("EPICS - a ruby ebics kernel", 'Language' => 'de')
+          xml.OrderDetails {
+            xml.OrderType 'Z53'
+            xml.OrderAttribute 'DZHNN'
+            xml.StandardOrderParams {
+              xml.DateRange {
+                xml.Start from
+                xml.End to
+              }
+            }
+          }
+          xml.BankPubKeyDigests {
+            xml.Authentication(client.bank_x.public_digest, Version: 'X002', Algorithm: "http://www.w3.org/2001/04/xmlenc#sha256")
+            xml.Encryption(client.bank_e.public_digest, Version: 'E002', Algorithm: "http://www.w3.org/2001/04/xmlenc#sha256" )
+          }
+          xml.SecurityMedium '0000'
+        }
+        xml.mutable {
+          xml.TransactionPhase 'Initialisation'
+        }
+      }
+    end.doc.root
+  end
+end

data/lib/epics/z54.rb

@@ -0,0 +1,42 @@
+class Epics::Z54 < Epics::GenericRequest
+  attr_accessor :from, :to
+
+  def initialize(client, from, to)
+    super(client)
+    self.from = from
+    self.to = to
+  end
+
+  def header
+    Nokogiri::XML::Builder.new do |xml|
+      xml.header(authenticate: true) {
+        xml.static {
+          xml.HostID host_id
+          xml.Nonce nonce
+          xml.Timestamp timestamp
+          xml.PartnerID partner_id
+          xml.UserID user_id
+          xml.Product("EPICS - a ruby ebics kernel", 'Language' => 'de')
+          xml.OrderDetails {
+            xml.OrderType 'Z54'
+            xml.OrderAttribute 'DZHNN'
+            xml.StandardOrderParams {
+              xml.DateRange {
+                xml.Start from
+                xml.End to
+              }
+            }
+          }
+          xml.BankPubKeyDigests {
+            xml.Authentication(client.bank_x.public_digest, Version: 'X002', Algorithm: "http://www.w3.org/2001/04/xmlenc#sha256")
+            xml.Encryption(client.bank_e.public_digest, Version: 'E002', Algorithm: "http://www.w3.org/2001/04/xmlenc#sha256" )
+          }
+          xml.SecurityMedium '0000'
+        }
+        xml.mutable {
+          xml.TransactionPhase 'Initialisation'
+        }
+      }
+    end.doc.root
+  end
+end

data/lib/epics.rb

@@ -26,6 +26,9 @@ require "epics/vmk"
 require "epics/c52"
 require "epics/c53"
 require "epics/c54"
+require "epics/z52"
+require "epics/z53"
+require "epics/z54"
 require "epics/ptk"
 require "epics/hac"
 require "epics/hpd"
@@ -37,6 +40,7 @@ require "epics/cdd"
 require "epics/b2b"
 require "epics/xds"
 require "epics/cds"
+require "epics/c2s"
 require "epics/cdz"
 require "epics/crz"
 require "epics/xct"

data/spec/client_spec.rb

@@ -209,25 +209,25 @@ RSpec.describe Epics::Client do
     end
   end
 
-  describe '#C53/C52/C54 types with zipped data' do
+  describe '#C53/C52/C54/Z52/Z53/Z54 types with zipped data' do
     before do
       allow(subject).to receive(:download).and_return( File.read(File.join(File.dirname(__FILE__), 'fixtures', 'test.zip') ))
     end
 
     it 'will unzip the returned data' do
-      %w(C52 C53 C54).each do |c|
+      %w(C52 C53 C54 Z52 Z53 Z54).each do |c|
         expect(subject.send(c, :today, :yesterday)).to eq(["ebics is great\n"])
       end
     end
   end
 
-  describe '#C53/C52/C54 types with zipped data with general purpose bit flag 3 set' do
+  describe '#C53/C52/C54/Z52/Z53/Z54 types with zipped data with general purpose bit flag 3 set' do
     before do
       allow(subject).to receive(:download).and_return( File.read(File.join(File.dirname(__FILE__), 'fixtures', 'test_with_general_purpose_bit_3.zip') ))
     end
 
     it 'will unzip the returned data' do
-      %w(C52 C53 C54).each do |c|
+      %w(C52 C53 C54 Z52 Z53 Z54).each do |c|
         expect(subject.send(c, :today, :yesterday)).to eq(["ebics is great\n"])
       end
     end

data/spec/orders/c2s_spec.rb

@@ -0,0 +1,21 @@
+RSpec.describe Epics::C2S do
+
+  let(:client) { Epics::Client.new( File.open(File.join( File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')), 'secret' , 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS') }
+  let(:document) { File.read( File.join( File.dirname(__FILE__), '..', 'fixtures', 'xml', 'cdb.xml') ) }
+  subject { described_class.new(client, document) }
+
+  describe 'order attributes' do
+    it { expect(subject.header.to_s).to include('<OrderAttribute>DZHNN</OrderAttribute>') }
+    it { expect(subject.header.to_s).to include('<OrderType>C2S</OrderType>') }
+  end
+
+  describe '#to_xml' do
+    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+  end
+
+  describe '#to_transfer_xml' do
+    before { subject.transaction_id = SecureRandom.hex(16) }
+
+    specify { expect(subject.to_transfer_xml).to be_a_valid_ebics_doc }
+  end
+end

data/spec/orders/z52_spec.rb

@@ -0,0 +1,11 @@
+RSpec.describe Epics::Z52 do
+
+  let(:client) { Epics::Client.new( File.open(File.join( File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')), 'secret' , 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS') }
+
+  subject { described_class.new(client, "2014-09-01", "2014-09-30") }
+
+  describe '#to_xml' do
+    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+  end
+
+end

data/spec/orders/z53_spec.rb

@@ -0,0 +1,11 @@
+RSpec.describe Epics::Z53 do
+
+  let(:client) { Epics::Client.new( File.open(File.join( File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')), 'secret' , 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS') }
+
+  subject { described_class.new(client, "2014-09-01", "2014-09-30") }
+
+  describe '#to_xml' do
+    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+  end
+
+end

data/spec/orders/z54_spec.rb

@@ -0,0 +1,9 @@
+RSpec.describe Epics::Z54 do
+  let(:client) { Epics::Client.new( File.open(File.join( File.dirname(__FILE__), '..', 'fixtures', 'SIZBN001.key')), 'secret' , 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS') }
+
+  subject { described_class.new(client, "2014-09-01", "2014-09-30") }
+
+  describe '#to_xml' do
+    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epics
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Lars Brillert
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2024-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.5
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 3.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +180,7 @@ files:
 - lib/epics.rb
 - lib/epics/azv.rb
 - lib/epics/b2b.rb
+- lib/epics/c2s.rb
 - lib/epics/c52.rb
 - lib/epics/c53.rb
 - lib/epics/c54.rb
@@ -214,6 +215,9 @@ files:
 - lib/epics/vmk.rb
 - lib/epics/xct.rb
 - lib/epics/xds.rb
+- lib/epics/z52.rb
+- lib/epics/z53.rb
+- lib/epics/z54.rb
 - lib/letter/ini.erb
 - spec/.DS_Store
 - spec/client_spec.rb
@@ -258,6 +262,7 @@ files:
 - spec/middleware/parse_ebics_spec.rb
 - spec/orders/azv_spec.rb
 - spec/orders/b2b_spec.rb
+- spec/orders/c2s_spec.rb
 - spec/orders/c52_spec.rb
 - spec/orders/c53_spec.rb
 - spec/orders/c54_spec.rb
@@ -280,6 +285,9 @@ files:
 - spec/orders/sta_spec.rb
 - spec/orders/vmk_spec.rb
 - spec/orders/xds_spec.rb
+- spec/orders/z52_spec.rb
+- spec/orders/z53_spec.rb
+- spec/orders/z54_spec.rb
 - spec/response_spec.rb
 - spec/signer_spec.rb
 - spec/spec_helper.rb
@@ -319,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: a ruby implementation of the EBICS protocol
@@ -367,6 +375,7 @@ test_files:
 - spec/middleware/parse_ebics_spec.rb
 - spec/orders/azv_spec.rb
 - spec/orders/b2b_spec.rb
+- spec/orders/c2s_spec.rb
 - spec/orders/c52_spec.rb
 - spec/orders/c53_spec.rb
 - spec/orders/c54_spec.rb
@@ -389,6 +398,9 @@ test_files:
 - spec/orders/sta_spec.rb
 - spec/orders/vmk_spec.rb
 - spec/orders/xds_spec.rb
+- spec/orders/z52_spec.rb
+- spec/orders/z53_spec.rb
+- spec/orders/z54_spec.rb
 - spec/response_spec.rb
 - spec/signer_spec.rb
 - spec/spec_helper.rb