rdf-rdfxml 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41d5cd8a197cd448768a2cfe131274a47d77ae2a
-  data.tar.gz: 00d32b32a2a5828b0493c4297165f653887f460e
+  metadata.gz: c09e2c03981f607db89feff748f72476728de1c7
+  data.tar.gz: 671669e3b8643b452e928c50f5735f0a9af723af
 SHA512:
-  metadata.gz: 32b38d47f5ac974896f37d95e28a2d9d94d686834d60f13c33846b1c5c095ca31d62a549840e40dbe05ee62c0b8d9cc747da459c205e8b48ad91702dbe312320
-  data.tar.gz: ac0060be5c8dcc2539f9b346b8e05276c492677ce56787ddad0ef608a9cdcea9328a6a96c2bdd65665297449e1472a041240d0538e59979b95d4c79743daf7ac
+  metadata.gz: 4aea12d47881ae63f93c4a74d4dde1e5620ee1637031ca1315d11150d7bfe6565e1330a5171d1dae5764923d6beb94bcad7d6fc1a08616aa178bad8bceda2e48
+  data.tar.gz: ca9dc408d616e72c3a6f7e2fede59cc9971ed790620f27f1921c9c817ad87d1a0daf9971cd5ffa1c6c271b63d4ac48fed232aebd7f541b7638705f504422553c

data/README.md

@@ -18,7 +18,7 @@ Install with `gem install rdf-rdfxml`
 
 * 100% free and unencumbered [public domain](http://unlicense.org/) software.
 * Implements a complete parser for [RDF/XML][].
-* Compatible with Ruby >= 2.0.
+* Compatible with Ruby >= 2.2.2.
 
 ## Usage:
 Instantiate a parser and parse source, specifying type and base-URL

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/lib/rdf/rdfxml/reader.rb

@@ -337,8 +337,8 @@ module RDF::RDFXML
         # 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|

data/lib/rdf/rdfxml/reader/nokogiri.rb

@@ -81,6 +81,14 @@ module RDF::RDFXML
           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 @@ module RDF::RDFXML
         def children
           @children ||= NodeSetProxy.new(@node.children, self)
         end
-        
+
         # Ancestors of this element, in order
         def ancestors
           @ancestors ||= parent ? parent.ancestors + [parent] : []

data/lib/rdf/rdfxml/writer/haml_templates.rb

@@ -38,7 +38,8 @@ module RDF::RDFXML
             - if expanded_type.start_with?('_:')
               - haml_tag(get_qname(RDF.type), "rdf:nodeID" => expanded_type[2..-1])
             -else
-              - haml_tag(get_qname(RDF.type), "rdf:resource" => expanded_type)
+              - # FIXME: closing tag forces close tag, as :/ is not honored in 5.0.1
+              - haml_tag(get_qname(RDF.type), "", "rdf:resource" => expanded_type)
           - predicates.each do |p|
             = yield(p)
       ),
@@ -59,9 +60,11 @@ module RDF::RDFXML
         - haml_tag(property, :"<", "xml:lang" => object.language, "rdf:datatype" => (object.datatype unless object.plain?)) do
           = object.value.to_s.encode(xml: :text)
       - elsif object.node?
-        - haml_tag(property, :"/", "rdf:nodeID" => object.id)
+        - # FIXME: closing tag forces close tag, as :/ is not honored in 5.0.1
+        - haml_tag(property, "", "rdf:nodeID" => object.id)
       - else
-        - haml_tag(property, :"/", "rdf:resource" => relativize(object))
+        - # FIXME: closing tag forces close tag, as :/ is not honored in 5.0.1
+        - haml_tag(property, "", "rdf:resource" => relativize(object))
       ),
 
       # Outpust for a list
@@ -75,9 +78,11 @@ module RDF::RDFXML
             - if recurse && res = yield(object)
               = res
             - elsif object.node?
-              - haml_tag(get_qname(RDF.Description), :"/", "rdf:nodeID" => (object.id if ref_count(object) > 1))
+              - # FIXME: closing tag forces close tag, as :/ is not honored in 5.0.1
+              - haml_tag(get_qname(RDF.Description), "", "rdf:nodeID" => (object.id if ref_count(object) > 1))
             - else
-              - haml_tag(get_qname(RDF.Description), :"/", "rdf:about" => relativize(object))
+              - # FIXME: closing tag forces close tag, as :/ is not honored in 5.0.1
+              - haml_tag(get_qname(RDF.Description), "", "rdf:about" => relativize(object))
       ),
     }
     HAML_TEMPLATES = {base: BASE_HAML}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfxml
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Gregg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -247,7 +247,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -255,9 +255,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf-rdfxml
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: RDF/XML reader/writer for RDF.rb.
 test_files: []
-has_rdoc: false