rdf-turtle 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9093a424b624c733fd209a33dc7ac8ceb650bd2f
-  data.tar.gz: ab2bb587fdb532cbb6a7068df58d0c40c4fb2b98
+  metadata.gz: 0e70f98dd4b68010ecd944b0adaab421d282fc68
+  data.tar.gz: c8133157388afcc8b8fdfaef1cdc7818cf8ee101
 SHA512:
-  metadata.gz: 05ba9c14422a1be8c51ca24f6e2c7e87fafae3ee24b04023a96f726cf112bb51b7fde1cc053659c61ee6cf87e04dff92d719065a44705dd84ca3fa65cf417c10
-  data.tar.gz: 5020e9eb963ea2433c173557750cfb8d62de8a218deee5e5ff406642e53d1e8b3ef8b7979199827c93f86241e974b198e8e439e2611ce7066cb9ed53f709d9aa
+  metadata.gz: 9b0f9a3588b5e5f1e0ac0745d3a197bc28a90b49afdd616812af04c6149283e6037c0365cacb52b26ef6def7a61e8747e8bf36db12684447bd637e90885c84a6
+  data.tar.gz: 9a9286be339a48c7697a8886008d781c3fb7ef030b319d979e81bb98be36c009230c1eae80886e7fc8e5b9f239b583982fdb3b9945c5e71c2d786d6a92e39b14

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/lib/rdf/turtle/writer.rb

@@ -266,7 +266,7 @@ module RDF::Turtle
     # @return [String]
     def format_uri(uri, options = {})
       md = relativize(uri)
-      debug("relativize") {"#{uri.inspect} => #{md.inspect}"} if md != uri.to_s
+      debug("relativize") {"#{uri.to_ntriples} => #{md.inspect}"} if md != uri.to_s
       md != uri.to_s ? "<#{md}>" : (get_pname(uri) || "<#{uri}>")
     end
     
@@ -325,7 +325,7 @@ module RDF::Turtle
       # 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|
-          debug("order_subjects") {subject.inspect}
+          debug("order_subjects") {subject.to_ntriples}
           subjects << subject
           seen[subject] = true
         end
@@ -362,7 +362,7 @@ module RDF::Turtle
     # prefixes.
     # @param [Statement] statement
     def preprocess_statement(statement)
-      #debug("preprocess") {statement.inspect}
+      #debug("preprocess") {statement.to_ntriples}
       bump_reference(statement.object)
       @subjects[statement.subject] = true
 
@@ -413,11 +413,12 @@ module RDF::Turtle
       return unless @options[:debug] || RDF::Turtle.debug?
       options = args.last.is_a?(Hash) ? args.pop : {}
       depth = options[:depth] || @depth
+      d_str = depth > 100 ? ' ' * 100 + '+' : ' ' * depth
       message = args.pop
       message = message.call if message.is_a?(Proc)
       args << message if message
       args << yield if block_given?
-      message = "#{args.join(': ')}"
+      message = "#{d_str}#{args.join(': ')}"
       @options[:debug] << message if @options[:debug].is_a?(Array)
       $stderr.puts(message) if RDF::Turtle.debug?
     end
@@ -445,7 +446,7 @@ module RDF::Turtle
 
     def collection(node, position)
       return false if !is_valid_list?(node)
-      #debug("collection") {"#{node.inspect}, #{position}"}
+      #debug("collection") {"#{node.to_ntriples}, #{position}"}
 
       @output.write(position == :subject ? "(" : " (")
       @depth += 2
@@ -454,31 +455,31 @@ module RDF::Turtle
       @output.write(')')
     end
 
-    # Can object be represented using a predicateObjectList?
+    # Can object be represented using a blankNodePropertyList?
     def p_squared?(resource, position)
       resource.is_a?(RDF::Node) &&
         !@serialized.has_key?(resource) &&
         ref_count(resource) <= 1
     end
 
-    # Represent an object as a predicateObjectList
+    # Represent an object as a blankNodePropertyList
     def p_squared(resource, position)
       return false unless p_squared?(resource, position)
 
-      #debug("p_squared") {"#{resource.inspect}, #{position}"}
+      #debug("p_squared") {"#{resource.to_ntriples}, #{position}"}
       subject_done(resource)
       @output.write(position == :subject ? '[' : ' [')
       @depth += 2
-      predicateObjectList(resource)
+      num_props = predicateObjectList(resource, true)
+      @output.write(num_props > 1 ? "\n#{indent} ]" : "]")
       @depth -= 2
-      @output.write(']')
       
       true
     end
 
     # Default singular resource representation.
     def p_default(resource, position)
-      #debug("p_default") {"#{resource.inspect}, #{position}"}
+      #debug("p_default") {"#{resource.to_ntriples}, #{position}"}
       l = (position == :subject ? "" : " ") + format_value(resource)
       @output.write(l)
     end
@@ -487,17 +488,17 @@ module RDF::Turtle
     # Use either collection, blankNodePropertyList or singular resource notation.
     def path(resource, position)
       debug("path") do
-        "#{resource.inspect}, " +
+        "#{resource.to_ntriples}, " +
         "pos: #{position}, " +
-        "[]: #{is_valid_list?(resource)}, " +
-        "p2?: #{p_squared?(resource, position)}, " +
+        "()?: #{is_valid_list?(resource)}, " +
+        "[]?: #{p_squared?(resource, position)}, " +
         "rc: #{ref_count(resource)}"
       end
       raise RDF::WriterError, "Cannot serialize resource '#{resource}'" unless collection(resource, position) || p_squared(resource, position) || p_default(resource, position)
     end
     
     def predicate(resource)
-      debug("predicate") {resource.inspect}
+      debug("predicate") {resource.to_ntriples}
       if resource == RDF.type
         @output.write(" a")
       else
@@ -511,23 +512,28 @@ module RDF::Turtle
       return if objects.empty?
 
       objects.each_with_index do |obj, i|
-        @output.write(",\n#{indent(4)}") if i > 0
+        if i > 0 && p_squared?(obj, :object)
+          @output.write ", "
+        elsif i > 0
+          @output.write ",\n#{indent(4)}"
+        end
         path(obj, :object)
       end
     end
 
     # Render a predicateObjectList having a common subject.
-    def predicateObjectList(subject)
+    # @return [Integer] the number of properties serialized
+    def predicateObjectList(subject, from_bpl = false)
       properties = {}
       @graph.query(:subject => subject) do |st|
-        properties[st.predicate.to_s] ||= []
-        properties[st.predicate.to_s] << st.object
+        (properties[st.predicate.to_s] ||= []) << st.object
       end
 
       prop_list = sort_properties(properties) - [RDF.first.to_s, RDF.rest.to_s]
       debug("predicateObjectList") {prop_list.inspect}
-      return if prop_list.empty?
+      return 0 if prop_list.empty?
 
+      @output.write("\n#{indent(2)}") if properties.keys.length > 1 && from_bpl
       prop_list.each_with_index do |prop, i|
         begin
           @output.write(";\n#{indent(2)}") if i > 0
@@ -536,6 +542,7 @@ module RDF::Turtle
           objectList(properties[prop])
         end
       end
+      properties.keys.length
     end
 
     # Can subject be represented as a blankNodePropertyList?
@@ -547,12 +554,12 @@ module RDF::Turtle
     def blankNodePropertyList(subject)
       return false unless blankNodePropertyList?(subject)
       
-      debug("blankNodePropertyList") {subject.inspect}
+      debug("blankNodePropertyList") {subject.to_ntriples}
       @output.write("\n#{indent} [")
       @depth += 1
-      predicateObjectList(subject)
+      num_props = predicateObjectList(subject, true)
       @depth -= 1
-      @output.write("] .")
+      @output.write(num_props > 1 ? "\n#{indent} ] ." : "] .")
       true
     end
 
@@ -566,7 +573,7 @@ module RDF::Turtle
     end
     
     def statement(subject)
-      debug("statement") {"#{subject.inspect}, bnodePL?: #{blankNodePropertyList?(subject)}"}
+      debug("statement") {"#{subject.to_ntriples}, bnodePL?: #{blankNodePropertyList?(subject)}"}
       subject_done(subject)
       blankNodePropertyList(subject) || triples(subject)
       @output.puts

metadata

@@ -1,139 +1,145 @@
 --- !ruby/object:Gem::Specification
 name: rdf-turtle
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1.1
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1.1
+        version: 1.1.2.1
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.
@@ -143,10 +149,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - AUTHORS
-- README.md
 - History
+- README.md
 - UNLICENSE
 - VERSION
+- lib/rdf/turtle.rb
 - lib/rdf/turtle/format.rb
 - lib/rdf/turtle/freebase_reader.rb
 - lib/rdf/turtle/meta.rb
@@ -155,7 +162,6 @@ files:
 - lib/rdf/turtle/terminals.rb
 - lib/rdf/turtle/version.rb
 - lib/rdf/turtle/writer.rb
-- lib/rdf/turtle.rb
 homepage: http://ruby-rdf.github.com/rdf-turtle
 licenses:
 - Public Domain
@@ -166,17 +172,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rdf-turtle
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Turtle reader/writer for Ruby.