For Nokogiri, implement #text? to also include CDATA elements.

Fixes #37.

Author: gkellogg

dependencyci.yml

@@ -0,0 +1,5 @@
+platform:
+  Rubygems:
+    rdf-isomorphic:
+      tests:
+        unmaintained: skip

lib/rdf/rdfxml/reader.rb

@@ -337,8 +337,8 @@ def nodeElement(el, ec)
         # Determine the content type of this property element
         log_fatal "child must be a proxy not a #{child.class}" unless child.is_a?(@implementation::NodeProxy)
 
-        text_nodes = child.children.select {|e| e.text? && !e.blank?}
-        element_nodes = child.children.select {|c| c.element? }
+        text_nodes = child.children.select(&:text?)
+        element_nodes = child.children.select(&:element?)
         add_debug(child) {"#{text_nodes.to_a.length} text nodes, #{element_nodes.to_a.length} element nodes"}
 
         text_nodes.each do |node|

lib/rdf/rdfxml/reader/nokogiri.rb

@@ -81,6 +81,14 @@ def display_path
           end
         end
 
+        ##
+        # Return true of this is a text node
+        #
+        # @return [Array<:text, :element, :attribute>]
+        def text?
+          (@node.text? || @node.cdata?) && !@node.blank?
+        end
+
         ##
         # Return true of all child elements are text
         #
@@ -104,7 +112,7 @@ def namespaces
         def children
           @children ||= NodeSetProxy.new(@node.children, self)
         end
-        
+
         # Ancestors of this element, in order
         def ancestors
           @ancestors ||= parent ? parent.ancestors + [parent] : []

spec/reader_spec.rb

@@ -202,6 +202,24 @@
         expect(graph).to be_equivalent_graph(expected, logger: logger)
       end
 
+      it "reads text from CDATA" do
+        sampledoc = %(<?xml version="1.0" encoding="utf-8"?>
+          <rdf:RDF
+            xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+            xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+          >
+            <rdf:Property rdf:about="http://www.w3.org/ns/oa#annotationService">
+              <rdfs:comment><![CDATA[Text]]></rdfs:comment>
+            </rdf:Property>
+          </rdf:RDF>)
+        expected = %(
+        	<http://www.w3.org/ns/oa#annotationService> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
+        	<http://www.w3.org/ns/oa#annotationService> <http://www.w3.org/2000/01/rdf-schema#comment> "Text" .
+        )
+        graph = parse(sampledoc, validate: true)
+        expect(graph).to be_equivalent_graph(expected, logger: logger)
+      end
+
       context :exceptions do
         it "should raise an error if rdf:aboutEach is used, as per the negative parser test rdfms-abouteach-error001 (rdf:aboutEach attribute)" do
           sampledoc = %q(<?xml version="1.0" ?>