rdf-virtuoso 0.1.2 → 0.1.7

data/README.md

@@ -1,12 +1,17 @@
 # rdf-virtuoso: Ruby Virtuoso adapter for RDF.rb
+
 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.
 
+[![Gem Version](https://badge.fury.io/rb/rdf-virtuoso.png)](https://badge.fury.io/rb/rdf-virtuoso)
+[![Build Status](https://github.com/ruby-rdf/rdf-virtuoso/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-virtuoso/actions?query=workflow%3ACI)
+[![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
+
 ## 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 
 
@@ -19,10 +24,10 @@ This example assumes you have a local installation of Virtoso running at standar
     uri        = "http://localhost:8890/sparql"
     update_uri = "http://localhost:8890/sparql-auth"
     repo       = RDF::Virtuoso::Repository.new(uri, 
-                    :update_uri => update_uri, 
-                    :username => 'admin', 
-                    :password => 'secret', 
-                    :auth_method => 'digest')
+                    update_uri: update_uri, 
+                    username: 'admin', 
+                    password: 'secret', 
+                    auth_method: 'digest')
 
 :auth_method can be 'digest' or 'basic'. a repository connection without auth requires only uri
 

data/VERSION

@@ -0,0 +1 @@
+0.1.7

data/lib/rdf/virtuoso.rb

@@ -1,8 +1,11 @@
+require 'rdf'
+
 module RDF
   module Virtuoso
     autoload :Repository,  'rdf/virtuoso/repository'
     autoload :Query,       'rdf/virtuoso/query'
     autoload :Prefixes,    'rdf/virtuoso/prefixes'
     autoload :Parser,      'rdf/virtuoso/parser'
+    autoload :VERSION,     'rdf/virtuoso/version'
   end
 end

data/lib/rdf/virtuoso/parser.rb

@@ -29,9 +29,9 @@ module RDF
           when :uri
             RDF::URI.new(value['value'])
           when :literal
-            RDF::Literal.new(value['value'], :language => value['xml:lang'])
+            RDF::Literal.new(value['value'], language: value['xml:lang'])
           when :'typed-literal'
-            RDF::Literal.new(value['value'], :datatype => value['datatype'])
+            RDF::Literal.new(value['value'], datatype: value['datatype'])
           else nil
           end
         end    

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
@@ -269,7 +262,7 @@ module RDF::Virtuoso
     # @param RDF::URI uri
     # @return [Query]
     def from_named(uri)
-      options[:from_named] = uri
+      (options[:from_named] ||= []) << uri
       self
     end
 
@@ -348,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
@@ -422,7 +414,7 @@ module RDF::Virtuoso
     ##
     # @private 
     # make RDF::Query::Pattern from triple array if not already done
-    # include :context in Statement
+    # include :graph_name in Statement
     # @return [RDF::Query::Pattern]
     def build_patterns(patterns)
       patterns.map do |pattern|
@@ -484,10 +476,10 @@ module RDF::Virtuoso
 
     ##
     # @return [Object]
-    def execute
+    # def execute
       #query
       #raise NotImplementedError
-    end
+    # end
 
     ##
     # Returns the string representation of this query.
@@ -505,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
@@ -603,7 +594,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))
@@ -612,10 +603,10 @@ module RDF::Virtuoso
         buffer << '{' if options[:unions]
 
         # iterate patterns
-        # does patterns have :context hash? build with GRAPH statement
+        # does patterns have :graph_name hash? build with GRAPH statement
         patterns.each do | pattern|
-          if pattern.context
-            buffer << "GRAPH #{serialize_value(RDF::URI(pattern.context))}"
+          if pattern.graph_name
+            buffer << "GRAPH #{serialize_value(RDF::URI(pattern.graph_name))}"
             buffer << '{'
             buffer << serialize_patterns(pattern)
             buffer << '}'
@@ -629,8 +620,8 @@ module RDF::Virtuoso
             buffer << 'OPTIONAL {'
 
 	        patterns.each do | pattern|
-          if pattern.context
-            buffer << "GRAPH #{serialize_value(RDF::URI(pattern.context))}"
+          if pattern.graph_name
+            buffer << "GRAPH #{serialize_value(RDF::URI(pattern.graph_name))}"
             buffer << '{'
             buffer << serialize_patterns(pattern)
             buffer << '}'
@@ -648,8 +639,8 @@ module RDF::Virtuoso
             buffer << 'MINUS {'
 
 	        patterns.each do | pattern|
-          if pattern.context
-            buffer << "GRAPH #{serialize_value(RDF::URI(pattern.context))}"
+          if pattern.graph_name
+            buffer << "GRAPH #{serialize_value(RDF::URI(pattern.graph_name))}"
             buffer << '{'
             buffer << serialize_patterns(pattern)
             buffer << '}'

data/lib/rdf/virtuoso/repository.rb

@@ -1,10 +1,11 @@
 require 'api_smith'
 require 'rdf'
 require 'uri'
+require 'timeout'
 
 module RDF
   module Virtuoso
-    class Repository
+    class Repository < ::RDF::Repository
       include APISmith::Client
 
       RESULT_JSON = 'application/sparql-results+json'.freeze
@@ -19,28 +20,28 @@ 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}"
         @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
         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|
@@ -53,7 +54,7 @@ module RDF
           response = api_post *args
         end
       end
-
+      
       private
 
       def check_response_errors(response)
@@ -72,46 +73,53 @@ module RDF
       end
 
       def base_query_options
-        { :format => 'json' }
+        { format: RESULT_JSON }
       end
 
       def base_request_options
-        { :headers => headers }
+        { headers: headers }
       end
 
       def extra_request_options
         case @auth_method
         when 'basic'
-          { :basic_auth => auth }
+          { basic_auth: auth }
         when 'digest'
-          { :digest_auth => auth }
+          { digest_auth: auth }
         end
       end
-      
+
       def auth
-        { :username => @username, :password => @password }
+        { 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) {
+          puts self.inspect
+            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,18 @@
-module RDF
-  module Virtuoso
-    VERSION = "0.1.2"
-  end
+module RDF::Virtuoso::VERSION
+  VERSION_FILE = File.join(File.expand_path(File.dirname(__FILE__)), "..", "..", "..", "VERSION")
+  MAJOR, MINOR, TINY, EXTRA = File.read(VERSION_FILE).chop.split(".")
+
+  STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')
+
+  ##
+  # @return [String]
+  def self.to_s()   STRING end
+
+  ##
+  # @return [String]
+  def self.to_str() STRING end
+
+  ##
+  # @return [Array(Integer, Integer, Integer)]
+  def self.to_a() STRING.split(".") end
 end

metadata

@@ -1,137 +1,138 @@
 --- !ruby/object:Gem::Specification
 name: rdf-virtuoso
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors:
 - Benjamin Rokseth
 - Peter Kordel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rdf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
-  type: :development
+        version: '3.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rdf-spec
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
+        version: 0.18.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
-  name: rdf
+  name: api_smith
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.2
-  type: :runtime
+        version: '3.10'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: '3.10'
 - !ruby/object:Gem::Dependency
-  name: api_smith
+  name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
+        version: '3.1'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
-description: An RDF.rb extension library for interacting with a Virtuoso rdf store
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rdf-vocab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+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: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
-- lib/rdf/virtuoso/version.rb
-- lib/rdf/virtuoso/query.rb
+- VERSION
+- lib/rdf/virtuoso.rb
+- lib/rdf/virtuoso/parser.rb
 - lib/rdf/virtuoso/prefixes.rb
+- lib/rdf/virtuoso/query.rb
 - lib/rdf/virtuoso/repository.rb
-- lib/rdf/virtuoso/parser.rb
-- lib/rdf/virtuoso.rb
-- spec/repository_spec.rb
-- spec/prefixes_spec.rb
-- spec/query_spec.rb
-- spec/spec_helper.rb
-homepage: https://github.com/digibib/rdf-virtuoso
-licenses: []
-post_install_message: 
+- lib/rdf/virtuoso/version.rb
+homepage: https://github.com/ruby-rdf/rdf-virtuoso
+licenses:
+- GPL-3.0
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rdf-virtuoso
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
+rubygems_version: 3.1.4
+signing_key:
+specification_version: 4
 summary: An RDF.rb extension library for interacting with a Virtuoso rdf store
 test_files: []