rdf-n3 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afdac73ba35b42f05afd81b7bda64d6ae2f8ca733d605dc9ba73baa83466f8b0
-  data.tar.gz: 0ed15e323151966a1244d0e0ad7082ff058e733ec0350200828b4560f0c00e59
+  metadata.gz: e1e295c958340c4c0dd8f47583cf716f65d3d2164acdddda485281cb2038c09a
+  data.tar.gz: eb2280ffe26460e5eb01e3c99cf330a47a2aa565711679f4c7ddbb4fffcc0546
 SHA512:
-  metadata.gz: 1f1bc864db4ccc46228207c6421a2a6961eeab25558f1ca976bf7662fd324e78e87a72b080d5f777c52818a9a9bcc3d38a38eae201e17272da71171f0ade8e58
-  data.tar.gz: 3f574efe368b1f7564298b95d7a6b7490d3859cf698bac24f139b00d746ffba828ec323a5cafff6bc7a233e9b22b0b8c9c3f2bb86c126af8bde970027a87a320
+  metadata.gz: 75ca555fe8e9369e7450fd1631f484ddba0af4ba2d370bfb5710310a1c74636cc78d6f8b64358d5dfd0825707be64b489537d2a6759b91d203e00715bb7b7078
+  data.tar.gz: 2179ab00eec3d52700a4d03cfc07d63ec54e6ec84b17fe922f280181d95bac402c627bed85abfe1789e35d15e2d707b5fcb871e379fd61199fa07c99d4a1f420

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/lib/rdf/n3/writer.rb

@@ -273,8 +273,6 @@ module RDF::N3
     protected
     # Output @base and @prefix definitions
     def start_document
-      @started = true
-      
       @output.write("#{indent}@base <#{base_uri}> .\n") unless base_uri.to_s.empty?
       
       log_debug {"start_document: #{prefixes.inspect}"}
@@ -317,14 +315,24 @@ module RDF::N3
       
       # Add distinguished classes
       top_classes.each do |class_uri|
-        graph.query(predicate: RDF.type, object: class_uri).map {|st| st.subject}.sort.uniq.each do |subject|
-          log_debug {"order_subjects: #{subject.inspect}"}
+        graph.query(predicate:  RDF.type, object:  class_uri).
+          map {|st| st.subject}.
+          sort.
+          uniq.
+          each do |subject|
+          log_debug("order_subjects") {subject.to_ntriples}
           subjects << subject
           seen[subject] = true
         end
       end
       log_debug {"subjects2: #{subjects.inspect}"}
-      
+
+      # Mark as seen lists that are part of another list
+      @lists.values.map(&:statements).
+        flatten.each do |st|
+          seen[st.object] if @lists.has_key?(st.object)
+        end
+
       # Sort subjects by resources over bnodes, ref_counts and the subject URI itself
       recursable = @subjects.keys.
         select {|s| !seen.include?(s)}.
@@ -358,7 +366,17 @@ module RDF::N3
       references = ref_count(statement.object) + 1
       @references[statement.object] = references
       @subjects[statement.subject] = true
-      
+
+      # Collect lists
+      if statement.predicate == RDF.first
+        @lists[statement.subject] = RDF::List.new(subject: statement.subject, graph: graph)
+      end
+
+      if statement.object == RDF.nil || statement.subject == RDF.nil
+        # Add an entry for the list tail
+        @lists[RDF.nil] ||= RDF::List[]
+      end
+
       # Pre-fetch qnames, to fill prefixes
       get_qname(statement.subject)
       get_qname(statement.predicate)
@@ -385,12 +403,10 @@ module RDF::N3
     def reset
       @depth = 0
       @lists = {}
-      @namespaces = {}
+
       @references = {}
       @serialized = {}
       @subjects = {}
-      @shortNames = {}
-      @started = false
     end
 
     ##
@@ -412,11 +428,11 @@ module RDF::N3
     # Checks if l is a valid RDF list, i.e. no nodes have other properties.
     def is_valid_list(l)
       #log_debug {"is_valid_list: #{l.inspect}"}
-      return (l.node? && RDF::List.new(subject: l, graph: @graph).valid?) || l == RDF.nil
+      return @lists[l] && @lists[l].valid?
     end
     
     def do_list(l)
-      list = RDF::List.new(subject: l, graph: @graph)
+      list = @lists[l]
       log_debug {"do_list: #{list.inspect}"}
       position = :subject
       list.each_statement do |st|
@@ -502,7 +518,8 @@ module RDF::N3
         properties[st.predicate.to_s] << st.object
       end
 
-      prop_list = sort_properties(properties) - [RDF.first.to_s, RDF.rest.to_s]
+      prop_list = sort_properties(properties)
+      prop_list -= [RDF.first.to_s, RDF.rest.to_s] if subject.node?
       log_debug {"predicate_list: #{prop_list.inspect}"}
       return if prop_list.empty?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-n3
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Gregg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-14 00:00:00.000000000 Z
+date: 2018-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Notation3 reader/writer for RDF.rb.