sparql-client 1.99.0 → 1.99.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12f0bfacb2a7bfbf5a747ffc5561c5115d4b02b6
-  data.tar.gz: c9c678a46958115483e217b1ffc13e230ff133a0
+  metadata.gz: 4c5c7196d4275b09823389b5cc22bc3551130e64
+  data.tar.gz: f4f53a7788c7accc3e76e16511b172733ec831dd
 SHA512:
-  metadata.gz: 00f5889614ffd403c945c02911ec75030805c44e90972ec11bda460bd053e4ab368ffbfca4218263158d004d428a2a6318ddd7088edbf33f8b82265fa335b39c
-  data.tar.gz: cc39bc81745d9fb223532ed7480bd9d4dc16830cd4b1729565fa2711d446516d5b321d4474484317c9292ffb27ec2c7139beb529aa750cdfbc570894b313da2a
+  metadata.gz: ede0b17bbe385b932f271ee203fac2a4f079035f912b54cb9645feb4dd5549b2aff58508ef71e98f8605f823350667ed8ef706b20ccf649c8ddbc30116dae3c9
+  data.tar.gz: d579ae89a32cec7d420bda0302d7eb0b480c3bacbc6dd11b7ce41b7bd43f80fb49b092427376ead918ab73a7cd537483bf5577994c25715c6c9d75d29f23871b

data/README

@@ -0,0 +1 @@
+README.md

data/VERSION

@@ -1 +1 @@
-1.99.0
+1.99.1

data/lib/sparql/client.rb

@@ -35,13 +35,13 @@ module SPARQL
       RESULT_JSON,
       RESULT_XML,
       RESULT_BOOL,
-      "#{RESULT_TSV};p=0.8",
-      "#{RESULT_CSV};p=0.2",
-      '*/*;p=0.1'
+      "#{RESULT_TSV};q=0.8",
+      "#{RESULT_CSV};q=0.2",
+      '*/*;q=0.1'
     ].join(', ').freeze
     GRAPH_ALL  = (
       RDF::Format.content_types.keys + 
-      ['*/*;p=0.1']
+      ['*/*;q=0.1']
     ).join(', ').freeze
 
     ACCEPT_JSON    = {'Accept' => RESULT_JSON}.freeze
@@ -291,6 +291,7 @@ module SPARQL
     # @see    http://www.w3.org/TR/sparql11-protocol/#query-operation
     def query(query, options = {})
       @op = :query
+      @alt_endpoint = options[:endpoint]
       case @url
       when RDF::Queryable
         require 'sparql' unless defined?(::SPARQL::Grammar)
@@ -317,13 +318,13 @@ module SPARQL
     # @see    http://www.w3.org/TR/sparql11-protocol/#update-operation
     def update(query, options = {})
       @op = :update
-      @alt_endpoint = options[:endpoint] unless options[:endpoint].nil?
+      @alt_endpoint = options[:endpoint]
       case @url
       when RDF::Queryable
         require 'sparql' unless defined?(::SPARQL::Grammar)
         SPARQL.execute(query, @url, options.merge(update: true))
       else
-        parse_response(response(query, options), options)
+        response(query, options)
       end
       self
     end
@@ -360,6 +361,8 @@ module SPARQL
     # @return [Object]
     def parse_response(response, options = {})
       case options[:content_type] || response.content_type
+        when NilClass
+          response.body
         when RESULT_BOOL # Sesame-specific
           response.body == 'true'
         when RESULT_JSON
@@ -536,9 +539,11 @@ module SPARQL
     # @param  [Hash{Symbol => Object}] options
     # @return [RDF::Enumerable]
     def parse_rdf_serialization(response, options = {})
-      options = {:content_type => response.content_type} if options.empty?
+      options = {:content_type => response.content_type} unless options[:content_type]
       if reader = RDF::Reader.for(options)
         reader.new(response.body)
+      else
+        raise RDF::ReaderError, "no suitable rdf reader was found."
       end
     end
 
@@ -650,7 +655,7 @@ module SPARQL
           proxy_url = URI.parse(value) unless value.nil? || value.empty?
       end
       klass = Net::HTTP::Persistent.new(self.class.to_s, proxy_url)
-      klass.keep_alive = 120 # increase to 2 minutes
+      klass.keep_alive =  @options[:keep_alive] || 120
       klass.read_timeout = @options[:read_timeout] || 60
       klass
     end
@@ -678,8 +683,12 @@ module SPARQL
 
       request.basic_auth(url.user, url.password) if url.user && !url.user.empty?
 
+      pre_http_hook(request) if respond_to?(:pre_http_hook)
+
       response = @http.request(::URI.parse(url.to_s), request)
 
+      post_http_hook(response) if respond_to?(:post_http_hook)
+
       10.times do
         if response.kind_of? Net::HTTPRedirection
           response = @http.request(::URI.parse(response['location']), request)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql-client
 version: !ruby/object:Gem::Version
-  version: 1.99.0
+  version: 1.99.1
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,22 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.99'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.99'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -41,39 +47,93 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
-  name: sparql
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: sparql
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: '1.99'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: '1.99'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.99'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.99'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rdf-turtle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.99'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.99'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +190,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: |-
   Executes SPARQL queries and updates against a remote SPARQL 1.0 or 1.1 endpoint,
                               or against a local repository. Generates SPARQL queries using a simple DSL.
@@ -170,9 +244,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sparql-client
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: SPARQL client for RDF.rb.
 test_files: []
-has_rdoc: false

data/README

@@ -1,184 +0,0 @@
-#SPARQL Client for RDF.rb
-
-This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
-
-* <http://ruby-rdf.github.com/sparql-client/>
-
-[![Gem Version](https://badge.fury.io/rb/sparql-client.png)](http://badge.fury.io/rb/sparql-client)
-[![Build Status](https://travis-ci.org/ruby-rdf/sparql-client.png?branch=master)](http://travis-ci.org/ruby-rdf/sparql-client)
-[![Coverage Status](https://coveralls.io/repos/ruby-rdf/sparql-client/badge.svg?branch=master&service=github)](https://coveralls.io/github/ruby-rdf/sparql-client?branch=master)
-
-##Features
-
-* Executes queries against any SPARQL 1.0/1.1-compatible endpoint over HTTP,
-  or against an `RDF::Queryable` instance, using the `SPARQL` gem.
-* Provides a query builder [DSL][] for `ASK`, `SELECT`, `DESCRIBE` and
-  `CONSTRUCT` queries.
-* Includes preliminary support for some SPARQL 1.1 Update operations.
-* Supports tuple result sets in both XML, JSON, CSV and TSV formats, with JSON being
-  the preferred default for content-negotiation purposes.
-* Supports graph results in any RDF serialization format understood by RDF.rb.
-* Returns results using the [RDF.rb object model][RDF.rb model].
-* Supports accessing endpoints as read/write [`RDF::Repository`][RDF::Repository]
-  instances {SPARQL::Client::Repository}.
-
-##Examples
-
-### Querying a remote SPARQL endpoint
-    require 'sparql/client'
-
-    sparql = SPARQL::Client.new("http://dbpedia.org/sparql")
-
-### Querying a `RDF::Repository` instance
-
-    require 'rdf/trig'
-    repository = RDF::Repository.load("http://example/dataset.trig")
-
-    sparql = SPARQL::Client.new(repository)
-
-### Executing a boolean query and outputting the result
-
-    # ASK WHERE { ?s ?p ?o }
-    result = sparql.ask.whether([:s, :p, :o]).true?
-
-    puts result.inspect   #=> true or false
-
-### Executing a tuple query and iterating over the returned solutions
-
-    # SELECT * WHERE { ?s ?p ?o } OFFSET 100 LIMIT 10
-    query = sparql.select.where([:s, :p, :o]).offset(100).limit(10)
-
-    query.each_solution do |solution|
-      puts solution.inspect
-    end
-
-### Executing a graph query and iterating over the returned statements
-
-    # CONSTRUCT { ?s ?p ?o } WHERE { ?s ?p ?o } LIMIT 10
-    query = sparql.construct([:s, :p, :o]).where([:s, :p, :o]).limit(10)
-
-    query.each_statement do |statement|
-      puts statement.inspect
-    end
-
-### Executing an arbitrary textual SPARQL query string
-
-    result = sparql.query("ASK WHERE { ?s ?p ?o }")
-
-    puts result.inspect   #=> true or false
-
-### Inserting data into a graph
-
-    # INSERT DATA { <http://example.org/jhacker> <http://xmlns.com/foaf/0.1/name> "J. Random Hacker" .}
-    data = RDF::Graph.new do |graph|
-      graph << [RDF::URI('http://example.org/jhacker'), RDF::FOAF.name, "J. Random Hacker"]
-    end
-    insert_data(data)
-
-### Deleting data from a graph
-
-    # DELETE DATA { <http://example.org/jhacker> <http://xmlns.com/foaf/0.1/name> "J. Random Hacker" .}
-    data = RDF::Graph.new do |graph|
-      graph << [RDF::URI('http://example.org/jhacker'), RDF::FOAF.name, "J. Random Hacker"]
-    end
-    delete_data(data)
-
-##Documentation
-
-* {SPARQL::Client}
-  * {SPARQL::Client::Query}
-  * {SPARQL::Client::Repository}
-  * {SPARQL::Client::Update}
-
-##Dependencies
-
-* [Ruby](http://ruby-lang.org/) (>= 1.9.3)
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1)
-* [Net::HTTP::Persistent](http://rubygems.org/gems/net-http-persistent) (>= 1.4)
-* Soft dependency on [SPARQL](http://rubygems.org/gems/sparql) (>= 1.1)
-* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.5)
-
-##Installation
-
-The recommended installation method is via [RubyGems](http://rubygems.org/).
-To install the latest official release of the `SPARQL::Client` gem, do:
-
-    % [sudo] gem install sparql-client
-
-##Download
-
-To get a local working copy of the development repository, do:
-
-    % git clone git://github.com/ruby-rdf/sparql-client.git
-
-Alternatively, download the latest development version as a tarball as
-follows:
-
-    % wget http://github.com/ruby-rdf/sparql-client/tarball/master
-
-##Mailing List
-
-* <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
-
-##Authors
-
-* [Arto Bendiken](http://github.com/bendiken) - <http://ar.to/>
-* [Ben Lavender](http://github.com/bhuga) - <http://bhuga.net/>
-* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
-
-##Contributors
-
-* [Christoph Badura](http://github.com/bad) - <http://github.com/bad>
-* [James Hetherington](http://github.com/jamespjh) - <http://twitter.com/jamespjh>
-* [Gabriel Horner](http://github.com/cldwalker) - <http://tagaholic.me/>
-* [Nicholas Humfrey](http://github.com/njh) - <http://www.aelius.com/njh/>
-* [Fumihiro Kato](http://github.com/fumi) - <http://fumi.me/>
-* [David Nielsen](http://github.com/drankard) - <http://github.com/drankard>
-* [Thamaraiselvan Poomalai](http://github.com/selvan) - <http://softonaut.blogspot.com/>
-* [Michael Sokol](http://github.com/mikaa123) - <http://sokolmichael.com/>
-* [Yves Raimond](http://github.com/moustaki) - <http://moustaki.org/>
-* [Thomas Feron](http://github.com/thoferon) - <http://github.com/thoferon>
-* [Nick Gottlieb](http://github.com/ngottlieb) - <http://www.nicholasgottlieb.com>
-
-##Contributing
-This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
-
-* Do your best to adhere to the existing coding conventions and idioms.
-* Don't use hard tabs, and don't leave trailing whitespace on any line.
-* Do document every method you add using [YARD][] annotations. Read the
-  [tutorial][YARD-GS] or just look at the existing code for examples.
-* Don't touch the `.gemspec`, `VERSION` or `AUTHORS` files. If you need to
-  change them, do so on your private branch only.
-* Do feel free to add yourself to the `CREDITS` file and the corresponding
-  list in the the `README`. Alphabetical order applies.
-* Do note that in order for us to merge any non-trivial changes (as a rule
-  of thumb, additions larger than about 15 lines of code), we need an
-  explicit [public domain dedication][PDD] on record from you.
-
-##Resources
-
-* <http://ruby-rdf.github.com/sparql-client/>
-* <http://github.com/ruby-rdf/sparql-client>
-* <http://rubygems.org/gems/sparql-client>
-* <http://rubyforge.org/projects/sparql/>
-* <http://raa.ruby-lang.org/project/sparql-client/>
-* <http://www.ohloh.net/p/rdf>
-
-##License
-
-This is free and unencumbered public domain software. For more information,
-see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
-
-[Ruby]:            http://ruby-lang.org/
-[RDF]:             http://www.w3.org/RDF/
-[SPARQL]:          http://en.wikipedia.org/wiki/SPARQL
-[SPARQL JSON]:     http://www.w3.org/TR/rdf-sparql-json-res/
-[RDF.rb]:          http://rubygems.org/gems/rdf
-[RDF.rb model]:    http://blog.datagraph.org/2010/03/rdf-for-ruby
-[RDF::Repository]: http://rubydoc.info/github/ruby-rdf/rdf/RDF/Repository
-[DSL]:             http://en.wikipedia.org/wiki/Domain-specific_language
-                   "domain-specific language"
-[YARD]:            http://yardoc.org/
-[YARD-GS]:         http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
-[PDD]:             http://unlicense.org/#unlicensing-contributions
-[Backports]:       http://rubygems.org/gems/backports