rdf-virtuoso 0.0.13 → 0.0.14

data/README.md

@@ -37,21 +37,24 @@ New prefixes can either extend the RDF::Vocabulary class (best if you want to mo
 
     module RDF
       class FOO < RDF::Vocabulary("http://purl.org/ontology/foo/");end
+      class BAR < RDF::Vocabulary("http://bar.net#");end
     end
 
-it can then be easily accessed by RDF::FOO, eg. 
+it can then be easily accessed by RDF superclass, eg. 
 
     RDF::FOO.Document
+    => #<RDF::URI:0x4d273ec(http://purl.org/ontology/foo/Document)> 
+    RDF::BAR.telescope
+    => #<RDF::URI:0x4d294ee(http://bar.net#telescope)> 
 
-or you can use the RDF::Virtuoso::Prefixes class in a query:
+or you can dynamically add RDF::Vocabulary objects
 
-    prefixes = RDF::Virtuoso::Prefixes.new foo: "http://purl.org/ontology/foo/", bar: "http://bar.net"
+    foo = RDF::Vocabulary.new("http://purl.org/ontology/foo/")
 
     QUERY  = RDF::Virtuoso::Query
     graph  = RDF::URI.new("http://test.com")
-    type   =  RDF::FOO.Document
 
-    query  = QUERY.select.where([:s, type, :o]).count(:s).prefixes(prefixes).graph(graph)
+    query  = QUERY.select.where([:s, foo.bar, :o]).count(:s).graph(graph)
     result = repo.select(query)
     
 Results will be an array of RDF::Query::Solution that can be accessed by bindings or iterated

data/lib/active_rdf/persistence.rb

@@ -77,6 +77,7 @@ module ActiveRDF
         all(limit: 1).first
       end
 
+      # What does this do?
       def execute(sql)
         results = []
         solutions = connection.select(sql)

data/lib/active_rdf/version.rb

@@ -2,7 +2,7 @@ module ActiveRDF
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 13
+    TINY  = 14
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/rdf/virtuoso/query.rb

@@ -306,15 +306,17 @@ module RDF::Virtuoso
     ## SPARQL 1.1 Aggregates
     # @return [Query]
     # @see    http://www.w3.org/TR/sparql11-query/#defn_aggCount
-   # def count(*variables)
-   #   options[:count] = variables
-   #   self
-   # end
+    # def count(*variables)
+    #   options[:count] = variables
+    #   self
+    # end
     AGG_METHODS  = %w(count min max sum avg sample group_concat group_digest)
     
     AGG_METHODS.each do |m|
       define_method m do |*variables|
-        options[m.to_sym] = variables
+        #options[m.to_sym] = variables
+        options[m.to_sym] ||= []
+        options[m.to_sym] += variables
         self
       end
     end
@@ -467,24 +469,50 @@ module RDF::Virtuoso
         aggregates = [:count, :min, :max, :avg, :sum, :sample, :group_concat, :group_digest]
         if (options.keys & aggregates).any?
           (options.keys & aggregates).each do |agg|
+#p options[agg]
             case agg
             when :sample
-              buffer << '(sql:' + agg.to_s.upcase
-              buffer << options[agg].map { |var| var.is_a?(String) ? var : "(?#{var})" }
-            when :group_concat, :group_digest
-              buffer << '(sql:' + agg.to_s.upcase
-              buffer << options[agg].map { |var| var.is_a?(Symbol) ? "(?#{var}" : "'#{var}'"}.join(', ')
-              buffer << ')'
-            else  
-              buffer << '(' + agg.to_s.gsub('_', ' ').upcase
-              buffer << options[agg].map { |var| var.is_a?(String) ? var : "(?#{var})" }
+              # multiple samples splits to individual sample expressions
+              options[agg].each_slice(1) do |a|
+                buffer << '(sql:' + agg.to_s.upcase
+                a.map do |var| 
+                  buffer << (var.is_a?(String) ? var : "(?#{var})")
+                  buffer << "AS ?#{var})"
+                end
+              end
+            when :group_concat
+              # multiple samples splits to individual sample expressions
+              options[agg].each_slice(2) do |a|
+                buffer << '(sql:' + agg.to_s.upcase
+                buffer << a.map {|var| (var.is_a?(Symbol) ? "(?#{var}" : var.is_a?(String) ? "'#{var}'" : var )}.join(', ')
+                buffer << ') AS ?' + a.first.to_s + ')'
+              end
+            when :group_digest
+              # multiple samples splits to individual sample expressions
+              options[agg].each_slice(4) do |a|
+                buffer << '(sql:' + agg.to_s.upcase
+                buffer << a.map {|var| (var.is_a?(Symbol) ? "(?#{var}" : var.is_a?(String) ? "'#{var}'" : var )}.join(', ')
+                buffer << ') AS ?' + a.first.to_s + ')'
+              end              
+            else
+              # multiple samples splits to individual sample expressions
+              options[agg].each_slice(1) do |a|
+                buffer << '(' + agg.to_s.upcase
+                a.map do |var| 
+                  buffer << (var.is_a?(String) ? var : "(?#{var})")
+                  buffer << "AS ?#{var})"
+                end
+              end
             end
-            
-            buffer << 'AS ?' + agg.to_s + ')'
+            #
           end
+          # also handle variables that are not aggregates
+          buffer << values.map { |v| serialize_value(v[1]) }.join(' ') unless values.empty?
         else
+          # no variables? select/describe all (*)
           buffer << (values.empty? ? '*' : values.map { |v| serialize_value(v[1]) }.join(' '))
         end
+        
       when :construct
         buffer << '{'
         buffer += serialize_patterns(@data_values)
@@ -512,7 +540,7 @@ module RDF::Virtuoso
         buffer << '}'          
         
       when :delete_data
-        buffer << "FROM #{serialize_value(options[:graph])}" #if options[:graph]
+        buffer << "FROM #{serialize_value(options[:graph])}" if options[:graph]
         buffer << '{'
         @data_values.each do |triple|
           if triple.first.first.is_a?(RDF::Statement)
@@ -549,7 +577,8 @@ module RDF::Virtuoso
         # does patterns have :context hash? build with GRAPH statement
         if patterns.any? { |p| p.has_context? }
           patterns.each do | pattern|
-            buffer << "GRAPH #{serialize_value(RDF::URI(pattern.context))} {"
+            buffer << "GRAPH #{serialize_value(RDF::URI(pattern.context))}" if pattern.context
+            buffer << '{'
             buffer << serialize_patterns(pattern)
             buffer << '}'
           end
@@ -560,7 +589,18 @@ module RDF::Virtuoso
         if options[:optionals]
           options[:optionals].each do |patterns|
             buffer << 'OPTIONAL {'
-            buffer += serialize_patterns(patterns)
+            
+	        if patterns.any? { |p| p.has_context? }
+	          patterns.each do | pattern|
+	            buffer << "GRAPH #{serialize_value(RDF::URI(pattern.context))}" if pattern.context
+                buffer << '{'
+	            buffer << serialize_patterns(pattern)
+	            buffer << '}'
+	          end
+	        else
+	          buffer += serialize_patterns(patterns)
+	        end
+            
             buffer << '}'
           end
         end
@@ -568,7 +608,18 @@ module RDF::Virtuoso
         if options[:minuses]
           options[:minuses].each do |patterns|
             buffer << 'MINUS {'
-            buffer += serialize_patterns(patterns)
+
+	        if patterns.any? { |p| p.has_context? }
+	          patterns.each do | pattern|
+	            buffer << "GRAPH #{serialize_value(RDF::URI(pattern.context))}" if pattern.context
+                buffer << '{'
+	            buffer << serialize_patterns(pattern)
+	            buffer << '}'
+	          end
+	        else
+	          buffer += serialize_patterns(patterns)
+	        end
+
             buffer << '}'
           end
         end

data/lib/rdf/virtuoso/version.rb

@@ -1,5 +1,5 @@
 module RDF
   module Virtuoso
-    VERSION = "0.0.13"
+    VERSION = "0.0.14"
   end
 end

data/spec/query_spec.rb

@@ -83,7 +83,14 @@ describe RDF::Virtuoso::Query do
       statements = [RDF::Statement.new(RDF::URI('http://test'), RDF.type, RDF::URI('http://type')), RDF::Statement.new(RDF::URI('http://test'), RDF.type, RDF::URI('http://type2'))]
       @query.delete_data(statements).graph(RDF::URI.new(@graph)).to_s.should == "DELETE DATA FROM <#{@graph}> { <http://test> <#{RDF.type}> <http://type> .\n <http://test> <#{RDF.type}> <http://type2> .\n }"
     end
-    
+
+    it "should support DELETE DATA queries with appendable objects" do
+      statements = []
+      statements << RDF::Statement.new(RDF::URI('http://test'), RDF.type, RDF::URI('http://type'))
+      statements << RDF::Statement.new(RDF::URI('http://test'), RDF.type, RDF::URI('http://type2'))
+      @query.delete_data(statements).graph(RDF::URI.new(@graph)).to_s.should == "DELETE DATA FROM <#{@graph}> { <http://test> <#{RDF.type}> <http://type> .\n <http://test> <#{RDF.type}> <http://type2> .\n }"
+    end
+        
     it "should support DELETE WHERE queries with symbols and patterns" do
       @query.delete([:s, :p, :o]).graph(RDF::URI.new(@graph)).where([:s, :p, :o]).to_s.should == "DELETE FROM <#{@graph}> { ?s ?p ?o . } WHERE { ?s ?p ?o . }"
       @query.delete([:s, @uri.newtype, :o]).graph(RDF::URI.new(@graph)).where([:s, @uri.newtype, :o]).to_s.should == "DELETE FROM <#{@graph}> { ?s <#{@graph}newtype> ?o . } WHERE { ?s <#{@graph}newtype> ?o . }"
@@ -120,6 +127,11 @@ describe RDF::Virtuoso::Query do
       @query.select(:s, :p, :o).where([:s, :p, :o]).to_s.should == "SELECT ?s ?p ?o WHERE { ?s ?p ?o . }"
     end
 
+    it "should support SELECT from NAMED GRAPH" do
+      @graph = RDF::URI("http://example.org/")
+      @query.select(:s).where([:s, :p, :o]).from(@graph).to_s.should == "SELECT ?s FROM <#{@graph}> WHERE { ?s ?p ?o . }"
+    end
+    
     it "should support SELECT with complex WHERE patterns" do
       @query.select.where(
       [:s, :p, :o], 
@@ -161,27 +173,54 @@ describe RDF::Virtuoso::Query do
     end
 
     it "should support aggregate COUNT" do
-      @query.select.where([:s, :p, :o]).count(:s).to_s.should == "SELECT (COUNT (?s) AS ?count) WHERE { ?s ?p ?o . }"
-      @query.select.count(:s).where([:s, :p, :o]).to_s.should == "SELECT (COUNT (?s) AS ?count) WHERE { ?s ?p ?o . }"
+      @query.select.where([:s, :p, :o]).count(:s).to_s.should == "SELECT (COUNT (?s) AS ?s) WHERE { ?s ?p ?o . }"
+      @query.select.count(:s).where([:s, :p, :o]).to_s.should == "SELECT (COUNT (?s) AS ?s) WHERE { ?s ?p ?o . }"
     end
 
     it "should support aggregates SUM, MIN, MAX, AVG, SAMPLE, GROUP_CONCAT, GROUP_DIGEST" do
-      @query.select.where([:s, :p, :o]).sum(:s).to_s.should == "SELECT (SUM (?s) AS ?sum) WHERE { ?s ?p ?o . }"
-      @query.select.where([:s, :p, :o]).min(:s).to_s.should == "SELECT (MIN (?s) AS ?min) WHERE { ?s ?p ?o . }"
-      @query.select.where([:s, :p, :o]).max(:s).to_s.should == "SELECT (MAX (?s) AS ?max) WHERE { ?s ?p ?o . }"
-      @query.select.where([:s, :p, :o]).avg(:s).to_s.should == "SELECT (AVG (?s) AS ?avg) WHERE { ?s ?p ?o . }"
-      @query.select.where([:s, :p, :o]).sample(:s).to_s.should == "SELECT (sql:SAMPLE (?s) AS ?sample) WHERE { ?s ?p ?o . }"
-      @query.select.where([:s, :p, :o]).group_concat(:s, '_').to_s.should == "SELECT (sql:GROUP_CONCAT (?s, '_' ) AS ?group_concat) WHERE { ?s ?p ?o . }"
-      @query.select.where([:s, :p, :o]).group_digest(:s, '_', 1000, 1).to_s.should == "SELECT (sql:GROUP_DIGEST (?s, '_', '1000', '1' ) AS ?group_digest) WHERE { ?s ?p ?o . }"
+      @query.select.where([:s, :p, :o]).sum(:s).to_s.should == "SELECT (SUM (?s) AS ?s) WHERE { ?s ?p ?o . }"
+      @query.select.where([:s, :p, :o]).min(:s).to_s.should == "SELECT (MIN (?s) AS ?s) WHERE { ?s ?p ?o . }"
+      @query.select.where([:s, :p, :o]).max(:s).to_s.should == "SELECT (MAX (?s) AS ?s) WHERE { ?s ?p ?o . }"
+      @query.select.where([:s, :p, :o]).avg(:s).to_s.should == "SELECT (AVG (?s) AS ?s) WHERE { ?s ?p ?o . }"
+      @query.select.where([:s, :p, :o]).sample(:s).to_s.should == "SELECT (sql:SAMPLE (?s) AS ?s) WHERE { ?s ?p ?o . }"
+      @query.select.where([:s, :p, :o]).group_concat(:s, '_').to_s.should == "SELECT (sql:GROUP_CONCAT (?s, '_' ) AS ?s) WHERE { ?s ?p ?o . }"
+      @query.select.where([:s, :p, :o]).group_digest(:s, '_', 1000, 1).to_s.should == "SELECT (sql:GROUP_DIGEST (?s, '_', 1000, 1 ) AS ?s) WHERE { ?s ?p ?o . }"
+    end
+
+    it "should support multiple instances of SAMPLE" do
+      @query.select.where([:s, :p, :o]).sample(:s).sample(:p).to_s.should == "SELECT (sql:SAMPLE (?s) AS ?s) (sql:SAMPLE (?p) AS ?p) WHERE { ?s ?p ?o . }"
+    end
+
+    it "should support multiple instances of MIN/MAX/AVG/SUM" do
+      @query.select.where([:s, :p, :o]).min(:s).min(:p).to_s.should == "SELECT (MIN (?s) AS ?s) (MIN (?p) AS ?p) WHERE { ?s ?p ?o . }"
+      @query.select.where([:s, :p, :o]).max(:s).max(:p).to_s.should == "SELECT (MAX (?s) AS ?s) (MAX (?p) AS ?p) WHERE { ?s ?p ?o . }"
+      @query.select.where([:s, :p, :o]).avg(:s).avg(:p).to_s.should == "SELECT (AVG (?s) AS ?s) (AVG (?p) AS ?p) WHERE { ?s ?p ?o . }"      
+      @query.select.where([:s, :p, :o]).sum(:s).sum(:p).to_s.should == "SELECT (SUM (?s) AS ?s) (SUM (?p) AS ?p) WHERE { ?s ?p ?o . }"      
     end
     
+    it "should support multiple instances of GROUP_CONCAT" do
+      @query.select.where([:s, :p, :o]).group_concat(:s, '_').group_concat(:p, '-').to_s.should == "SELECT (sql:GROUP_CONCAT (?s, '_' ) AS ?s) (sql:GROUP_CONCAT (?p, '-' ) AS ?p) WHERE { ?s ?p ?o . }"
+    end
+
+    it "should support multiple instances of GROUP_DIGEST" do
+      @query.select.where([:s, :p, :o]).group_digest(:s, '_', 1000, 1).group_digest(:p, '-', 1000, 1).to_s.should == "SELECT (sql:GROUP_DIGEST (?s, '_', 1000, 1 ) AS ?s) (sql:GROUP_DIGEST (?p, '-', 1000, 1 ) AS ?p) WHERE { ?s ?p ?o . }"
+    end
+            
+    it "should support aggregates in addition to SELECT variables" do
+      @query.select(:s).where([:s, :p, :o]).group_digest(:o, '_', 1000, 1).to_s.should == "SELECT (sql:GROUP_DIGEST (?o, '_', 1000, 1 ) AS ?o) ?s WHERE { ?s ?p ?o . }"
+    end
+
+    it "should support multiple instances of aggregates AND select variables" do
+      @query.select(:s).where([:s, :p, :o]).sample(:p).sample(:o).to_s.should == "SELECT (sql:SAMPLE (?p) AS ?p) (sql:SAMPLE (?o) AS ?o) ?s WHERE { ?s ?p ?o . }"
+    end
+        
     it "should support ORDER BY" do
       @query.select.where([:s, :p, :o]).order_by(:o).to_s.should == "SELECT * WHERE { ?s ?p ?o . } ORDER BY ?o"
       @query.select.where([:s, :p, :o]).order_by('?o').to_s.should == "SELECT * WHERE { ?s ?p ?o . } ORDER BY ?o"
       # @query.select.where([:s, :p, :o]).order_by(:o => :asc).to_s.should == "SELECT * WHERE { ?s ?p ?o . } ORDER BY ?o ASC"
-      @query.select.where([:s, :p, :o]).order_by('?o ASC').to_s.should == "SELECT * WHERE { ?s ?p ?o . } ORDER BY ?o ASC"
+      @query.select.where([:s, :p, :o]).order_by('ASC(?o)').to_s.should == "SELECT * WHERE { ?s ?p ?o . } ORDER BY ASC(?o)"
       # @query.select.where([:s, :p, :o]).order_by(:o => :desc).to_s.should == "SELECT * WHERE { ?s ?p ?o . } ORDER BY ?o DESC"
-      @query.select.where([:s, :p, :o]).order_by('?o DESC').to_s.should == "SELECT * WHERE { ?s ?p ?o . } ORDER BY ?o DESC"
+      @query.select.where([:s, :p, :o]).order_by('DESC(?o)').to_s.should == "SELECT * WHERE { ?s ?p ?o . } ORDER BY DESC(?o)"
     end
 
     it "should support OFFSET" do
@@ -197,6 +236,8 @@ describe RDF::Virtuoso::Query do
       @query.select.where([:s, :p, :o]).slice(100, 10).to_s.should == "SELECT * WHERE { ?s ?p ?o . } OFFSET 100 LIMIT 10"
     end
 
+#  DEPRECATED - USE RDF::Vocabulary instead
+=begin
     it "should support PREFIX" do
       prefixes = ["dc: <http://purl.org/dc/elements/1.1/>", "foaf: <http://xmlns.com/foaf/0.1/>"]
       @query.select.prefix(prefixes[0]).prefix(prefixes[1]).where([:s, :p, :o]).to_s.should ==
@@ -214,12 +255,32 @@ describe RDF::Virtuoso::Query do
       @query.select.prefixes(prefixes).where([:s, :p, :o]).to_s.should ==
         "PREFIX foo: <http://foo.com/> PREFIX bar: <http://bar.net> SELECT * WHERE { ?s ?p ?o . }"
     end
+
+    it "should support accessing custom PREFIXes in SELECT" do
+      prefixes = RDF::Virtuoso::Prefixes.new foo: "http://foo.com/"
+      @query.select.where(['foo:bar', :p, :o]).prefixes(prefixes).to_s.should ==
+        "PREFIX foo: <http://foo.com/bar> SELECT * WHERE { ?s ?p ?o . }"
+    end
+=end  
+
+    it "should support using custom RDF::Vocabulary prefixes" do
+      BIBO = RDF::Vocabulary.new("http://purl.org/ontology/bibo/")
+      @query.select.where([:s, :p, BIBO.Document]).to_s.should ==
+        "SELECT * WHERE { ?s ?p <http://purl.org/ontology/bibo/Document> . }"
+    end
     
     it "should support OPTIONAL" do
       @query.select.where([:s, :p, :o]).optional([:s, RDF.type, :o], [:s, RDF::DC.abstract, :o]).to_s.should ==
         "SELECT * WHERE { ?s ?p ?o . OPTIONAL { ?s <#{RDF.type}> ?o . ?s <#{RDF::DC.abstract}> ?o . } }"
     end
 
+    it "should support OPTIONAL with GRAPH contexts" do
+      @graph1 = "http://example1.org/"
+      @graph2 = "http://example2.org/"
+      @query.select.where([:s, :p, :o, :context => @graph1]).optional([:s, RDF.type, RDF::DC.Document, :context => @graph2]).to_s.should == 
+        "SELECT * WHERE { GRAPH <#{@graph1}> { ?s ?p ?o . } OPTIONAL { GRAPH <#{@graph2}> { ?s <#{RDF.type}> <#{RDF::DC.Document}> . } } }"
+    end
+    
     it "should support multiple OPTIONALs" do
       @query.select.where([:s, :p, :o]).optional([:s, RDF.type, :o]).optional([:s, RDF::DC.abstract, :o]).to_s.should ==
         "SELECT * WHERE { ?s ?p ?o . OPTIONAL { ?s <#{RDF.type}> ?o . } OPTIONAL { ?s <#{RDF::DC.abstract}> ?o . } }"
@@ -234,7 +295,13 @@ describe RDF::Virtuoso::Query do
       @query.select.where([:s, :p, :o]).minus([:s, RDF.type, :o]).minus([:s, RDF::DC.abstract, :o]).to_s.should ==
         "SELECT * WHERE { ?s ?p ?o . MINUS { ?s <#{RDF.type}> ?o . } MINUS { ?s <#{RDF::DC.abstract}> ?o . } }"
     end
-    
+
+    it "should support MINUS with a GRAPH context" do
+      @graph1 = "http://example1.org/"
+      @query.select.where([:s, :p, :o]).minus([:s, RDF.type, :o, :context => @graph1]).to_s.should ==
+        "SELECT * WHERE { ?s ?p ?o . MINUS { GRAPH <#{@graph1}> { ?s <#{RDF.type}> ?o . } } }"
+    end
+        
     it "should support UNION" do
       @query.select.where([:s, RDF::DC.abstract, :o]).union([:s, RDF.type, :o]).to_s.should ==
       "SELECT * WHERE { { ?s <#{RDF::DC.abstract}> ?o . } UNION { ?s <#{RDF.type}> ?o . } }"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-virtuoso
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-18 00:00:00.000000000 Z
+date: 2012-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -197,25 +197,25 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/active_rdf.rb
+- lib/rdf/virtuoso.rb
 - lib/rdf/virtuoso/version.rb
-- lib/rdf/virtuoso/query.rb
+- lib/rdf/virtuoso/parser.rb
 - lib/rdf/virtuoso/prefixes.rb
 - lib/rdf/virtuoso/repository.rb
-- lib/rdf/virtuoso/parser.rb
-- lib/rdf/virtuoso.rb
-- lib/active_rdf/persistence.rb
-- lib/active_rdf/reflections.rb
+- lib/rdf/virtuoso/query.rb
+- lib/active_rdf.rb
 - lib/active_rdf/version.rb
-- lib/active_rdf/errors.rb
+- lib/active_rdf/reflections.rb
 - lib/active_rdf/association_reflection.rb
-- lib/active_rdf/exceptions.rb
+- lib/active_rdf/persistence.rb
+- lib/active_rdf/errors.rb
 - lib/active_rdf/model.rb
+- lib/active_rdf/exceptions.rb
 - spec/repository_spec.rb
-- spec/prefixes_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb
 - spec/active_rdf/persistence_spec.rb
+- spec/prefixes_spec.rb
 homepage: https://github.com/digibib/rdf-virtuoso
 licenses: []
 post_install_message: