sparql-client 0.0.9 → 0.0.11

data/CREDITS

@@ -5,3 +5,4 @@
 * Fumihiro Kato <fumi@fumi.me>
 * David Nielsen <david@graveyard.dk>
 * Thamaraiselvan Poomalai <p.thamarai@gmail.com>
+* Gregg Kellogg <gregg@greggkellogg.net>

data/README

@@ -113,6 +113,7 @@ Contributors
 * [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/>
+* [Gregg Kellogg](http://github.com/gkellogg) - <http://kellogg-assoc.com/>
 
 Contributing
 ------------

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.11

data/lib/sparql/client.rb

@@ -1,4 +1,4 @@
-require 'net/http'
+require 'net/http/persistent'
 require 'rdf' # @see http://rubygems.org/gems/rdf
 require 'rdf/ntriples'
 
@@ -29,10 +29,14 @@ module SPARQL
     ##
     # @param  [String, #to_s]          url
     # @param  [Hash{Symbol => Object}] options
+    # @option options [Hash] :headers
     def initialize(url, options = {}, &block)
       @url, @options = RDF::URI.new(url.to_s), options
       #@headers = {'Accept' => "#{RESULT_JSON}, #{RESULT_XML}, text/plain"}
-      @headers = {'Accept' => [RESULT_JSON, RESULT_XML, RDF::Format.content_types.collect { |k,v| k.to_s }].join(', ')}
+      @headers = {
+        'Accept' => [RESULT_JSON, RESULT_XML, RDF::Format.content_types.keys.map(&:to_s)].join(', ')
+      }.merge @options[:headers] || {}
+      @http = http_klass(@url.scheme)
 
       if block_given?
         case block.arity
@@ -101,6 +105,7 @@ module SPARQL
     # @param  [String, #to_s]          url
     # @param  [Hash{Symbol => Object}] options
     # @option options [String] :content_type
+    # @option options [Hash] :headers
     # @return [Array<RDF::Query::Solution>]
     def query(query, options = {})
       parse_response(response(query, options), options)
@@ -112,10 +117,11 @@ module SPARQL
     # @param [String, #to_s]   url
     # @param  [Hash{Symbol => Object}] options
     # @option options [String] :content_type
+    # @option options [Hash] :headers
     # @return [String]
     def response(query, options = {})
       @headers['Accept'] = options[:content_type] if options[:content_type]
-      get(query) do |response|
+      get(query, options[:headers] || {}) do |response|
         case response
           when Net::HTTPBadRequest  # 400 Bad Request
             raise MalformedQuery.new(response.body)
@@ -270,11 +276,9 @@ module SPARQL
         when "https"
           proxy_uri = URI.parse(ENV['https_proxy']) unless ENV['https_proxy'].nil?
       end
-      return Net::HTTP if proxy_uri.nil? 
-
-      proxy_host, proxy_port = proxy_uri.host, proxy_uri.port
-      proxy_user, proxy_pass = proxy_uri.userinfo.split(/:/) if proxy_uri.userinfo
-      Net::HTTP::Proxy(proxy_host, proxy_port, proxy_user, proxy_pass)
+      klass = Net::HTTP::Persistent.new(self.class.to_s, proxy_uri)
+      klass.keep_alive = 120	# increase to 2 minutes
+      klass
     end
 
     ##
@@ -289,13 +293,13 @@ module SPARQL
       url = self.url.dup
       url.query_values = {:query => query.to_s}
 
-      http_klass(url.scheme).start(url.host, url.port) do |http|
-        response = http.get(url.path + "?#{url.query}", @headers.merge(headers))
-        if block_given?
-          block.call(response)
-        else
-          response
-        end
+      request = Net::HTTP::Get.new(url.request_uri, @headers.merge(headers))
+      request.basic_auth url.user, url.password if url.user && !url.user.empty?
+      response = @http.request url, request
+      if block_given?
+	block.call(response)
+      else
+	response
       end
     end
   end # Client

data/lib/sparql/client/query.rb

@@ -73,7 +73,7 @@ module SPARQL; class Client
     # @yieldparam [Query]
     def initialize(form = :ask, options = {}, &block)
       @form = form.respond_to?(:to_sym) ? form.to_sym : form.to_s.to_sym
-      super(options.dup, &block)
+      super([], options, &block)
     end
 
     ##

data/lib/sparql/client/version.rb

@@ -2,7 +2,7 @@ module SPARQL; class Client
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 9
+    TINY  = 11
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sparql-client
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -15,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 +01:00
-default_executable: 
+date: 2011-10-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -26,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
@@ -39,60 +40,80 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 4
+        version: 0.3.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: net-http-persistent
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 4
+        - 1
+        version: 1.4.1
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 6
         - 0
         version: 0.6.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 1
         - 0
         version: 2.1.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rdf-spec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
         - 3
         - 0
         version: 0.3.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: SPARQL client for RDF.rb.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -111,8 +132,6 @@ files:
 - lib/sparql/client/repository.rb
 - lib/sparql/client/version.rb
 - lib/sparql/client.rb
-- lib/sparql.rb
-has_rdoc: false
 homepage: http://sparql.rubyforge.org/client/
 licenses: 
 - Public Domain
@@ -126,6 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 53
       segments: 
       - 1
       - 8
@@ -136,13 +156,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: sparql
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: SPARQL client for RDF.rb.

data/lib/sparql.rb

@@ -1,8 +0,0 @@
-module SPARQL
-  # @see http://rubygems.org/gems/sparql-algebra
-  autoload :Algebra, 'sparql/algebra'
-  # @see http://rubygems.org/gems/sparql-grammar
-  autoload :Grammar, 'sparql/grammar'
-  # @see http://rubygems.org/gems/sparql-client
-  autoload :Client,  'sparql/client'
-end