rdf-turtle 1.1.0p2 → 1.1.0p3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjQ4ODA0OWM2ZDg4NjVhZGE1OTIwYmIwMzkxMzNmNWJjMDU5MDZhNQ==
+    MmNhNDYwMWEyY2VhYTY4MzE1OTk2Mjk3ODA0YjFhNjgwZDhmN2U0NA==
   data.tar.gz: !binary |-
-    NGE1ZDQ2MTgzOGY1NzNhYzcyNTBmNzczNjg2NDQ1ZDVkNDA3NDgxZQ==
+    MmEzYTM0MGUzMjVmNzg2NWI2NDljNzNiZjU2ZWJjN2JkYmY2NmVhZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzhhMTA3NTFjMTY2ZjUxYzU3ZDJiNjg3NTMzMmU2ZTljZDIzNDVlZDA0ZTAx
-    NDUwZGYwNDAwNjdmZDhhOWNlNGY0MmNiNTNhOTNhMzI1ZTVmZmFlOWI3MGU1
-    MGE4OWI5ZGI4MjVlNzNhZWNhMGFiYWMxODM2N2NmMzA2MDJjNmE=
+    Y2UxYTFhODg2YWFhMDlmYjU3ZDJlOThjOGU0NGI0Yzc0Mzc1ZTJmZDliMGVl
+    MjAzMWZhZGQwNWRhNTI2YTRhYTY2ZGNmOTk3YzM0YWIyZjIwZjM4ZjYzZGRm
+    OTRkZjdhNmUzMWYwOGI5YzM1NDhjNDEwYzIwZDUwNzE4N2Y0OWQ=
   data.tar.gz: !binary |-
-    YjY2ZDMzYjRkNjg5ODk2YmRjMTQwMjIwMTcyYWIyZmEzOTZjOWJhYjEzMTBm
-    Y2YwMGM4ZjhjYjJlZWVlOWFlM2RjYTIzNDI4NjliM2JjNmRjOGJiMTJlOGIw
-    MWRkYmUzOGM0NzQ3ZjZhZDFmNjljMjJhMWFhNDAyYmEzN2YxNTM=
+    NTliNWU3ZjJmNTk2YmYzOTQ2NzJkZWYyYTllODJmNmY1MTAxNzI3YjI3OTA5
+    NDMxNTc1ZDE4ZmZmMzg1MTM5YWIyZjI3ODYxYTNjMDQwNzJkYmFkNzUxYTY3
+    YTVlODYwZmZjMWNhNWU5NjJlNGViNjc3MzFkYWRkZWE2NWZkZjE=

data/README.md

@@ -16,6 +16,7 @@ Install with `gem install rdf-turtle`
 * 100% free and unencumbered [public domain](http://unlicense.org/) software.
 * Implements a complete parser for [Turtle][].
 * Compatible with Ruby >= 1.9.2.
+* Optional streaming writer, to serialize large graphs
 
 ## Usage
 Instantiate a reader from a local file:

data/VERSION

@@ -1 +1 @@
-1.1.0p2
+1.1.0p3

data/lib/rdf/turtle/meta.rb

@@ -1,4 +1,4 @@
-# This file is automatically generated by /Users/gregg/.rvm/gems/ruby-1.9.3-p392/bundler/gems/ebnf-af9a669d518f/bin/ebnf
+# This file is automatically generated by /Users/gregg/.rvm/gems/ruby-1.9.3-p429/bundler/gems/ebnf-3f823030418a/bin/ebnf
 # BRANCH derived from etc/turtle.bnf
 module RDF::Turtle::Meta
   START = :turtleDoc
@@ -197,7 +197,6 @@ module RDF::Turtle::Meta
       :PNAME_NS => [:iri],
     },
     :predicateObjectList => {
-      "A" => [:verb, :objectList, :_predicateObjectList_1],
       :IRIREF => [:verb, :objectList, :_predicateObjectList_1],
       :PNAME_LN => [:verb, :objectList, :_predicateObjectList_1],
       :PNAME_NS => [:verb, :objectList, :_predicateObjectList_1],
@@ -217,7 +216,6 @@ module RDF::Turtle::Meta
     :_predicateObjectList_4 => {
       "." => [],
       ";" => [],
-      "A" => [:_predicateObjectList_5],
       :IRIREF => [:_predicateObjectList_5],
       :PNAME_LN => [:_predicateObjectList_5],
       :PNAME_NS => [:_predicateObjectList_5],
@@ -225,7 +223,6 @@ module RDF::Turtle::Meta
       "a" => [:_predicateObjectList_5],
     },
     :_predicateObjectList_5 => {
-      "A" => [:verb, :objectList],
       :IRIREF => [:verb, :objectList],
       :PNAME_LN => [:verb, :objectList],
       :PNAME_NS => [:verb, :objectList],
@@ -296,7 +293,6 @@ module RDF::Turtle::Meta
     },
     :_triples_3 => {
       "." => [],
-      "A" => [:predicateObjectList],
       :IRIREF => [:predicateObjectList],
       :PNAME_LN => [:predicateObjectList],
       :PNAME_NS => [:predicateObjectList],
@@ -325,7 +321,6 @@ module RDF::Turtle::Meta
       "[" => [:statement, :turtleDoc],
     },
     :verb => {
-      "A" => ["A"],
       :IRIREF => [:predicate],
       :PNAME_LN => [:predicate],
       :PNAME_NS => [:predicate],
@@ -338,7 +333,6 @@ module RDF::Turtle::Meta
     ",",
     ".",
     ";",
-    "A",
     :ANON,
     :BASE,
     :BLANK_NODE_LABEL,
@@ -411,7 +405,6 @@ module RDF::Turtle::Meta
     :blankNodePropertyList => [
       "["],
     :_blankNodePropertyList_1 => [
-      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
@@ -581,7 +574,6 @@ module RDF::Turtle::Meta
       :PNAME_LN,
       :PNAME_NS],
     :predicateObjectList => [
-      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
@@ -595,13 +587,11 @@ module RDF::Turtle::Meta
       ";"],
     :_predicateObjectList_4 => [
       :_eps,
-      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
       :PNAME_NS],
     :_predicateObjectList_5 => [
-      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
@@ -628,7 +618,6 @@ module RDF::Turtle::Meta
       ";"],
     :_predicateObjectList_8 => [
       :_eps,
-      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
@@ -708,20 +697,17 @@ module RDF::Turtle::Meta
       "["],
     :_triples_3 => [
       :_eps,
-      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
       :PNAME_NS],
     :_triples_4 => [
-      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
       :PNAME_NS],
     :_triples_5 => [
       :_eps,
-      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
@@ -759,7 +745,6 @@ module RDF::Turtle::Meta
       :PNAME_LN,
       :PNAME_NS],
     :verb => [
-      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
@@ -767,7 +752,6 @@ module RDF::Turtle::Meta
   }.freeze
   FOLLOW = {
     :BlankNode => [
-      "A",
       "a",
       ")",
       ",",
@@ -835,7 +819,6 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_SINGLE_QUOTE,
       :STRING_LITERAL_LONG_QUOTE],
     :PrefixedName => [
-      "A",
       "a",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1038,7 +1021,6 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :blankNodePropertyList => [
       ".",
-      "A",
       "a",
       ")",
       ",",
@@ -1062,7 +1044,6 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_QUOTE],
     :_blankNodePropertyList_1 => [
       ".",
-      "A",
       "a",
       ")",
       ",",
@@ -1086,7 +1067,6 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_QUOTE],
     :_blankNodePropertyList_2 => [
       ".",
-      "A",
       "a",
       ")",
       ",",
@@ -1109,7 +1089,6 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_SINGLE_QUOTE,
       :STRING_LITERAL_LONG_QUOTE],
     :collection => [
-      "A",
       "a",
       ")",
       ",",
@@ -1137,7 +1116,6 @@ module RDF::Turtle::Meta
     :_collection_2 => [
       ")"],
     :_collection_3 => [
-      "A",
       "a",
       ")",
       ",",
@@ -1163,7 +1141,6 @@ module RDF::Turtle::Meta
     :_collection_4 => [
       ")"],
     :_collection_5 => [
-      "A",
       "a",
       ")",
       ",",
@@ -1198,7 +1175,6 @@ module RDF::Turtle::Meta
       :PNAME_LN,
       :PNAME_NS],
     :iri => [
-      "A",
       "a",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1441,7 +1417,6 @@ module RDF::Turtle::Meta
       :PNAME_LN,
       :PNAME_NS],
     :subject => [
-      "A",
       "a",
       :IRIREF,
       :PNAME_LN,

data/lib/rdf/turtle/reader.rb

@@ -72,15 +72,16 @@ module RDF::Turtle
       when 'A', 'a'           then input[:resource] = RDF.type
       when 'true', 'false'    then input[:resource] = RDF::Literal::Boolean.new(token.value)
       when '@base', '@prefix' then input[:lang] = token.value[1..-1]
+      when '.'                then input[:terminated] = true
       else                         input[:string] = token.value
       end
     end
 
     terminal(:PREFIX,      PREFIX) do |prod, token, input|
-      input[:string_value] = token.value.downcase
+      input[:string_value] = token.value
     end
     terminal(:BASE,      BASE) do |prod, token, input|
-      input[:string_value] = token.value.downcase
+      input[:string_value] = token.value
     end
 
     terminal(:LANGTAG,              LANGTAG) do |prod, token, input|
@@ -92,14 +93,32 @@ module RDF::Turtle
     production(:prefixID) do |input, current, callback|
       prefix = current[:prefix]
       iri = current[:resource]
+      lexical = current[:string_value]
+      terminated = current[:terminated]
       debug("prefixID") {"Defined prefix #{prefix.inspect} mapping to #{iri.inspect}"}
+      if lexical.start_with?('@') && lexical != '@prefix'
+        error(:prefixID, "should be downcased")
+      elsif lexical == '@prefix'
+        error(:prefixID, "directive not terminated") unless terminated
+      else
+        error(:prefixID, "directive should not be terminated") if terminated
+      end
       prefix(prefix, iri)
     end
     
     # [5] base set base_uri
     production(:base) do |input, current, callback|
       iri = current[:resource]
+      lexical = current[:string_value]
+      terminated = current[:terminated]
       debug("base") {"Defined base as #{iri}"}
+      if lexical.start_with?('@') && lexical != '@base'
+        error(:base, "should be downcased")
+      elsif lexical == '@base'
+        error(:base, "directive not terminated") unless terminated
+      else
+        error(:base, "directive should not be terminated") if terminated
+      end
       options[:base_uri] = iri
     end
     

data/lib/rdf/turtle/streaming_writer.rb

@@ -0,0 +1,52 @@
+require 'rdf/turtle/terminals'
+
+module RDF::Turtle
+  ##
+  # Streaming writer interface
+  # @author [Gregg Kellogg](http://greggkellogg.net/)
+  module StreamingWriter
+    ##
+    # Write out declarations
+    # @return [void] `self`
+    def stream_prologue
+      if @options[:standard_prefixes]
+        RDF::Vocabulary.each do |vocab|
+          pfx = vocab.__name__.to_s.split('::').last.downcase
+          prefix(pfx, vocab.to_uri)
+        end
+      end
+      preprocess
+      start_document
+      @output.puts ""
+      self
+    end
+
+    ##
+    # Write out a statement, retaining current
+    # `subject` and `predicate` to create more compact output
+    # @return [void] `self`
+    def stream_statement(statement)
+      if statement.subject != @streaming_subject
+        @output.puts ' .' if @streaming_subject
+        @streaming_subject, @streaming_predicate = statement.subject, statement.predicate
+        @output.write "#{format_term(statement.subject)} "
+        @output.write "#{format_term(statement.predicate)} "
+      elsif statement.predicate != @streaming_predicate
+        @streaming_predicate = statement.predicate
+        @output.write ";\n#{indent(1)}#{format_term(statement.predicate)} "
+      else
+        @output.write ",\n#{indent(2)}"
+      end
+      @output.write("#{format_term(statement.object)}")
+    end
+
+    ##
+    # Complete open statements
+    # @return [void] `self`
+    def stream_epilogue
+      @output.puts ' .' if @streaming_subject
+    end
+
+    private
+  end
+end

data/lib/rdf/turtle/writer.rb

@@ -1,4 +1,5 @@
 require 'rdf/turtle/terminals'
+require 'rdf/turtle/streaming_writer'
 
 module RDF::Turtle
   ##
@@ -34,6 +35,13 @@ module RDF::Turtle
   #     end
   #   end
   #
+  # @example Serializing RDF statements to a string in streaming mode
+  #   RDF::Turtle::Writer.buffer(:stream => true) do |writer|
+  #     graph.each_statement do |statement|
+  #       writer << statement
+  #     end
+  #   end
+  #
   # The writer will add prefix definitions, and use them for creating @prefix definitions, and minting QNames
   #
   # @example Creating @base and @prefix definitions in output
@@ -48,12 +56,11 @@ module RDF::Turtle
   #
   # @author [Gregg Kellogg](http://greggkellogg.net/)
   class Writer < RDF::Writer
+    include StreamingWriter
     format RDF::Turtle::Format
 
     # @return [Graph] Graph of statements serialized
     attr_accessor :graph
-    # @return [URI] Base URI used for relativizing URIs
-    attr_accessor :base_uri
     
     ##
     # Initializes the Turtle writer instance.
@@ -74,6 +81,8 @@ module RDF::Turtle
     #   Maximum depth for recursively defining resources, defaults to 3
     # @option options [Boolean]  :standard_prefixes   (false)
     #   Add standard prefixes to @prefixes, if necessary.
+    # @option options [Boolean] :stream (false)
+    #   Do not attempt to optimize graph presentation, suitable for streaming large graphs.
     # @option options [String]   :default_namespace (nil)
     #   URI to use as default namespace, same as `prefixes[nil]`
     # @yield  [writer] `self`
@@ -82,10 +91,11 @@ module RDF::Turtle
     # @yield  [writer]
     # @yieldparam [RDF::Writer] writer
     def initialize(output = $stdout, options = {}, &block)
+      reset
+      @graph = RDF::Graph.new
+      @uri_to_pname = {}
+      @uri_to_prefix = {}
       super do
-        @graph = RDF::Graph.new
-        @uri_to_pname = {}
-        @uri_to_prefix = {}
         if block_given?
           case block.arity
             when 0 then instance_eval(&block)
@@ -95,21 +105,18 @@ module RDF::Turtle
       end
     end
 
-    ##
-    # Write whole graph
-    #
-    # @param  [Graph] graph
-    # @return [void]
-    def write_graph(graph)
-      @graph = graph
-    end
-
     ##
     # Adds a statement to be serialized
     # @param  [RDF::Statement] statement
     # @return [void]
     def write_statement(statement)
-      @graph.insert(statement)
+      case
+      when @options[:stream]
+        stream_statement(statement)
+      else
+        # Add to local graph and output in epilogue
+        @graph.insert(statement)
+      end
     end
 
     ##
@@ -118,10 +125,19 @@ module RDF::Turtle
     # @param  [RDF::URI]      predicate
     # @param  [RDF::Value]    object
     # @return [void]
-    # @raise  [NotImplementedError] unless implemented in subclass
-    # @abstract
     def write_triple(subject, predicate, object)
-      @graph.insert(Statement.new(subject, predicate, object))
+      write_statement(Statement.new(subject, predicate, object))
+    end
+
+    ##
+    # Write out declarations
+    # @return [void] `self`
+    def write_prologue
+      case
+      when @options[:stream]
+        stream_prologue
+      else
+      end
     end
 
     ##
@@ -130,19 +146,23 @@ module RDF::Turtle
     # @return [void]
     # @see    #write_triple
     def write_epilogue
-      @max_depth = @options[:max_depth] || 3
-      @base_uri = RDF::URI(@options[:base_uri])
+      case
+      when @options[:stream]
+        stream_epilogue
+      else
+        @max_depth = @options[:max_depth] || 3
 
-      self.reset
+        self.reset
 
-      debug("\nserialize") {"graph: #{@graph.size}"}
+        debug("\nserialize") {"graph: #{@graph.size}"}
 
-      preprocess
-      start_document
+        preprocess
+        start_document
 
-      order_subjects.each do |subject|
-        unless is_done?(subject)
-          statement(subject)
+        order_subjects.each do |subject|
+          unless is_done?(subject)
+            statement(subject)
+          end
         end
       end
     end
@@ -300,8 +320,8 @@ module RDF::Turtle
       
       # Start with base_uri
       if base_uri && @subjects.keys.include?(base_uri)
-        subjects << base_uri
-        seen[base_uri] = true
+        subjects << RDF::URI(base_uri)
+        seen[RDF::URI(base_uri)] = true
       end
       
       # Add distinguished classes
@@ -328,11 +348,16 @@ module RDF::Turtle
       (@options[:prefixes] || {}).each_pair do |k, v|
         @uri_to_prefix[v.to_s] = k
       end
-      @options[:prefixes] = {}  # Will define actual used when matched
 
       prefix(nil, @options[:default_namespace]) if @options[:default_namespace]
 
-      @graph.each {|statement| preprocess_statement(statement)}
+      case
+      when @options[:stream]
+      else
+        @options[:prefixes] = {}  # Will define actual used when matched
+
+        @graph.each {|statement| preprocess_statement(statement)}
+      end
     end
     
     # Perform any statement preprocessing required. This is used to perform reference counts and determine required

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-turtle
 version: !ruby/object:Gem::Version
-  version: 1.1.0p2
+  version: 1.1.0p3
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -151,6 +151,7 @@ files:
 - lib/rdf/turtle/freebase_reader.rb
 - lib/rdf/turtle/meta.rb
 - lib/rdf/turtle/reader.rb
+- lib/rdf/turtle/streaming_writer.rb
 - lib/rdf/turtle/terminals.rb
 - lib/rdf/turtle/version.rb
 - lib/rdf/turtle/writer.rb
@@ -175,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: rdf-turtle
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Turtle reader/writer for Ruby.