rdf-virtuoso 0.1.4 → 0.1.5

data/lib/rdf/virtuoso/repository.rb

@@ -1,6 +1,7 @@
 require 'api_smith'
 require 'rdf'
 require 'uri'
+require 'timeout'
 
 module RDF
   module Virtuoso
@@ -30,9 +31,10 @@ module RDF
         @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 
+        @username        = opts[:username]    || nil
         @password        = opts[:password]    || nil
         @auth_method     = opts[:auth_method] || 'digest'
+        @timeout         = opts[:timeout]     || 5 # default timeout 5 seconds
 
         @sparql_endpoint = @uri.request_uri
         @sparul_endpoint = @update_uri.nil? ? @sparql_endpoint : @update_uri.request_uri
@@ -72,7 +74,8 @@ module RDF
       end
 
       def base_query_options
-        { :format => 'json' }
+        #{ :format => 'json' }
+        { :format => RESULT_JSON }
       end
 
       def base_request_options
@@ -87,31 +90,37 @@ module RDF
           { :digest_auth => auth }
         end
       end
-      
+
       def auth
         { :username => @username, :password => @password }
       end
-      
+
       def api_get(query, options = {})
         # prefer sparul endpoint with auth if present to allow SELECT/CONSTRUCT access to protected graphs
         if @sparul_endpoint
           self.class.endpoint @sparul_endpoint
-          get '/', :extra_query => { :query => query }.merge(options),
-                   :extra_request => extra_request_options,
-                   :transform => RDF::Virtuoso::Parser::JSON
+          Timeout::timeout(@timeout) {
+            get '/', :extra_query => { :query => query }.merge(options),
+                     :extra_request => extra_request_options,
+                     :transform => RDF::Virtuoso::Parser::JSON
+          }
         else
           self.class.endpoint @sparql_endpoint
-          get '/', :extra_query => { :query => query }.merge(options), 
-                   :transform => RDF::Virtuoso::Parser::JSON
+          Timeout::timeout(@timeout) {
+            get '/', :extra_query => { :query => query }.merge(options),
+                     :transform => RDF::Virtuoso::Parser::JSON
+          }
         end
       end
 
       def api_post(query, options = {})
         self.class.endpoint @sparul_endpoint
-        post '/', :extra_body => { :query => query }.merge(options), 
-                  :extra_request => extra_request_options,
-                  :response_container => [
-                    "results", "bindings", 0, "callret-0", "value"]
+        Timeout::timeout(@timeout) {
+          post '/', :extra_body => { :query => query }.merge(options),
+                    :extra_request => extra_request_options,
+                    :response_container => [
+                      "results", "bindings", 0, "callret-0", "value"]
+        }
       end
 
     end

data/lib/rdf/virtuoso/version.rb

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

data/spec/repository_spec.rb

@@ -33,4 +33,9 @@ describe RDF::Virtuoso::Repository 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
+    
+    it "should support timeout option" do
+      repo = RDF::Virtuoso::Repository.new(@uri, :timeout => 10)
+      repo.instance_variable_get("@timeout").should == 10
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-virtuoso
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: api_smith
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 description: An RDF.rb extension library for interacting with a Virtuoso rdf store
 email:
 - benjamin.rokseth@kul.oslo.kommune.no
@@ -100,15 +100,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/rdf/virtuoso/version.rb
-- lib/rdf/virtuoso/query.rb
 - lib/rdf/virtuoso/prefixes.rb
+- lib/rdf/virtuoso/query.rb
 - lib/rdf/virtuoso/repository.rb
+- lib/rdf/virtuoso/version.rb
 - lib/rdf/virtuoso/parser.rb
 - lib/rdf/virtuoso.rb
-- spec/repository_spec.rb
 - spec/prefixes_spec.rb
 - spec/query_spec.rb
+- spec/repository_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/digibib/rdf-virtuoso
 licenses: []
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf-virtuoso
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: An RDF.rb extension library for interacting with a Virtuoso rdf store