cdz.rb in epics-2.5.0

- old
+ new
@@ -1,46 +1,17 @@
 class Epics::CDZ < 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 'CDZ'
-            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'
+    client.header_request.build(
+      nonce: nonce,
+      timestamp: timestamp,
+      order_type: 'CDZ',
+      order_attribute: 'DZHNN',
+      order_params: !!options[:from] && !!options[:to] ? {
+        DateRange: {
+          Start: options[:from],
+          End: options[:to]
         }
-        xml.mutable {
-          xml.TransactionPhase 'Initialisation'
-        }
-      }
-    end.doc.root
+      } : {},
+      mutable: { TransactionPhase: 'Initialisation' }
+    )
   end
 end