updated to RDF.rb 1.1

Author: bensinober

lib/rdf/virtuoso/query.rb

@@ -476,10 +476,10 @@ def result
 
     ##
     # @return [Object]
-    def execute
+    # def execute
       #query
       #raise NotImplementedError
-    end
+    # end
 
     ##
     # Returns the string representation of this query.

lib/rdf/virtuoso/repository.rb

@@ -25,7 +25,7 @@ class ServerError < StandardError; end
 
       attr_reader :uri, :update_uri, :username, :password, :auth_method
 
-      def initialize(uri, opts={})
+      def initialize(uri, opts={}, &block)
         @uri             = URI.parse(uri)
         @update_uri      = URI.parse(opts[:update_uri]) if opts[:update_uri]
         @base_uri        = "#{@uri.scheme}://#{@uri.host}"
@@ -54,7 +54,7 @@ def initialize(uri, opts={})
           response = api_post *args
         end
       end
-
+      
       private
 
       def check_response_errors(response)

lib/rdf/virtuoso/version.rb

@@ -1,5 +1,5 @@
 module RDF
   module Virtuoso
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

rdf-virtuoso.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'rspec', '~> 2.14.1'
-  s.add_development_dependency 'rdf-spec', '~> 1.0.9'
+  s.add_development_dependency 'rdf-spec', '~> 1.1.0'
 
-  s.add_runtime_dependency 'rdf', '~> 1.0.10.2'
+  s.add_runtime_dependency 'rdf', '~> 1.1.0'
   s.add_runtime_dependency 'httparty', '~> 0.12.0'
   s.add_runtime_dependency 'api_smith', '~> 1.3.0'
 

spec/query_spec.rb

@@ -149,16 +149,16 @@
     it "should support SELECT with complex WHERE patterns" do
       @query.select.where(
       [:s, :p, :o],
-      [:s, RDF.type, RDF::DC.Document]
+      [:s, RDF.type, RDF::DC.BibliographicResource]
       ).to_s.should ==
-        "SELECT * WHERE { ?s ?p ?o . ?s <#{RDF.type}> <#{RDF::DC.Document}> . }"
+        "SELECT * WHERE { ?s ?p ?o . ?s <#{RDF.type}> <#{RDF::DC.BibliographicResource}> . }"
     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 ==
-        "SELECT * WHERE { GRAPH <#{@graph1}> { ?s ?p ?o . } GRAPH <#{@graph2}> { ?s <#{RDF.type}> <#{RDF::DC.Document}> . } }"
+      @query.select.where([:s, :p, :o, :context => @graph1],[:s, RDF.type, RDF::DC.BibliographicResource, :context => @graph2]).to_s.should ==
+        "SELECT * WHERE { GRAPH <#{@graph1}> { ?s ?p ?o . } GRAPH <#{@graph2}> { ?s <#{RDF.type}> <#{RDF::DC.BibliographicResource}> . } }"
     end
 
     it "should support string objects in SPARQL queries" do
@@ -291,8 +291,8 @@
     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}> . } } }"
+      @query.select.where([:s, :p, :o, :context => @graph1]).optional([:s, RDF.type, RDF::DC.BibliographicResource, :context => @graph2]).to_s.should == 
+        "SELECT * WHERE { GRAPH <#{@graph1}> { ?s ?p ?o . } OPTIONAL { GRAPH <#{@graph2}> { ?s <#{RDF.type}> <#{RDF::DC.BibliographicResource}> . } } }"
     end
 
     it "should support multiple OPTIONALs" do

spec/repository_spec.rb

@@ -2,16 +2,14 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'rdf/spec/repository'
 
-#require_relative '../lib/rdf/virtuoso/repository'
-
 describe RDF::Virtuoso::Repository do
 
   before(:each) do
     @uri = "http://localhost:8890/sparql"
     @update_uri = "http://localhost:8890/sparql-auth"
     @repository = RDF::Virtuoso::Repository.new(@uri)
   end
-
+  
     #include RDF_Repository  # not implemented
 
     it "should support connecting to a Virtuoso SPARQL endpoint" do