saml2 2.2.9 → 2.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85079eef2484ac29ff4b22303b10fa1a08afdeab25c22bd0b3c610324945dabd
-  data.tar.gz: bb93d0ef57206e8ec3b773b742625c4e5d60f76f696be91786528b5845bef188
+  metadata.gz: 453b3acfb0a9b791d213e0c985e36beaddfc915512a9722aee036bfb09e43a24
+  data.tar.gz: f725eba226322b37181528c19fcdd320477b4cd67b54775cb0d72a727dd761c0
 SHA512:
-  metadata.gz: 4c064cf43d5bd7feb0ecbf1070da413fbf8dcf19e2b5130aa8965367fbb194abf5565000b210fb6a9406c7b49d96e6de4ed613cb94227428a21585c7a35172e1
-  data.tar.gz: 113b16ec4a20b0af0d60ee9e114e35d1b658ebc259de1ce196d8494269096b2d40bfe2ea9d5a875f03972eb548ac01fc9d3856bc92d9db34cfaf7140dc80c0e1
+  metadata.gz: 95845c85c633d58abf0131820a2be7eb8dfdbca1976e60dc77f5b7fafbcb68024089eefe59e99a42778d4e99ab9c808a4cd278f0aa0c7cacf2b1b04e5975f40c
+  data.tar.gz: 5b45cd12d4f79353a61e36e47fbcd4b4e0d3fbcd6f3eac62dd640a0e19260f3e5deef64c72b01014a2b43e128d6145d10855dcedb5e6ba31ab1d7441f1334930

data/lib/saml2/attribute.rb

@@ -190,7 +190,7 @@ module SAML2
           # repeated key; convert to array
           if attribute.value.is_a?(Array)
             # both values are arrays; concatenate them
-            prior_value.concat(attribute.value)
+            value.concat(attribute.value)
           else
             value << attribute.value
           end

data/lib/saml2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SAML2
-  VERSION = '2.2.9'
+  VERSION = '2.2.10'
 end

data/spec/lib/attribute_spec.rb

@@ -109,6 +109,24 @@ XML
             'eduPersonAffiliation' => 'member',
             'eduPersonPrincipalName' => 'student@example.edu'})
       end
+
+      it "properly combines repeated attributes" do
+        attr_statement = AttributeStatement.from_xml(Nokogiri::XML(<<-XML).root)
+<saml2:AttributeStatement xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">
+  <saml2:Attribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+    <saml2:AttributeValue>02</saml2:AttributeValue>
+  </saml2:Attribute>
+  <saml2:Attribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+    <saml2:AttributeValue>employee@school.edu</saml2:AttributeValue>
+    <saml2:AttributeValue>students@school.edu</saml2:AttributeValue>
+  </saml2:Attribute>
+</saml2:AttributeStatement>
+        XML
+
+        expect(attr_statement.to_h).to eq({
+            'eduPersonScopedAffiliation' => ['02', 'employee@school.edu', 'students@school.edu']
+                                          })
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saml2
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.2.10
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri