rdf-virtuoso 0.0.11 → 0.0.12

data/README.md

@@ -5,7 +5,10 @@ The intent of this class is to act as an abstraction for clients wishing to conn
 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.).
 
-For examples on use, see ./spec/client_spec.rb and ./spec/query_spec.rb 
+For examples on use, please read:
+     ./spec/client_spec.rb 
+and 
+     ./spec/query_spec.rb 
 
 ### A simple example
 
@@ -29,12 +32,31 @@ This example assumes you have a local installation of Virtoso running at standar
 
 #### A count query example
 
-    QUERY = RDF::Virtuoso::Query
-    graph = RDF::URI.new("http://test.com")
-    type =  RDF::BIBO.Document
+New prefixes can either extend the RDF::Vocabulary class (best if you want to model yourself:
+
+    module RDF
+      class FOO < RDF::Vocabulary("http://purl.org/ontology/foo/");end
+    end
+
+it can then be easily accessed by RDF::FOO, eg. 
+
+    RDF::FOO.Document
 
-    count = REPO.select.where(:s, type, :o).count(:s).graph(graph)
+or you can use the RDF::Virtuoso::Prefixes class in a query:
+
+    prefixes = RDF::Virtuoso::Prefixes.new foo: "http://purl.org/ontology/foo/", bar: "http://bar.net"
+
+    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)
+    result = REPO.select(query)
     
+Results will be an array of RDF::Query::Solution that can be accessed by bindings or iterated
+
+    count = result.first[:count].to_i
+
 ## Rails specifics
 Working on a prototype Rails application for negotiating and manipulating linked data in an RDF store, I discovered the lack of a reasonably current library to bridge the gap between the fairly well-established, modular RDF.rb library and a Rails 3 application. I wanted to be able to manipulate RDF data in a convenient, ActiveRecord/ActiveModel way. It turned out to be fairly non-trivial to mimic true AR/AM behavior and this is more or less the groundwork and result of my experimentation. I now have a much better idea of how to proceed, I just need the time to really go deep into this.
 An example prototype that exercises this library can be found here: https://github.com/digibib/booky

data/lib/rdf/virtuoso/repository.rb

@@ -1,5 +1,6 @@
 require 'api_smith'
 require 'rdf'
+require 'uri'
 
 module RDF
   module Virtuoso
@@ -22,14 +23,20 @@ module RDF
       #persistent
       maintain_method_across_redirects true
 
-      attr_reader :username, :password, :uri, :auth_method
+      attr_reader :uri, :update_uri, :username, :password, :auth_method
 
       def initialize(uri, opts={})
-        self.class.base_uri uri
-        @uri = uri
-        @username        = opts[:username]    ||= nil 
-        @password        = opts[:password]    ||= nil
-        @auth_method     = opts[:auth_method] ||= 'digest'
+        @uri             = URI.parse(uri)
+        @update_uri      = URI.parse(opts[:update_uri]) if opts[:update_uri]
+        @base_uri        = "#{@uri.scheme}://#{@uri.host}"
+        @base_uri       += ":" + @uri.port.to_s if @uri.port
+        @username        = opts[:username]    || nil 
+        @password        = opts[:password]    || nil
+        @auth_method     = opts[:auth_method] || 'digest'
+
+        @sparql_endpoint = @uri.request_uri
+        @sparul_endpoint = @update_uri.nil? ? @sparql_endpoint : @update_uri.request_uri
+        self.class.base_uri @base_uri
       end
 
       READ_METHODS  = %w(select ask construct describe)
@@ -86,13 +93,13 @@ module RDF
       end
       
       def api_get(query, options = {})
-        self.class.endpoint 'sparql'
+        self.class.endpoint @sparql_endpoint
         get '/', :extra_query => { :query => query }.merge(options), 
                  :transform => RDF::Virtuoso::Parser::JSON
       end
 
       def api_post(query, options = {})
-        self.class.endpoint 'sparql-auth'
+        self.class.endpoint @sparul_endpoint
         post '/', :extra_body => { :query => query }.merge(options), 
                   :extra_request => extra_request_options,
                   :response_container => [

data/lib/rdf/virtuoso/version.rb

@@ -1,5 +1,5 @@
 module RDF
   module Virtuoso
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end
 end

data/spec/repository_spec.rb

@@ -2,20 +2,31 @@ require_relative '../lib/rdf/virtuoso/repository'
 describe RDF::Virtuoso do
 
   before(:each) do
-    @uri = "http://localhost:8890"
+    @uri = "http://localhost:8890/sparql"
+    @update_uri = "http://localhost:8890/sparql-auth"
   end
 
   context "when connecting to a Virtuoso server" do
     it "should support connecting to a Virtuoso SPARQL endpoint" do
-      RDF::Virtuoso::Repository.new(@uri)
+      repo = RDF::Virtuoso::Repository.new(@uri)
+            p repo
+
+      repo.instance_variable_get("@sparul_endpoint").should == "/sparql"
     end
-    
+
+    it "should support accept port in repository endpoint" do
+      repo = RDF::Virtuoso::Repository.new(@uri)
+      repo.instance_variable_get("@base_uri").should == "http://localhost:8890"
+    end
+        
     it "should support connecting to a Virtuoso SPARUL endpoint with BASIC AUTH" do
-      RDF::Virtuoso::Repository.new(@uri, :username => 'admin', :password => 'secret', :auth_method => 'basic')
+      repo = RDF::Virtuoso::Repository.new(@uri, :update_uri => @update_uri, :username => 'admin', :password => 'secret', :auth_method => 'basic')
+      repo.instance_variable_get("@auth_method").should == "basic"
     end
     
     it "should support connecting to a Virtuoso SPARUL endpoint with DIGEST AUTH" do
-      RDF::Virtuoso::Repository.new(@uri, :username => 'admin', :password => 'secret', :auth_method => 'digest')
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-virtuoso
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec