rdf-virtuoso 0.1.1 → 0.1.2

data/lib/rdf/virtuoso/query.rb

@@ -266,6 +266,13 @@ module RDF::Virtuoso
       self
     end
 
+    # @param RDF::URI uri
+    # @return [Query]
+    def from_named(uri)
+      options[:from_named] = uri
+      self
+    end
+
     # @param RDF::URI uri
     # @return [Query]
     def graph(uri)
@@ -284,6 +291,25 @@ module RDF::Virtuoso
 
     alias_method :whether, :where
 
+    ##
+    # @param  [Array<RDF::Query::Pattern, Array>] patterns
+    # @return [Query]
+    # Group is a non-SPARQL function. It works same as where, but groups the
+    # patterns within brackets: { }, allowing to structure the query.
+    def group(*patterns)
+      @patterns += [Pattern.new(:start_group_pattern)] + build_patterns(patterns) + [Pattern.new(:end_group_pattern)]
+      self
+    end
+
+    ##
+    # @param RDF::URI uri
+    # @return [Query]
+    # Inline version of graph
+    def graph2(uri)
+      @patterns += [Pattern.new(:graph_statement, uri)]
+      self
+    end
+
     ##
     # @param  [Array<Symbol, String>] variables
     # @return [Query]
@@ -310,7 +336,7 @@ module RDF::Virtuoso
       options[:reduced] = state
       self
     end
-    
+
     ## SPARQL 1.1 Aggregates
     # @return [Query]
     # @see    http://www.w3.org/TR/sparql11-query/#defn_aggCount
@@ -577,40 +603,42 @@ module RDF::Virtuoso
       end
 
       buffer << "FROM #{serialize_value(options[:from])}" if options[:from]
+      buffer << "FROM NAMED #{serialize_value(options[:from_named])}" if options[:from_named]
+
 
       unless patterns.empty? && ([:describe, :insert_data, :delete_data, :create, :clear, :drop].include?(form))
         buffer << 'WHERE {'
-        
+
         buffer << '{' if options[:unions]
-        
+
         # iterate patterns
         # 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))}" if pattern.context
+        patterns.each do | pattern|
+          if pattern.context
+            buffer << "GRAPH #{serialize_value(RDF::URI(pattern.context))}"
             buffer << '{'
             buffer << serialize_patterns(pattern)
             buffer << '}'
+          else
+            buffer << serialize_patterns(pattern)
           end
-        else
-          buffer += serialize_patterns(patterns)
         end
-         
+
         if options[:optionals]
           options[:optionals].each do |patterns|
             buffer << 'OPTIONAL {'
-            
-	        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
-            
+
+	        patterns.each do | pattern|
+          if pattern.context
+            buffer << "GRAPH #{serialize_value(RDF::URI(pattern.context))}"
+            buffer << '{'
+            buffer << serialize_patterns(pattern)
+            buffer << '}'
+          else
+            buffer << serialize_patterns(pattern)
+          end
+        end
+
             buffer << '}'
           end
         end
@@ -619,21 +647,21 @@ module RDF::Virtuoso
           options[:minuses].each do |patterns|
             buffer << 'MINUS {'
 
-	        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
+	        patterns.each do | pattern|
+          if pattern.context
+            buffer << "GRAPH #{serialize_value(RDF::URI(pattern.context))}"
+            buffer << '{'
+            buffer << serialize_patterns(pattern)
+            buffer << '}'
+          else
+            buffer << serialize_patterns(pattern)
+          end
+        end
 
             buffer << '}'
           end
         end
-                
+
         if options[:filters]
           buffer += options[:filters].map { |filter| "FILTER(#{filter})" }
         end
@@ -666,7 +694,15 @@ module RDF::Virtuoso
     # @private
     def serialize_patterns(patterns)
       if patterns.is_a?(RDF::Query::Pattern)
-        patterns.to_triple.map { |v| serialize_value(v) }.join(' ') << " ."
+        if patterns.variables[:start_group_pattern]
+          "{"
+        elsif patterns.variables[:end_group_pattern]
+          "}"
+        elsif patterns.variables[:graph_statement]
+          "GRAPH #{serialize_value(patterns[1])}"
+        else
+          patterns.to_triple.map { |v| serialize_value(v) }.join(' ') << " ."
+        end
       else
         patterns.map do |p|
           p.to_triple.map { |v| serialize_value(v) }.join(' ') << " ."

data/lib/rdf/virtuoso/version.rb

@@ -1,5 +1,5 @@
 module RDF
   module Virtuoso
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/spec/query_spec.rb

@@ -126,26 +126,34 @@ 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
+    it "should support SELECT FROM" 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 FROM and FROM NAMED" do
+      @graph1 = RDF::URI("a")
+      @graph2 = RDF::URI("b")
+      @query.select(:s).where([:s, :p, :o, :context => @graph2]).from(@graph1).from_named(@graph2).to_s.should ==
+        "SELECT ?s FROM <#{@graph1}> FROM NAMED <#{@graph2}> WHERE { GRAPH <#{@graph2}> { ?s ?p ?o . } }"
+    end
+
+
     it "should support SELECT with complex WHERE patterns" do
       @query.select.where(
-      [:s, :p, :o], 
+      [:s, :p, :o],
       [:s, RDF.type, RDF::DC.Document]
-      ).to_s.should == 
+      ).to_s.should ==
         "SELECT * WHERE { ?s ?p ?o . ?s <#{RDF.type}> <#{RDF::DC.Document}> . }"
     end
 
     it "should support SELECT WHERE patterns from different GRAPH contexts" do
       @graph1 = "http://example1.org/"
       @graph2 = "http://example2.org/"
-      @query.select.where([:s, :p, :o, :context => @graph1],[:s, RDF.type, RDF::DC.Document, :context => @graph2]).to_s.should == 
+      @query.select.where([:s, :p, :o, :context => @graph1],[:s, RDF.type, RDF::DC.Document, :context => @graph2]).to_s.should ==
         "SELECT * WHERE { GRAPH <#{@graph1}> { ?s ?p ?o . } GRAPH <#{@graph2}> { ?s <#{RDF.type}> <#{RDF::DC.Document}> . } }"
     end
-        
+
     it "should support string objects in SPARQL queries" do
       @query.select.where([:s, :p, "dummyobject"]).to_s.should == "SELECT * WHERE { ?s ?p \"dummyobject\" . }"
     end
@@ -322,7 +330,19 @@ describe RDF::Virtuoso::Query do
       @query.select.where([:s, RDF::DC.abstract, :o]).define(define).to_s.should ==
       "DEFINE #{define} SELECT * WHERE { ?s <#{RDF::DC.abstract}> ?o . }"
     end
-        
+
+    it "should support grouping graph patterns within brackets" do
+      @query.select.where.group([:s, :p, :o],[:s2, :p2, :o2]).
+        where([:s3, :p3, :o3]).to_s.should ==
+      "SELECT * WHERE { { ?s ?p ?o . ?s2 ?p2 ?o2 . } ?s3 ?p3 ?o3 . }"
+    end
+
+    it "should support grouping with several graph statements" do
+      @query.select.where.graph2(RDF::URI.new("a")).group([:s, :p, :o],[:s2, :p2, :o2]).
+        where.graph2(RDF::URI.new("b")).group([:s3, :p3, :o3]).to_s.should ==
+        "SELECT * WHERE { GRAPH <a> { ?s ?p ?o . ?s2 ?p2 ?o2 . } GRAPH <b> { ?s3 ?p3 ?o3 . } }"
+    end
+
   end
 
   context "when building DESCRIBE queries" do

data/spec/spec_helper.rb

@@ -1,12 +1,3 @@
 require 'rdf/spec'
 require 'rdf'
-require 'rdf/virtuoso'
-#require 'active_rdf'
-require 'vcr'
-
-VCR.configure do |c|
-  c.cassette_library_dir = 'fixtures/cassettes'
-  c.hook_into :webmock
-end
-
-Dir[File.expand_path('../../spec/support/**/*.rb', File.path(__FILE__))].each { |f| require f }
+require 'rdf/virtuoso'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-virtuoso
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: api_smith
   requirement: !ruby/object:Gem::Requirement