libsaml 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15b1bc506c0d773071297dcf07db5790ae88f380
-  data.tar.gz: ec73cff60998ef1fbb56ff21997cd28765dfd818
+  metadata.gz: a9e195ed198652f536ab402c05ff6482b5a8a01e
+  data.tar.gz: 250c776273dc68c698543239a95ed47cb77522a9
 SHA512:
-  metadata.gz: 5774652f6ed9ad934b8bc619ec691cfe1bd90c423723f785ad5e5697a12973ef2ce182a76bd0f8973858efc20a42c4cc1eee77d0ff47a0dca9a40d314057d576
-  data.tar.gz: cc807e052949b5d7319e504329644e330fea0d9a32898a9333b8379c597914e521995b4e46d99fa0ffc9e713264be4d6bea9b35ac49cf376d510a5f11692af39
+  metadata.gz: 32ce58306d95b976fc0477ebdfd16c91bf9a1aea336db82e7a4cd0451b53f9c2778bb69875503c581845ba4bcc513b4e91e4f8e64a555729d823299aa03ea26c
+  data.tar.gz: 0e26262b7cc6542270b51895deaf037dcb21783c589aad812ca137d9ff703e65ffd741581368aa80700789a8479765f5875f6c4340d603d684f8bb0076a6102c

data/lib/saml.rb

@@ -16,6 +16,8 @@ module Saml
   MD_ATTR_NAMESPACE  = 'urn:oasis:names:tc:SAML:metadata:attribute'
   SAML_NAMESPACE     = 'urn:oasis:names:tc:SAML:2.0:assertion'
   SAMLP_NAMESPACE    = 'urn:oasis:names:tc:SAML:2.0:protocol'
+  XS_NAMESPACE       = 'http://www.w3.org/2001/XMLSchema'
+  XSI_NAMESPACE      = 'http://www.w3.org/2001/XMLSchema-instance'
   XML_DSIG_NAMESPACE = 'http://www.w3.org/2000/09/xmldsig#'
   SAML_VERSION       = '2.0'
 
@@ -111,6 +113,7 @@ module Saml
     require 'saml/elements/subject_confirmation'
     require 'saml/elements/encrypted_assertion'
     require 'saml/elements/encrypted_attribute'
+    require 'saml/elements/attribute_value'
     require 'saml/elements/attribute'
     require 'saml/elements/attribute_statement'
     require 'saml/elements/entity_attributes'

data/lib/saml/complex_types/attribute_type.rb

@@ -10,15 +10,31 @@ module Saml
         attribute :name, String, :tag => 'Name'
         attribute :format, String, tag: 'NameFormat'
         attribute :friendly_name, String, tag: 'FriendlyName'
-        element :attribute_value, String, :namespace => 'saml', :tag => "AttributeValue"
+
+        has_many :attribute_values, Saml::Elements::AttributeValue
 
         validates :name, :presence => true
       end
 
       def initialize(*args)
         options = args.extract_options!
+        @attribute_values ||= []
         super(*(args << options))
       end
+
+      def attribute_value
+        warn '[DEPRECATED] please use #attribute_values'
+        attribute_values.first.try(:content)
+      end
+
+      def attribute_value=(value)
+        self.attribute_values << if value.is_a? String
+          Saml::Elements::AttributeValue.new(content: value)
+        else
+          value
+        end
+      end
+
     end
   end
 end

data/lib/saml/complex_types/statement_abstract_type.rb

@@ -3,7 +3,7 @@ module Saml
     class StatementAbstractType
       include HappyMapper
 
-      register_namespace 'xsi', 'http://www.w3.org/2001/XMLSchema-instance'
+      register_namespace 'xsi', Saml::XSI_NAMESPACE
 
       tag 'Statement'
       namespace 'saml'

data/lib/saml/elements/attribute_statement.rb

@@ -15,7 +15,7 @@ module Saml
       end
 
       def fetch_attributes(key)
-        attribute.find_all { |attr| attr.name == key }.map(&:attribute_value)
+        attribute.find_all { |attr| attr.name == key }.flat_map(&:attribute_values).map(&:content)
       end
     end
   end

data/lib/saml/elements/attribute_value.rb

@@ -0,0 +1,18 @@
+module Saml
+  module Elements
+    class AttributeValue
+      include Saml::Base
+
+      register_namespace 'saml', Saml::SAML_NAMESPACE
+      register_namespace 'xs',   Saml::XS_NAMESPACE
+      register_namespace 'xsi',  Saml::XSI_NAMESPACE
+
+      namespace 'saml'
+      tag 'AttributeValue'
+
+      attribute :type, String, tag: 'xsi:type'
+
+      content :content, String
+    end
+  end
+end

data/lib/saml/version.rb

@@ -1,3 +1,3 @@
 module Saml
-  VERSION = "2.7.0"
+  VERSION = "2.8.0"
 end

data/lib/saml/xml_helpers.rb

@@ -27,8 +27,8 @@ module Saml
 
       builder = Nokogiri::XML::Builder.new(:encoding => "UTF-8")
       builder.Envelope(:'xmlns:soapenv' => "http://schemas.xmlsoap.org/soap/envelope/",
-                       :'xmlns:xsd'     => "http://www.w3.org/2001/XMLSchema",
-                       :'xmlns:xsi'     => "http://www.w3.org/2001/XMLSchema-instance") do |xml|
+                       :'xmlns:xsd'     => Saml::XS_NAMESPACE,
+                       :'xmlns:xsi'     => Saml::XSI_NAMESPACE) do |xml|
         builder.parent.namespace = builder.parent.namespace_definitions.find { |n| n.prefix == 'soapenv' }
         builder.Body do
           builder.parent.add_child body.doc.root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -147,6 +147,7 @@ files:
 - lib/saml/elements/attribute_authority_descriptor.rb
 - lib/saml/elements/attribute_consuming_service.rb
 - lib/saml/elements/attribute_statement.rb
+- lib/saml/elements/attribute_value.rb
 - lib/saml/elements/audience_restriction.rb
 - lib/saml/elements/authenticating_authority.rb
 - lib/saml/elements/authn_context.rb