sparql 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0f0674def56366f986d2d91cf7777c16552d64b
-  data.tar.gz: 2ccb0b9d631516cc71c0482d074bb65945af1ad6
+  metadata.gz: 82e194c49c69133eb481e0402d00491cc069f9a7
+  data.tar.gz: 97d91d9ec9a9c239af05db0d3703c848e876fcac
 SHA512:
-  metadata.gz: 4be041a007b6fd78818f5c9188744f081f3d1c321aed9e49629e48760d6b9531c01918fa690f3580fd7fac0c8d32f82e9dd870f8e45f3a0e775273fe971a49fe
-  data.tar.gz: e1dba08317fec9abe5051428628613c6a8761e7f4f6c6889b17eeab821c2a9b868d3567914a1a598517a443eddfbb118552c8a72e84d8bf8a1f7d9bd2986ef70
+  metadata.gz: 22821faf2d2545126f0c29f23b0a0395ddc1d183eefaf5adb5ef630357ed2e861097b0e643335254673989955352abe526bc87580ecc66cefc94ad8d9cb1485b
+  data.tar.gz: 44ac7ac772aa4b90047275079d85f93520d14b6216471cf8f358f7b9759cd9ad6163cc8eea747fba56365abfceae723a35319015129e727301f299fddd638a48

data/VERSION

@@ -1 +1 @@
-2.0.0.beta1
+2.0.0.beta2

data/lib/sparql/algebra/aggregate.rb

@@ -15,6 +15,8 @@ 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 ({})
@@ -23,6 +25,7 @@ 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
@@ -33,7 +36,7 @@ module SPARQL; module Algebra
           end
         end.compact
       end
-      apply(args_enum)
+      apply(distinct ? args_enum.uniq : args_enum)
     end
 
     ##

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

@@ -18,8 +18,9 @@ module SPARQL; module Algebra
       include Aggregate
 
       NAME = :group_concat
+
       ##
-      # One or two operands, the second operand, if it exists, is a separator, defaulting to ' '.
+      # One, two or three operands, the first may be `distinct`, the last operand, if it exists, is a separator, defaulting to ' '.
       #
       # @param  [Enumerable<RDF::Query::Solution>] solutions ([])
       #   an enumerable set of query solutions
@@ -29,6 +30,7 @@ module SPARQL; module Algebra
       # @raise [TypeError]
       # @abstract
       def aggregate(solutions = [], options = {})
+        operands.shift if distinct = (operands.first == :distinct)
         sep = operands.length == 2 ? operand(0).last : RDF::Literal(' ')
         args_enum = solutions.map do |solution|
           begin
@@ -38,10 +40,9 @@ module SPARQL; module Algebra
             nil
           end
         end
-        apply(args_enum, sep)
+        apply(distinct ? args_enum.uniq : args_enum, sep)
       end
 
-
       ##
       # GroupConcat is a set function which performs a string concatenation across the values of an expression with a group. The order of the strings is not specified. The separator character used in the concatenation may be given with the scalar argument SEPARATOR.
       #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf