rdf-virtuoso 0.1.2 → 0.1.3

data/README.md

@@ -2,11 +2,11 @@
 The intent of this class is to act as an abstraction for clients wishing to connect and manipulate linked data stored in a Virtuoso Quad store.
 
 ## How?
-RDF::Virtuoso::Repository builds on RDF.rb and is the main connection class built on top of APISmith to establish the read and write methods to a Virtuoso store SPARQL endpoint.
-RDF::Virtuoso::Query extends RDF::Query and adds SPARQL 1.1. update methods (insert, delete, aggregates, etc.).
+RDF::Virtuoso::Repository subclasses RDF::Repository built on RDF.rb and is the main connection class built on top of APISmith to establish the read and write methods to a Virtuoso store SPARQL endpoint.
+RDF::Virtuoso::Query subclasses RDF::Query and adds SPARQL 1.1. update methods (insert, delete, aggregates, etc.).
 
 For examples on use, please read:
-     ./spec/client_spec.rb 
+     ./spec/repository_spec.rb 
 and 
      ./spec/query_spec.rb 
 

data/lib/rdf/virtuoso/query.rb

@@ -269,8 +269,10 @@ module RDF::Virtuoso
     # @param RDF::URI uri
     # @return [Query]
     def from_named(uri)
-      options[:from_named] = uri
+      (options[:from_named] ||= []) << uri
       self
+      #options[:from_named] = uri
+      #self
     end
 
     # @param RDF::URI uri
@@ -603,7 +605,7 @@ 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]
+      options[:from_named].each {|from_named| buffer << "FROM NAMED #{serialize_value(from_named)}" } if options[:from_named]
 
 
       unless patterns.empty? && ([:describe, :insert_data, :delete_data, :create, :clear, :drop].include?(form))

data/lib/rdf/virtuoso/repository.rb

@@ -4,7 +4,7 @@ require 'uri'
 
 module RDF
   module Virtuoso
-    class Repository
+    class Repository < RDF::Repository
       include APISmith::Client
 
       RESULT_JSON = 'application/sparql-results+json'.freeze

data/lib/rdf/virtuoso/version.rb

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

data/spec/query_spec.rb

@@ -138,6 +138,13 @@ describe RDF::Virtuoso::Query do
         "SELECT ?s FROM <#{@graph1}> FROM NAMED <#{@graph2}> WHERE { GRAPH <#{@graph2}> { ?s ?p ?o . } }"
     end
 
+    it "should support one SELECT FROM and multiple FROM NAMED" do
+      @graph1 = RDF::URI("a")
+      @graph2 = RDF::URI("b")
+      @graph3 = RDF::URI("c")
+      @query.select(:s).where([:s, :p, :o, :context => @graph2], [:s, :p, :o, :context => @graph3]).from(@graph1).from_named(@graph2).from_named(@graph3).to_s.should ==
+        "SELECT ?s FROM <#{@graph1}> FROM NAMED <#{@graph2}> FROM NAMED <#{@graph3}> WHERE { GRAPH <#{@graph2}> { ?s ?p ?o . } GRAPH <#{@graph3}> { ?s ?p ?o . } }"
+    end
 
     it "should support SELECT with complex WHERE patterns" do
       @query.select.where(

data/spec/repository_spec.rb

@@ -1,12 +1,19 @@
-require_relative '../lib/rdf/virtuoso/repository'
-describe RDF::Virtuoso do
+$:.unshift "."
+require '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"
   end
-
-  context "when connecting to a Virtuoso server" do
+  
+    it "should mixin RDF::Repository" do
+      @repository = RDF::Virtuoso::Repository.new(@uri)
+      #it_should_behave_like RDF_Repository # not working!
+    end
+    
     it "should support connecting to a Virtuoso SPARQL endpoint" do
       repo = RDF::Virtuoso::Repository.new(@uri)
       repo.instance_variable_get("@sparul_endpoint").should == "/sparql"
@@ -26,5 +33,4 @@ describe RDF::Virtuoso do
       repo = RDF::Virtuoso::Repository.new(@uri, :update_uri => @update_uri, :username => 'admin', :password => 'secret', :auth_method => 'digest')
       repo.instance_variable_get("@sparul_endpoint").should == "/sparql-auth"
     end
-  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
-require 'rdf/spec'
+require 'bundler/setup'
+require 'rspec'
 require 'rdf'
-require 'rdf/virtuoso'
+require 'rdf/spec'
+require 'rdf/virtuoso'
+require 'rdf/spec/repository'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-virtuoso
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -100,16 +100,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- 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/rdf/virtuoso/query.rb
 - spec/repository_spec.rb
-- spec/prefixes_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb
+- spec/prefixes_spec.rb
 homepage: https://github.com/digibib/rdf-virtuoso
 licenses: []
 post_install_message: