libsaml 2.11.1 → 2.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: feedb049131233fa3b5af8e496c634a4a3f62258
-  data.tar.gz: 29c4fdbee9fd7487edd7fb9154fdf45d1592f531
+  metadata.gz: 52fd6cd1d0af0f41f1632b2479b78d1b5365c455
+  data.tar.gz: 5260800a99393c17ec10737eefdbb4028e9c9cf1
 SHA512:
-  metadata.gz: 140b08f978e59a54c21eb8269245bc463fcdb7ab9f9f5cd742c374ef439df7c38880b922331dabda6975b894d4ad64bbfc8e3c37bb831d6509c222d0fda0019f
-  data.tar.gz: e2aa1bfa00bcf148465aaa52ee51f80f0bb350bbb17f9d4a7b542c1eaa17752f9a89106de49f84bd147861c375a6e4b8d950b4206f0a2cff52daa8f79cd69ae4
+  metadata.gz: 741c4c38a246efb603c329d72921e7f72560f3256a2593c7759a4b32e5d77d169e515e248bd189405424c1a5851c884806eb6e26308470d32d175a82375c9c38
+  data.tar.gz: ff59291d3bc4120db647434a61d270516bb8f0b26f7aabb65abac070f4857dc0cb45ed30aa5c76af3b0bfe421ed8bd5fd6ab3522366234f9adc133884ec34bb0

data/lib/saml/assertion.rb

@@ -58,7 +58,7 @@ module Saml
     end
 
     def fetch_attribute(key)
-      fetch_attributes(key).first if fetch_attributes(key)
+      Array(fetch_attributes(key)).first
     end
 
     def fetch_attributes(key)
@@ -67,6 +67,16 @@ module Saml
       attribute_statements.flat_map { |attribute_statement| attribute_statement.fetch_attributes(key) }
     end
 
+    def fetch_attribute_value(key)
+      Array(fetch_attribute_values(key)).first
+    end
+
+    def fetch_attribute_values(key)
+      return unless self.attribute_statements
+      return unless self.attribute_statements.flat_map(&:attribute)
+      attribute_statements.flat_map { |attribute_statement| attribute_statement.fetch_attribute_values(key) }
+    end
+
     def attribute_statement
       attribute_statements.try(:first)
     end

data/lib/saml/elements/attribute_statement.rb

@@ -11,11 +11,19 @@ module Saml
       has_many :encrypted_attributes, Saml::Elements::EncryptedAttribute
 
       def fetch_attribute(key)
-        fetch_attributes(key).first
+        fetch_attribute_value(key).content
       end
 
       def fetch_attributes(key)
-        attribute.find_all { |attr| attr.name == key }.flat_map(&:attribute_values).map(&:content)
+        fetch_attribute_values(key).map(&:content)
+      end
+
+      def fetch_attribute_value(key)
+        fetch_attribute_values(key).first
+      end
+
+      def fetch_attribute_values(key)
+        attribute.find_all { |attr| attr.name == key }.flat_map(&:attribute_values)
       end
     end
   end

data/lib/saml/version.rb

@@ -1,3 +1,3 @@
 module Saml
-  VERSION = "2.11.1"
+  VERSION = "2.11.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.11.2
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport