rdf-sesame 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e058f96f2674ca2473f1c1287cb9956d2dd40ec3
-  data.tar.gz: 16cfeacf6604c3808414652904e0f15550759fdd
+  metadata.gz: c2f329d7861b08b851a2eccae110ace25fe424e6
+  data.tar.gz: f457fb5e4db30918ebaf472fa8c574ad7236b932
 SHA512:
-  metadata.gz: 1f7b9ed8834936df2bf5da9260136fa230e88dcb8b8ad9727b2316a66103b5d03f640e0059b71744c542ce84ebb288c0b4b9846c4ed61d8a10e77e813cae6d20
-  data.tar.gz: 7e751f8d6db397afb38ecbe1d4654b55abfe51d9df03decdd49717cca91ead4f5ecc58342bd64c148fb41304839672747c4d44f492c55e90cb2db1ad8a6bbf98
+  metadata.gz: 24201ab9073a36d5f8d715f42cfb298edae092de72697534220dc637b2aad14008cbe74389c156fbcfa1baae7002ff66769cc1da7ebe12e99a7c064d00cf488d
+  data.tar.gz: f8639b735212b6da34887e18832fadd961ec7290935793c59778907882dcf46b475e03837d031a1f74aec1af57368caea9a004e4276f837c666c0bfdf5986bde

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/rdf/sesame/repository.rb

@@ -321,7 +321,9 @@ module RDF::Sesame
       if queryLn == 'sparql' and options[:format].nil? and query =~ /\bconstruct\b/i
         options[:format] = Server::ACCEPT_NTRIPLES
       end
+
       options[:format] = Server::ACCEPT_JSON unless options[:format]
+      options[:parsing] = :full unless options[:parsing]
 
       parameters = { :query => query, :queryLn => queryLn, :infer => options[:infer] }
 
@@ -339,7 +341,12 @@ module RDF::Sesame
         server.get(url, options[:format])
       end
 
-      results = parse_response(response)
+      results = if (options[:parsing] == :full)
+        parse_response(response)
+      else
+        raw_parse_response(response)
+      end
+
       if block_given?
         results.each {|s| yield s }
       else
@@ -480,13 +487,41 @@ module RDF::Sesame
       end
     end
 
+    ##
+    # @param [Net::HTTPSuccess] response
+    # @param [Hash{Symbol => Object}] options
+    # @return [Object]
+    def raw_parse_response(response, options = {})
+      case content_type = options[:content_type] || response.content_type
+        when Server::RESULT_BOOL
+          response.body == 'true'
+        when Server::RESULT_JSON, Server::RESULT_RDF_JSON
+          self.class.parse_json(response.body)
+        when Server::RESULT_XML
+          self.class.parse_xml(response.body)
+        else
+          response.body
+      end
+    end
+
+    def self.parse_json(json)
+      require 'json' unless defined?(::JSON)
+      json = JSON.parse(json.to_s) unless json.is_a?(Hash)
+    end
+
+    def self.parse_xml(xml)
+      xml.force_encoding(::Encoding::UTF_8) if xml.respond_to?(:force_encoding)
+      require 'rexml/document' unless defined?(::REXML::Document)
+      xml = REXML::Document.new(xml).root unless xml.is_a?(REXML::Element)
+      xml
+    end
+
     ##
     # @param [String, Hash] json
     # @return [<RDF::Query::Solutions>]
     # @see http://www.w3.org/TR/rdf-sparql-json-res/#results
     def self.parse_json_bindings(json, nodes = {})
-      require 'json' unless defined?(::JSON)
-      json = JSON.parse(json.to_s) unless json.is_a?(Hash)
+      json = self.parse_json(json)
 
       case
         when json['boolean']
@@ -526,9 +561,7 @@ module RDF::Sesame
     # @return [<RDF::Query::Solutions>]
     # @see http://www.w3.org/TR/rdf-sparql-json-res/#results
     def self.parse_xml_bindings(xml, nodes = {})
-      xml.force_encoding(::Encoding::UTF_8) if xml.respond_to?(:force_encoding)
-      require 'rexml/document' unless defined?(::REXML::Document)
-      xml = REXML::Document.new(xml).root unless xml.is_a?(REXML::Element)
+      xml = self.parse_xml(xml)
 
       case
         when boolean = xml.elements['boolean']
@@ -589,7 +622,7 @@ module RDF::Sesame
         if c == 'null' or !c
           c
         else
-          RDF::NTriples.serialize(RDF::URI.new(c))
+          RDF::NTriples.serialize(RDF::URI(c))
         end
       end
 

data/lib/rdf/sesame/server.rb

@@ -42,6 +42,7 @@ module RDF::Sesame
   class Server
     include Enumerable
 
+    ACCEPT_RDF_JSON = {'Accept' => 'application/rdf+json'}.freeze
     ACCEPT_JSON = {'Accept' => 'application/sparql-results+json'}.freeze
     ACCEPT_NTRIPLES = {'Accept' => 'text/plain'}.freeze
     ACCEPT_XML  = {'Accept' => 'application/sparql-results+xml'}.freeze
@@ -60,6 +61,7 @@ module RDF::Sesame
     RESULT_BOOL = 'text/boolean'.freeze
     RESULT_JSON = 'application/sparql-results+json'.freeze
     RESULT_XML = 'application/sparql-results+xml'.freeze
+    RESULT_RDF_JSON = 'application/rdf+json'.freeze
 
     # @return [Connection]
     attr_reader :connection

data/lib/rdf/sesame/version.rb

@@ -2,7 +2,7 @@ module RDF; module Sesame
   module VERSION
     MAJOR = 2
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-sesame
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Arto Bendiken
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Sesame 2.0 adapter for RDF.rb.