rdf-trix 1.1.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 147cdb2e02fe4edfcd27d30489737d24a515c5dc
-  data.tar.gz: d0afbd93a45315a1e631bfd911591dc90284b7c5
+SHA256:
+  metadata.gz: fcb519d95583f7549372cf7158b3d6f6eff1534e74d7d6f5183587fecf974dd3
+  data.tar.gz: a75d81aa6706ad6d05d0e5d9bdb793ab5c2f6d62351b8aafe1e1b83b69d588a4
 SHA512:
-  metadata.gz: 1d78b6f700492b541bf56a115a6336179e5341be90b719199a1bb402278793038f458b012c6ba16970b6680d1c5caf7af5e9de68bdd5f980632c68863b521a49
-  data.tar.gz: 6bf0255b66b73755b8e0f30395afa3b6983edd3c0005f27bb2e43e9bcd1a3d133d6216488c9c7a9840c001ad5cfbd0ccedbe11cecb366743371e8d2be433a8a6
+  metadata.gz: effcfaeffb7c99ff1434d81ba17e22b29caf22b22f5649a7321e25621b8132a77224fdb7e51e876a9e57256a96e1f98b487c93c00d7448ecdbf415afacc0ec6e
+  data.tar.gz: 85107068c714384204d1ce8e642777470b1e6e573019dd3347726deeefcdd7aaaf55d50c65b497ccab278f8a8de5978c6296c9eab375f11737123dcba4094a69

data/{README → README.md}

@@ -22,8 +22,8 @@ Documentation
 Dependencies
 ------------
 
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1)
-  [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.6.0)
+* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.1)
+  [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.10.0)
 
 Installation
 ------------

data/VERSION

@@ -1 +1 @@
-1.1.0.1
+3.1.0

data/etc/doap.xml

@@ -44,7 +44,7 @@
     <triple>
       <uri>http://rubygems.org/gems/rdf-trix</uri>
       <uri>http://usefulinc.com/ns/doap#download-page</uri>
-      <uri>http://rubyforge.org/projects/rdf/</uri>
+      <uri>http://rubygems.org/gems/rdf-trix/</uri>
     </triple>
     <triple>
       <uri>http://rubygems.org/gems/rdf-trix</uri>

data/lib/rdf/trix.rb

@@ -1,4 +1,4 @@
-require 'rdf' # @see http://rubygems.org/gems/rdf
+require 'rdf'
 
 module RDF
   ##
@@ -21,7 +21,7 @@ module RDF
   #     end
   #   end
   #
-  # @see http://rdf.rubyforge.org/
+  # @see http://rubygems.org/gems/rdf
   # @see http://www.w3.org/2004/03/trix/
   # @see http://www.hpl.hp.com/techreports/2004/HPL-2004-56.pdf
   # @see http://swdev.nokia.com/trix/trix.html

data/lib/rdf/trix/reader.rb

@@ -66,7 +66,7 @@ module RDF::TriX
     # @yield  [reader] `self`
     # @yieldparam  [RDF::Reader] reader
     # @yieldreturn [void] ignored
-    def initialize(input = $stdin, options = {}, &block)
+    def initialize(input = $stdin, **options, &block)
       super do
         @library = case options[:library]
           when nil
@@ -96,7 +96,12 @@ module RDF::TriX
         end
         self.extend(@implementation)
 
-        initialize_xml(options)
+        begin
+          initialize_xml(**options)
+        rescue
+          log_error("Malformed document: #{$!.message}")
+        end
+
         if block_given?
           case block.arity
             when 0 then instance_eval(&block)
@@ -162,7 +167,7 @@ module RDF::TriX
           literal.canonicalize! if canonicalize?
           literal
         else
-          raise RDF::ReaderError, "expected element name to be 'id', 'uri', 'typedLiteral', or 'plainLiteral', but got #{name.inspect}"
+          log_error "expected element name to be 'id', 'uri', 'typedLiteral', or 'plainLiteral', but got #{name.inspect}"
       end
     end
   end # Reader

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

@@ -20,11 +20,11 @@ module RDF::TriX
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [void]
-      def initialize_xml(options = {})
+      def initialize_xml(**options)
         require 'libxml' unless defined?(::LibXML)
         @xml = case @input
-          when File   then ::LibXML::XML::Document.file(@input.path)
-          when IO     then ::LibXML::XML::Document.io(@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
@@ -35,7 +35,7 @@ module RDF::TriX
       def each_graph(&block)
         if block_given?
           @xml.find('//trix:graph', OPTIONS).each do |graph_element|
-            graph = RDF::Graph.new(read_context(graph_element))
+            graph = RDF::Graph.new(read_graph(graph_element))
             read_statements(graph_element) { |statement| graph << statement }
             block.call(graph)
           end
@@ -59,7 +59,7 @@ module RDF::TriX
 
       ##
       # @private
-      def read_context(graph_element)
+      def read_graph(graph_element)
         name = graph_element.children.select { |node| node.element? && node.name.to_s == 'uri' }.first.content.strip rescue nil
         name ? RDF::URI.intern(name) : nil
       end
@@ -67,12 +67,12 @@ module RDF::TriX
       ##
       # @private
       def read_statements(graph_element, &block)
-        context = read_context(graph_element)
+        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.new(*triple))
+          block.call(RDF::Statement(*triple))
         end
       end
     end # LibXML

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

@@ -20,9 +20,11 @@ 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(@input)
+        log_error("Errors: #{@xml.errors.join('\n')}") unless @xml.errors.empty?
+        @xml
       end
 
       ##
@@ -31,7 +33,7 @@ module RDF::TriX
       def each_graph(&block)
         if block_given?
           @xml.xpath('//trix:graph', OPTIONS).each do |graph_element|
-            graph = RDF::Graph.new(read_context(graph_element))
+            graph = RDF::Graph.new(read_graph(graph_element))
             read_statements(graph_element) { |statement| graph << statement }
             block.call(graph)
           end
@@ -55,7 +57,7 @@ module RDF::TriX
 
       ##
       # @private
-      def read_context(graph_element)
+      def read_graph(graph_element)
         name = graph_element.children.select { |node| node.element? && node.name.to_s == 'uri' }.first.content.strip rescue nil
         name ? RDF::URI.intern(name) : nil
       end
@@ -63,12 +65,12 @@ module RDF::TriX
       ##
       # @private
       def read_statements(graph_element, &block)
-        context = read_context(graph_element)
+        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.new(*triple))
+          block.call(RDF::Statement(*triple))
         end
       end
     end # Nokogiri

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

@@ -20,7 +20,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(@input, :compress_whitespace => %w{uri})
       end
@@ -31,7 +31,7 @@ module RDF::TriX
       def each_graph(&block)
         if block_given?
           @xml.elements.each('TriX/graph') do |graph_element|
-            graph = RDF::Graph.new(read_context(graph_element))
+            graph = RDF::Graph.new(read_graph(graph_element))
             read_statements(graph_element) { |statement| graph << statement }
             block.call(graph)
           end
@@ -55,7 +55,7 @@ module RDF::TriX
 
       ##
       # @private
-      def read_context(graph_element)
+      def read_graph(graph_element)
         name = graph_element.elements.select { |element| element.name.to_s == 'uri' }.first.text.strip rescue nil
         name ? RDF::URI.intern(name) : nil
       end
@@ -63,12 +63,12 @@ module RDF::TriX
       ##
       # @private
       def read_statements(graph_element, &block)
-        context = read_context(graph_element)
+        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.new(*triple))
+          block.call(RDF::Statement(*triple))
         end
       end
     end # REXML

data/lib/rdf/trix/writer.rb

@@ -53,10 +53,10 @@ module RDF::TriX
     attr_reader :implementation
 
     ##
-    # Returns the current named graph context, if any.
+    # Returns the current graph_name, if any.
     #
     # @return [RDF::Resource]
-    attr_reader :context
+    attr_reader :graph_name
 
     ##
     # Initializes the TriX writer instance.
@@ -70,8 +70,8 @@ module RDF::TriX
     # @yield  [writer] `self`
     # @yieldparam  [RDF::Writer] writer
     # @yieldreturn [void] ignored
-    def initialize(output = $stdout, options = {}, &block)
-      @context = nil
+    def initialize(output = $stdout, **options, &block)
+      @graph_name = nil
       @nesting = 0
 
       @library = case options[:library]
@@ -104,12 +104,20 @@ 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
 
     ##
-    # Defines a named graph context.
+    # Defines a named graph.
     #
     # @param  [RDF::Resource] name
     # @yield  [writer]
@@ -117,7 +125,7 @@ module RDF::TriX
     # @return [void]
     def graph(name = nil, &block)
       @nesting += 1
-      @graph = create_graph(@context = name)
+      @graph = create_graph(@graph_name = name)
       if block_given?
         case block.arity
           when 1 then block.call(self)
@@ -149,24 +157,18 @@ module RDF::TriX
     end
 
     ##
-    # @private
-    # @see    RDF::Writer#write_graph
-    # @since  0.2.0
-    def write_graph(graph)
-      @graph = create_graph(@context = graph.context)
-      graph.each_triple { |*triple| write_triple(*triple) }
-    end
-
-    ##
-    # Generates the TriX representation of an RDF statement.
+    # Generates the TriX representation of a quad.
     #
-    # @param  [RDF::Statement] statement
+    # @param  [RDF::Resource] subject
+    # @param  [RDF::URI]      predicate
+    # @param  [RDF::Value]    object
+    # @param  [RDF::Resource] graph_name
     # @return [void]
-    def write_statement(statement)
-      unless nested? || statement.context.to_s == @context.to_s
-        @graph = create_graph(@context = statement.context)
+    def write_quad(subject, predicate, object, graph_name)
+      unless nested? || graph_name.to_s == @graph_name.to_s
+        @graph = create_graph(@graph_name = graph_name)
       end
-      write_triple(*statement.to_triple)
+      write_triple(subject, predicate, object)
     end
 
     ##
@@ -179,6 +181,8 @@ module RDF::TriX
     def write_triple(subject, predicate, object)
       @graph = create_graph unless @graph
       @graph << format_triple(subject, predicate, object)
+    rescue ArgumentError => e
+      log_error(subject, predicate, object, e.message)
     end
 
     ##
@@ -189,11 +193,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
 
@@ -203,7 +207,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
 
@@ -213,7 +217,7 @@ module RDF::TriX
     # @param  [RDF::URI]               value
     # @param  [Hash{Symbol => Object}] options
     # @return [Element]
-    def format_uri(value, options = {})
+    def format_uri(value, **options)
       create_element(:uri, value.to_s)
     end
 
@@ -223,7 +227,7 @@ 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)

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

@@ -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
@@ -30,6 +30,7 @@ module RDF::TriX
       # @return [void]
       def write_prologue
         @xml << (@trix = create_element(:TriX, nil, :xmlns => Format::XMLNS))
+        super
       end
 
       ##
@@ -39,6 +40,7 @@ module RDF::TriX
       def write_epilogue
         puts @xml.to_xml
         @xml = @trix = nil
+        super
       end
 
       ##

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

@@ -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)
@@ -30,6 +30,7 @@ module RDF::TriX
       # @return [void]
       def write_prologue
         @trix = @xml.add_element('TriX', 'xmlns' => Format::XMLNS)
+        super
       end
 
       ##
@@ -42,6 +43,7 @@ module RDF::TriX
         formatter.write(@xml, @output)
         puts # add a line break after the last line
         @xml = @trix = nil
+        super
       end
 
       ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-trix
 version: !ruby/object:Gem::Version
-  version: 1.1.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Arto Bendiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2019-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,96 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.20
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: libxml-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: RDF.rb extension for parsing/serializing TriX data.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -114,7 +116,7 @@ extra_rdoc_files: []
 files:
 - AUTHORS
 - CREDITS
-- README
+- README.md
 - UNLICENSE
 - VERSION
 - etc/doap.xml
@@ -130,7 +132,7 @@ files:
 - lib/rdf/trix/writer/rexml.rb
 homepage: http://ruby-rdf.github.com/rdf-trix
 licenses:
-- Public Domain
+- Unlicense
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -140,17 +142,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rdf
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: TriX support for RDF.rb.
 test_files: []
-has_rdoc: false