rdf-trig 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7ce940c1194b8d974da285178e7ef433cfb03f0
-  data.tar.gz: 3ff117c02554be9b45456e456c03982bf7ddd149
+  metadata.gz: b7b4720c71847712c74bec5ee24e11ac4e680865
+  data.tar.gz: f910a370ebbbd31303e83fe955141e8e010858af
 SHA512:
-  metadata.gz: ae77f3090ab86e7f5ffad7aea1e383ebd04369a91214d874537ad55c73d294d6a61d00dd2f6c30450b92a31f0745541b94582ff341e100be4ac3a79b30014717
-  data.tar.gz: afa52c8d340d799587baa864122a7b64fc28eff8d492f24439e9c3fdc4f522663587f697a27f09e896ff86e855c565d985a6ee0698a5177ee54848715cf1f7bd
+  metadata.gz: d7495a3be1df086ed1a442f5caf9385d0ba2f4d74b54252447cb7ab9a9ae5801d5593d3bbeacbe82b185c369bb7cb801fe88f1c799012c53b1ae31da67d9fc9d
+  data.tar.gz: 25374295795a6eebcb819e8b54593cf8d5b3ad42691ca2c585ebb3a413b6c1dcf7aa503fb6fe5528a1a55135c8a62de8125c045d25e4c5ac49c6cb0c1cf64b38

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/rdf/trig/streaming_writer.rb

@@ -17,7 +17,8 @@ module RDF::TriG
         @output.write "#{format_term(statement.subject)} "
         @output.write "#{format_term(statement.predicate)} "
       elsif statement.subject != @streaming_subject
-        @output.write " .\n#{indent(@streaming_subject ? 1 : 0)}"
+        @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)} "
         @output.write "#{format_term(statement.predicate)} "
@@ -28,13 +29,18 @@ module RDF::TriG
         @output.write ",\n#{indent(@streaming_subject ? 3 : 2)}"
       end
       @output.write("#{format_term(statement.object)}")
+      @previous_statement = statement
     end
 
     ##
     # Complete open statements
     # @return [void] `self`
     def stream_epilogue
-      @output.puts " }" if @streaming_context
+      case
+      when @previous_statement.nil? ;
+      when @streaming_context then @output.puts " }"
+      else @output.puts " ."
+      end
     end
 
     private

data/lib/rdf/trig/writer.rb

@@ -209,6 +209,23 @@ module RDF::TriG
     end
 
     protected
+
+    # Add additional constraint that the resource must be in a single context
+    def blankNodePropertyList?(subject)
+      super && resource_in_single_context?(subject)
+    end
+
+    # Add additional constraint that the resource must be in a single context
+    def p_squared?(resource, position)
+      super && resource_in_single_context?(resource)
+    end
+
+    def resource_in_single_context?(resource)
+      contexts = @repo.query(:subject => resource).map(&:context)
+      contexts += @repo.query(:object => resource).map(&:context)
+      contexts.length == 1
+    end
+
     # Order contexts for output
     def order_contexts
       debug("order_contexts") {@repo.contexts.to_a.inspect}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-trig
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.1.1
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement