sparql 0.3.1 → 0.3.2

data/README.markdown

@@ -19,10 +19,10 @@ This is a [Ruby][] implementation of [SPARQL][] for [RDF.rb][].
 
 ## Description
 
-The {SPARQL} gem implements [SPARQL 1.0 Query] and provides [Rack][] and [Sinatra][]
+The {SPARQL} gem implements [SPARQL 1.0][] and provides [Rack][] and [Sinatra][]
 middleware to provide results using [HTTP Content Negotiation][conneg].
 
-* {SPARQL::Grammar} implements a [SPARQL 1.0 Query] parser generating [SPARQL S-Expressions (SSE)][SSE].
+* {SPARQL::Grammar} implements a [SPARQL 1.0][] parser generating [SPARQL S-Expressions (SSE)][SSE].
 * {SPARQL::Algebra} executes SSE against Any `RDF::Graph` or `RDF::Repository`, including
   compliant [RDF.rb][] repository adaptors such as [RDF::DO][] and [RDF::Mongo][].
 * {Rack::SPARQL} and {Sinatra::SPARQL} provide middleware components to format results

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/rack/sparql/conneg.rb

@@ -9,7 +9,7 @@ module Rack; module SPARQL
   # format to serialize any result with a body being `RDF::Enumerable`.
   #
   # Override content negotiation by setting the :format option to
-  # {#initialize}.
+  # {Rack::SPARQL#initialize}.
   #
   # This endpoint also serves the fuction of Rack::LinkedData, as it will serialize
   # SPARQL results, which may be RDF Graphs

data/lib/sparql/algebra/extensions.rb

@@ -4,7 +4,7 @@ require 'json'
 # Extensions for Ruby's `Object` class.
 class Object
   ##
-  # Returns the SXP binary representation of this object, defaults to `self'.
+  # Returns the SXP binary representation of this object, defaults to `self`.
   #
   # @return [String]
   def to_sxp_bin
@@ -28,7 +28,7 @@ end
 # Extensions for Ruby's `Object` class.
 class Array
   ##
-  # Returns the SXP representation of this object, defaults to `self'.
+  # Returns the SXP representation of this object, defaults to `self`.
   #
   # @return [String]
   def to_sxp_bin

data/lib/sparql/algebra/operator/dataset.rb

@@ -10,13 +10,14 @@ module SPARQL; module Algebra
     # The SPARQL GraphPattern `dataset` operator.
     #
     # Instintiated with two operands, the first being an array of data source URIs,
-    # either bare, indicating a default dataset, or expressed as an array [:named, <uri>],
+    # either bare, indicating a default dataset, or expressed as an array `\[:named, \<uri\>\]`,
     # indicating that it represents a named data source.
     #
     # @example
-    #   (prefix ((: <http://example/>))
-    #     (dataset (<data-g1.ttl> (named <data-g2.ttl>))
-    #       (bgp (triple ?s ?p ?o))))
+    #
+    #     (prefix ((: <http://example/>))
+    #       (dataset (<data-g1.ttl> (named <data-g2.ttl>))
+    #         (bgp (triple ?s ?p ?o))))
     #
     # @see http://www.w3.org/TR/rdf-sparql-query/#specifyingDataset
     class Dataset < Binary

data/lib/sparql/grammar.rb

@@ -30,22 +30,27 @@ module SPARQL
   #     sxp = sse.to_sxp
   # 
   # The following examples illustrate SPARQL transformations:
-  # 
+  #
   # SPARQL:
+  #
   #     SELECT * WHERE { ?a ?b ?c }
   # 
   # SSE:
+  #
   #     RDF::Query.new {
   #       pattern [RDF::Query::Variable.new("a"), RDF::Query::Variable.new("b"), RDF::Query::Variable.new("c")]
   #     }
   # 
   # SXP:
+  #
   #     (bgp (triple ?a ?b ?c))
   # 
   # SPARQL:
+  #
   #     SELECT * FROM <a> WHERE { ?a ?b ?c }
   # 
   # SSE:
+  #
   #     SPARQL::Algebra::Operator::Dataset.new(
   #       [RDF::URI("a")],
   #       RDF::Query.new {
@@ -54,12 +59,15 @@ module SPARQL
   #     )
   # 
   # SXP:
+  #
   #     (dataset (<a>) (bgp (triple ?a ?b ?c)))
   # 
   # SPARQL:
+  #
   #     SELECT * FROM NAMED <a> WHERE { ?a ?b ?c }
   # 
   # SSE:
+  #
   #     SPARQL::Algebra::Operator::Dataset.new(
   #       [[:named, RDF::URI("a")]],
   #       RDF::Query.new {
@@ -68,12 +76,15 @@ module SPARQL
   #     )
   # 
   # SXP:
+  #
   #     (dataset ((named <a>)) (bgp (triple ?a ?b ?c)))
   # 
   # SPARQL:
+  #
   #     SELECT DISTINCT * WHERE {?a ?b ?c}
   # 
   # SSE:
+  #
   #     SPARQL::Algebra::Operator::Distinct.new(
   #       RDF::Query.new {
   #         pattern [RDF::Query::Variable.new("a"), RDF::Query::Variable.new("b"), RDF::Query::Variable.new("c")]
@@ -81,12 +92,15 @@ module SPARQL
   #     )
   # 
   # SXP:
+  #
   #     (distinct (bgp (triple ?a ?b ?c)))
   # 
   # SPARQL:
+  #
   #     SELECT ?a ?b WHERE {?a ?b ?c}
   # 
   # SSE:
+  #
   #     SPARQL::Algebra::Operator::Project.new(
   #       [RDF::Query::Variable.new("a"), RDF::Query::Variable.new("b")], 
   #       RDF::Query.new {
@@ -95,12 +109,15 @@ module SPARQL
   #     )
   # 
   # SXP:
+  #
   #     (project (?a ?b) (bgp (triple ?a ?b ?c)))
   # 
   # SPARQL:
+  #
   #     CONSTRUCT {?a ?b ?c} WHERE {?a ?b ?c FILTER (?a)}
   # 
   # SSE:
+  #
   #     SPARQL::Algebra::Operator::Construct.new(
   #       [RDF::Query::Pattern.new(RDF::Query::Variable.new("a"), RDF::Query::Variable.new("b"), RDF::Query::Variable.new("c"))],
   #       SPARQL::Algebra::Operator::Filter.new(
@@ -112,12 +129,15 @@ module SPARQL
   #     )
   # 
   # SXP:
+  #
   #     (construct ((triple ?a ?b ?c)) (filter ?a (bgp (triple ?a ?b ?c))))
   # 
   # SPARQL:
+  #
   #     SELECT * WHERE {<a> <b> <c> OPTIONAL {<d> <e> <f>}}
   # 
   # SSE:
+  #
   #     SPARQL::Algebra::Operator::LeftJoin.new(
   #       RDF::Query.new {
   #         pattern [RDF::URI("a"), RDF::URI("b"), RDF::URI("c")]
@@ -128,12 +148,15 @@ module SPARQL
   #     )
   # 
   # SXP:
+  #
   #     (leftjoin (bgp (triple <a> <b> <c>)) (bgp (triple <d> <e> <f>)))
   # 
   # SPARQL:
+  #
   #     SELECT * WHERE {<a> <b> <c> {<d> <e> <f>}}
   # 
   # SSE:
+  #
   #     SPARQL::Algebra::Operator::Join.new(
   #       RDF::Query.new {
   #         pattern [RDF::URI("a"), RDF::URI("b"), RDF::URI("c")]
@@ -144,9 +167,11 @@ module SPARQL
   #     )
   # 
   # SXP:
+  #
   #     (join (bgp (triple <a> <b> <c>)) (bgp (triple <d> <e> <f>)))
   # 
   # SPARQL:
+  #
   #     PREFIX : <http://example/> 
   # 
   #     SELECT * 
@@ -157,6 +182,7 @@ module SPARQL
   #     }
   # 
   # SSE:
+  #
   #     SPARQL::Algebra::Operator::Prefix.new(
   #       [[:":", RDF::URI("http://example/")]],
   #       SPARQL::Algebra::Operator::Union.new(
@@ -170,6 +196,7 @@ module SPARQL
   #     )
   # 
   # SXP:
+  #
   #     (prefix ((: <http://example/>))
   #       (union
   #         (bgp (triple ?s ?p ?o))

data/lib/sparql/grammar/lexer.rb

@@ -5,8 +5,8 @@ module SPARQL; module Grammar
   ##
   # A lexical analyzer for the SPARQL 1.0 grammar.
   #
-  # Note that productions [80]-[85] have been incorporated directly into
-  # [77], [78], [79].
+  # Note that productions \[80\]-\[85\] have been incorporated directly into
+  # \[77\], \[78\], \[79\].
   #
   # @example Tokenizing a SPARQL query string
   #   query = "SELECT * WHERE { ?s ?p ?o }"
@@ -105,38 +105,38 @@ module SPARQL; module Grammar
     OPERATOR             = /a|\|\||&&|!=|<=|>=|[!=<>+\-*\/]/
     COMMENT              = /#.*/
 
-    PN_CHARS_BASE        = /[A-Z]|[a-z]|#{U_CHARS1}/                            # [95]
-    PN_CHARS_U           = /_|#{PN_CHARS_BASE}/                                 # [96]
+    PN_CHARS_BASE        = /[A-Z]|[a-z]|#{U_CHARS1}/                            # \[95\]
+    PN_CHARS_U           = /_|#{PN_CHARS_BASE}/                                 # \[96\]
     VARNAME              = /(?:[0-9]|#{PN_CHARS_U})
-                            (?:[0-9]|#{PN_CHARS_U}|#{U_CHARS2})*/x              # [97]
-    PN_CHARS             = /-|[0-9]|#{PN_CHARS_U}|#{U_CHARS2}/                  # [98]
+                            (?:[0-9]|#{PN_CHARS_U}|#{U_CHARS2})*/x              # \[97\]
+    PN_CHARS             = /-|[0-9]|#{PN_CHARS_U}|#{U_CHARS2}/                  # \[98\]
     PN_CHARS_BODY        = /(?:(?:\.|#{PN_CHARS})*#{PN_CHARS})?/
-    PN_PREFIX            = /#{PN_CHARS_BASE}#{PN_CHARS_BODY}/                   # [99]
-    PN_LOCAL             = /(?:[0-9]|#{PN_CHARS_U})#{PN_CHARS_BODY}/            # [100]
-
-    IRI_REF              = /<([^<>"{}|^`\\\x00-\x20]*)>/                        # [70]
-    PNAME_NS             = /(#{PN_PREFIX}?):/                                   # [71]
-    PNAME_LN             = /#{PNAME_NS}(#{PN_LOCAL})/                           # [72]
-    BLANK_NODE_LABEL     = /_:(#{PN_LOCAL})/                                    # [73]
-    VAR1                 = /\?(#{VARNAME})/                                     # [74]
-    VAR2                 = /\$(#{VARNAME})/                                     # [75]
-    LANGTAG              = /@([a-zA-Z]+(?:-[a-zA-Z0-9]+)*)/                     # [76]
-    INTEGER              = /[0-9]+/                                             # [77]
-    DECIMAL              = /(?:[0-9]+\.[0-9]*|\.[0-9]+)/                        # [78]
-    EXPONENT             = /[eE][+-]?[0-9]+/                                    # [86]
-    DOUBLE               = /(?:[0-9]+\.[0-9]*|\.[0-9]+|[0-9]+)#{EXPONENT}/      # [79]
-    ECHAR                = /\\[tbnrf\\"']/                                      # [91]
-    STRING_LITERAL1      = /'((?:[^\x27\x5C\x0A\x0D]|#{ECHAR})*)'/              # [87]
-    STRING_LITERAL2      = /"((?:[^\x22\x5C\x0A\x0D]|#{ECHAR})*)"/              # [88]
-    STRING_LITERAL_LONG1 = /'''((?:(?:'|'')?(?:[^'\\]|#{ECHAR})+)*)'''/m       # [89]
-    STRING_LITERAL_LONG2 = /"""((?:(?:"|"")?(?:[^"\\]|#{ECHAR})+)*)"""/m        # [90]
-    WS                   = /\x20|\x09|\x0D|\x0A/                                # [93]
-    NIL                  = /\(#{WS}*\)/                                         # [92]
-    ANON                 = /\[#{WS}*\]/                                         # [94]
-
-    BooleanLiteral       = /true|false/                                         # [65]
+    PN_PREFIX            = /#{PN_CHARS_BASE}#{PN_CHARS_BODY}/                   # \[99\]
+    PN_LOCAL             = /(?:[0-9]|#{PN_CHARS_U})#{PN_CHARS_BODY}/            # \[100\]
+
+    IRI_REF              = /<([^<>"{}|^`\\\x00-\x20]*)>/                        # \[70\]
+    PNAME_NS             = /(#{PN_PREFIX}?):/                                   # \[71\]
+    PNAME_LN             = /#{PNAME_NS}(#{PN_LOCAL})/                           # \[72\]
+    BLANK_NODE_LABEL     = /_:(#{PN_LOCAL})/                                    # \[73\]
+    VAR1                 = /\?(#{VARNAME})/                                     # \[74\]
+    VAR2                 = /\$(#{VARNAME})/                                     # \[75\]
+    LANGTAG              = /@([a-zA-Z]+(?:-[a-zA-Z0-9]+)*)/                     # \[76\]
+    INTEGER              = /[0-9]+/                                             # \[77\]
+    DECIMAL              = /(?:[0-9]+\.[0-9]*|\.[0-9]+)/                        # \[78\]
+    EXPONENT             = /[eE][+-]?[0-9]+/                                    # \[86\]
+    DOUBLE               = /(?:[0-9]+\.[0-9]*|\.[0-9]+|[0-9]+)#{EXPONENT}/      # \[79\]
+    ECHAR                = /\\[tbnrf\\"']/                                      # \[91\]
+    STRING_LITERAL1      = /'((?:[^\x27\x5C\x0A\x0D]|#{ECHAR})*)'/              # \[87\]
+    STRING_LITERAL2      = /"((?:[^\x22\x5C\x0A\x0D]|#{ECHAR})*)"/              # \[88\]
+    STRING_LITERAL_LONG1 = /'''((?:(?:'|'')?(?:[^'\\]|#{ECHAR})+)*)'''/m       # \[89\]
+    STRING_LITERAL_LONG2 = /"""((?:(?:"|"")?(?:[^"\\]|#{ECHAR})+)*)"""/m        # \[90\]
+    WS                   = /\x20|\x09|\x0D|\x0A/                                # \[93\]
+    NIL                  = /\(#{WS}*\)/                                         # \[92\]
+    ANON                 = /\[#{WS}*\]/                                         # \[94\]
+
+    BooleanLiteral       = /true|false/                                         # \[65\]
     String               = /#{STRING_LITERAL_LONG1}|#{STRING_LITERAL_LONG2}|
-                            #{STRING_LITERAL1}|#{STRING_LITERAL2}/x             # [66]
+                            #{STRING_LITERAL1}|#{STRING_LITERAL2}/x             # \[66\]
 
     # Make all defined regular expression constants immutable:
     constants.each { |name| const_get(name).freeze }

data/lib/sparql/grammar/parser/meta.rb

@@ -1,12 +1,16 @@
 # This file is automatically generated by script/build_meta
 # Branch and Regexp tables derived from /Users/gregg/Projects/sparql-grammar/etc/sparql-selectors.n3
 # Note, branch tables completed with conflicts, may need to be resolved manually:
-#   Conflict: in :UnaryExpression:
-#      "+" is the condition for ["\"+\"", ":PrimaryExpression"].
-#      We are changing it to :PrimaryExpression.
-#   Conflict: in :UnaryExpression:
-#      "-" is the condition for ["\"-\"", ":PrimaryExpression"].
-#      We are changing it to :PrimaryExpression.
+#
+#     Conflict: in :UnaryExpression:
+#        "+" is the condition for ["\"+\"", ":PrimaryExpression"].
+#
+# We are changing it to :PrimaryExpression.
+#
+#     Conflict: in :UnaryExpression:
+#        "-" is the condition for ["\"-\"", ":PrimaryExpression"].
+#
+# We are changing it to :PrimaryExpression.
 module SPARQL::Grammar::Meta
   BRANCHES = {
     :AdditiveExpression => {

data/lib/sparql/results.rb

@@ -25,7 +25,7 @@ module SPARQL
             {n => {:type => "bnode", :value => s.id }}
           when RDF::Literal
             if s.datatype?
-              {n => {:type => "literal", :datatype => s.datatype.to_s, :value => s.to_s }}
+              {n => {:type => "typed-literal", :datatype => s.datatype.to_s, :value => s.to_s }}
             elsif s.language
               {n => {:type => "literal", "xml:lang" => s.language.to_s, :value => s.to_s }}
             else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -386,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sparql
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: SPARQL library for Ruby.