ruby-saml 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbac6942120c5332a95a90dd3d88cde723269092
-  data.tar.gz: 4b08b52dc6263e036983b519cd01028af7725566
+  metadata.gz: 58b2d78436fa5304bc67e40cd5f4a0cc766b4301
+  data.tar.gz: b2445dcda50eeb89ce6fe2b9b285c5021755e189
 SHA512:
-  metadata.gz: b7394a6d2d7e02d069e1b721d036a5af5f8a324ccbc308026d38f6876b5fcd9b88a73ad963ba6be7ad4a7125634a65f8c5d9dae6e96567141500dcfa9e5eca4a
-  data.tar.gz: 7efb59314189ccf38abc734378cbbd91a38c6235557d4e25f70b45494c9b235e6ba899f43e4b51693503880b97cc67a3f3111c4c1944af4bab4481c64a94f363
+  metadata.gz: 5b90724f90916e973182de8bf2d009aeabfbc356acb167e927a63d1e360b831e540b25602ba4bb1d79b74fd6e07889860fda5f4620eeb31f76fdc9b585bd13f0
+  data.tar.gz: cd3750758fa6326bfe6be73552480b1f37994ba137eb048750afbd093d7ee4b23afadcbc1869bfdd49f9b77bdf29f629b0fc6963d814e3cdf54ad72281053999

data/changelog.md

@@ -1,5 +1,8 @@
 # RubySaml Changelog
 
+### 1.7.2 (Feb 28, 2018)
+* [#446](https://github.com/onelogin/ruby-saml/pull/446) Normalize text returned by OneLogin::RubySaml::Utils.element_text
+
 ### 1.7.1 (Feb 28, 2018)
 * [#444](https://github.com/onelogin/ruby-saml/pull/444) Fix audience validation for empty audience restriction
 

data/lib/onelogin/ruby-saml/utils.rb

@@ -286,7 +286,7 @@ module OneLogin
       # that there all children other than text nodes can be ignored (e.g. comments). If nil is
       # passed, nil will be returned.
       def self.element_text(element)
-        element.texts.join if element
+        element.texts.map(&:value).join if element
       end
     end
   end

data/lib/onelogin/ruby-saml/version.rb

@@ -1,5 +1,5 @@
 module OneLogin
   module RubySaml
-    VERSION = '1.7.1'
+    VERSION = '1.7.2'
   end
 end

data/test/utils_test.rb

@@ -213,5 +213,42 @@ class UtilsTest < Minitest::Test
         assert !OneLogin::RubySaml::Utils.uri_match?(destination, settings)
       end
     end
+
+    describe 'element_text' do
+      it 'returns the element text' do
+        element = REXML::Document.new('<element>element text</element>').elements.first
+        assert_equal 'element text', OneLogin::RubySaml::Utils.element_text(element)
+      end
+
+      it 'returns all segments of the element text' do
+        element = REXML::Document.new('<element>element <!-- comment -->text</element>').elements.first
+        assert_equal 'element text', OneLogin::RubySaml::Utils.element_text(element)
+      end
+
+      it 'returns normalized element text' do
+        element = REXML::Document.new('<element>element &amp; text</element>').elements.first
+        assert_equal 'element & text', OneLogin::RubySaml::Utils.element_text(element)
+      end
+
+      it 'returns the CDATA element text' do
+        element = REXML::Document.new('<element><![CDATA[element & text]]></element>').elements.first
+        assert_equal 'element & text', OneLogin::RubySaml::Utils.element_text(element)
+      end
+
+      it 'returns the element text with newlines and additional whitespace' do
+        element = REXML::Document.new("<element>  element \n text  </element>").elements.first
+        assert_equal "  element \n text  ", OneLogin::RubySaml::Utils.element_text(element)
+      end
+
+      it 'returns nil when element is nil' do
+        assert_nil OneLogin::RubySaml::Utils.element_text(nil)
+      end
+
+      it 'returns empty string when element has no text' do
+        element = REXML::Document.new('<element></element>').elements.first
+        assert_equal '', OneLogin::RubySaml::Utils.element_text(element)
+      end
+
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-saml
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - OneLogin LLC