rdf-trig 2.2.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 98b197e728557afd6d317fe99c7638c7d9545c5b
-  data.tar.gz: 926d33a2a88b1ee8870889525017163ff3e67469
+SHA256:
+  metadata.gz: f72dbe26e686e91519169554116b88ab44c8203c947a2d8e55fac50e611951ab
+  data.tar.gz: ff314a298fe3c0f4a29d48d200288865178fc6766dc6fb73dfc7601807bc883d
 SHA512:
-  metadata.gz: 38e0122e3f6cfeed559ee0d2ba51f92d74526f52f5fb0d0f1203083b6b78aa3237a5c7803a578ad7718f1fe082fe7c9d1d9ecbd5c5344b3f1f04e93a08756d53
-  data.tar.gz: 5da40dda8c646b2fc868ed92005ee4f3bfebb2274026d46beb7d066bfb284240f243327610f72524148c648a357af4a913f8668ebb2f8d432879ab8282089e55
+  metadata.gz: f85f92259ef67c8af2f4d5f8fc808ede0153642d13407b343f41ebf18c6a5ba6606ca3c631453e30d5bd46c180c835835febf3956156cc125095f5a722a15ba8
+  data.tar.gz: 735aeeeae7e05bfd889201669c6148df7b6ff65d273146712214e4bea0231e47b6a0330fe590bf80885ebe3f30e7d7cf4aa37bcee9f910da9c3a2aac8bdf94ef

data/README.md

@@ -2,10 +2,10 @@
 
 [TriG][] reader/writer for [RDF.rb][RDF.rb] .
 
-[![Gem Version](https://badge.fury.io/rb/rdf-trig.png)](http://badge.fury.io/rb/rdf-trig)
-[![Build Status](https://travis-ci.org/ruby-rdf/rdf-trig.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf-trig)
-[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-trig/badge.svg)](https://coveralls.io/r/ruby-rdf/rdf-trig)
-[![Dependency Status](https://gemnasium.com/ruby-rdf/rdf-trig.png)](https://gemnasium.com/ruby-rdf/rdf-trig)
+[![Gem Version](https://badge.fury.io/rb/rdf-trig.png)](https://badge.fury.io/rb/rdf-trig)
+[![Build Status](https://github.com/ruby-rdf/rdf-trig/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-trig/actions?query=workflow%3ACI)
+[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-trig/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/rdf-trig?branch=develop)
+[![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
 
 ## Description
 This is a [Ruby][] implementation of a [TriG][] reader and writer for [RDF.rb][].
@@ -15,7 +15,7 @@ RDF::TriG parses [TriG][Trig] into statements or quads. It also serializes to Tr
 
 Install with `gem install rdf-trig`
 
-* 100% free and unencumbered [public domain](http://unlicense.org/) software.
+* 100% free and unencumbered [public domain](https://unlicense.org/) software.
 * Implements a complete parser and serializer for [TriG][].
 * Compatible with Ruby 2.x, and JRuby 1.7+.
 * Optional streaming writer, to serialize large graphs
@@ -58,22 +58,22 @@ There is a new `:stream` option to {RDF::TriG::Writer} which is more efficient f
       
 ## Dependencies
 
-* [Ruby](http://ruby-lang.org/) (>= 2.2.2)
-* [RDF.rb](http://rubygems.org/gems/rdf) (~> 2.0)
-* [rdf-turtle](http://rubygems.org/gems/rdf-turtle) (~> 2.0)
+* [Ruby](https://ruby-lang.org/) (>= 2.2.2)
+* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.0)
+* [rdf-turtle](https://rubygems.org/gems/rdf-turtle) (~> 3.0)
 
 ## Installation
 
-The recommended installation method is via [RubyGems](http://rubygems.org/).
+The recommended installation method is via [RubyGems](https://rubygems.org/).
 To install the latest official release of the `RDF::TriG` gem, do:
 
     % [sudo] gem install rdf-trig
 
 ## Mailing List
-* <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
+* <https://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
 ## Author
-* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
+* [Gregg Kellogg](https://github.com/gkellogg) - <https://greggkellogg.net/>
 
 ## Contributing
 * Do your best to adhere to the existing coding conventions and idioms.
@@ -86,22 +86,24 @@ To install the latest official release of the `RDF::TriG` gem, do:
   list in the the `README`. Alphabetical order applies.
 * Do note that in order for us to merge any non-trivial changes (as a rule
   of thumb, additions larger than about 15 lines of code), we need an
-  explicit [public domain dedication][PDD] on record from you.
+  explicit [public domain dedication][PDD] on record from you,
+  which you will be asked to agree to on the first commit to a repo within the organization.
+  Note that the agreement applies to all repos in the [Ruby RDF](https://github.com/ruby-rdf/) organization.
 
 ## License
 This is free and unencumbered public domain software. For more information,
-see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
-
-A copy of the [TriG EBNF][] and derived parser files are included in the repository, which are not covered under the UNLICENSE. These files are covered via the [W3C Document License](http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231).
-
-[Ruby]:         http://ruby-lang.org/
-[RDF]:          http://www.w3.org/RDF/
-[YARD]:         http://yardoc.org/
-[YARD-GS]:      http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
-[PDD]:          http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
-[RDF.rb]:       http://rubydoc.info/github/ruby-rdf/rdf/master/frames
-[Backports]:    http://rubygems.org/gems/backports
-[TriG]:         http://www.w3.org/TR/trig/
-[TriG doc]:     http://rubydoc.info/github/ruby-rdf/rdf-trig/master/file/README.markdown
-[TriG EBNF]:    http://dvcs.w3.org/hg/rdf/raw-file/default/trig/trig.bnf
-[Turtle doc]:   http://rubydoc.info/github/ruby-rdf/rdf-turtle/master/file/README.markdown
+see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
+
+A copy of the [TriG EBNF][] and derived parser files are included in the repository, which are not covered under the UNLICENSE. These files are covered via the [W3C Document License](https://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231).
+
+[Ruby]:         https://ruby-lang.org/
+[RDF]:          https://www.w3.org/RDF/
+[YARD]:         https://yardoc.org/
+[YARD-GS]:      https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
+[PDD]:              https://unlicense.org/#unlicensing-contributions
+[RDF.rb]:       https://rubydoc.info/github/ruby-rdf/rdf/master/frames
+[Backports]:    https://rubygems.org/gems/backports
+[TriG]:         https://www.w3.org/TR/trig/
+[TriG doc]:     https://rubydoc.info/github/ruby-rdf/rdf-trig/master/file/README.markdown
+[TriG EBNF]:    https://dvcs.w3.org/hg/rdf/raw-file/default/trig/trig.bnf
+[Turtle doc]:   https://rubydoc.info/github/ruby-rdf/rdf-turtle/master/file/README.markdown

data/UNLICENSE

@@ -21,4 +21,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-For more information, please refer to <http://unlicense.org/>
+For more information, please refer to <https://unlicense.org/>

data/VERSION

@@ -1 +1 @@
-2.2.0
+3.1.2

data/lib/rdf/trig.rb

@@ -15,11 +15,11 @@ module RDF
   #     end
   #   end
   #
-  # @see http://rubydoc.info/github/ruby-rdf/rdf-turtle/
-  # @see http://rubydoc.info/github/ruby-rdf/rdf/master/
-  # @see http://www.w3.org/TR/trig/
+  # @see https://rubydoc.info/github/ruby-rdf/rdf-turtle/
+  # @see https://rubydoc.info/github/ruby-rdf/rdf/master/
+  # @see https://www.w3.org/TR/trig/
   #
-  # @author [Gregg Kellogg](http://greggkellogg.net/)
+  # @author [Gregg Kellogg](https://greggkellogg.net/)
   module TriG
     require  'rdf/trig/format'
     autoload :Reader,     'rdf/trig/reader'

data/lib/rdf/trig/format.rb

@@ -14,7 +14,7 @@ module RDF::TriG
   # @example Obtaining serialization format file extension mappings
   #     RDF::Format.file_extensions    #=> {trig: "application/trig"}
   #
-  # @see http://www.w3.org/TR/rdf-testcases/#ntriples
+  # @see https://www.w3.org/TR/rdf-testcases/#ntriples
   class Format < RDF::Format
     content_type     'application/trig',  extension: :trig, alias: 'application/x-trig;q=0.2'
     content_encoding 'utf-8'

data/lib/rdf/trig/reader.rb

@@ -23,7 +23,15 @@ module RDF::TriG
     terminal(:STRING_LITERAL_SINGLE_QUOTE,      STRING_LITERAL_SINGLE_QUOTE,      unescape:  true)
  
     # String terminals
-    terminal(nil,                               %r([\{\}\(\),.;\[\]a]|\^\^|true|false))
+    terminal(nil,                               %r(
+                                                    [\(\),.;\[\]Aa]
+                                                  | \^\^
+                                                  | \{\|
+                                                  | \|\}
+                                                  | [\{\}]
+                                                  | true|false
+                                                  | <<|>>
+                                                )x)
 
     terminal(:GRAPH,                            /graph/i)
     terminal(:PREFIX,                           PREFIX)
@@ -112,7 +120,7 @@ module RDF::TriG
           read_triplesOrGraph || error("Expected triplesOrGraph", production: :block, token: @lexer.first)
         when '{'
           read_wrappedGraph || error("Expected wrappedGraph", production: :block, token: @lexer.first)
-        when '(', '['
+        when '(', '[', '<<'
           read_triples2 || error("Expected collection or blankNodePropertyList", production: :block, token: @lexer.first)
         when nil
           # End of input
@@ -183,6 +191,23 @@ module RDF::TriG
           end
           true
         end
+      when '<<'
+        prod(:triples2) do
+          subject = read_embTriple || error("Failed to parse embedded triple", production: :triples2, token: @lexer.first)
+          token = @lexer.first
+          case token && (token.type || token.value)
+          when 'a', :IRIREF, :PNAME_LN, :PNAME_NS then read_predicateObjectList(subject)
+          else error("Expected predicateObjectList after collection subject", production: :triples2, token: token)
+          end
+          if !@recovering || @lexer.first === '.'
+            # If recovering, we will have eaten the closing '.'
+            token = @lexer.shift
+            unless token && token.value == '.'
+              error("Expected '.' following triple", production: :triples2, token: token)
+            end
+          end
+          true
+        end
       end
     end
 

data/lib/rdf/trig/streaming_writer.rb

@@ -1,7 +1,7 @@
 module RDF::TriG
   ##
   # Streaming writer interface
-  # @author [Gregg Kellogg](http://greggkellogg.net/)
+  # @author [Gregg Kellogg](https://greggkellogg.net/)
   module StreamingWriter
     ##
     # Write out a statement, retaining current
@@ -11,24 +11,24 @@ module RDF::TriG
       if statement.graph_name != @streaming_graph
         stream_epilogue
         if statement.graph_name
-          @output.write "#{format_term(statement.graph_name, options)} {"
+          @output.write "#{format_term(statement.graph_name, **options)} {"
         end
         @streaming_graph, @streaming_subject, @streaming_predicate = statement.graph_name, statement.subject, statement.predicate
-        @output.write "#{format_term(statement.subject, options)} "
-        @output.write "#{format_term(statement.predicate, options)} "
+        @output.write "#{format_term(statement.subject, **options)} "
+        @output.write "#{statement.predicate == RDF.type ? 'a' : format_term(statement.predicate, **options)} "
       elsif statement.subject != @streaming_subject
         @output.puts " ." if @previous_statement
         @output.write "#{indent(@streaming_subject ? 1 : 0)}"
         @streaming_subject, @streaming_predicate = statement.subject, statement.predicate
-        @output.write "#{format_term(statement.subject, options)} "
-        @output.write "#{format_term(statement.predicate, options)} "
+        @output.write "#{format_term(statement.subject, **options)} "
+        @output.write "#{statement.predicate == RDF.type ? 'a' : format_term(statement.predicate, **options)} "
       elsif statement.predicate != @streaming_predicate
         @streaming_predicate = statement.predicate
-        @output.write ";\n#{indent(@streaming_subject ? 2 : 1)}#{format_term(statement.predicate, options)} "
+        @output.write ";\n#{indent(@streaming_subject ? 2 : 1)}#{statement.predicate == RDF.type ? 'a' : format_term(statement.predicate, **options)} "
       else
         @output.write ",\n#{indent(@streaming_subject ? 3 : 2)}"
       end
-      @output.write("#{format_term(statement.object, options)}")
+      @output.write("#{format_term(statement.object, **options)}")
       @previous_statement = statement
     end
 

data/lib/rdf/trig/writer.rb

@@ -54,7 +54,7 @@ module RDF::TriG
   #     end
   #   end
   #
-  # @author [Gregg Kellogg](http://greggkellogg.net/)
+  # @author [Gregg Kellogg](https://greggkellogg.net/)
   class Writer < RDF::Turtle::Writer
     include StreamingWriter
     format RDF::TriG::Format
@@ -87,7 +87,7 @@ module RDF::TriG
     # @yieldreturn [void]
     # @yield  [writer]
     # @yieldparam [RDF::Writer] writer
-    def initialize(output = $stdout, options = {}, &block)
+    def initialize(output = $stdout, **options, &block)
       super do
         # Set both @repo and @graph to a new repository.
         @repo = @graph = RDF::Repository.new
@@ -100,7 +100,6 @@ module RDF::TriG
       end
     end
 
-
     ##
     # Adds a triple to be serialized
     # @param  [RDF::Resource] subject
@@ -149,7 +148,8 @@ module RDF::TriG
         preprocess
         start_document
 
-        order_graphs.each do |graph_name|
+        @graph_names = order_graphs
+        @graph_names.each do |graph_name|
           log_depth do
             log_debug {"graph_name: #{graph_name.inspect}"}
             reset
@@ -164,6 +164,16 @@ module RDF::TriG
 
             # Pre-process statements again, but in the specified graph
             @graph.each {|st| preprocess_statement(st)}
+
+            # Remove lists that are referenced and have non-list properties,
+            # or are present in more than one graph, or have elements
+            # that are present in more than one graph;
+            # these are legal, but can't be serialized as lists
+            @lists.reject! do |node, list|
+              ref_count(node) > 0 && prop_count(node) > 0 ||
+              list.subjects.any? {|elt| !resource_in_single_graph?(elt)}
+            end
+
             order_subjects.each do |subject|
               unless is_done?(subject)
                 statement(subject)
@@ -180,18 +190,14 @@ module RDF::TriG
     protected
 
     # Add additional constraint that the resource must be in a single graph
-    def blankNodePropertyList?(subject)
-      super && resource_in_single_graph?(subject)
-    end
-
-    # Add additional constraint that the resource must be in a single graph
-    def p_squared?(resource, position)
-      super && resource_in_single_graph?(resource)
+    # and must not be a graph name
+    def blankNodePropertyList?(resource, position)
+      super && resource_in_single_graph?(resource) && !@graph_names.include?(resource)
     end
 
     def resource_in_single_graph?(resource)
-      graph_names = @repo.query(subject: resource).map(&:graph_name)
-      graph_names += @repo.query(object: resource).map(&:graph_name)
+      graph_names = @repo.query({subject: resource}).map(&:graph_name)
+      graph_names += @repo.query({object: resource}).map(&:graph_name)
       graph_names.uniq.length <= 1
     end
 
@@ -201,7 +207,7 @@ module RDF::TriG
       graph_names = @repo.graph_names.to_a.sort
       
       # include default graph, if necessary
-      graph_names.unshift(nil) unless @repo.query(graph_name: false).to_a.empty?
+      graph_names.unshift(nil) unless @repo.query({graph_name: false}).to_a.empty?
       
       graph_names
     end

metadata

@@ -1,143 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: rdf-trig
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Gregg Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -154,38 +124,18 @@ dependencies:
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '3.1'
 description: RDF::TriG is an TriG reader/writer for the RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -203,11 +153,11 @@ files:
 - lib/rdf/trig/streaming_writer.rb
 - lib/rdf/trig/version.rb
 - lib/rdf/trig/writer.rb
-homepage: http://ruby-rdf.github.com/rdf-trig
+homepage: https://github.com/ruby-rdf/rdf-trig
 licenses:
 - Unlicense
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,16 +165,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: TriG reader/writer for Ruby.
 test_files: []