rdf-trix 2.0.0.beta → 3.1.1

data/lib/rdf/trix/reader/libxml.rb

@@ -3,7 +3,7 @@ module RDF::TriX
     ##
     # LibXML-Ruby implementation of the TriX reader.
     #
-    # @see http://libxml.rubyforge.org/rdoc/
+    # @see https://rubygems.org/gems/libxml-ruby/
     module LibXML
       OPTIONS = {'trix' => Format::XMLNS}.freeze
 
@@ -20,43 +20,30 @@ module RDF::TriX
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [void]
-      def initialize_xml(options = {})
+      def initialize_xml(input, **options)
         require 'libxml' unless defined?(::LibXML)
-        @xml = case @input
-          when File         then ::LibXML::XML::Document.file(@input.path)
-          when IO, StringIO then ::LibXML::XML::Document.io(@input)
-          else ::LibXML::XML::Document.string(@input.to_s)
+        @xml = case input
+          when File         then ::LibXML::XML::Document.file(input.path)
+          when IO, StringIO then ::LibXML::XML::Document.io(input)
+          else ::LibXML::XML::Document.string(input.to_s)
         end
       end
 
+    protected
+
       ##
       # @private
-      # @see RDF::Reader#each_graph
-      def each_graph(&block)
-        if block_given?
-          @xml.find('//trix:graph', OPTIONS).each do |graph_element|
-            graph = RDF::Graph.new(read_graph(graph_element))
-            read_statements(graph_element) { |statement| graph << statement }
-            block.call(graph)
-          end
-        end
-        enum_graph
+      def find_graphs(&block)
+        @xml.find('//trix:graph', OPTIONS).each(&block)
       end
 
       ##
       # @private
-      # @see RDF::Reader#each_statement
-      def each_statement(&block)
-        if block_given?
-          @xml.find('//trix:graph', OPTIONS).each do |graph_element|
-            read_statements(graph_element, &block)
-          end
-        end
-        enum_statement
+      def read_base
+        base = @xml.root.attributes.get_attribute_ns("http://www.w3.org/XML/1998/namespace", "base") if @xml && @xml.root
+        RDF::URI(base.value) if base
       end
 
-    protected
-
       ##
       # @private
       def read_graph(graph_element)
@@ -66,14 +53,20 @@ module RDF::TriX
 
       ##
       # @private
-      def read_statements(graph_element, &block)
-        context = read_graph(graph_element)
-        graph_element.find('./trix:triple', OPTIONS).each do |triple_element|
-          triple = triple_element.children.select { |node| node.element? }[0..2]
-          triple = triple.map { |element| parse_element(element.name, element.attributes, element.content) }
-          triple << {:context => context} if context
-          block.call(RDF::Statement(*triple))
-        end
+      def triple_elements(element)
+        element.find('./trix:triple', OPTIONS)
+      end
+
+      ##
+      # @private
+      def element_elements(element)
+        element.children.select { |node| node.element? }
+      end
+
+      ##
+      # @private
+      def element_content(element)
+        element.content
       end
     end # LibXML
   end # Reader

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

@@ -3,7 +3,7 @@ module RDF::TriX
     ##
     # Nokogiri implementation of the TriX reader.
     #
-    # @see http://nokogiri.org/
+    # @see https://nokogiri.org/
     module Nokogiri
       OPTIONS = {'trix' => Format::XMLNS}.freeze
 
@@ -20,41 +20,28 @@ module RDF::TriX
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [void]
-      def initialize_xml(options = {})
+      def initialize_xml(input, **options)
         require 'nokogiri' unless defined?(::Nokogiri)
-        @xml = ::Nokogiri::XML(@input)
+        @xml = ::Nokogiri::XML(input)
         log_error("Errors: #{@xml.errors.join('\n')}") unless @xml.errors.empty?
         @xml
       end
 
+    protected
+
       ##
       # @private
-      # @see RDF::Reader#each_graph
-      def each_graph(&block)
-        if block_given?
-          @xml.xpath('//trix:graph', OPTIONS).each do |graph_element|
-            graph = RDF::Graph.new(read_graph(graph_element))
-            read_statements(graph_element) { |statement| graph << statement }
-            block.call(graph)
-          end
-        end
-        enum_graph
+      def find_graphs(&block)
+        @xml.xpath('//trix:graph', OPTIONS).each(&block)
       end
 
       ##
       # @private
-      # @see RDF::Reader#each_statement
-      def each_statement(&block)
-        if block_given?
-          @xml.xpath('//trix:graph', OPTIONS).each do |graph_element|
-            read_statements(graph_element, &block)
-          end
-        end
-        enum_statement
+      def read_base
+        base = @xml.root.attribute_with_ns("base", "http://www.w3.org/XML/1998/namespace") if @xml && @xml.root
+        RDF::URI(base.to_s) if base
       end
 
-    protected
-
       ##
       # @private
       def read_graph(graph_element)
@@ -64,14 +51,20 @@ module RDF::TriX
 
       ##
       # @private
-      def read_statements(graph_element, &block)
-        context = read_graph(graph_element)
-        graph_element.xpath('./trix:triple', OPTIONS).each do |triple_element|
-          triple = triple_element.children.select { |node| node.element? }[0..2]
-          triple = triple.map { |element| parse_element(element.name, element, element.content) }
-          triple << {:context => context} if context
-          block.call(RDF::Statement(*triple))
-        end
+      def triple_elements(element)
+        element.xpath('./trix:triple', OPTIONS)
+      end
+
+      ##
+      # @private
+      def element_elements(element)
+        element.children.select { |node| node.element? }
+      end
+
+      ##
+      # @private
+      def element_content(element)
+        element.content
       end
     end # Nokogiri
   end # Reader

data/lib/rdf/trix/reader/rexml.rb

@@ -3,7 +3,7 @@ module RDF::TriX
     ##
     # REXML implementation of the TriX reader.
     #
-    # @see http://www.germane-software.com/software/rexml/
+    # @see https://www.germane-software.com/software/rexml/
     module REXML
       OPTIONS = {}.freeze
 
@@ -20,39 +20,26 @@ module RDF::TriX
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [void]
-      def initialize_xml(options = {})
+      def initialize_xml(input, **options)
         require 'rexml/document' unless defined?(::REXML)
-        @xml = ::REXML::Document.new(@input, :compress_whitespace => %w{uri})
+        @xml = ::REXML::Document.new(input, :compress_whitespace => %w{uri})
       end
 
+    protected
+
       ##
       # @private
-      # @see RDF::Reader#each_graph
-      def each_graph(&block)
-        if block_given?
-          @xml.elements.each('TriX/graph') do |graph_element|
-            graph = RDF::Graph.new(read_graph(graph_element))
-            read_statements(graph_element) { |statement| graph << statement }
-            block.call(graph)
-          end
-        end
-        enum_graph
+      def find_graphs(&block)
+        @xml.elements.each('TriX/graph', &block)
       end
 
       ##
       # @private
-      # @see RDF::Reader#each_statement
-      def each_statement(&block)
-        if block_given?
-          @xml.elements.each('TriX/graph') do |graph_element|
-            read_statements(graph_element, &block)
-          end
-        end
-        enum_statement
+      def read_base
+        base = @xml.root.attribute("base", "http://www.w3.org/XML/1998/namespace") if @xml && @xml.root
+        RDF::URI(base.to_s) if base
       end
 
-    protected
-
       ##
       # @private
       def read_graph(graph_element)
@@ -62,14 +49,20 @@ module RDF::TriX
 
       ##
       # @private
-      def read_statements(graph_element, &block)
-        context = read_graph(graph_element)
-        graph_element.elements.each('triple') do |triple_element|
-          triple = triple_element.elements.to_a[0..2]
-          triple = triple.map { |element| parse_element(element.name, element.attributes, element.text) }
-          triple << {:context => context} if context
-          block.call(RDF::Statement(*triple))
-        end
+      def triple_elements(element)
+        element.get_elements('triple')
+      end
+
+      ##
+      # @private
+      def element_elements(element)
+        element.elements.to_a
+      end
+
+      ##
+      # @private
+      def element_content(element)
+        element.text
       end
     end # REXML
   end # Reader

data/lib/rdf/trix/writer.rb

@@ -8,9 +8,9 @@ module RDF::TriX
   # override the used implementation by passing in a `:library` option to
   # `Writer.new` or `Writer.open`.
   #
-  # [REXML]:    http://www.germane-software.com/software/rexml/
-  # [LibXML]:   http://libxml.rubyforge.org/rdoc/
-  # [Nokogiri]: http://nokogiri.org/
+  # [REXML]:    https://www.germane-software.com/software/rexml/
+  # [LibXML]:   https://rubygems.org/gems/libxml-ruby/
+  # [Nokogiri]: https://nokogiri.org/
   #
   # @example Loading TriX serialization support
   #   require 'rdf/trix'
@@ -42,7 +42,7 @@ module RDF::TriX
   #     end
   #   end
   #
-  # @see http://www.w3.org/2004/03/trix/
+  # @see https://www.w3.org/2004/03/trix/
   class Writer < RDF::Writer
     format RDF::TriX::Format
 
@@ -70,7 +70,7 @@ module RDF::TriX
     # @yield  [writer] `self`
     # @yieldparam  [RDF::Writer] writer
     # @yieldreturn [void] ignored
-    def initialize(output = $stdout, options = {}, &block)
+    def initialize(output = $stdout, **options, &block)
       @graph_name = nil
       @nesting = 0
 
@@ -104,8 +104,16 @@ module RDF::TriX
       self.extend(@implementation)
 
       @encoding = (options[:encoding] || 'utf-8').to_s
-      initialize_xml(options)
-      super
+      initialize_xml(**options)
+
+      super do
+        if block_given?
+          case block.arity
+            when 0 then instance_eval(&block)
+            else block.call(self)
+          end
+        end
+      end
     end
 
     ##
@@ -177,6 +185,31 @@ module RDF::TriX
       log_error(subject, predicate, object, e.message)
     end
 
+    ##
+    # Returns the TriX representation of a statement.
+    #
+    # @param  [RDF::Statement] statement
+    # @param  [Hash{Symbol => Object}] options ({})
+    # @return [String]
+    def format_statement(statement, **options)
+      format_triple(*statement.to_triple, **options)
+    end
+
+    ##
+    # Formats a referenced triple.
+    #
+    # @example
+    #     <<<s> <p> <o>>> <p> <o> .
+    #
+    # @param  [RDF::Statement] statment
+    # @param  [Hash{Symbol => Object}] options = ({})
+    # @return [String]
+    # @raise  [NotImplementedError] unless implemented in subclass
+    # @abstract
+    def format_embTriple(statement, **options)
+      format_statement(statement, **options)
+    end
+
     ##
     # Returns the TriX representation of a triple.
     #
@@ -185,11 +218,11 @@ module RDF::TriX
     # @param  [RDF::Value]             object
     # @param  [Hash{Symbol => Object}] options
     # @return [Element]
-    def format_triple(subject, predicate, object, options = {})
+    def format_triple(subject, predicate, object, **options)
       create_element(:triple) do |triple|
-        triple << format_term(subject, options)
-        triple << format_term(predicate, options)
-        triple << format_term(object, options)
+        triple << format_term(subject, **options)
+        triple << format_term(predicate, **options)
+        triple << format_term(object, **options)
       end
     end
 
@@ -199,7 +232,7 @@ module RDF::TriX
     # @param  [RDF::Node]              value
     # @param  [Hash{Symbol => Object}] options
     # @return [Element]
-    def format_node(value, options = {})
+    def format_node(value, **options)
       create_element(:id, value.id.to_s)
     end
 
@@ -209,8 +242,8 @@ module RDF::TriX
     # @param  [RDF::URI]               value
     # @param  [Hash{Symbol => Object}] options
     # @return [Element]
-    def format_uri(value, options = {})
-      create_element(:uri, value.to_s)
+    def format_uri(value, **options)
+      create_element(:uri, value.relativize(base_uri).to_s)
     end
 
     ##
@@ -219,14 +252,16 @@ module RDF::TriX
     # @param  [RDF::Literal, String, #to_s] value
     # @param  [Hash{Symbol => Object}]      options
     # @return [Element]
-    def format_literal(value, options = {})
+    def format_literal(value, **options)
       case
-        when value.has_datatype?
-          create_element(:typedLiteral, value.value.to_s, 'datatype' => value.datatype.to_s)
-        when value.has_language?
-          create_element(:plainLiteral, value.value.to_s, 'xml:lang' => value.language.to_s)
-        else
-          create_element(:plainLiteral, value.value.to_s)
+      when value.datatype == RDF.XMLLiteral
+        create_element(:typedLiteral, nil, 'datatype' => value.datatype.to_s, fragment: value.value.to_s)
+      when value.has_datatype?
+        create_element(:typedLiteral, value.value.to_s, 'datatype' => value.datatype.to_s)
+      when value.has_language?
+        create_element(:plainLiteral, value.value.to_s, 'xml:lang' => value.language.to_s)
+      else
+        create_element(:plainLiteral, value.value.to_s)
       end
     end
   end # Writer

data/lib/rdf/trix/writer/nokogiri.rb

@@ -3,7 +3,7 @@ module RDF::TriX
     ##
     # Nokogiri implementation of the TriX writer.
     #
-    # @see http://nokogiri.org/
+    # @see https://nokogiri.org/
     module Nokogiri
       ##
       # Returns the name of the underlying XML library.
@@ -18,7 +18,7 @@ module RDF::TriX
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [void]
-      def initialize_xml(options = {})
+      def initialize_xml(**options)
         require 'nokogiri' unless defined?(::Nokogiri)
         @xml = ::Nokogiri::XML::Document.new
         @xml.encoding = @encoding
@@ -29,7 +29,10 @@ module RDF::TriX
       #
       # @return [void]
       def write_prologue
-        @xml << (@trix = create_element(:TriX, nil, :xmlns => Format::XMLNS))
+        options = {xmlns: Format::XMLNS, xml: "http://www.w3.org/XML/1998/namespace"}
+        options["xml:base"] = base_uri.to_s if base_uri
+        @xml << (@trix = create_element(:TriX, nil, options))
+        super
       end
 
       ##
@@ -84,8 +87,10 @@ module RDF::TriX
         if xmlns = attributes.delete(:xmlns)
           element.default_namespace = xmlns
         end
+        fragment = attributes.delete(:fragment)
         attributes.each { |k, v| element[k.to_s] = v }
         element.content = content.to_s unless content.nil?
+        element << fragment if fragment
         block.call(element) if block_given?
         element
       end

data/lib/rdf/trix/writer/rexml.rb

@@ -3,7 +3,7 @@ module RDF::TriX
     ##
     # REXML implementation of the TriX writer.
     #
-    # @see http://www.germane-software.com/software/rexml/
+    # @see https://www.germane-software.com/software/rexml/
     module REXML
       ##
       # Returns the name of the underlying XML library.
@@ -18,7 +18,7 @@ module RDF::TriX
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [void]
-      def initialize_xml(options = {})
+      def initialize_xml(**options)
         require 'rexml/document' unless defined?(::REXML)
         @xml = ::REXML::Document.new(nil, :attribute_quote => :quote)
         @xml << ::REXML::XMLDecl.new(::REXML::XMLDecl::DEFAULT_VERSION, @encoding)
@@ -29,7 +29,10 @@ module RDF::TriX
       #
       # @return [void]
       def write_prologue
-        @trix = @xml.add_element('TriX', 'xmlns' => Format::XMLNS)
+        options = {"xmlns" => Format::XMLNS, "xml" => "http://www.w3.org/XML/1998/namespace"}
+        options["xml:base"] = base_uri.to_s if base_uri
+        @trix = @xml.add_element('TriX', options)
+        super
       end
 
       ##
@@ -84,8 +87,10 @@ module RDF::TriX
       # @return [REXML::Element]
       def create_element(name, content = nil, attributes = {}, &block)
         element = ::REXML::Element.new(name.to_s, nil, @xml.context)
+        fragment = attributes.delete(:fragment)
         attributes.each { |k, v| element.add_attribute(k.to_s, v) }
         element.text = content.to_s unless content.nil?
+        element << fragment if fragment
         block.call(element) if block_given?
         element
       end