Add support for multivalued attributes

lib/omniauth/strategies/cas.rb

@@ -22,6 +22,7 @@ class InvalidCASTicket < StandardError; end
       option :port, nil
       option :path, nil
       option :ssl,  true
+      option :merge_multivalued_attributes, false
       option :service_validate_url, '/serviceValidate'
       option :login_url,            '/login'
       option :logout_url,           '/logout'

lib/omniauth/strategies/cas/service_ticket_validator.rb

@@ -52,7 +52,11 @@ def parse_user_info(node)
               unless e.kind_of?(Nokogiri::XML::Text) || node_name == 'proxies'
                 # There are no child elements
                 if e.element_children.count == 0
-                  hash[node_name] = e.content
+                  hash[node_name] = if hash[node_name] && @options.merge_multivalued_attributes
+                                      Array(hash[node_name]).push(e.content)
+                                    else
+                                      e.content
+                                    end
                 elsif e.element_children.count
                   # JASIG style extra attributes
                   if node_name == 'attributes'

spec/omniauth/strategies/cas/service_ticket_validator_spec.rb

@@ -9,6 +9,7 @@
   let(:provider_options) do
     double('provider_options',
       disable_ssl_verification?: false,
+      merge_multivalued_attributes: false,
       ca_path: '/etc/ssl/certsZOMG'
     )
   end
@@ -48,8 +49,26 @@
 
     subject { validator.user_info }
 
-    it 'parses user info from the response' do
-      expect(subject).to include 'user' => 'psegel'
+    context 'with default settings' do
+      it 'parses user info from the response' do
+        expect(subject).to include 'user' => 'psegel'
+        expect(subject).to include 'roles' => 'financier'
+      end
+    end
+
+    context 'when merging multivalued attributes' do
+      let(:provider_options) do
+        double('provider_options',
+          disable_ssl_verification?: false,
+          merge_multivalued_attributes: true,
+          ca_path: '/etc/ssl/certsZOMG'
+        )
+      end
+
+      it 'parses multivalued user info from the response' do
+        expect(subject).to include 'user' => 'psegel'
+        expect(subject).to include 'roles' => %w[senator lobbyist financier]
+      end
     end
   end
 end