epics 1.5.1 → 1.5.2

data/lib/epics/cdb.rb

@@ -1,42 +1,30 @@
 class Epics::CDB < 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" => "CDB",
-          "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
+    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 'CDB'
+            xml.OrderAttribute 'OZHNN'
+            xml.StandardOrderParams
           }
-        },
-        "SecurityMedium" => "0000",
-        "NumSegments" => 1
-     },
-      "mutable" => {
-        "TransactionPhase" => "Initialisation"
+          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
   end
-
 end

data/lib/epics/cdd.rb

@@ -8,42 +8,31 @@ class Epics::CDD < Epics::GenericUploadRequest
   end
 
   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" => order_type,
-          "OrderAttribute" => order_attribute,
-          "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
+     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 order_type
+            xml.OrderAttribute order_attribute
+            xml.StandardOrderParams ''
           }
-        },
-        "SecurityMedium" => "0000",
-        "NumSegments" => 1
-     },
-      "mutable" => {
-        "TransactionPhase" => "Initialisation"
+          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
   end
-
 end

data/lib/epics/client.rb

@@ -55,6 +55,10 @@ class Epics::Client
     @bic ||= (self.HTD; @bic)
   end
 
+  def order_types
+    @order_types ||= (self.HTD; @order_types)
+  end
+
   def self.setup(passphrase, url, host_id, user_id, partner_id, keysize = 2048)
     client = new(nil, passphrase, url, host_id, user_id, partner_id)
     client.keys = %w(A006 X002 E002).each_with_object({}) do |type, memo|
@@ -165,9 +169,10 @@ class Epics::Client
 
   def HTD
     Nokogiri::XML(download(Epics::HTD)).tap do |htd|
-      @iban ||= htd.at_xpath("//xmlns:AccountNumber[@international='true']", xmlns: "urn:org:ebics:H004").text
-      @bic  ||= htd.at_xpath("//xmlns:BankCode[@international='true']", xmlns: "urn:org:ebics:H004").text
-      @name ||= htd.at_xpath("//xmlns:Name", xmlns: "urn:org:ebics:H004").text
+      @iban        ||= htd.at_xpath("//xmlns:AccountNumber[@international='true']", xmlns: "urn:org:ebics:H004").text
+      @bic         ||= htd.at_xpath("//xmlns:BankCode[@international='true']", xmlns: "urn:org:ebics:H004").text
+      @name        ||= htd.at_xpath("//xmlns:Name", xmlns: "urn:org:ebics:H004").text
+      @order_types ||= htd.search("//xmlns:OrderTypes", xmlns: "urn:org:ebics:H004").map{|o| o.content.split(/\s/) }.delete_if{|o| o == ""}.flatten
     end.to_xml
   end
 

data/lib/epics/generic_request.rb

@@ -22,107 +22,82 @@ class Epics::GenericRequest
   end
 
   def body
-    ""
+    Nokogiri::XML::Builder.new do |xml|
+      xml.body
+    end.doc.root
   end
 
   def auth_signature
-    {
-      "ds:SignedInfo" => {
-        "ds:CanonicalizationMethod/" => {
-          :@Algorithm => "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
-        },
-        "ds:SignatureMethod/" => {
-          :@Algorithm => "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
-        },
-        "ds:Reference/" => {
-          :@URI => "#xpointer(//*[@authenticate='true'])",
-          "ds:Transforms" => {
-            "ds:Transform/" => {
-              :@Algorithm => "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
+    Nokogiri::XML::Builder.new do |xml|
+      xml.AuthSignature{
+        xml.send('ds:SignedInfo') {
+          xml.send('ds:CanonicalizationMethod', '', Algorithm: "http://www.w3.org/TR/2001/REC-xml-c14n-20010315")
+          xml.send('ds:SignatureMethod', '', Algorithm: "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256")
+          xml.send('ds:Reference', '', URI: "#xpointer(//*[@authenticate='true'])") {
+            xml.send('ds:Transforms') {
+              xml.send('ds:Transform', '', Algorithm: "http://www.w3.org/TR/2001/REC-xml-c14n-20010315")
             }
-          },
-          "ds:DigestMethod/" => {
-            :@Algorithm => "http://www.w3.org/2001/04/xmlenc#sha256"
-          },
-          "ds:DigestValue/" => ""
+            xml.send('ds:DigestMethod', '', Algorithm: "http://www.w3.org/2001/04/xmlenc#sha256")
+            xml.send('ds:DigestValue', '')
+          }
         }
-      },
-      "ds:SignatureValue/" => ""
-    }
+        xml.send('ds:SignatureValue', '')
+      }
+    end.doc.root
   end
 
   def to_transfer_xml
-    Nokogiri::XML.parse(Gyoku.xml({
-      root => {
-        :"@xmlns:ds" => "http://www.w3.org/2000/09/xmldsig#",
-        :@xmlns => "urn:org:ebics:H004",
-        :@Version => "H004",
-        :@Revision => "1",
-        "header" => {
-          :@authenticate => true,
-          "static" => {
-            "HostID" => host_id,
-            "TransactionID" => transaction_id
-          },
-          "mutable" => {
-            "TransactionPhase" => "Transfer",
-            "SegmentNumber" => {
-              :@lastSegment => true,
-              :content! => 1
-            }
+    Nokogiri::XML::Builder.new do |xml|
+      xml.send(root, 'xmlns:ds' => 'http://www.w3.org/2000/09/xmldsig#', 'xmlns' => 'urn:org:ebics:H004', 'Version' => 'H004', 'Revision' => '1') {
+        xml.header(authenticate: true) {
+          xml.static {
+            xml.HostID host_id
+            xml.TransactionID transaction_id
           }
-        },
-        "AuthSignature" => auth_signature,
-        "body" => {
-          "DataTransfer" => {
-            "OrderData" => encrypted_order_data
+          xml.mutable {
+            xml.TransactionPhase 'Transfer'
+            xml.SegmentNumber(1, lastSegment: true)
+          }
+        }
+        xml.parent.add_child(auth_signature)
+        xml.body {
+          xml.DataTransfer {
+            xml.OrderData encrypted_order_data
           }
         }
       }
-    }), nil, "utf-8").to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
+    end.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML, encoding: 'utf-8')
   end
 
   def to_receipt_xml
-    Nokogiri::XML.parse(Gyoku.xml({
-      root => {
-        :"@xmlns:ds" => "http://www.w3.org/2000/09/xmldsig#",
-        :@xmlns => "urn:org:ebics:H004",
-        :@Version => "H004",
-        :@Revision => "1",
-        "header" => {
-          :@authenticate => true,
-          "static" => {
-            "HostID" => host_id,
-            "TransactionID" => transaction_id
-          },
-          "mutable" => {
-            "TransactionPhase" => "Receipt"
+    Nokogiri::XML::Builder.new do |xml|
+      xml.send(root, 'xmlns:ds' => 'http://www.w3.org/2000/09/xmldsig#', 'xmlns' => 'urn:org:ebics:H004', 'Version' => 'H004', 'Revision' => '1') {
+        xml.header(authenticate: true) {
+          xml.static {
+            xml.HostID host_id
+            xml.TransactionID(transaction_id)
           }
-        },
-        "AuthSignature" => auth_signature,
-        "body" => {
-          "TransferReceipt" => {
-            :@authenticate => true,
-            "ReceiptCode" => 0
+          xml.mutable {
+            xml.TransactionPhase 'Receipt'
+          }
+        }
+        xml.parent.add_child(auth_signature)
+        xml.body {
+          xml.TransferReceipt(authenticate: true) {
+            xml.ReceiptCode 0
           }
         }
       }
-    }), nil, "utf-8").to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
+    end.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML, encoding: 'utf-8')
   end
 
   def to_xml
-    Nokogiri::XML.parse(Gyoku.xml(    {
-      root => {
-        :"@xmlns:ds" => "http://www.w3.org/2000/09/xmldsig#",
-        :@xmlns => "urn:org:ebics:H004",
-        :@Version => "H004",
-        :@Revision => "1",
-        :header => header,
-        "AuthSignature" => auth_signature,
-        "body" => body
+    Nokogiri::XML::Builder.new do |xml|
+      xml.send(root, 'xmlns:ds' => 'http://www.w3.org/2000/09/xmldsig#', 'xmlns' => 'urn:org:ebics:H004', 'Version' => 'H004', 'Revision'=> '1') {
+        xml.parent.add_child(header)
+        xml.parent.add_child(auth_signature)
+        xml.parent.add_child(body)
       }
-    }), nil, "utf-8").to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
+    end.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML, encoding: 'utf-8')
   end
-
-
 end

data/lib/epics/generic_upload_request.rb

@@ -1,5 +1,4 @@
 class Epics::GenericUploadRequest < Epics::GenericRequest
-
   attr_accessor :key
   attr_accessor :document
 
@@ -18,37 +17,30 @@ class Epics::GenericUploadRequest < Epics::GenericRequest
   end
 
   def body
-    {
-      "DataTransfer" => {
-        "DataEncryptionInfo" => {
-          :@authenticate => true,
-          "EncryptionPubKeyDigest" => {
-            :"@Version" => "E002",
-            :"@Algorithm" => "http://www.w3.org/2001/04/xmlenc#sha256",
-            :content! => client.bank_e.public_digest
-          },
-          "TransactionKey" => Base64.encode64(client.bank_e.key.public_encrypt(self.key)).gsub(/\n/,'')
-        },
-        "SignatureData" => {
-          :@authenticate => true,
-          :content! => encrypted_order_signature
+    Nokogiri::XML::Builder.new do |xml|
+      xml.body {
+        xml.DataTransfer {
+          xml.DataEncryptionInfo(authenticate: true) {
+            xml.EncryptionPubKeyDigest(client.bank_e.public_digest, Version: 'E002', Algorithm: "http://www.w3.org/2001/04/xmlenc#sha256")
+            xml.TransactionKey Base64.encode64(client.bank_e.key.public_encrypt(self.key)).gsub(/\n/,'')
+          }
+          xml.SignatureData(encrypted_order_signature, authenticate: true)
         }
       }
-    }
+    end.doc.root
   end
 
   def order_signature
-    Gyoku.xml("UserSignatureData" => {
-      :"@xmlns" => "http://www.ebics.org/S001",
-      :"@xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
-      :"@xsi:schemaLocation" => "http://www.ebics.org/S001 http://www.ebics.org/S001/ebics_signature.xsd",
-      "OrderSignatureData" => {
-        "SignatureVersion" => "A006",
-        "SignatureValue" => signature_value,
-        "PartnerID" => partner_id,
-        "UserID" => user_id
+    Nokogiri::XML::Builder.new do |xml|
+      xml.UserSignatureData('xmlns' => 'http://www.ebics.org/S001', 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation' => 'http://www.ebics.org/S001 http://www.ebics.org/S001/ebics_signature.xsd') {
+        xml.OrderSignatureData {
+          xml.SignatureVersion "A006"
+          xml.SignatureValue signature_value
+          xml.PartnerID partner_id
+          xml.UserID user_id
+        }
       }
-    })
+    end.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML, encoding: 'utf-8')
   end
 
   def signature_value
@@ -83,4 +75,4 @@ class Epics::GenericUploadRequest < Epics::GenericRequest
     end
   end
 
-end
+end

data/lib/epics/haa.rb

@@ -1,40 +1,29 @@
 class Epics::HAA < Epics::GenericRequest
-
   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" => "HAA",
-          "OrderAttribute" => "DZHNN",
-          "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
+    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 'HAA'
+            xml.OrderAttribute 'DZHNN'
+            xml.StandardOrderParams
           }
-        },
-        "SecurityMedium" => "0000"
-     },
-      "mutable" => {
-        "TransactionPhase" => "Initialisation"
+          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