rdf-turtle 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 499e06e63d69ec0216db2600e34260d5eda5c7a3736e8f1a42c63a91c716779c
-  data.tar.gz: 3443fdb3e53d2b12d66f6a9534a9532dabde58b0b319ecc62ffff0a4bd87afb3
+  metadata.gz: a2739fecb539c03eacd39c93e7c002ee32f9b6b49f8786d2119150d1a57cd236
+  data.tar.gz: b72813794b2c80e8b518aaa151740f26a55017074555823fdd14dfbe181efc7f
 SHA512:
-  metadata.gz: 1cad03d53fb973b02f541168549cc110769fde86da3b37c1a6187d7fbfffe8bee3f72bea687d14786094ad0cb6a2cd7d4f2072c9989ec4d0c62b6ad81020bccd
-  data.tar.gz: 1e7f38e3f561a6f16304727fa89b2bbeab0b93b31e8e5a58633f533ba69e2a874e461f59bcf31d015d23382290e33b9b2ecfd007691fe6f5dc0961c98ca0d285
+  metadata.gz: 43ad711bd729dcabcdf0e3e07006fed39f7a31fbe074513777e1dcaec358bb373a1e77e31fd8bb5761ebf487efa0e2aa94cccc2311ffa135534fdabdf4654aa7
+  data.tar.gz: dc7bafb1ff5ba905b85982b6514e65da5bdf1b1e2fd1f0813ee4678f3e174cf20871087c73f7c1a2a52d65e3d07058d26be31cc8d6ea92dfd315f81e904647b9

data/VERSION

@@ -1 +1 @@
-3.0.3
+3.0.4

data/lib/rdf/turtle/reader.rb

@@ -86,11 +86,9 @@ module RDF::Turtle
       super do
         @options = {
           anon_base:  "b0",
-          validate:  false,
           whitespace:  WS,
           log_depth: 0,
-        }.merge(options)
-        @options = {prefixes:  {nil => ""}}.merge(@options) unless @options[:validate]
+        }.merge(@options)
         @prod_stack = []
 
         @options[:base_uri] = RDF::URI(base_uri || "")
@@ -178,7 +176,7 @@ module RDF::Turtle
       value = RDF::URI(iri)
       value = base_uri.join(value) if value.relative?
       value.validate! if validate?
-      value.canonicalize! if canonicalize?
+      value.canonicalize! if canonicalize? && !value.frozen?
       value = RDF::URI.intern(value) if intern?
       value
     rescue ArgumentError => e
@@ -214,11 +212,13 @@ module RDF::Turtle
     # Expand a PNAME using string concatenation
     def pname(prefix, suffix)
       # Prefixes must be defined, except special case for empty prefix being alias for current @base
-      if prefix(prefix)
-        base = prefix(prefix).to_s
-      elsif !prefix(prefix)
+      base = if prefix(prefix)
+        prefix(prefix).to_s
+      elsif prefix.to_s.empty? && !validate?
+        base_uri.to_s
+      else
         error("undefined prefix", production: :pname, token: prefix)
-        base = ''
+        ''
       end
       suffix = suffix.to_s.sub(/^\#/, "") if base.index("#")
       log_debug("pname") {"base: '#{base}', suffix: '#{suffix}'"}

data/lib/rdf/turtle/writer.rb

@@ -366,8 +366,8 @@ module RDF::Turtle
           seen[st.object] if @lists.has_key?(st.object)
         end
 
-      # List elements should not be targets for top-level serialization
-      list_elements = @lists.values.map(&:to_a).flatten.compact
+        # List elements which are bnodes should not be targets for top-level serialization
+        list_elements = @lists.values.map(&:to_a).flatten.select(&:node?).compact
 
       # Sort subjects by resources over bnodes, ref_counts and the subject URI itself
       recursable = (@subjects.keys - list_elements).
@@ -504,12 +504,15 @@ module RDF::Turtle
       list = @lists[l]
       log_debug("do_list") {list.inspect}
       subject_done(RDF.nil)
+      index = 0
       list.each_statement do |st|
         next unless st.predicate == RDF.first
         log_debug {" list this: #{st.subject} first: #{st.object}[#{position}]"}
+        @output.write(" ") if index > 0
         path(st.object, position)
         subject_done(st.subject)
         position = :object
+        index += 1
       end
     end
 
@@ -519,7 +522,7 @@ module RDF::Turtle
       return false if position == :object && prop_count(node) > 0
       #log_debug("collection") {"#{node.to_ntriples}, #{position}"}
 
-      @output.write(position == :subject ? "(" : " (")
+      @output.write("(")
       log_depth {do_list(node, position)}
       @output.write(')')
     end
@@ -530,16 +533,20 @@ module RDF::Turtle
 
       log_debug("blankNodePropertyList") {resource.to_ntriples}
       subject_done(resource)
-      @output.write(position == :subject ? "\n#{indent} [" : ' [')
+      @output.write(position == :subject ? "\n#{indent} [" : '[')
       num_props = log_depth {predicateObjectList(resource, true)}
-      @output.write((num_props > 1 ? "\n#{indent}" : "") + (position == :object ? ']' : '] .'))
+      @output.write((num_props > 1 ? "\n#{indent(2)}" : "") + (position == :object ? ']' : '] .'))
       true
     end
 
     # Default singular resource representation.
     def p_term(resource, position)
       #log_debug("p_term") {"#{resource.to_ntriples}, #{position}"}
-      l = (position == :subject ? "" : " ") + format_term(resource, options)
+      l = if resource == RDF.nil
+        "()"
+      else
+        format_term(resource, options)
+      end
       @output.write(l)
     end
 
@@ -562,7 +569,7 @@ module RDF::Turtle
     def predicate(resource)
       log_debug("predicate") {resource.to_ntriples}
       if resource == RDF.type
-        @output.write(" a")
+        @output.write("a")
       else
         path(resource, :predicate)
       end
@@ -601,6 +608,7 @@ module RDF::Turtle
         begin
           @output.write(";\n#{indent(2)}") if i > 0
           predicate(RDF::URI.intern(prop))
+          @output.write(" ")
           objectList(properties[prop])
         end
       end
@@ -611,8 +619,9 @@ module RDF::Turtle
     def triples(subject)
       @output.write("\n#{indent}")
       path(subject, :subject)
-      predicateObjectList(subject)
-      @output.write(" .")
+      @output.write(" ")
+      num_props = predicateObjectList(subject)
+      @output.write("#{num_props > 0 ? ' ' : ''}.")
       true
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-turtle
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-22 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -194,8 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Turtle reader/writer for Ruby.