sparql 1.99.1 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ec364c42e06e4cdc86392e739b67253706707a6
-  data.tar.gz: c3248886ed4b4821d66f03373a6a770547c2b9e9
+  metadata.gz: e0f0674def56366f986d2d91cf7777c16552d64b
+  data.tar.gz: 2ccb0b9d631516cc71c0482d074bb65945af1ad6
 SHA512:
-  metadata.gz: 79e904fa34e79c9a49517a690e5a190900b9b96462807c22fc22b7913d329f455628b9d3a6b6c264eb47492438694c16d1f758ca3b87dd089b656bb665441159
-  data.tar.gz: 9d9675ad236cb8fd49e7a09da77e38c43e9fa616d190aaa2e2fead03e9f2d577f4d027332676c3810a0ec620c0c39a5ac9f05504fdac25e3d3cd498876a013bf
+  metadata.gz: 4be041a007b6fd78818f5c9188744f081f3d1c321aed9e49629e48760d6b9531c01918fa690f3580fd7fac0c8d32f82e9dd870f8e45f3a0e775273fe971a49fe
+  data.tar.gz: e1dba08317fec9abe5051428628613c6a8761e7f4f6c6889b17eeab821c2a9b868d3567914a1a598517a443eddfbb118552c8a72e84d8bf8a1f7d9bd2986ef70

data/README.md

@@ -327,12 +327,12 @@ A copy of the [SPARQL 1.0 tests][] and [SPARQL 1.1 tests][] are also included in
 [YARD-GS]:          http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
 [PDD]:              http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
 [SPARQL]:           http://en.wikipedia.org/wiki/SPARQL
-[SPARQL 1.0]:       http://www.w3.org/TR/rdf-sparql-query/
+[SPARQL 1.0]:       http://www.w3.org/TR/sparql11-query/
 [SPARQL 1.0 tests]:http://www.w3.org/2001/sw/DataAccess/tests/
 [SPARQL 1.1 tests]: http://www.w3.org/2009/sparql/docs/tests/
 [SSE]:              http://openjena.org/wiki/SSE
 [SXP]:              http://www.rubydoc.info/github/bendiken/sxp-ruby
-[grammar]:          http://www.w3.org/TR/rdf-sparql-query/#grammar
+[grammar]:          http://www.w3.org/TR/sparql11-query/#grammar
 [RDF 1.1]:          http://www.w3.org/TR/rdf11-concepts
 [RDF.rb]:           http://rubydoc.info/github/ruby-rdf/rdf
 [Backports]:        http://rubygems.org/gems/backports

data/VERSION

@@ -1 +1 @@
-1.99.1
+2.0.0.beta1

data/lib/sparql.rb

@@ -3,7 +3,7 @@ require 'sparql/extensions'
 ##
 # A SPARQL for RDF.rb.
 #
-# @see http://www.w3.org/TR/rdf-sparql-query
+# @see http://www.w3.org/TR/sparql11-query
 module SPARQL
   autoload :Algebra, 'sparql/algebra'
   autoload :Grammar, 'sparql/grammar'

data/lib/sparql/algebra.rb

@@ -348,7 +348,7 @@ module SPARQL
   # ====
   # * Operator#optimize needs to be completed and tested.
   # 
-  # @see http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
+  # @see http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
   module Algebra
     include RDF
 

data/lib/sparql/algebra/aggregate.rb

@@ -15,8 +15,6 @@ module SPARQL; module Algebra
     # Aggregates this operator accross its operands using
     # a solutions enumerable.
     #
-    # The first operand may be :distinct, in which case the result of applying the rest of the operands is uniqued before applying the expression.
-    #
     # @param  [Enumerable<RDF::Query::Solution>] solutions ([])
     #   an enumerable set of query solutions
     # @param [Hash{Symbol => Object}] options ({})
@@ -25,7 +23,6 @@ module SPARQL; module Algebra
     # @raise [TypeError]
     # @abstract
     def aggregate(solutions = [], options = {})
-      operands.shift if distinct = (operands.first == :distinct)
       args_enum = solutions.map do |solution|
         operands.map do |operand|
           begin
@@ -36,7 +33,7 @@ module SPARQL; module Algebra
           end
         end.compact
       end
-      apply(distinct ? args_enum.uniq : args_enum)
+      apply(args_enum)
     end
 
     ##

data/lib/sparql/algebra/extensions.rb

@@ -66,7 +66,7 @@ class Array
   # @param  [Hash{Symbol => Object}] options
   # @raise [NotImplementedError]
   #   If an attempt is made to perform an unsupported operation
-  # @see    http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
+  # @see    http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
   def execute(queryable, options = {})
     raise NotImplementedError, "SPARQL::Algebra '#{first}' operator not implemented"
   end

data/lib/sparql/algebra/operator.rb

@@ -647,7 +647,7 @@ module SPARQL; module Algebra
     # @param  [RDF::Literal] literal
     # @return [RDF::Literal::Boolean] `true` or `false`
     # @raise  [TypeError] if the literal could not be coerced to an `RDF::Literal::Boolean`
-    # @see    http://www.w3.org/TR/rdf-sparql-query/#ebv
+    # @see    http://www.w3.org/TR/sparql11-query/#ebv
     def boolean(literal)
       case literal
         when FalseClass then RDF::Literal::FALSE

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

@@ -14,8 +14,8 @@ module SPARQL; module Algebra
       NAME = [:abs]
 
       ##
-      # Returns the absolute value of the operand. An error is raised if operand is not a numeric value
-      #
+      # Returns the absolute value of `arg`. An error is raised if `arg` is not a numeric value.
+      # 
       # @param  [RDF::Literal] operand
       #   the operand
       # @return [RDF::Literal] literal of same type

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

@@ -3,6 +3,10 @@ module SPARQL; module Algebra
     ##
     # The SPARQL Property Path `alt` (Alternative Property Path) operator.
     #
+    # Let P and Q be property path expressions.
+    #
+    #     eval(Path(X, alt(P,Q), Y)) = Union(eval(Path(X, P, Y)), eval(Path(X, Q, Y)))
+    #
     # @example
     #   (alt a b)
     #
@@ -28,7 +32,7 @@ module SPARQL; module Algebra
       #   each matching solution
       # @yieldparam  [RDF::Query::Solution] solution
       # @yieldreturn [void] ignored
-      # @see    http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
+      # @see    http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
       def execute(queryable, options = {}, &block)
         subject, object = options[:subject], options[:object]
         debug(options) {"Alt #{[subject, operands, object].to_sse}"}

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

@@ -7,8 +7,8 @@ module SPARQL; module Algebra
     #   (&& ?x ?y)
     #   (and ?x ?y)
     #
-    # @see http://www.w3.org/TR/rdf-sparql-query/#func-logical-and
-    # @see http://www.w3.org/TR/rdf-sparql-query/#evaluation
+    # @see http://www.w3.org/TR/sparql11-query/#func-logical-and
+    # @see http://www.w3.org/TR/sparql11-query/#evaluation
     class And < Operator::Binary
       include Evaluatable
 
@@ -29,10 +29,7 @@ module SPARQL; module Algebra
       end
 
       ##
-      # Returns the logical `AND` of the left operand and the right operand.
-      #
-      # Note that this operator operates on the effective boolean value
-      # (EBV) of its operands.
+      # Returns a logical `AND` of `left` and `right`. Note that logical-and operates on the effective boolean value of its arguments.
       #
       # @param  [RDF::Query::Solution] bindings
       #   a query solution containing zero or more variable bindings
@@ -53,7 +50,7 @@ module SPARQL; module Algebra
           right = nil
         end
 
-        # From http://www.w3.org/TR/rdf-sparql-query/#evaluation
+        # From http://www.w3.org/TR/sparql11-query/#evaluation
         # A logical-and that encounters an error on only one branch will return an error if the other branch is
         # TRUE and FALSE if the other branch is FALSE.
         case

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     #       (order ((asc ?name))
     #         (bgp (triple ?x foaf:name ?name)))))
     #
-    # @see http://www.w3.org/TR/rdf-sparql-query/#func-isLiteral
+    # @see http://www.w3.org/TR/sparql11-query/#modOrderBy
     class Asc < Operator::Unary
       include Evaluatable
 

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

@@ -3,12 +3,14 @@ module SPARQL; module Algebra
     ##
     # The SPARQL GraphPattern `ask` operator.
     #
+    # Applications can use the ASK form to test whether or not a query pattern has a solution. No information is returned about the possible query solutions, just whether or not a solution exists.
+    #
     # @example
     #   (prefix ((: <http://example/>))
     #     (ask
     #       (bgp (triple :x :p ?x))))
     #
-    # @see http://www.w3.org/TR/rdf-sparql-query/#ask
+    # @see http://www.w3.org/TR/sparql11-query/#ask
     class Ask < Operator::Unary
       include Query
       
@@ -26,7 +28,7 @@ module SPARQL; module Algebra
       # @yieldparam  [RDF::Query::Solution] solution
       # @yieldreturn [void] ignored
       # @return [RDF::Literal::Boolean]\
-      # @see    http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
+      # @see    http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
       def execute(queryable, options = {})
         debug(options) {"Ask #{operands.first}"}
         res = boolean(!queryable.query(operands.last, options.merge(depth: options[:depth].to_i + 1)).empty?)

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

@@ -7,7 +7,7 @@ module SPARQL; module Algebra
     #   (base <http://example.org/>
     #     (bgp (triple <a> <b> 123.0)))
     #
-    # @see http://www.w3.org/TR/rdf-sparql-query/#QSynIRI
+    # @see http://www.w3.org/TR/sparql11-query/#QSynIRI
     class Base < Binary
       include Query
       
@@ -28,7 +28,7 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Queryable, RDF::Query::Solutions]
       #   the resulting solution sequence
-      # @see    http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
+      # @see    http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
       def execute(queryable, options = {}, &block)
         debug(options) {"Base #{operands.first}"}
         Operator.base_uri = operands.first

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     #   (prefix ((: <http://example/>))
     #     (bgp (triple ?s ?p ?o)))
     #
-    # @see http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
+    # @see http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
     class BGP < Operator
       NAME = [:bgp]
       ##

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

@@ -3,6 +3,8 @@ module SPARQL; module Algebra
     ##
     # The SPARQL `bnode` operator.
     #
+    # The BNODE function constructs a blank node that is distinct from all blank nodes in the dataset being queried and distinct from all blank nodes created by calls to this constructor for other query solutions. If the no argument form is used, every call results in a distinct blank node. If the form with a simple literal is used, every call results in distinct blank nodes for different simple literals, and the same blank node for calls with the same simple literal within expressions for one solution mapping.
+    #
     # @example
     #     (prefix ((: <http://example.org/>)
     #              (xsd: <http://www.w3.org/2001/XMLSchema#>))

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

@@ -11,7 +11,7 @@ module SPARQL; module Algebra
     #           (bgp (triple ?a :b ?c))
     #           (bgp (triple ?c :d ?e))))))
     #
-    # @see http://www.w3.org/TR/rdf-sparql-query/#func-bound
+    # @see http://www.w3.org/TR/sparql11-query/#func-bound
     class Bound < Operator::Unary
       include Evaluatable
 
@@ -30,8 +30,7 @@ module SPARQL; module Algebra
       end
 
       ##
-      # Returns `true` if the operand is a variable that is bound to a
-      # value in the given `bindings`, `false` otherwise.
+      # Returns `true` if `var` is bound to a value. Returns false otherwise. Variables with the value NaN or INF are considered bound.
       #
       # @param  [RDF::Query::Solution] bindings
       #   a query solution containing zero or more variable bindings

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

@@ -14,7 +14,7 @@ module SPARQL; module Algebra
       NAME = [:ceil]
 
       ##
-      # Returns the smallest (closest to negative infinity) number with no fractional part that is not less than the value of arg. An error is raised if arg is not a numeric value.
+      # Returns the smallest (closest to negative infinity) number with no fractional part that is not less than the value of `arg`. An error is raised if `arg` is not a numeric value.
       #
       # @param  [RDF::Literal] operand
       #   the operand

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

@@ -3,8 +3,6 @@ module SPARQL; module Algebra
     ##
     # The SPARQL `coalesce` function.
     #
-    # Used for filters with more than one expression.
-    #
     # @example
     #     (prefix ((: <http://example.org/>)
     #              (xsd: <http://www.w3.org/2001/XMLSchema#>))
@@ -25,9 +23,8 @@ module SPARQL; module Algebra
 
       ##
       # The COALESCE function form returns the RDF term value of the first expression that evaluates without error. In SPARQL, evaluating an unbound variable raises an error.
-      # 
+      #
       # If none of the arguments evaluates to an RDF term, an error is raised. If no expressions are evaluated without error, an error is raised.
-      # 
       #
       # @example
       #   Suppose ?x = 2 and ?y is not bound in some query solution:

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

@@ -6,7 +6,7 @@ module SPARQL; module Algebra
     # @example
     #   (<=> ?x ?y)
     #
-    # @see http://www.w3.org/TR/rdf-sparql-query/#OperatorMapping
+    # @see http://www.w3.org/TR/sparql11-query/#OperatorMapping
     # @see http://www.w3.org/TR/xpath-functions/#func-compare
     class Compare < Operator::Binary
       include Evaluatable
@@ -33,8 +33,8 @@ module SPARQL; module Algebra
       # @raise  [TypeError] if either operand is not a literal
       def apply(left, right)
         case
-        # @see http://www.w3.org/TR/rdf-sparql-query/#OperatorMapping
-        # @see http://www.w3.org/TR/rdf-sparql-query/#modOrderBy
+        # @see http://www.w3.org/TR/sparql11-query/#OperatorMapping
+        # @see http://www.w3.org/TR/sparql11-query/#modOrderBy
         when left.is_a?(RDF::Literal) && right.is_a?(RDF::Literal)
           case
           # @see http://www.w3.org/TR/xpath-functions/#string-compare

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

@@ -3,6 +3,8 @@ module SPARQL; module Algebra
     ##
     # A SPARQL `concat` operator.
     #
+    # The CONCAT function corresponds to the XPath fn:concat function. The function accepts string literals as arguments.
+    #
     # @example
     #   (concat ?a ?b ...)
     #
@@ -14,7 +16,7 @@ module SPARQL; module Algebra
       NAME = :concat
 
       ##
-      # The lexical form of the returned literal is obtained by concatenating the lexical forms of its inputs. If all input literals are typed literals of type xsd:string, then the returned literal is also of type xsd:string, if all input literals are plain literals with identical language tag, then the returned literal is a plain literal with the same language tag, in all other cases, the returned literal is a simple literal.
+      # The lexical form of the returned literal is obtained by concatenating the lexical forms of its inputs. If all input literals are typed literals of type xsd:string, then the returned literal is also of type `xsd:string`, if all input literals are plain literals with identical language tag, then the returned literal is a plain literal with the same language tag, in all other cases, the returned literal is a simple literal.
       #
       # @example
       #     concat("foo", "bar")                         #=> "foobar"

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

@@ -3,6 +3,8 @@ module SPARQL; module Algebra
     ##
     # The SPARQL GraphPattern `construct` operator.
     #
+    # The CONSTRUCT query form returns a single RDF graph specified by a graph template. The result is an RDF graph formed by taking each query solution in the solution sequence, substituting for the variables in the graph template, and combining the triples into a single RDF graph by set union.
+    #
     # @example
     #   (prefix ((rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>)
     #            (foaf: <http://xmlns.com/foaf/0.1/>))
@@ -10,7 +12,7 @@ module SPARQL; module Algebra
     #       (project (?s ?p ?o)
     #         (bgp (triple ?s ?p ?o)))))
     #
-    # @see http://www.w3.org/TR/rdf-sparql-query/#ask
+    # @see http://www.w3.org/TR/sparql11-query/#construct
     class Construct < Operator::Binary
       include Query
       
@@ -20,10 +22,7 @@ module SPARQL; module Algebra
       # Executes this query on the given {RDF::Queryable} object.
       # Binds variables to the array of patterns in the first operand and returns the resulting RDF::Graph object
       #
-      # If any such instantiation produces a triple containing an unbound variable or an illegal RDF construct,
-      # such as an RDF::Literal in _subject_ or _predicate_ position, then that triple is not included in the output RDF
-      # graph. The graph template can contain triples with no variables (known as ground or explicit triples),
-      # and these also appear in the output RDF graph returned by the CONSTRUCT query form.
+      # If any such instantiation produces a triple containing an unbound variable or an illegal RDF construct, such as a literal in subject or predicate position, then that triple is not included in the output RDF graph. The graph template can contain triples with no variables (known as ground or explicit triples), and these also appear in the output RDF graph returned by the CONSTRUCT query form.
       #
       # @param  [RDF::Queryable] queryable
       #   the graph or repository to query
@@ -35,7 +34,7 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Queryable]
       #   A Queryable with constructed triples
-      # @see    http://www.w3.org/TR/rdf-sparql-query/#construct
+      # @see    http://www.w3.org/TR/sparql11-query/#construct
       def execute(queryable, options = {}, &block)
         debug(options) {"Construct #{operands.first}, #{options.inspect}"}
         graph = RDF::Graph.new

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

@@ -14,7 +14,7 @@ module SPARQL; module Algebra
       NAME = :contains
 
       ##
-      # The CONTAINS function corresponds to the XPath fn:contains. The arguments must be argument compatible otherwise an error is raised.
+      # The `CONTAINS` function corresponds to the XPath fn:contains. The arguments must be argument compatible otherwise an error is raised.
       #
       # @example
       #    contains("foobar", "bar") #=> true

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     # @example
     #   (copy silent <iri> to default)
     #
-    # @see hhttp://www.w3.org/TR/sparql11-update/#copy
+    # @see http://www.w3.org/TR/sparql11-update/#copy
     class Copy < Operator
       include SPARQL::Algebra::Update
 

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

@@ -102,7 +102,7 @@ module SPARQL; module Algebra
     #         (graph ?g (bgp (triple ?s ?p ?o))))))
     #
     # @example Dataset with multiple named graphs
-    # @see http://www.w3.org/TR/rdf-sparql-query/#specifyingDataset
+    # @see http://www.w3.org/TR/sparql11-query/#specifyingDataset
     class Dataset < Binary
       include Query
 
@@ -125,7 +125,7 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
-      # @see    http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
+      # @see    http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
       def execute(queryable, options = {}, &base)
         debug(options) {"Dataset"}
         default_datasets = []

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

@@ -11,7 +11,7 @@ module SPARQL; module Algebra
     #       (filter (= (datatype (xsd:double ?v)) xsd:double)
     #         (bgp (triple ?s :p ?v)))))
     #
-    # @see http://www.w3.org/TR/rdf-sparql-query/#func-datatype
+    # @see http://www.w3.org/TR/sparql11-query/#func-datatype
     class Datatype < Operator::Unary
       include Evaluatable
 

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

@@ -16,7 +16,7 @@ module SPARQL; module Algebra
       NAME = :day
 
       ##
-      # Returns the day part of arg as an integer.
+      # Returns the day part of `arg` as an integer.
       #
       # @param  [RDF::Literal] operand
       #   the operand

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     #       (order ((desc ?name))
     #         (bgp (triple ?x foaf:name ?name)))))
     #
-    # @see http://www.w3.org/TR/rdf-sparql-query/#func-isLiteral
+    # @see http://www.w3.org/TR/sparql11-query/#modOrderBy
     class Desc < Operator::Asc
       NAME = :desc
     end # Desc

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #     (describe (?x)
     #       (bgp (triple ?x exOrg:employeeId "1234"))))
     #
-    # @see http://www.w3.org/TR/rdf-sparql-query/#describe
+    # @see http://www.w3.org/TR/sparql11-query/#describe
     class Describe < Operator::Binary
       include Query
       
@@ -39,7 +39,7 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Graph]
       #   containing the constructed triples
-      # @see    http://www.w3.org/TR/rdf-sparql-query/#describe
+      # @see    http://www.w3.org/TR/sparql11-query/#describe
       def execute(queryable, options = {}, &block)
         debug(options) {"Describe #{operands.first}, #{options.inspect}"}