allow api_get of raw query

Author: bensinober

lib/rdf/virtuoso/query.rb

@@ -228,13 +228,6 @@ def delete(*patterns)
       self
     end
 
-#    def delete(*variables)
-#      @values = variables.map { |var|
-#        [var, var.is_a?(RDF::URI) ? var : RDF::Query::Variable.new(var)]
-#      }
-#      self
-#    end
-
     def create(uri)
       options[:graph] = uri
       self
@@ -271,8 +264,6 @@ def from(uri)
     def from_named(uri)
       (options[:from_named] ||= []) << uri
       self
-      #options[:from_named] = uri
-      #self
     end
 
     # @param RDF::URI uri
@@ -350,7 +341,6 @@ def reduced(state = true)
 
     AGG_METHODS.each do |m|
       define_method m do |*variables|
-        #options[m.to_sym] = variables
         options[m.to_sym] ||= []
         options[m.to_sym] += variables
         self
@@ -507,7 +497,6 @@ def to_s
         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
               # multiple samples splits to individual sample expressions

lib/rdf/virtuoso/repository.rb

@@ -5,7 +5,7 @@
 
 module RDF
   module Virtuoso
-    class Repository
+    class Repository < ::RDF::Repository
       include APISmith::Client
 
       RESULT_JSON = 'application/sparql-results+json'.freeze
@@ -20,7 +20,6 @@ class MalformedQuery < ClientError; end
       class NotAuthorized < ClientError; end
       class ServerError < StandardError; end
 
-      # TODO: Look at issues with HTTParty Connection reset
       #persistent
       maintain_method_across_redirects true
 
@@ -41,8 +40,8 @@ def initialize(uri, opts={})
         self.class.base_uri @base_uri
       end
 
-      READ_METHODS  = %w(select ask construct describe)
-      WRITE_METHODS = %w(query insert insert_data update delete delete_data create drop clear)
+      READ_METHODS  = %w(query select ask construct describe)
+      WRITE_METHODS = %w(insert insert_data update delete delete_data create drop clear)
 
       READ_METHODS.each do |m|
         define_method m do |*args|
@@ -74,7 +73,6 @@ def headers
       end
 
       def base_query_options
-        #{ :format => 'json' }
         { :format => RESULT_JSON }
       end
 
@@ -107,6 +105,7 @@ def api_get(query, options = {})
         else
           self.class.endpoint @sparql_endpoint
           Timeout::timeout(@timeout) {
+          puts self.inspect
             get '/', :extra_query => { :query => query }.merge(options),
                      :transform => RDF::Virtuoso::Parser::JSON
           }

rdf-virtuoso.gemspec

@@ -10,7 +10,8 @@ Gem::Specification.new do |s|
   s.email       = ['benjamin.rokseth@kul.oslo.kommune.no']
   s.homepage    = 'https://github.com/digibib/rdf-virtuoso'
   s.summary     = %q{An RDF.rb extension library for interacting with a Virtuoso rdf store}
-  s.description = %q{An RDF.rb extension library for interacting with a Virtuoso rdf store}
+  s.description = %q{An RDF.rb extension library for interacting with a Virtuoso rdf store.\nSupports SPARQL 1.1 UPDATE extensions and some Virtuoso specific commands.}
+  s.licenses    = ['GPL-3']
 
   s.rubyforge_project = 'rdf-virtuoso'
 

spec/repository_spec.rb

@@ -1,19 +1,19 @@
 $:.unshift "."
-require 'spec_helper'
+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
-  
-    it "should mixin RDF::Repository" do
-      @repository = RDF::Virtuoso::Repository.new(@uri)
-      #it_should_behave_like RDF_Repository # not working!
-    end
-    
+
+    #include RDF_Repository  # not implemented
+      
     it "should support connecting to a Virtuoso SPARQL endpoint" do
       repo = RDF::Virtuoso::Repository.new(@uri)
       repo.instance_variable_get("@sparul_endpoint").should == "/sparql"
@@ -38,4 +38,11 @@
       repo = RDF::Virtuoso::Repository.new(@uri, :timeout => 10)
       repo.instance_variable_get("@timeout").should == 10
     end
+    
+    it "should support custom query" do
+      q = "CONSTRUCT {?s a rdf:resource} WHERE {?s a ?type} LIMIT 1"
+      repo = RDF::Virtuoso::Repository.new(@uri, :update_uri => @update_uri, :username => 'dba', :password => 'virtuoso99admin', :auth_method => 'digest')
+      result = repo.query(q)
+      result.first[:p].should == RDF.type
+    end
 end

spec/spec_helper.rb

@@ -2,5 +2,9 @@
 require 'rspec'
 require 'rdf'
 require 'rdf/spec'
+require 'rdf/spec/matchers'
 require 'rdf/virtuoso'
-require 'rdf/spec/repository'
+
+RSpec.configure do |config|
+  config.include(RDF::Spec::Matchers)
+end