Finish 2.2.0

Author: gkellogg

.gitignore

@@ -9,3 +9,4 @@ tmp
 doc
 coverage
 .bundle
+/.byebug_history

.travis.yml

@@ -4,16 +4,15 @@ script: "bundle exec rspec spec"
 env:
   - CI=true
 rvm:
-  - 2.2.5
-  - 2.3.1
-  - jruby
-  - rbx
-gemfile:
-  - Gemfile
-  - Gemfile-pure
+  - 2.2
+  - 2.3
+  - 2.4
+  - jruby-9
+  - rbx-3
 cache: bundler
 sudo: false
 matrix:
   allow_failures:
-    - rvm: rbx
-    - rvm: jruby
+    - rvm: jruby-9
+    - rvm: rbx-3
+dist: trusty

README.md

@@ -1,4 +1,4 @@
-#SPARQL Client for RDF.rb
+# SPARQL Client for RDF.rb
 
 This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 
@@ -8,7 +8,7 @@ This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 [![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
+## Features
 
 * Executes queries against any SPARQL 1.0/1.1-compatible endpoint over HTTP,
   or against an `RDF::Queryable` instance, using the `SPARQL` gem.
@@ -22,7 +22,7 @@ This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 * Supports accessing endpoints as read/write [`RDF::Repository`][RDF::Repository]
   instances {SPARQL::Client::Repository}.
 
-##Examples
+## Examples
 
 ### Querying a remote SPARQL endpoint
     require 'sparql/client'
@@ -83,29 +83,29 @@ This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
     end
     delete_data(data)
 
-##Documentation
+## Documentation
 
 * {SPARQL::Client}
   * {SPARQL::Client::Query}
   * {SPARQL::Client::Repository}
   * {SPARQL::Client::Update}
 
-##Dependencies
+## Dependencies
 
 * [Ruby](http://ruby-lang.org/) (>= 2.2.2)
 * [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.0)
 * [Net::HTTP::Persistent](http://rubygems.org/gems/net-http-persistent) (>= 1.4)
 * Soft dependency on [SPARQL](http://rubygems.org/gems/sparql) (>= 2.0)
 * Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.6)
 
-##Installation
+## 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
+## Download
 
 To get a local working copy of the development repository, do:
 
@@ -116,17 +116,17 @@ follows:
 
     % wget http://github.com/ruby-rdf/sparql-client/tarball/master
 
-##Mailing List
+## Mailing List
 
 * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
-##Authors
+## 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
+## Contributors
 
 * [Christoph Badura](http://github.com/bad) - <http://github.com/bad>
 * [James Hetherington](http://github.com/jamespjh) - <http://twitter.com/jamespjh>
@@ -140,7 +140,7 @@ follows:
 * [Thomas Feron](http://github.com/thoferon) - <http://github.com/thoferon>
 * [Nick Gottlieb](http://github.com/ngottlieb) - <http://www.nicholasgottlieb.com>
 
-##Contributing
+## 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.
@@ -155,7 +155,7 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
   of thumb, additions larger than about 15 lines of code), we need an
   explicit [public domain dedication][PDD] on record from you.
 
-##Resources
+## Resources
 
 * <http://ruby-rdf.github.com/sparql-client/>
 * <http://github.com/ruby-rdf/sparql-client>
@@ -164,7 +164,7 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
 * <http://raa.ruby-lang.org/project/sparql-client/>
 * <http://www.ohloh.net/p/rdf>
 
-##License
+## License
 
 This is free and unencumbered public domain software. For more information,
 see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.

examples/workergnome-literal-issue.rb

@@ -0,0 +1,18 @@
+#require 'rdf/turtle'
+require 'sparql/client'
+require 'byebug'
+
+sparql = SPARQL::Client.new("http://data.americanartcollaborative.org/sparql")
+uri = RDF.URI("http://data.crystalbridges.org/object/2258")
+label = RDF::RDFS.label
+
+query = sparql.construct([uri, label, :o]).where([uri, label, :o])
+require 'byebug'; byebug
+query.each_statement do |s|
+  puts s.object.inspect
+end
+
+# <http://data.crystalbridges.org/object/2258> <http://www.w3.org/2000/01/rdf-schema#label> "Bison-Dance of the Mandan Indians in front of their Medicine Lodge in Mih-Tuta-Hankush" .
+# <http://data.crystalbridges.org/object/2258> <http://www.w3.org/2000/01/rdf-schema#label> "From \"Voyage dans l’intérieur de l’Amérique du Nord, executé pendant les années 1832, 1833 et 1834, par le prince Maximilien de Wied-Neuwied\" (Paris & Coblenz, 1839-1843)" .
+
+# "<http://data.crystalbridges.org/object/2258> <http://www.w3.org/2000/01/rdf-schema#label> \"Bison-Dance of the Mandan Indians in front of their Medicine Lodge in Mih-Tuta-Hankush\" .\n<http://data.crystalbridges.org/object/2258> <http://www.w3.org/2000/01/rdf-schema#label> \"From \\\"Voyage dans l\xE2\x80\x99int\xC3\xA9rieur de l\xE2\x80\x99Am\xC3\xA9rique du Nord, execut\xC3\xA9 pendant les ann\xC3\xA9es 1832, 1833 et 1834, par le prince Maximilien de Wied-Neuwied\\\" (Paris & Coblenz, 1839-1843)\" .\n"

lib/sparql/client.rb

@@ -609,11 +609,15 @@ def self.serialize_predicate(value,rdepth=0)
     # @private
     def self.serialize_patterns(patterns, use_vars = false)
       patterns.map do |pattern|
-        serialized_pattern = RDF::Statement.from(pattern).to_triple.each_with_index.map do |v, i|
-          if i == 1
-            SPARQL::Client.serialize_predicate(v)
-         else
-            SPARQL::Client.serialize_value(v, use_vars)
+        serialized_pattern = case pattern
+        when SPARQL::Client::QueryElement then [pattern.to_s]
+        else
+          RDF::Statement.from(pattern).to_triple.each_with_index.map do |v, i|
+            if i == 1
+              SPARQL::Client.serialize_predicate(v)
+           else
+              SPARQL::Client.serialize_value(v, use_vars)
+            end
           end
         end
         serialized_pattern.join(' ') + ' .'
@@ -654,7 +658,11 @@ def http_klass(scheme)
           value = ENV['https_proxy']
           proxy_url = URI.parse(value) unless value.nil? || value.empty?
       end
-      klass = Net::HTTP::Persistent.new(self.class.to_s, proxy_url)
+      klass = if Net::HTTP::Persistent::VERSION >= '3.0'
+        Net::HTTP::Persistent.new(name: self.class.to_s, proxy: proxy_url)
+      else
+        Net::HTTP::Persistent.new(self.class.to_s, proxy_url)
+      end
       klass.keep_alive =  @options[:keep_alive] || 120
       klass.read_timeout = @options[:read_timeout] || 60
       klass
@@ -748,5 +756,18 @@ def make_post_request(query, headers = {})
       end
       request
     end
+
+    # A query element can be used as a component of a query. It may be initialized with a string, which is wrapped in an appropriate container depending on the type of QueryElement. Implements {#to_s} to property serialize when generating a SPARQL query.
+    class QueryElement
+      attr_reader :elements
+
+      def initialize(*args)
+        @elements = args
+      end
+
+      def to_s
+        raise NotImplemented
+      end
+    end
   end # Client
 end # SPARQL