Commit 5973a84

@@ -1,25 +1,32 @@
 module Saml
   module Kit
     module Namespaces
-      ASSERTION = "urn:oasis:names:tc:SAML:2.0:assertion"
-      ATTR_SPLAT = "urn:oasis:names:tc:SAML:2.0:attrname-format:*"
-      BASIC = "urn:oasis:names:tc:SAML:2.0:attrname-format:basic"
-      BEARER = "urn:oasis:names:tc:SAML:2.0:cm:bearer"
-      EMAIL_ADDRESS = "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
-      INVALID_NAME_ID_POLICY = "urn:oasis:names:tc:SAML:2.0:status:InvalidNameIDPolicy"
-      METADATA = "urn:oasis:names:tc:SAML:2.0:metadata"
-      PASSWORD = "urn:oasis:names:tc:SAML:2.0:ac:classes:Password"
-      PASSWORD_PROTECTED = "urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"
-      PERSISTENT = "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent"
-      PROTOCOL = "urn:oasis:names:tc:SAML:2.0:protocol"
-      REQUESTER_ERROR = "urn:oasis:names:tc:SAML:2.0:status:Requester"
-      RESPONDER_ERROR = "urn:oasis:names:tc:SAML:2.0:status:Responder"
-      SUCCESS = "urn:oasis:names:tc:SAML:2.0:status:Success"
-      TRANSIENT = "urn:oasis:names:tc:SAML:2.0:nameid-format:transient"
-      UNSPECIFIED = "urn:oasis:names:tc:SAML:2.0:consent:unspecified"
-      UNSPECIFIED_NAMEID = "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"
-      URI = "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-      VERSION_MISMATCH_ERROR = "urn:oasis:names:tc:SAML:2.0:status:VersionMismatch"
+      SAML_2_0 = "urn:oasis:names:tc:SAML:2.0"
+      SAML_1_1 = "urn:oasis:names:tc:SAML:1.1"
+      ATTR_NAME_FORMAT = "#{SAML_2_0}:attrname-format"
+      NAME_ID_FORMAT_1_1 = "#{SAML_1_1}:nameid-format"
+      NAME_ID_FORMAT_2_0 = "#{SAML_2_0}:nameid-format"
+      STATUS = "#{SAML_2_0}:status"
+
+      ASSERTION = "#{SAML_2_0}:assertion"
+      ATTR_SPLAT = "#{ATTR_NAME_FORMAT}:*"
+      BASIC = "#{ATTR_NAME_FORMAT}:basic"
+      BEARER = "#{SAML_2_0}:cm:bearer"
+      EMAIL_ADDRESS = "#{NAME_ID_FORMAT_1_1}:emailAddress"
+      INVALID_NAME_ID_POLICY = "#{STATUS}:InvalidNameIDPolicy"
+      METADATA = "#{SAML_2_0}:metadata"
+      PASSWORD = "#{SAML_2_0}:ac:classes:Password"
+      PASSWORD_PROTECTED = "#{SAML_2_0}:ac:classes:PasswordProtectedTransport"
+      PERSISTENT = "#{NAME_ID_FORMAT_2_0}:persistent"
+      PROTOCOL = "#{SAML_2_0}:protocol"
+      REQUESTER_ERROR = "#{STATUS}:Requester"
+      RESPONDER_ERROR = "#{STATUS}:Responder"
+      SUCCESS = "#{STATUS}:Success"
+      TRANSIENT = "#{NAME_ID_FORMAT_2_0}:transient"
+      UNSPECIFIED = "#{SAML_2_0}:consent:unspecified"
+      UNSPECIFIED_NAMEID = "#{NAME_ID_FORMAT_1_1}:unspecified"
+      URI = "#{ATTR_NAME_FORMAT}:uri"
+      VERSION_MISMATCH_ERROR = "#{STATUS}:VersionMismatch"
     end
   end
 end