Commit 4fb61ae
Changed files (6)
lib
saml
xml-kit
lib
xml
kit
spec
xml
lib/saml/kit/document.rb
@@ -86,7 +86,7 @@ module Saml
# @param xml [String] the raw xml string.
# @param configuration [Saml::Kit::Configuration] the configuration to use for unpacking the document.
def to_saml_document(xml, configuration: Saml::Kit.configuration)
- xml_document = ::Xml::Kit::Xml.new(xml, namespaces: {
+ xml_document = ::Xml::Kit::Document.new(xml, namespaces: {
"samlp": ::Saml::Kit::Namespaces::PROTOCOL
})
constructor = {
lib/saml/kit/metadata.rb
@@ -203,7 +203,7 @@ module Saml
attr_reader :xml
def document
- @document ||= ::Xml::Kit::Xml.new(xml, namespaces: NAMESPACES)
+ @document ||= ::Xml::Kit::Document.new(xml, namespaces: NAMESPACES)
end
def metadata
@@ -227,7 +227,7 @@ module Saml
end
def valid_signature?
- xml = ::Xml::Kit::Xml.new(to_xml)
+ xml = document
result = xml.valid?
xml.errors.each do |error|
errors[:base] << error
lib/saml/kit/trustable.rb
@@ -44,7 +44,7 @@ module Saml
def must_have_valid_signature
return if to_xml.blank?
- xml = ::Xml::Kit::Xml.new(to_xml, namespaces: {
+ xml = ::Xml::Kit::Document.new(to_xml, namespaces: {
"NameFormat": Namespaces::ATTR_SPLAT,
"ds": ::Xml::Kit::Namespaces::XMLDSIG,
"md": Namespaces::METADATA,
xml-kit/lib/xml/kit/xml.rb → xml-kit/lib/xml/kit/document.rb
@@ -1,7 +1,7 @@
module Xml
module Kit
# {include:file:spec/saml/xml_spec.rb}
- class Xml # :nodoc:
+ class Document
include ActiveModel::Validations
NAMESPACES = { "ds": ::Xml::Kit::Namespaces::XMLDSIG }.freeze
xml-kit/lib/xml/kit.rb
@@ -8,20 +8,21 @@ require "openssl"
require "tilt"
require "xmldsig"
+require "xml/kit/namespaces"
+
require "xml/kit/builders/xml_encryption"
require "xml/kit/builders/xml_signature"
require "xml/kit/certificate"
require "xml/kit/crypto"
+require "xml/kit/document"
require "xml/kit/fingerprint"
require "xml/kit/id"
require "xml/kit/key_pair"
-require "xml/kit/namespaces"
require "xml/kit/self_signed_certificate"
require "xml/kit/signatures"
require "xml/kit/templatable"
require "xml/kit/template"
require "xml/kit/version"
-require "xml/kit/xml"
require "xml/kit/xml_decryption"
module Xml
xml-kit/spec/xml/xml_spec.rb → xml-kit/spec/xml/document_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Xml::Kit::Xml do
+RSpec.describe Xml::Kit::Document do
class Item
include ::Xml::Kit::Templatable