rdf-rdfxml 1.99.1 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5a53c64ca08c4b1ba11a7bfd1a2e53e1150b4b1dc9adf6a006c409a09459f4d5
-  data.tar.gz: da09af1c4ded29d47b46c0a8a2abf16f3f997625ef9c155c196ab9fbdc53a4f5
+SHA1:
+  metadata.gz: a97e15f4b3060b84e86264e393b428fc6ed99206
+  data.tar.gz: 4816c1d928adb1d589306ee67a50410f43f3d4b0
 SHA512:
-  metadata.gz: da1d0c673da3e3c2a3d36632e0f69886ce8d318fcb207dd61145798621b9cd8532d2dc920df08280a0b83cfd937506d5fa168574245c5fd65b6cb8792c631af1
-  data.tar.gz: 93db4498130704ff853f9d9747fc01bb1db713e9d9d0c8e700e2b8ace1622787fa40058022e345fcc395bbdefc73726fc8a264c22b867c1f3091411e86af7afa
+  metadata.gz: c1951f8988b0e05bcdfe6edee336332286ba1aa93c6bbd70f51928305d895a001ba92b914b771e68f4e616e2fa65334bfd3fe7fbd9c3a7f64fc443b70a534a66
+  data.tar.gz: bccc43775383cf308f9aff69ec8b66089bcc6bb4fc6ed3079e820c5c36b6e64a9ef034165be6fc0d2b15063e8e8316ba3093a63b32d8b755d7cd2abaff8c2a27

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 >= 1.9.2.
+* Compatible with Ruby >= 2.0.
 
 ## Usage:
 Instantiate a parser and parse source, specifying type and base-URL
@@ -40,7 +40,7 @@ Write a graph to a file:
     end
 
 ## Dependencies
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.0)
 * Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.6.0)
 
 ## Documentation

data/VERSION

@@ -1 +1 @@
-1.99.1
+2.0.0.beta1

data/lib/rdf/rdfxml/format.rb

@@ -6,21 +6,21 @@ module RDF::RDFXML
   #   RDF::Format.for(:rdf)         # RDF::RDFXML::Format
   #   RDF::Format.for(:rdfxml)      # RDF::RDFXML::Format
   #   RDF::Format.for("etc/foaf.xml")
-  #   RDF::Format.for(:file_name      => "etc/foaf.xml")
-  #   RDF::Format.for(:file_extension => "xml")
-  #   RDF::Format.for(:file_extension => "rdf")
-  #   RDF::Format.for(:content_type   => "application/xml")
-  #   RDF::Format.for(:content_type   => "application/rdf+xml")
+  #   RDF::Format.for(file_name: "etc/foaf.xml")
+  #   RDF::Format.for(file_extension: "xml")
+  #   RDF::Format.for(file_extension: "rdf")
+  #   RDF::Format.for(content_type: "application/xml")
+  #   RDF::Format.for(content_type: "application/rdf+xml")
   #
   # @example Obtaining serialization format MIME types
   #   RDF::Format.content_types      #=> {"application/rdf+xml" => [RDF::RDFXML::Format]}
   #
   # @example Obtaining serialization format file extension mappings
-  #   RDF::Format.file_extensions    #=> {:rdf => "application/rdf+xml"}
+  #   RDF::Format.file_extensions    #=> {rdf: "application/rdf+xml"}
   #
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
   class Format < RDF::Format
-    content_type     'application/rdf+xml', :extension => :rdf
+    content_type     'application/rdf+xml', extensions: [:rdf, :owl]
     content_encoding 'utf-8'
 
     reader { RDF::RDFXML::Reader }
@@ -43,22 +43,9 @@ module RDF::RDFXML
     def self.name
       "RDF/XML"
     end
-  end
 
-  # Aliases for RDF::Format
-  #
-  # This allows the following:
-  #
-  # @example Obtaining an HTML format class
-  #   RDF::Format.for(:rdf)         # RDF::RDFXML::Lite
-  #   RDF::Format.for(:rdf).reader  # RDF::RDFXML::Reader
-  #   RDF::Format.for(:rdf).writer  # RDF::RDFXML::Writer
-  class RDFFormat < RDF::Format
-    content_type     'application/rdf+xml'
-    content_encoding 'utf-8'
-    reader { RDF::RDFXML::Reader }
-    writer { RDF::RDFXML::Writer }
-    
-    def self.to_sym; :rdf; end
+    def self.symbols
+      [:rdfxml, :rdf, :owl]
+    end
   end
 end

data/lib/rdf/rdfxml/reader.rb

@@ -14,6 +14,7 @@ module RDF::RDFXML
   # @author [Gregg Kellogg](http://kellogg-assoc.com/)
   class Reader < RDF::Reader
     format Format
+    include RDF::Util::Logger
 
     CORE_SYNTAX_TERMS = %w(RDF ID about parseType resource nodeID datatype).map {|n| "http://www.w3.org/1999/02/22-rdf-syntax-ns##{n}"}
     OLD_TERMS = %w(aboutEach aboutEachPrefix bagID).map {|n| "http://www.w3.org/1999/02/22-rdf-syntax-ns##{n}"}
@@ -130,8 +131,6 @@ module RDF::RDFXML
     #   the prefix mappings to use (not supported by all readers)
     # @option options [#to_s]    :base_uri     (nil)
     #   the base URI to use when resolving relative URIs
-    # @option options [Array] :debug
-    #   Array to place debug messages
     # @return [reader]
     # @yield  [reader] `self`
     # @yieldparam  [RDF::Reader] reader
@@ -139,16 +138,14 @@ module RDF::RDFXML
     # @raise [Error] Raises RDF::ReaderError if _validate_
     def initialize(input = $stdin, options = {}, &block)
       super do
-        @debug = options[:debug]
-            
         @library = case options[:library]
-          when nil
-            # Use Nokogiri when available, and REXML otherwise:
-            defined?(::Nokogiri) ? :nokogiri : :rexml
-          when :nokogiri, :rexml
-            options[:library]
-          else
-            raise ArgumentError.new("expected :rexml or :nokogiri, but got #{options[:library].inspect}")
+        when nil
+          # Use Nokogiri when available, and REXML otherwise:
+          defined?(::Nokogiri) ? :nokogiri : :rexml
+        when :nokogiri, :rexml
+          options[:library]
+        else
+          log_fatal("expected :rexml or :nokogiri, but got #{options[:library].inspect}", exception: ArgumentError)
         end
 
         require "rdf/rdfxml/reader/#{@library}"
@@ -158,10 +155,11 @@ module RDF::RDFXML
         end
         self.extend(@implementation)
 
-        initialize_xml(input, options) rescue raise RDF::ReaderError.new($!.message)
+        input.rewind if input.respond_to?(:rewind)
+        initialize_xml(input, options) rescue log_fatal($!.message)
 
-        raise RDF::ReaderError, "Empty document" if root.nil? && validate?
-        raise RDF::ReaderError, "Synax errors:\n#{doc_errors}" if !doc_errors.empty? && validate?
+        log_error("Empty document") if root.nil?
+        log_error("Synax errors") {doc_errors} if !doc_errors.empty?
 
         block.call(self) if block_given?
       end
@@ -183,8 +181,9 @@ module RDF::RDFXML
       if block_given?
         # Block called from add_statement
         @callback = block
+        return unless root
 
-        raise "root must be a proxy not a #{root.class}" unless root.is_a?(@implementation::NodeProxy)
+        log_fatal "root must be a proxy not a #{root.class}" unless root.is_a?(@implementation::NodeProxy)
 
         add_debug(root, "base_uri: #{base_uri.inspect}")
       
@@ -199,7 +198,7 @@ module RDF::RDFXML
           nodeElement(root, ec)
         else
           rdf_nodes.each do |node|
-            raise "node must be a proxy not a #{node.class}" unless node.is_a?(@implementation::NodeProxy)
+            log_fatal "node must be a proxy not a #{node.class}" unless node.is_a?(@implementation::NodeProxy)
             # XXX Skip this element if it's contained within another rdf:RDF element
 
             # Extract base, lang and namespaces from parents to create proper evaluation context
@@ -209,7 +208,7 @@ module RDF::RDFXML
             end
             node.children.each {|el|
               next unless el.element?
-              raise "el must be a proxy not a #{el.class}" unless el.is_a?(@implementation::NodeProxy)
+              log_fatal "el must be a proxy not a #{el.class}" unless el.is_a?(@implementation::NodeProxy)
               new_ec = ec.clone(el) do |prefix, value|
                 prefix(prefix, value)
               end
@@ -217,6 +216,10 @@ module RDF::RDFXML
             }
           end
         end
+
+        if validate? && log_statistics[:error]
+          raise RDF::ReaderError, "Errors found during processing"
+        end
       end
       enum_for(:each_statement)
     end
@@ -251,16 +254,22 @@ module RDF::RDFXML
       "<#{base_uri}>#{node.respond_to?(:display_path) ? node.display_path : node}"
     end
     
-    # Add debug event to debug array, if specified
+    # Log a debug message
     #
     # @param [Nokogiri::XML::Node, #to_s] node XML Node or string for showing context
     # @param [String] message
     # @yieldreturn [String] appended to message, to allow for lazy-evaulation of message
-    def add_debug(node, message = "")
-      return unless ::RDF::RDFXML.debug? || @debug
-      message = message + yield if block_given?
-      puts "#{node_path(node)}: #{message}" if ::RDF::RDFXML::debug?
-      @debug << "#{node_path(node)}: #{message}".force_encoding("utf-8") if @debug.is_a?(Array)
+    def add_debug(node, message = "", &block)
+      log_debug(node_path(node), message, &block)
+    end
+
+    # Log an error message
+    #
+    # @param [Nokogiri::XML::Node, #to_s] node XML Node or string for showing context
+    # @param [String] message
+    # @yieldreturn [String] appended to message, to allow for lazy-evaulation of message
+    def add_error(node, message = "", &block)
+      log_error(node_path(node), message, &block)
     end
 
     # add a statement, object can be literal or URI or bnode
@@ -272,7 +281,7 @@ module RDF::RDFXML
     # @return [Statement] Added statement
     # @raise [RDF::ReaderError] Checks parameter types and raises if they are incorrect if validating.
     def add_triple(node, subject, predicate, object)
-      statement = RDF::Statement.new(subject, predicate, object)
+      statement = RDF::Statement(subject, predicate, object)
       add_debug(node) {"statement: #{statement}"}
       @callback.call(statement)
     end
@@ -284,7 +293,7 @@ module RDF::RDFXML
     # @return [RDF::URI] subject The subject found for the node
     # @raise [RDF::ReaderError] Raises Exception if validating
     def nodeElement(el, ec)
-      raise "el must be a proxy not a #{el.class}" unless el.is_a?(@implementation::NodeProxy)
+      log_fatal "el must be a proxy not a #{el.class}" unless el.is_a?(@implementation::NodeProxy)
       # subject
       subject = ec.subject || parse_subject(el, ec)
       
@@ -308,7 +317,7 @@ module RDF::RDFXML
         elsif is_propertyAttr?(attr)
           # Attributes not RDF.type
           predicate = attr.uri
-          lit = RDF::Literal.new(attr.value, :language => ec.language, :validate => validate?, :canonicalize => canonicalize?)
+          lit = RDF::Literal.new(attr.value, language: ec.language, validate: validate?, canonicalize: canonicalize?)
           add_triple(attr, subject, predicate, lit)
         end
       end
@@ -316,7 +325,7 @@ module RDF::RDFXML
       # Handle the propertyEltList children events in document order
       li_counter = 0 # this will increase for each li we iterate through
       el.children.each do |child|
-        raise "child must be a proxy not a #{child.class}" unless child.is_a?(@implementation::NodeProxy)
+        log_fatal "child must be a proxy not a #{child.class}" unless child.is_a?(@implementation::NodeProxy)
         next unless child.element?
         child_ec = ec.clone(child) do |prefix, value|
           prefix(prefix, value)
@@ -326,17 +335,17 @@ module RDF::RDFXML
         propertyElementURI_check(child)
         
         # Determine the content type of this property element
-        raise "child must be a proxy not a #{child.class}" unless child.is_a?(@implementation::NodeProxy)
+        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? }
         add_debug(child) {"#{text_nodes.to_a.length} text nodes, #{element_nodes.to_a.length} element nodes"}
 
         text_nodes.each do |node|
-          raise "text node must be a proxy not a #{node.class}" unless node.is_a?(@implementation::NodeProxy)
+          log_fatal "text node must be a proxy not a #{node.class}" unless node.is_a?(@implementation::NodeProxy)
         end
         element_nodes.each do |node|
-          raise "element node must be a proxy not a #{node.class}" unless node.is_a?(@implementation::NodeProxy)
+          log_fatal "element node must be a proxy not a #{node.class}" unless node.is_a?(@implementation::NodeProxy)
         end
 
         if element_nodes.size > 1
@@ -383,10 +392,7 @@ module RDF::RDFXML
           end
         end
         
-        if nodeID && resourceAttr
-          add_debug(el, "Cannot have rdf:nodeID and rdf:resource.")
-          raise RDF::ReaderError.new("Cannot have rdf:nodeID and rdf:resource.") if validate?
-        end
+        add_error(el, "Cannot have rdf:nodeID and rdf:resource.") if nodeID && resourceAttr
 
         # Apply character transformations
         id = id_check(el, RDF::NTriples.unescape(id), nil) if id
@@ -407,7 +413,7 @@ module RDF::RDFXML
             prefix(prefix, value)
           end
           new_node_element = element_nodes.first
-          raise "new_node_element must be a proxy not a #{new_node_element.class}" unless new_node_element.is_a?(@implementation::NodeProxy)
+          log_fatal "new_node_element must be a proxy not a #{new_node_element.class}" unless new_node_element.is_a?(@implementation::NodeProxy)
           add_debug(child) {"resourcePropertyElt: #{node_path(new_node_element)}"}
           new_subject = nodeElement(new_node_element, new_ec)
           add_triple(child, subject, predicate, new_subject)
@@ -415,7 +421,7 @@ module RDF::RDFXML
           # Production literalPropertyElt
           add_debug(child, "literalPropertyElt")
           
-          literal_opts = {:validate => validate?, :canonicalize => canonicalize?}
+          literal_opts = {validate: validate?, canonicalize: canonicalize?}
           if datatype
             literal_opts[:datatype] = uri(datatype)
           else
@@ -429,9 +435,7 @@ module RDF::RDFXML
           add_debug(child, "parseTypeResourcePropertyElt")
 
           unless attrs.empty?
-            warn = "Resource Property with extra attributes: '#{attrs.inspect}'"
-            add_debug(child, warn)
-            raise RDF::ReaderError.new(warn) if validate?
+            add_error(child, "Resource Property with extra attributes") {attrs.inspect}
           end
 
           # For element e with possibly empty element content c.
@@ -454,7 +458,7 @@ module RDF::RDFXML
           node = el.create_node("Description", child.children)
           node.add_namespace(nil, RDF.to_uri.to_s)
           add_debug(node) { "uri: #{node.uri}, namespace: #{node.namespace.inspect}"}
-          new_ec = child_ec.clone(nil, :subject => n) do |prefix, value|
+          new_ec = child_ec.clone(nil, subject: n) do |prefix, value|
             prefix(prefix, value)
           end
           nodeElement(node, new_ec)
@@ -463,9 +467,7 @@ module RDF::RDFXML
           add_debug(child, "parseTypeCollectionPropertyElt")
 
           unless attrs.empty?
-            warn = "Resource Property with extra attributes: '#{attrs.inspect}'"
-            add_debug(child, warn)
-            raise RDF::ReaderError.new(warn) if validate?
+            add_error(child, "Resource Property with extra attributes") {attrs.inspect}
           end
 
           # For element event e with possibly empty nodeElementList l. Set s:=list().
@@ -493,27 +495,23 @@ module RDF::RDFXML
           add_debug(child, parseType == "Literal" ? "parseTypeResourcePropertyElt" : "parseTypeOtherPropertyElt (#{parseType})")
 
           unless attrs.empty?
-            warn = "Resource Property with extra attributes: '#{attrs.inspect}'"
-            add_debug(child, warn)
-            raise RDF::ReaderError.new(warn) if validate?
+            add_error(child, "Resource Property with extra attributes") {attrs.inspect}
           end
 
           if resourceAttr
-            warn = "illegal rdf:resource"
-            add_debug(child, warn)
-            raise RDF::ReaderError.new(warn) if validate?
+            add_error(child, "illegal rdf:resource") {resourceAttr.inspect}
           end
 
           begin
             c14nxl = child.children.c14nxl(
-              :library => @library,
-              :language => ec.language,
-              :namespaces => child_ec.uri_mappings)
+              library: @library,
+              language: ec.language,
+              namespaces: child_ec.uri_mappings)
             object = RDF::Literal.new(c14nxl,
-              :library => @library,
-              :datatype => RDF.XMLLiteral,
-              :validate => validate?,
-              :canonicalize => canonicalize?)
+              library: @library,
+              datatype: RDF.XMLLiteral,
+              validate: validate?,
+              canonicalize: canonicalize?)
 
             add_triple(child, subject, predicate, object)
           rescue ArgumentError => e
@@ -525,7 +523,7 @@ module RDF::RDFXML
 
           if attrs.empty? && resourceAttr.nil? && nodeID.nil?
             
-            literal = RDF::Literal.new("", :language => ec.language)
+            literal = RDF::Literal.new("", language: ec.language)
             add_triple(child, subject, predicate, literal)
             
             # Reification
@@ -550,7 +548,7 @@ module RDF::RDFXML
                 next unless is_propertyAttr?(attr)
 
                 # Attributes not in RDF.type
-                lit = RDF::Literal.new(val, :language => child_ec.language)
+                lit = RDF::Literal.new(val, language: child_ec.language)
                 add_triple(child, resource, attr.uri, lit)
               end
             end
@@ -587,11 +585,9 @@ module RDF::RDFXML
       nodeID = el.attribute_with_ns("nodeID", RDF.to_uri.to_s)
       
       if nodeID && about
-        add_debug(el, "Cannot have rdf:nodeID and rdf:about.")
-        raise RDF::ReaderError.new("Cannot have rdf:nodeID and rdf:about.") if validate?
+        add_error(el, "Cannot have rdf:nodeID and rdf:about.")
       elsif nodeID && id
-        add_debug(el, "Cannot have rdf:nodeID and rdf:ID.")
-        raise RDF::ReaderError.new("Cannot have rdf:nodeID and rdf:ID.") if validate?
+        add_error(el, "Cannot have rdf:nodeID and rdf:ID.")
       end
 
       case
@@ -615,19 +611,12 @@ module RDF::RDFXML
     
     # ID attribute must be an NCName
     def id_check(el, id, base)
-      unless NC_REGEXP.match(id)
-        warn = "ID addtribute '#{id}' must be a NCName"
-        add_debug(el, warn)
-        raise RDF::ReaderError.new(warn) if validate?
-      end
+      add_error(el, "ID addtribute '#{id}' must be a NCName") unless NC_REGEXP.match(id)
+
       # ID may only be specified once for the same URI
       if base
         uri = uri(base, "##{id}")
-        if prefix(id) && RDF::URI(prefix(id)) == uri
-          warn = "ID addtribute '#{id}' may only be defined once for the same URI"
-          add_debug(el, warn)
-          raise RDF::ReaderError.new(warn) if validate?
-        end
+        add_error(el, "ID addtribute '#{id}' may only be defined once for the same URI") if prefix(id) && RDF::URI(prefix(id)) == uri
         
         RDF::URI(prefix(id, uri))
         # Returns URI, in this case
@@ -642,8 +631,7 @@ module RDF::RDFXML
       if NC_REGEXP.match(nodeID)
         nodeID
       else
-        add_debug(el, "nodeID addtribute '#{nodeID}' must be an XML Name")
-        raise RDF::ReaderError.new("nodeID addtribute '#{nodeID}' must be a NCName") if validate?
+        add_error(el, "nodeID addtribute '#{nodeID}' must be an XML Name")
         nil
       end
     end
@@ -651,9 +639,7 @@ module RDF::RDFXML
     # Is this attribute a Property Attribute?
     def is_propertyAttr?(attr)
       if ([RDF.Description.to_s, RDF.li.to_s] + OLD_TERMS).include?(attr.uri.to_s)
-        warn = "Invalid use of rdf:#{attr.name}"
-        add_debug(attr, warn)
-        raise RDF::ReaderError.new(warn) if validate?
+        add_error(attr, "Invalid use of rdf:#{attr.name}")
         return false
       end
       !CORE_SYNTAX_TERMS.include?(attr.uri.to_s) && attr.namespace && attr.namespace.href != RDF::XML.to_s
@@ -662,18 +648,14 @@ module RDF::RDFXML
     # Check Node Element name
     def nodeElementURI_check(el)
       if (CORE_SYNTAX_TERMS + [RDF.li.to_s] + OLD_TERMS).include?(el.uri.to_s)
-        warn = "Invalid use of rdf:#{el.name}"
-        add_debug(el, warn)
-        raise RDF::ReaderError.new(warn) if validate?
+        add_error(el, "Invalid use of rdf:#{el.name}")
       end
     end
 
     # Check Property Element name
     def propertyElementURI_check(el)
       if (CORE_SYNTAX_TERMS + [RDF.Description.to_s] + OLD_TERMS).include?(el.uri.to_s)
-        warn = "Invalid use of rdf:#{el.name}"
-        add_debug(el, warn)
-        raise RDF::ReaderError.new(warn) if validate?
+        add_error(el, "Invalid use of rdf:#{el.name}")
       end
     end
 
@@ -681,8 +663,7 @@ module RDF::RDFXML
     def old_property_check(el)
       el.attribute_nodes.each do |attr|
         if OLD_TERMS.include?(attr.uri.to_s)
-          add_debug(el) {"Obsolete attribute '#{attr.uri}'"}
-          raise RDF::ReaderError.new("Obsolete attribute '#{attr.uri}'") if validate?
+          add_error(el) {"Obsolete attribute '#{attr.uri}'"}
         end
       end
     end

data/lib/rdf/rdfxml/writer.rb

@@ -13,9 +13,9 @@ module RDF::RDFXML
   # @example Obtaining a RDF/XML writer class
   #   RDF::Writer.for(:rdf)         #=> RDF::RDFXML::Writer
   #   RDF::Writer.for("etc/test.rdf")
-  #   RDF::Writer.for(:file_name      => "etc/test.rdf")
-  #   RDF::Writer.for(:file_extension => "rdf")
-  #   RDF::Writer.for(:content_type   => "application/rdf+xml")
+  #   RDF::Writer.for(file_name: "etc/test.rdf")
+  #   RDF::Writer.for(file_extension: "rdf")
+  #   RDF::Writer.for(content_type: "application/rdf+xml")
   #
   # @example Serializing RDF graph into an RDF/XML file
   #   RDF::RDFXML::Write.open("etc/test.rdf") do |writer|
@@ -37,9 +37,9 @@ module RDF::RDFXML
   #   end
   #
   # @example Creating @base and @prefix definitions in output
-  #   RDF::RDFXML::Writer.buffer(:base_uri => "http://example.com/", :prefixes => {
+  #   RDF::RDFXML::Writer.buffer(base_uri: "http://example.com/", prefixes: {
   #       nil => "http://example.com/ns#",
-  #       :foaf => "http://xmlns.com/foaf/0.1/"}
+  #       foaf: "http://xmlns.com/foaf/0.1/"}
   #   ) do |writer|
   #     graph.each_statement do |statement|
   #       writer << statement
@@ -49,9 +49,43 @@ module RDF::RDFXML
   # @author [Gregg Kellogg](http://kellogg-assoc.com/)
   class Writer < RDF::RDFa::Writer
     format RDF::RDFXML::Format
+    include RDF::Util::Logger
 
     VALID_ATTRIBUTES = [:none, :untyped, :typed]
 
+    ##
+    # RDF/XML Writer options
+    # @see http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Writer#options-class_method
+    def self.options
+      super + [
+        RDF::CLI::Option.new(
+          symbol: :attributes,
+          datatype: %w(none untyped typed),
+          on: ["--attributes ATTRIBUTES",  %w(none untyped typed)],
+          description: "How to use XML attributes when serializing, one of :none, :untyped, :typed. The default is :none.") {|arg| arg.to_sym},
+        RDF::CLI::Option.new(
+          symbol: :default_namespace,
+          datatype: RDF::URI,
+          on: ["--default-namespace URI", :REQUIRED],
+          description: "URI to use as default namespace, same as prefixes.") {|arg| RDF::URI(arg)},
+        RDF::CLI::Option.new(
+          symbol: :lang,
+          datatype: String,
+          on: ["--lang"],
+          description: "Output as root @lang attribute, and avoid generation _@lang_ where possible."),
+        RDF::CLI::Option.new(
+          symbol: :max_depth,
+          datatype: Integer,
+          on: ["--max-depth"],
+          description: "Maximum depth for recursively defining resources, defaults to 3.") {|arg| arg.to_i},
+        RDF::CLI::Option.new(
+          symbol: :stylesheet,
+          datatype: RDF::URI,
+          on: ["--stylesheet URI", :REQUIRED],
+          description: "URI to use as @href for output stylesheet processing instruction.") {|arg| RDF::URI(arg)},
+      ]
+    end
+
     ##
     # Initializes the RDF/XML writer instance.
     #
@@ -155,7 +189,7 @@ module RDF::RDFXML
       end
 
       predicates -= attr_props.keys.map {|k| expand_curie(k).to_s}
-      super(subject, predicates, options.merge(:attr_props => attr_props), &block)
+      super(subject, predicates, options.merge(attr_props: attr_props), &block)
     end
     # See if we can serialize as attribute.
     # * untyped attributes that aren't duplicated where xml:lang == @lang
@@ -195,7 +229,7 @@ module RDF::RDFXML
     # @return String
     #   The rendered document is returned as a string
     def render_document(subjects, options = {}, &block)
-      super(subjects, options.merge(:stylesheet => @options[:stylesheet]), &block)
+      super(subjects, options.merge(stylesheet: @options[:stylesheet]), &block)
     end
 
     # Render a single- or multi-valued predicate using `haml_template[:property_value]` or `haml_template[:property_values]`. Yields each object for optional rendering. The block should only render for recursive subject definitions (i.e., where the object is also a subject and is rendered underneath the first referencing subject).
@@ -223,7 +257,7 @@ module RDF::RDFXML
     # @return String
     #   The rendered document is returned as a string
     def render_property(predicate, objects, options = {}, &block)
-      add_debug {"render_property(#{predicate}): #{objects.inspect}, #{options.inspect}"}
+      log_debug {"render_property(#{predicate}): #{objects.inspect}, #{options.inspect}"}
       # If there are multiple objects, and no :property_values is defined, call recursively with
       # each object
 
@@ -233,19 +267,19 @@ module RDF::RDFXML
       # Separate out the objects which are lists and render separately
       lists = objects.
         select(&:node?).
-        map {|o| RDF::List.new(o, @graph)}.
+        map {|o| RDF::List.new(subject: o, graph: @graph)}.
         select {|l| l.valid? && l.none?(&:literal?)}
 
       unless lists.empty?
         # Render non-list objects
-        add_debug {"properties with lists: #{lists} non-lists: #{objects - lists.map(&:subject)}"}
-        nl = depth {render_property(predicate, objects - lists.map(&:subject), options, &block)} unless objects == lists.map(&:subject)
+        log_debug {"properties with lists: #{lists} non-lists: #{objects - lists.map(&:subject)}"}
+        nl = log_depth {render_property(predicate, objects - lists.map(&:subject), options, &block)} unless objects == lists.map(&:subject)
         return nl.to_s + lists.map do |list|
           # Render each list as multiple properties and set :inlist to true
           list.each_statement {|st| subject_done(st.subject)}
 
-          add_debug {"list: #{list.inspect} #{list.to_a}"}
-          depth do
+          log_debug {"list: #{list.inspect} #{list.to_a}"}
+          log_depth do
             render_collection(predicate, list, options) do |object|
               yield(object, true) if block_given?
             end
@@ -256,16 +290,16 @@ module RDF::RDFXML
       if objects.length > 1
         # Render each property using property_value template
         objects.map do |object|
-          depth {render_property(predicate, [object], options, &block)}
+          log_depth {render_property(predicate, [object], options, &block)}
         end.join(" ")
       else
-        raise RDF::WriterError, "Missing property template" if template.nil?
+        log_fatal("Missing property template", exception:  RDF::WriterError) if template.nil?
 
         options = {
           object:     objects.first,
           predicate:  predicate,
           property:   get_qname(predicate),
-          recurse:    @depth <= @max_depth
+          recurse:    log_depth <= @max_depth
         }.merge(options)
         hamlify(template, options, &block)
       end
@@ -292,7 +326,7 @@ module RDF::RDFXML
         list:       list,
         predicate:  predicate,
         property:   get_qname(predicate),
-        recurse:    @depth <= @max_depth,
+        recurse:    log_depth <= @max_depth,
       }.merge(options)
       hamlify(template, options) do |object|
         yield object
@@ -365,7 +399,7 @@ module RDF::RDFXML
         base_uri = uri.to_s[0..separation]
         suffix = uri.to_s[separation+1..-1]
         @gen_prefix = @gen_prefix ? @gen_prefix.succ : "ns0"
-        add_debug {"ensure_curie: generated prefix #{@gen_prefix} for #{base_uri}"}
+        log_debug {"ensure_curie: generated prefix #{@gen_prefix} for #{base_uri}"}
         @uri_to_prefix[base_uri] = @gen_prefix
         @uri_to_term_or_curie[uri] = "#{@gen_prefix}:#{suffix}"
         prefix(@gen_prefix, base_uri)

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

@@ -3,11 +3,11 @@ module RDF::RDFXML
   class Writer
     # The default set of HAML templates used for RDFa code generation
    BASE_HAML = {
-     :identifier => "base", 
+     identifier: "base", 
       # Document
       # Locals: lang, title, prefix, base, subjects
       # Yield: subjects.each
-      :doc => %q(
+      doc: %q(
         = %(<?xml version='1.0' encoding='utf-8' ?>)
         - if stylesheet
           = %(<?xml-stylesheet type="text/xsl" href="#{stylesheet}"?>)
@@ -25,7 +25,7 @@ module RDF::RDFXML
       #
       # Locals: subject, typeof, predicates, rel, element, inlist, attr_props
       # Yield: predicates.each
-      :subject => %q(
+      subject: %q(
         - first_type, *types = typeof.to_s.split(' ')
         - (types.unshift(first_type); first_type = nil) if first_type && (first_type.include?('/') || first_type.start_with?('_:'))
         - first_type ||= get_qname(RDF.Description)
@@ -38,8 +38,7 @@ module RDF::RDFXML
             - if expanded_type.start_with?('_:')
               - haml_tag(get_qname(RDF.type), "rdf:nodeID" => expanded_type[2..-1])
             -else
-              - # FIXME: closing tag forces close tag, as :/ is not honored in 5.0.1
-              - haml_tag(get_qname(RDF.type), "", "rdf:resource" => expanded_type)
+              - haml_tag(get_qname(RDF.type), "rdf:resource" => expanded_type)
           - predicates.each do |p|
             = yield(p)
       ),
@@ -49,7 +48,7 @@ module RDF::RDFXML
       # Yields: object
       # If nil is returned, render as a leaf
       # Otherwise, render result
-      :property_value => %q(
+      property_value: %q(
       - if recurse && res = yield(object)
         - haml_tag(property) do
           = res
@@ -60,11 +59,9 @@ 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?
-        - # FIXME: closing tag forces close tag, as :/ is not honored in 5.0.1
-        - haml_tag(property, "", "rdf:nodeID" => object.id)
+        - haml_tag(property, :"/", "rdf:nodeID" => object.id)
       - else
-        - # FIXME: closing tag forces close tag, as :/ is not honored in 5.0.1
-        - haml_tag(property, "", "rdf:resource" => relativize(object))
+        - haml_tag(property, :"/", "rdf:resource" => relativize(object))
       ),
 
       # Outpust for a list
@@ -72,20 +69,18 @@ module RDF::RDFXML
       # Yields: object
       # If nil is returned, render as a leaf
       # Otherwise, render result
-      :collection => %q(
+      collection: %q(
         - haml_tag(property, get_qname(RDF.parseType) => "Collection") do
           - list.each do |object|
             - if recurse && res = yield(object)
               = res
             - elsif object.node?
-              - # 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))
+              - haml_tag(get_qname(RDF.Description), :"/", "rdf:nodeID" => (object.id if ref_count(object) > 1))
             - else
-              - # 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_tag(get_qname(RDF.Description), :"/", "rdf:about" => relativize(object))
       ),
     }
-    HAML_TEMPLATES = {:base => BASE_HAML}
+    HAML_TEMPLATES = {base: BASE_HAML}
     DEFAULT_HAML = BASE_HAML
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfxml
 version: !ruby/object:Gem::Version
-  version: 1.99.1
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Gregg
@@ -9,50 +9,68 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -105,100 +123,130 @@ dependencies:
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -237,7 +285,7 @@ files:
 - lib/rdf/rdfxml/writer/haml_templates.rb
 homepage: http://ruby-rdf.github.com/rdf-rdfxml
 licenses:
-- Public Domain
+- Unlicense
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -247,16 +295,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rdf-rdfxml
-rubygems_version: 2.7.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: RDF/XML reader/writer for RDF.rb.
 test_files: []
+has_rdoc: false