rdf-turtle 3.1.3 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 105a5880b1227824c5a05c14639512dad99a1501eb8e4a2590f8c02ac716aa32
-  data.tar.gz: 76b28dd1fb554b09fd0bd34ecea9e62cdd510748ac8efc5eee9a2368b6c18fa3
+  metadata.gz: 96b5531c582f4d0cd8d8fda744147e74501bf4efc0c721b1b3cf05a1d2cc60b3
+  data.tar.gz: 61e7f1e122300b7e822d81d9429dfee943a7ef7cfb12bb031f9ff133edd6a263
 SHA512:
-  metadata.gz: 0f0ff42a2229ef95aa8b0473f39f5341ee9dc6d05a9006eca3a0b7653b661e75481a859f7d0cb3cba2fd6a58e0d1108ec9212185bec63b979cd6f071d08c0006
-  data.tar.gz: e866f62804abda425c13145304443fd385632c9f1a97666614b339bf4a2678149c2966e79d5dfd7629f326fa4c515aac756b808870eb3d64e13b3e5798b0fab8
+  metadata.gz: faad4f256da8872159efeb82c150b30566770ad8fe1fdf504aa2b993b2b8e070192365ecfa5cea8c3f99d0087e3da4b21f0794b17883f17e0a8d6eaac6b82f26
+  data.tar.gz: f3c231a0ba031d14ff8273ec17a134144387626fe0594c6cb7d6b039d3aaac88d673344e8cf5cbb9019c3e3caba62929fa21ed0beb84c79f2896ea03bdd7028f

data/README.md

@@ -4,7 +4,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/rdf-turtle.png)](https://badge.fury.io/rb/rdf-turtle)
 [![Build Status](https://github.com/ruby-rdf/rdf-turtle/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-turtle/actions?query=workflow%3ACI)
-[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-turtle/badge.svg)](https://coveralls.io/github/ruby-rdf/rdf-turtle)
+[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-turtle/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/rdf-turtle?branch=develop)
 [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
 
 ## Description
@@ -17,9 +17,9 @@ Install with `gem install rdf-turtle`
 
 * 100% free and unencumbered [public domain](https://unlicense.org/) software.
 * Implements a complete parser for [Turtle][].
-* Compatible with Ruby >= 2.2.2.
+* Compatible with Ruby >= 2.6.
 * Optional streaming writer, to serialize large graphs
-* Provisional support for [Turtle*][RDF*].
+* Provisional support for [Turtle-star][RDF-star].
 
 ## Usage
 Instantiate a reader from a local file:
@@ -36,9 +36,9 @@ Write a graph to a file:
        writer << graph
     end
 
-## Turtle* (RDFStar)
+## Turtle-star (RDF-star)
 
-Both reader and writer include provisional support for [Turtle*][RDF*].
+Both reader and writer include provisional support for [Turtle-star][RDF-star].
 
 Internally, an `RDF::Statement` is treated as another resource, along with `RDF::URI` and `RDF::Node`, which allows an `RDF::Statement` to have a `#subject` or `#object` which is also an `RDF::Statement`.
 
@@ -88,7 +88,7 @@ where the subject is the the triple ending with that annotation.
     end
     # => RDF::ReaderError
 
-Note that this requires the `rdfstar` option to be se.
+Note that this requires the `rdfstar` option to be set.
 
 ## Documentation
 Full documentation available on [Rubydoc.info][Turtle doc]
@@ -140,9 +140,9 @@ This version uses a hand-written parser using the Lexer from the [EBNF][] gem in
 
 ## Dependencies
 
-* [Ruby](https://ruby-lang.org/) (>= 2.4)
-* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.1)
-* [EBNF][] (~> 1.1)
+* [Ruby](https://ruby-lang.org/) (>= 2.6)
+* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2)
+* [EBNF][] (~> 1.2)
 
 ## Installation
 
@@ -190,7 +190,7 @@ A copy of the [Turtle EBNF][] and derived parser files are included in the repos
 [Backports]:    https://rubygems.org/gems/backports
 [N-Triples]:    https://www.w3.org/TR/rdf-testcases/#ntriples
 [Turtle]:       https://www.w3.org/TR/2012/WD-turtle-20120710/
-[RDF*]:         https://w3c.github.io/rdf-star/rdf-star-cg-spec.html
+[RDF-star]:         https://w3c.github.io/rdf-star/rdf-star-cg-spec.html
 [Turtle doc]:   https://rubydoc.info/github/ruby-rdf/rdf-turtle/master/file/README.md
 [Turtle EBNF]:  https://dvcs.w3.org/hg/rdf/file/default/rdf-turtle/turtle.bnf
 [Freebase Dumps]: https://developers.google.com/freebase/data

data/VERSION

@@ -1 +1 @@
-3.1.3
+3.2.0

data/lib/rdf/turtle/reader.rb

@@ -373,7 +373,7 @@ module RDF::Turtle
         read_iri ||
         read_BlankNode ||
         read_collection ||
-        read_embTriple ||
+        read_quotedTriple ||
         error( "Expected subject", production: :subject, token: @lexer.first)
       end
     end
@@ -386,7 +386,7 @@ module RDF::Turtle
           read_collection ||
           read_blankNodePropertyList ||
           read_literal ||
-          read_embTriple
+          read_quotedTriple
 
           add_statement(:object, RDF::Statement(subject, predicate, object)) if subject && predicate
           object
@@ -394,18 +394,18 @@ module RDF::Turtle
       end
     end
 
-    # Read an RDF* reified statement
+    # Read an RDF-star reified statement
     # @return [RDF::Statement]
-    def read_embTriple
+    def read_quotedTriple
       return unless @options[:rdfstar]
       if @lexer.first.value == '<<'
-        prod(:embTriple) do
+        prod(:quotedTriple) do
           @lexer.shift # eat <<
-          subject = read_embSubject || error("Failed to parse subject", production: :embTriple, token: @lexer.first)
-          predicate = read_verb || error("Failed to parse predicate", production: :embTriple, token: @lexer.first)
-          object = read_embObject || error("Failed to parse object", production: :embTriple, token: @lexer.first)
+          subject = read_qtSubject || error("Failed to parse subject", production: :quotedTriple, token: @lexer.first)
+          predicate = read_verb || error("Failed to parse predicate", production: :quotedTriple, token: @lexer.first)
+          object = read_qtObject || error("Failed to parse object", production: :quotedTriple, token: @lexer.first)
           unless @lexer.first.value == '>>'
-            error("Failed to end of embedded triple", production: :embTriple, token: @lexer.first)
+            error("Failed to end of embedded triple", production: :quotedTriple, token: @lexer.first)
           end
           @lexer.shift
           statement = RDF::Statement(subject, predicate, object)
@@ -415,22 +415,22 @@ module RDF::Turtle
     end
 
     # @return [RDF::Resource]
-    def read_embSubject
-      prod(:embSubject) do
+    def read_qtSubject
+      prod(:qtSubject) do
         read_iri ||
         read_BlankNode ||
-        read_embTriple ||
-        error( "Expected embedded subject", production: :embSubject, token: @lexer.first)
+        read_quotedTriple ||
+        error( "Expected embedded subject", production: :qtSubject, token: @lexer.first)
       end
     end
 
     # @return [RDF::Term]
-    def read_embObject(subject = nil, predicate = nil)
-      prod(:embObject) do
+    def read_qtObject(subject = nil, predicate = nil)
+      prod(:qtObject) do
         read_iri ||
         read_BlankNode ||
         read_literal ||
-        read_embTriple
+        read_quotedTriple
       end
     end
 

data/lib/rdf/turtle/writer.rb

@@ -276,10 +276,23 @@ module RDF::Turtle
       case literal
       when RDF::Literal
         case @options[:literal_shorthand] && literal.valid? ? literal.datatype : false
-        when RDF::XSD.boolean, RDF::XSD.integer, RDF::XSD.decimal
-          literal.canonicalize.to_s
+        when RDF::XSD.boolean
+          %w(true false).include?(literal.value) ? literal.value : literal.canonicalize.to_s
+        when RDF::XSD.integer
+          literal.value.match?(/^[\+\-]?\d+$/) && !canonicalize? ? literal.value : literal.canonicalize.to_s
+        when RDF::XSD.decimal
+          literal.value.match?(/^[\+\-]?\d+\.\d+?$/) && !canonicalize? ?
+            literal.value :
+            literal.canonicalize.to_s
         when RDF::XSD.double
-          literal.canonicalize.to_s.sub('E', 'e')  # Favor lower case exponent
+          in_form = case literal.value
+          when /[\+\-]?\d+\.\d*E[\+\-]?\d+$/i then true
+          when /[\+\-]?\.\d+E[\+\-]?\d+$/i    then true
+          when /[\+\-]?\d+E[\+\-]?\d+$/i      then true
+          else false
+          end && !canonicalize?
+
+          in_form ? literal.value : literal.canonicalize.to_s.sub('E', 'e').to_s
         else
           text = quoted(literal.value)
           text << "@#{literal.language}" if literal.has_language?
@@ -319,7 +332,7 @@ module RDF::Turtle
     # @param [RDF::Statement] statement
     # @param [Hash{Symbol => Object}] options
     # @return [String]
-    def format_embTriple(statement, **options)
+    def format_quotedTriple(statement, **options)
       log_debug("rdfstar") {"#{statement.to_ntriples}"}
       "<<%s %s %s>>" % statement.to_a.map { |value| format_term(value, **options) }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-turtle
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.0
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-25 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,34 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -106,56 +100,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 description: RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -187,14 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Turtle reader/writer for Ruby.