rdf-trix 1.99.0 → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da8741a141629c95c4a59c8bc20199b72e2e76dd
-  data.tar.gz: 6b042b85dacae9bc0b0b11e80678113ca274b504
+  metadata.gz: 3d7c42646bb226196e34424a8a78e48bdd982f71
+  data.tar.gz: 57cb0bef6641edf06f0a44c99f9ba54e121d5115
 SHA512:
-  metadata.gz: af098f72570473df003bd2596d5c6ed4bf396c3bfac325d80c0b69592ae6b38115a086a0b2b4e31447ef9bbb97d4d4afef975b3abf37b38f3cea704dbe163630
-  data.tar.gz: 24213449a5a9883db54aade7ec03a3cfe78de923b8a84c6765d3000b26edd8f22edbe19c0b682854ec5cbcd0daefe2f2e3ea1299935ed6518e6f89ede71d3300
+  metadata.gz: 7d2b1c94581bb2188d0ab68f50c658f9665dd2fc3339afd219e6848dcf9044393294b01050e71447985d63bcbff79512347387b9c5160ca81f10c5515b37b8b2
+  data.tar.gz: 9a8d0781b3cb057333c3a3ee550a00f31d8d36ed6353183f8236e4c9348bb6ba0c4dcdfedb46e752865816ac8ed5128613b0bfa10c9063c73efd611b950c18ce

data/{README → README.md}

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

data/VERSION

@@ -1 +1 @@
-1.99.0
+2.0.0.beta

data/lib/rdf/trix/reader.rb

@@ -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

@@ -72,7 +72,7 @@ module RDF::TriX
           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

@@ -23,6 +23,8 @@ module RDF::TriX
       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
 
       ##
@@ -68,7 +70,7 @@ module RDF::TriX
           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

@@ -68,7 +68,7 @@ module RDF::TriX
           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

@@ -149,15 +149,18 @@ module RDF::TriX
     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.graph_name.to_s == @graph_name.to_s
-        @graph = create_graph(@graph_name = statement.graph_name)
+    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
 
     ##
@@ -170,6 +173,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
 
     ##

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

@@ -39,6 +39,7 @@ module RDF::TriX
       def write_epilogue
         puts @xml.to_xml
         @xml = @trix = nil
+        super
       end
 
       ##

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

@@ -42,6 +42,7 @@ module RDF::TriX
         formatter.write(@xml, @output)
         puts # add a line break after the last line
         @xml = @trix = nil
+        super
       end
 
       ##

metadata

@@ -1,71 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: rdf-trix
 version: !ruby/object:Gem::Version
-  version: 1.99.0
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - Arto Bendiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 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: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        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.1'
+        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.0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        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: yard
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +128,7 @@ extra_rdoc_files: []
 files:
 - AUTHORS
 - CREDITS
-- README
+- README.md
 - UNLICENSE
 - VERSION
 - etc/doap.xml
@@ -132,7 +144,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: []
@@ -142,15 +154,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      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
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: TriX support for RDF.rb.