epics 2.4.0 → 2.5.0

data/lib/epics/ptk.rb

@@ -1,46 +1,17 @@
 class Epics::PTK < Epics::GenericRequest
-  attr_accessor :from, :to
-
-  def initialize(client, from = nil, to = nil)
-    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 'PTK'
-            xml.OrderAttribute 'DZHNN'
-            if !!from && !!to
-              xml.StandardOrderParams {
-                xml.DateRange {
-                  xml.Start from
-                  xml.End to
-                }
-              }
-            else
-              xml.StandardOrderParams
-            end
-          }
-          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'
+    client.header_request.build(
+      nonce: nonce,
+      timestamp: timestamp,
+      order_type: 'PTK',
+      order_attribute: 'DZHNN',
+      order_params: !!options[:from] && !!options[:to] ? {
+        DateRange: {
+          Start: options[:from],
+          End: options[:to]
         }
-      }
-    end.doc.root
+      } : {},
+      mutable: { TransactionPhase: 'Initialisation' }
+    )
   end
 end

data/lib/epics/sta.rb

@@ -1,46 +1,17 @@
 class Epics::STA < Epics::GenericRequest
-  attr_accessor :from, :to
-
-  def initialize(client, from = nil, to = nil)
-    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 'STA'
-            xml.OrderAttribute 'DZHNN'
-            if !!from && !!to
-              xml.StandardOrderParams {
-                xml.DateRange {
-                  xml.Start from
-                  xml.End to
-                }
-              }
-            else
-              xml.StandardOrderParams
-            end
-          }
-          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'
+    client.header_request.build(
+      nonce: nonce,
+      timestamp: timestamp,
+      order_type: 'STA',
+      order_attribute: 'DZHNN',
+      order_params: !!options[:from] && !!options[:to] ? {
+        DateRange: {
+          Start: options[:from],
+          End: options[:to]
         }
-      }
-    end.doc.root
+      } : {},
+      mutable: { TransactionPhase: 'Initialisation' }
+    )
   end
 end

data/lib/epics/version.rb

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

data/lib/epics/vmk.rb

@@ -1,46 +1,17 @@
 class Epics::VMK < Epics::GenericRequest
-  attr_accessor :from, :to
-
-  def initialize(client, from = nil, to = nil)
-    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 'VMK'
-            xml.OrderAttribute 'DZHNN'
-            if !!from && !!to
-              xml.StandardOrderParams {
-                xml.DateRange {
-                  xml.Start from
-                  xml.End to
-                }
-              }
-            else
-              xml.StandardOrderParams
-            end
-          }
-          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'
+    client.header_request.build(
+      nonce: nonce,
+      timestamp: timestamp,
+      order_type: 'VMK',
+      order_attribute: 'DZHNN',
+      order_params: !!options[:from] && !!options[:to] ? {
+        DateRange: {
+          Start: options[:from],
+          End: options[:to]
         }
-      }
-    end.doc.root
+      } : {},
+      mutable: { TransactionPhase: 'Initialisation' }
+    )
   end
 end

data/lib/epics/wss.rb

@@ -0,0 +1,13 @@
+class Epics::WSS < Epics::GenericRequest
+  def header
+    client.header_request.build(
+      nonce: nonce,
+      timestamp: timestamp,
+      order_type: 'WSS',
+      order_attribute: 'DZHNN',
+      order_params: {},
+      mutable: { TransactionPhase: 'Initialisation' }
+    )
+  end
+end
+

data/lib/epics/xct.rb

@@ -1,30 +1,13 @@
 class Epics::XCT < Epics::GenericUploadRequest
   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 'XCT'
-            xml.OrderAttribute 'OZHNN'
-            xml.StandardOrderParams
-          }
-          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.NumSegments 1
-        }
-        xml.mutable {
-          xml.TransactionPhase 'Initialisation'
-        }
-      }
-    end.doc.root
+    client.header_request.build(
+      nonce: nonce,
+      timestamp: timestamp,
+      order_type: 'XCT',
+      order_attribute: 'OZHNN',
+      order_params: {},
+      num_segments: 1,
+      mutable: { TransactionPhase: 'Initialisation' }
+    )
   end
 end

data/lib/epics/xds.rb

@@ -1,5 +1,13 @@
-class Epics::XDS < Epics::CDD
-  def order_type
-    'XDS'
+class Epics::XDS < Epics::GenericUploadRequest
+  def header
+    client.header_request.build(
+      nonce: nonce,
+      timestamp: timestamp,
+      order_type: 'XDS',
+      order_attribute: 'OZHNN',
+      order_params: {},
+      num_segments: 1,
+      mutable: { TransactionPhase: 'Initialisation' }
+    )
   end
 end

data/lib/epics/xe2.rb

@@ -1,5 +1,13 @@
-class Epics::XE2 < Epics::CCT
-  def order_type
-    'XE2'
+class Epics::XE2 < Epics::GenericUploadRequest
+  def header
+    client.header_request.build(
+      nonce: nonce,
+      timestamp: timestamp,
+      order_type: 'XE2',
+      order_attribute: 'OZHNN',
+      order_params: {},
+      num_segments: 1,
+      mutable: { TransactionPhase: 'Initialisation' }
+    )
   end
 end

data/lib/epics/xe3.rb

@@ -1,5 +1,13 @@
-class Epics::XE3 < Epics::CDD
-  def order_type
-    'XE3'
+class Epics::XE3 < Epics::GenericUploadRequest
+  def header
+    client.header_request.build(
+      nonce: nonce,
+      timestamp: timestamp,
+      order_type: 'XE3',
+      order_attribute: 'OZHNN',
+      order_params: {},
+      num_segments: 1,
+      mutable: { TransactionPhase: 'Initialisation' }
+    )
   end
 end

data/lib/epics/z52.rb

@@ -1,42 +1,17 @@
 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'
+    client.header_request.build(
+      nonce: nonce,
+      timestamp: timestamp,
+      order_type: 'Z52',
+      order_attribute: 'DZHNN',
+      order_params: {
+        DateRange: {
+          Start: options[:from],
+          End: options[:to]
         }
-      }
-    end.doc.root
+      },
+      mutable: { TransactionPhase: 'Initialisation' }
+    )
   end
 end

data/lib/epics/z53.rb

@@ -1,42 +1,17 @@
 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'
+    client.header_request.build(
+      nonce: nonce,
+      timestamp: timestamp,
+      order_type: 'Z53',
+      order_attribute: 'DZHNN',
+      order_params: {
+        DateRange: {
+          Start: options[:from],
+          End: options[:to]
         }
-      }
-    end.doc.root
+      },
+      mutable: { TransactionPhase: 'Initialisation' }
+    )
   end
 end

data/lib/epics/z54.rb

@@ -1,42 +1,17 @@
 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'
+    client.header_request.build(
+      nonce: nonce,
+      timestamp: timestamp,
+      order_type: 'Z54',
+      order_attribute: 'DZHNN',
+      order_params: {
+        DateRange: {
+          Start: options[:from],
+          End: options[:to]
         }
-      }
-    end.doc.root
+      },
+      mutable: { TransactionPhase: 'Initialisation' }
+    )
   end
 end

data/lib/epics.rb

@@ -1,6 +1,7 @@
 require 'openssl'
 require 'base64'
 require 'erb'
+require 'i18n'
 require 'json'
 require 'zlib'
 require 'zip'
@@ -12,10 +13,12 @@ require "epics/version"
 require "epics/key"
 require "epics/response"
 require "epics/error"
+require 'epics/letter_renderer'
 require "epics/middleware/xmlsig"
 require "epics/middleware/parse_ebics"
 require "epics/generic_request"
 require "epics/generic_upload_request"
+require "epics/header_request"
 require "epics/azv"
 require "epics/hpb"
 require "epics/hkd"
@@ -26,11 +29,13 @@ require "epics/vmk"
 require "epics/c52"
 require "epics/c53"
 require "epics/c54"
+require "epics/c5n"
 require "epics/z52"
 require "epics/z53"
 require "epics/z54"
 require "epics/ptk"
 require "epics/hac"
+require "epics/wss"
 require "epics/hpd"
 require "epics/cd1"
 require "epics/cct"
@@ -51,6 +56,8 @@ require "epics/ini"
 require "epics/signer"
 require "epics/client"
 
+I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'letter/locales', '*.yml')]
+
 module Epics
 
 end