rdf-virtuoso 0.1.5 → 0.1.6

data/lib/rdf/virtuoso/query.rb

@@ -228,13 +228,6 @@ module RDF::Virtuoso
       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 @@ module RDF::Virtuoso
     def from_named(uri)
       (options[:from_named] ||= []) << uri
       self
-      #options[:from_named] = uri
-      #self
     end
 
     # @param RDF::URI uri
@@ -350,7 +341,6 @@ module RDF::Virtuoso
     
     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
@@ -486,10 +476,10 @@ module RDF::Virtuoso
 
     ##
     # @return [Object]
-    def execute
+    # def execute
       #query
       #raise NotImplementedError
-    end
+    # end
 
     ##
     # Returns the string representation of this query.
@@ -507,7 +497,6 @@ module RDF::Virtuoso
         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

data/lib/rdf/virtuoso/repository.rb

@@ -5,7 +5,7 @@ require 'timeout'
 
 module RDF
   module Virtuoso
-    class Repository
+    class Repository < ::RDF::Repository
       include APISmith::Client
 
       RESULT_JSON = 'application/sparql-results+json'.freeze
@@ -20,13 +20,12 @@ module RDF
       class NotAuthorized < ClientError; end
       class ServerError < StandardError; end
 
-      # TODO: Look at issues with HTTParty Connection reset
       #persistent
       maintain_method_across_redirects true
 
       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}"
@@ -41,8 +40,8 @@ module RDF
         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|
@@ -55,7 +54,7 @@ module RDF
           response = api_post *args
         end
       end
-
+      
       private
 
       def check_response_errors(response)
@@ -74,7 +73,6 @@ module RDF
       end
 
       def base_query_options
-        #{ :format => 'json' }
         { :format => RESULT_JSON }
       end
 
@@ -107,6 +105,7 @@ module RDF
         else
           self.class.endpoint @sparql_endpoint
           Timeout::timeout(@timeout) {
+          puts self.inspect
             get '/', :extra_query => { :query => query }.merge(options),
                      :transform => RDF::Virtuoso::Parser::JSON
           }

data/lib/rdf/virtuoso/version.rb

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

data/spec/query_spec.rb

@@ -149,16 +149,16 @@ describe RDF::Virtuoso::Query do
     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 @@ describe RDF::Virtuoso::Query do
     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

data/spec/repository_spec.rb

@@ -1,19 +1,17 @@
 $:.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 +36,5 @@ describe RDF::Virtuoso::Repository do
       repo = RDF::Virtuoso::Repository.new(@uri, :timeout => 10)
       repo.instance_variable_get("@timeout").should == 10
     end
+    
 end

data/spec/spec_helper.rb

@@ -2,5 +2,9 @@ require 'bundler/setup'
 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-virtuoso
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: api_smith
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +92,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
-description: An RDF.rb extension library for interacting with a Virtuoso rdf store
+description: An RDF.rb extension library for interacting with a Virtuoso rdf store.\nSupports
+  SPARQL 1.1 UPDATE extensions and some Virtuoso specific commands.
 email:
 - benjamin.rokseth@kul.oslo.kommune.no
 executables: []
@@ -100,18 +101,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/rdf/virtuoso/prefixes.rb
 - lib/rdf/virtuoso/query.rb
-- lib/rdf/virtuoso/repository.rb
+- lib/rdf/virtuoso/prefixes.rb
 - lib/rdf/virtuoso/version.rb
+- lib/rdf/virtuoso/repository.rb
 - lib/rdf/virtuoso/parser.rb
 - lib/rdf/virtuoso.rb
-- spec/prefixes_spec.rb
-- spec/query_spec.rb
 - spec/repository_spec.rb
 - spec/spec_helper.rb
+- spec/prefixes_spec.rb
+- spec/query_spec.rb
 homepage: https://github.com/digibib/rdf-virtuoso
-licenses: []
+licenses:
+- GPL-3
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -130,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf-virtuoso
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An RDF.rb extension library for interacting with a Virtuoso rdf store