rdf-n3 0.2.2 → 0.2.3

data/lib/rdf/n3/reader/n3_grammar_18.treetop

@@ -0,0 +1,227 @@
+#encoding: utf-8
+grammar N3Grammer
+  # Entry point to grammar
+  rule document
+    statements
+  end
+
+  rule barename
+    barename_start barename_tail*
+  end
+
+  rule barename_start
+    [A-Z_a-z\p{Alpha}]
+  end
+  
+  rule barename_tail
+    barename_start / [-0-9\\]
+  end
+  
+  rule hexdigit
+    [0-9a-fA-F]
+  end
+  
+  rule integer
+     [+-]? [0-9]+
+  end
+  
+  rule barename_csl
+    space+ barename barename_csl_tail
+    / ""
+  end
+
+  rule barename_csl_tail
+    space* "," space* barename space* barename_csl_tail
+    / ""
+  end
+
+  rule boolean
+    "@"* ("true" / "false")
+  end
+  
+  rule comment
+    '#' (![\n\r] .)*
+  end
+
+  rule declaration
+    "@"? 'keywords' barename_csl {
+      def declaration; true; end
+      def keywords; true;end
+    }
+    / "@"? 'base' space+ explicituri:explicituri {
+      def declaration; true; end
+      def base; true; end
+    }
+    / "@"? 'prefix' space+ nprefix:nprefix? ':' space* explicituri:explicituri {
+      def declaration; true; end
+    }
+  end
+  
+  rule decimal
+    integer '.' [0-9]+
+  end
+  
+  rule double
+    decimal [eE] integer
+  end
+  
+  rule existential
+    "@"? "forSome" space+ symbol_csl
+  end
+  
+  rule explicituri
+   "<" uri:URI_Reference ">"
+  end
+  
+  rule expression
+    pathitem space* '.' expression  
+    / pathitem space* "!" space* expression
+    / pathitem space* "^" space* expression { def reverse; true; end }
+    / pathitem
+  end
+
+  rule language
+    [a-zA-Z]+ ( "-" [a-zA-Z0-9]+ )*
+  end
+
+  rule literal
+    (string_single / string_multi) ("^^" symbol / "@" language )?
+  end
+  
+  rule localname
+    barename
+  end
+  
+  rule nprefix
+    barename
+  end
+
+  rule numericliteral
+    double { def numericliteral; "double"; end}
+    / decimal { def numericliteral; "decimal"; end}
+    / integer { def numericliteral; "integer"; end}
+  end
+  
+  rule object
+    expression
+  end
+  
+  rule object_list
+    object space* "," space* object_list
+    / object
+  end
+
+  rule pathitem
+    boolean { def boolean; true; end }
+    / literal { def literal; true; end }
+    / numericliteral
+    #/ quickvariable
+    / symbol
+    / "[" space* "]" { def anonnode; true; end }
+    / "[" space* property_list space* "]" { def anonnode; true; end }
+    / "{" space* statements space* "}" { def anonnode; true; end }
+    / "(" space* path_list space* ")" { def anonnode; true; end }
+  end
+  
+  rule path_list
+    expression space* path_list
+    / ""
+  end
+  
+  rule prop
+    expression
+  end
+  
+  rule property_list
+    verb space* object_list space* ";"+ space* property_list
+    / verb space* object_list space* ";"*
+    / verb space* ";"* {def object_missing; true; end}
+    / ""
+  end
+
+  rule qname
+    nprefix ":" localname
+    / nprefix ':' { def text_value; ""; end }
+    / ':' localname*
+    / localname { def barename; true; end }
+  end
+  
+  rule simpleStatement
+    subject space+ property_list
+    / subject # For [] and a.b
+  end
+  
+  rule space
+    [ \t\n\r]+ / comment
+  end
+  
+  rule statement
+    declaration
+    / existential
+    / simpleStatement
+    / universal
+  end
+  
+  rule statements
+    (space / statement space* ('.' space*)? )*
+  end
+  
+  # " constant-value-with-escaping "
+  rule string_single
+    '""' !["] / '"' string_single_char+ '"'
+  end
+
+  rule string_single_char
+    !["\n\r] (
+      ("\\"
+        [\\\"bfnrt]
+      / ( "u" hexdigit hexdigit hexdigit hexdigit )
+      / ( "U" "00" hexdigit hexdigit hexdigit hexdigit hexdigit hexdigit)
+      )
+    / .)
+  end
+
+  # """ constant value with escaping including single or double occurrences of quotes and/or newlines """ 
+  rule string_multi
+    '"""' string_multi_single_char* '"""'
+  end
+
+  rule string_multi_single_char
+    "\\\""
+    / !('"""') .
+  end
+
+  rule subject
+    expression
+  end
+  
+  rule symbol
+    qname / explicituri
+  end
+  
+  rule symbol_csl
+    symbol space* "," space* symbol_csl
+    / symbol
+  end
+  
+  rule verb
+    "@"? "has" space+ prop                    # has xxx
+    / "@"? "is" space+ prop space+ "@"? "of" { # is xxx of
+      def invert; true; end
+    }
+    / "@"? "a" !":"                           # has rdf:type
+    / "=>"                                    # has log:implies
+    / "<=" { def invert; true; end }          # is log:implies of
+    / "="                                     # has owl:sameAs
+    / prop                                    # has xxx of -- shorthand
+  end
+  
+  rule universal
+    "@"? "forAll" space+ symbol_csl
+  end
+  
+  rule URI_Reference
+    [^{}<>]*
+  end
+  
+end

data/lib/rdf/n3/version.rb

@@ -1,11 +1,8 @@
 module RDF::N3::VERSION
-  MAJOR = 0
-  MINOR = 2
-  TINY  = 2
-  EXTRA = nil
+  VERSION_FILE = File.join(File.expand_path(File.dirname(__FILE__)), "..", "..", "..", "VERSION")
+  MAJOR, MINOR, TINY, EXTRA = File.read(VERSION_FILE).chop.split(".")
 
-  STRING = [MAJOR, MINOR, TINY].join('.')
-  STRING << "-#{EXTRA}" if EXTRA
+  STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')
 
   ##
   # @return [String]
@@ -17,5 +14,5 @@ module RDF::N3::VERSION
 
   ##
   # @return [Array(Integer, Integer, Integer)]
-  def self.to_a() [MAJOR, MINOR, TINY] end
+  def self.to_a() STRING.split(".") end
 end

data/lib/rdf/n3/writer.rb

@@ -104,7 +104,7 @@ module RDF::N3
     # @see    #write_triple
     def write_epilogue
       @max_depth = @options[:max_depth] || 3
-      @base = @options[:base_uri]
+      @base_uri = @options[:base_uri]
       @debug = @options[:debug]
       @default_namespace = @options[:default_namespace]
 
@@ -129,7 +129,7 @@ module RDF::N3
     def start_document
       @started = true
       
-      write("#{indent}@base <#{@base}> .\n") if @base
+      write("#{indent}@base <#{@base_uri}> .\n") if @base_uri
       
       add_debug("start_document: #{@namespaces.inspect}")
       @namespaces.keys.sort.each do |prefix|
@@ -137,28 +137,30 @@ module RDF::N3
       end
     end
     
-    def end_document; end
+    def end_document
+      write("\n")
+    end
     
     # Checks if l is a valid RDF list, i.e. no nodes have other properties.
     def is_valid_list(l)
       props = @graph.properties(l)
-      #puts "is_valid_list: #{props.inspect}" if $DEBUG
+      #puts "is_valid_list: #{props.inspect}" if ::RDF::N3::debug?
       return false unless props.has_key?(RDF.first.to_s) || l == RDF.nil
       while l && l != RDF.nil do
-        #puts "is_valid_list(length): #{props.length}" if $DEBUG
+        #puts "is_valid_list(length): #{props.length}" if ::RDF::N3::debug?
         return false unless props.has_key?(RDF.first.to_s) && props.has_key?(RDF.rest.to_s)
         n = props[RDF.rest.to_s]
-        #puts "is_valid_list(n): #{n.inspect}" if $DEBUG
+        #puts "is_valid_list(n): #{n.inspect}" if ::RDF::N3::debug?
         return false unless n.is_a?(Array) && n.length == 1
         l = n.first
         props = @graph.properties(l)
       end
-      #puts "is_valid_list: valid" if $DEBUG
+      #puts "is_valid_list: valid" if ::RDF::N3::debug?
       true
     end
     
     def do_list(l)
-      puts "do_list: #{l.inspect}" if $DEBUG
+      puts "do_list: #{l.inspect}" if ::RDF::N3::debug?
       position = SUBJECT
       while l do
         p = @graph.properties(l)
@@ -174,7 +176,7 @@ module RDF::N3
     
     def p_list(node, position)
       return false if !is_valid_list(node)
-      #puts "p_list: #{node.inspect}, #{position}" if $DEBUG
+      #puts "p_list: #{node.inspect}, #{position}" if ::RDF::N3::debug?
 
       write(position == SUBJECT ? "(" : " (")
       @depth += 2
@@ -192,7 +194,7 @@ module RDF::N3
     def p_squared(node, position)
       return false unless p_squared?(node, position)
 
-      #puts "p_squared: #{node.inspect}, #{position}" if $DEBUG
+      #puts "p_squared: #{node.inspect}, #{position}" if ::RDF::N3::debug?
       subject_done(node)
       write(position == SUBJECT ? '[' : ' [')
       @depth += 2
@@ -204,18 +206,18 @@ module RDF::N3
     end
     
     def p_default(node, position)
-      #puts "p_default: #{node.inspect}, #{position}" if $DEBUG
-      l = (position == SUBJECT ? "" : " ") + label(node)
+      #puts "p_default: #{node.inspect}, #{position}" if ::RDF::N3::debug?
+      l = (position == SUBJECT ? "" : " ") + format_value(node)
       write(l)
     end
     
     def path(node, position)
-      puts "path: #{node.inspect}, pos: #{position}, []: #{is_valid_list(node)}, p2?: #{p_squared?(node, position)}, rc: #{ref_count(node)}" if $DEBUG
+      puts "path: #{node.inspect}, pos: #{position}, []: #{is_valid_list(node)}, p2?: #{p_squared?(node, position)}, rc: #{ref_count(node)}" if ::RDF::N3::debug?
       raise RDF::WriterError, "Cannot serialize node '#{node}'" unless p_list(node, position) || p_squared(node, position) || p_default(node, position)
     end
     
     def verb(node)
-      puts "verb: #{node.inspect}" if $DEBUG
+      puts "verb: #{node.inspect}" if ::RDF::N3::debug?
       if node == RDF.type
         write(" a")
       else
@@ -224,7 +226,7 @@ module RDF::N3
     end
     
     def object_list(objects)
-      puts "object_list: #{objects.inspect}" if $DEBUG
+      puts "object_list: #{objects.inspect}" if ::RDF::N3::debug?
       return if objects.empty?
 
       objects.each_with_index do |obj, i|
@@ -236,7 +238,7 @@ module RDF::N3
     def predicate_list(subject)
       properties = @graph.properties(subject)
       prop_list = sort_properties(properties) - [RDF.first.to_s, RDF.rest.to_s]
-      puts "predicate_list: #{prop_list.inspect}" if $DEBUG
+      puts "predicate_list: #{prop_list.inspect}" if ::RDF::N3::debug?
       return if prop_list.empty?
 
       prop_list.each_with_index do |prop, i|
@@ -271,11 +273,11 @@ module RDF::N3
     
     def relativize(uri)
       uri = uri.to_s
-      @base ? uri.sub(/^#{@base}/, "") : uri
+      @base_uri ? uri.sub(@base_uri.to_s, "") : uri
     end
 
     def statement(subject)
-      puts "statement: #{subject.inspect}, s2?: #{s_squared(subject)}" if $DEBUG
+      puts "statement: #{subject.inspect}, s2?: #{s_squared(subject)}" if ::RDF::N3::debug?
       subject_done(subject)
       s_squared(subject) || s_default(subject)
     end
@@ -342,8 +344,8 @@ module RDF::N3
     # Return a QName for the URI, or nil. Adds namespace of QName to defined namespaces
     def get_qname(uri)
       if uri.is_a?(RDF::URI)
-        md = uri.to_s.match(/^#{@base}(.*)$/) if @base
-        return "<#{md[1]}>" if md
+        md = relativize(uri)
+        return "<#{md}>" unless md == uri.to_s
 
         # Duplicate logic from URI#qname to remember namespace assigned
 
@@ -373,10 +375,6 @@ module RDF::N3
       end
     end
     
-    def label(node)
-      get_qname(node) || node.to_ntriples
-    end
-
     def add_namespace(prefix, ns)
       return if @namespaces.has_key?(prefix.to_s)
       uri = (ns.respond_to?(:to_uri) ? ns.to_uri : ns).to_s
@@ -429,7 +427,7 @@ module RDF::N3
     #
     # @param [String] message::
     def add_debug(message)
-      STDERR.puts message if $DEBUG
+      STDERR.puts message if ::RDF::N3::debug?
       @debug << message if @debug.is_a?(Array)
     end
 
@@ -442,5 +440,43 @@ module RDF::N3
     def write(text)
       @stream.write(text)
     end
+    
+    ##
+    # Returns the N-Triples representation of a literal.
+    #
+    # @param  [RDF::Literal, String, #to_s] literal
+    # @param  [Hash{Symbol => Object}] options
+    # @return [String]
+    def format_literal(literal, options = {})
+      case literal
+        when RDF::Literal
+          text = quoted(literal.value)
+          text << "@#{literal.language}" if literal.has_language?
+          text << "^^#{format_uri(literal.datatype)}" if literal.has_datatype?
+          text
+        else
+          quoted(literal.to_s)
+      end
+    end
+    
+    ##
+    # Returns the Turtle/N3 representation of a URI reference.
+    #
+    # @param  [RDF::URI] literal
+    # @param  [Hash{Symbol => Object}] options
+    # @return [String]
+    def format_uri(uri, options = {})
+      get_qname(uri) || "<%s>" % uri_for(uri)
+    end
+    
+    ##
+    # Returns the Turtle/N3 representation of a blank node.
+    #
+    # @param  [RDF::Node] node
+    # @param  [Hash{Symbol => Object}] options
+    # @return [String]
+    def format_node(node, options = {})
+      "_:%s" % node.id
+    end
   end
 end

data/rdf-n3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rdf-n3}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gregg Kellogg"]
-  s.date = %q{2010-08-11}
+  s.date = %q{2010-11-10}
   s.description = %q{    RDF::N3 is an Notation-3 (n3-rdf) parser for Ruby using the RDF.rb library suite.
 }
   s.email = %q{gregg@kellogg-assoc.com}
@@ -31,13 +31,13 @@ Gem::Specification.new do |s|
      "lib/rdf/n3/format.rb",
      "lib/rdf/n3/patches/array_hacks.rb",
      "lib/rdf/n3/patches/graph_properties.rb",
-     "lib/rdf/n3/patches/literal_normalization.rb",
      "lib/rdf/n3/patches/qname_hacks.rb",
      "lib/rdf/n3/patches/seq.rb",
-     "lib/rdf/n3/patches/uri_hacks.rb",
      "lib/rdf/n3/reader.rb",
      "lib/rdf/n3/reader/n3_grammar.rb",
      "lib/rdf/n3/reader/n3_grammar.treetop",
+     "lib/rdf/n3/reader/n3_grammar_18.rb",
+     "lib/rdf/n3/reader/n3_grammar_18.treetop",
      "lib/rdf/n3/version.rb",
      "lib/rdf/n3/vocab.rb",
      "lib/rdf/n3/writer.rb",
@@ -631,7 +631,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rdf>, [">= 0.2.1"])
       s.add_runtime_dependency(%q<treetop>, [">= 1.4.0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
       s.add_development_dependency(%q<rdf-spec>, [">= 0.2.1"])
       s.add_development_dependency(%q<rdf-rdfxml>, [">= 0.2.1"])
       s.add_development_dependency(%q<rdf-isomorphic>, [">= 0"])
@@ -639,7 +639,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<rdf>, [">= 0.2.1"])
       s.add_dependency(%q<treetop>, [">= 1.4.0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["= 1.3.0"])
       s.add_dependency(%q<rdf-spec>, [">= 0.2.1"])
       s.add_dependency(%q<rdf-rdfxml>, [">= 0.2.1"])
       s.add_dependency(%q<rdf-isomorphic>, [">= 0"])
@@ -648,7 +648,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rdf>, [">= 0.2.1"])
     s.add_dependency(%q<treetop>, [">= 1.4.0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["= 1.3.0"])
     s.add_dependency(%q<rdf-spec>, [">= 0.2.1"])
     s.add_dependency(%q<rdf-rdfxml>, [">= 0.2.1"])
     s.add_dependency(%q<rdf-isomorphic>, [">= 0"])