rdf-sesame 3.0.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f05b6d47318fbb72fc0b23fc39ecbc284a77bcc7
-  data.tar.gz: 4fdfc60cdc422cfe0b419eed3150beb29881e646
+SHA256:
+  metadata.gz: a61133a0a5d9d38168002df45bbd53101d5a6c66c72968bf0e05f2e44bd416c7
+  data.tar.gz: b26ed3787876b38d4542c5529a2bee1f3cc4d579a0da27ccc709ad70623fc087
 SHA512:
-  metadata.gz: ed8b957c75380bef0b2be6c38974785321b00da5c9e4c41729b8928b0db733792ae66ec53725fcd8242017232810638e0e0c3df322e185932d8cece16169a0cb
-  data.tar.gz: fcb03b4f168c3f3a1db2b33eb72779c0ff7e1c8708a6a1653a89fbd153c21e5ec7723dd4c7b1d97601def697f119c5757270fe012e8350896b1e868dbe1c6ad1
+  metadata.gz: a345ec1c99201380cdf65d323257bda9d0d642006aa782c2cf5881729b024e191ba0e37b2e79bbdccac0245da5a76796b14c7f13571683c5916232e5d221ecac
+  data.tar.gz: c559209cf90f38b8a73de13a938754c60d5d3d164c6bdf63b29e5838b0ded1de508e414e2322bb051dbbe6bd764a027a45bb5bcace381fa992378815a4de161d

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.1.2

data/lib/rdf/sesame/connection.rb

@@ -325,12 +325,10 @@ module RDF::Sesame
         request.body = data.to_s
         request.basic_auth @user, @pass unless @user.nil? || @pass.nil?
         response = http.request(request)
-        http.request(request) do |response|
-          if block_given?
-            yield response
-          else
-            response
-          end
+        if block_given?
+          yield response
+        else
+          response
         end
       end
     end

data/lib/rdf/sesame/repository.rb

@@ -291,6 +291,27 @@ module RDF::Sesame
       raw_query(query, 'sparql', options, &block)
     end
 
+    # Run a raw SPARQL query.
+    #
+    # @overload sparql_query(query) {|solution| ... }
+    #   @yield solution
+    #   @yieldparam [RDF::Query::Solution] solution
+    #   @yieldreturn [void]
+    #   @return [void]
+    #
+    # @overload sparql_query(pattern)
+    #   @return [Enumerator<RDF::Query::Solution>]
+    #
+    # @param [String] query The query to run.
+    # @param [Hash{Symbol => Object}] options
+    #   The query options (see build_query).
+    # @return [void]
+    #
+    # @see #build_query
+    def sparql_query(query, options={}, &block)
+      raw_query(query, 'sparql', options, &block)
+    end
+
     ##
     # Returns all statements of the given query when the query
     # is a READ query. Execute a WRITE query and returns the
@@ -325,21 +346,13 @@ module RDF::Sesame
       options[:format] = Server::ACCEPT_JSON unless options[:format]
       options[:parsing] = :full unless options[:parsing]
 
-      parameters = { :query => query, :queryLn => queryLn, :infer => options[:infer] }
+      parameters = { :queryLn => queryLn, :infer => options[:infer] }
 
-      response = if query.size > MAX_LENGTH_GET_QUERY
-        headers = Server::CONTENT_TYPE_X_FORM.merge(options[:format])
-        server.post(path, Addressable::URI.form_encode(parameters), headers)
-      else
-        params = Addressable::URI.form_encode(parameters).gsub("+", "%20").to_s
-        url = Addressable::URI.parse(path)
-        unless url.normalize.query.nil?
-          url.query = [url.query, params].compact.join('&')
-        else
-          url.query = [url.query, params].compact.join('?')
-        end
-        server.get(url, options[:format])
-      end
+      response = server.post(
+        encode_url_parameters(path, parameters),
+        query,
+        Server::CONTENT_TYPE_SPARQL_QUERY.merge(options[:format])
+      )
 
       results = if (options[:parsing] == :full)
         parse_response(response)
@@ -364,10 +377,14 @@ module RDF::Sesame
     # @param  [Hash]                 options
     # @return [Boolean]
     def write_query(query, queryLn, options)
-      parameters = {}
-      parameters[:update] = query
-      parameters[:infer] = options[:infer]
-      response = server.post(path(:statements), Addressable::URI.form_encode(parameters), Server::CONTENT_TYPE_X_FORM)
+      parameters = { infer: options[:infer] }
+
+      response = server.post(
+        encode_url_parameters(path(:statements), parameters),
+        query,
+        Server::CONTENT_TYPE_SPARQL_UPDATE
+      )
+
       response.code == "204"
     end
 
@@ -549,9 +566,9 @@ module RDF::Sesame
         when :uri
           RDF::URI.new(value['value'])
         when :literal
-          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'],
+            language: value['xml:lang'],
+            datatype: value['datatype'])
         else nil
       end
     end
@@ -642,6 +659,22 @@ module RDF::Sesame
       options
     end
 
+    # @private
+    #
+    # Encode in the URL parameters
+    def encode_url_parameters(path, parameters)
+      params = Addressable::URI.form_encode(parameters).gsub("+", "%20").to_s
+      url = Addressable::URI.parse(path)
+
+      unless url.normalize.query.nil?
+        url.query = [url.query, params].compact.join('&')
+      else
+        url.query = [url.query, params].compact.join('?')
+      end
+
+      url
+    end
+
     # @private
     #
     # Fetch the graph names from SESAME API

data/lib/rdf/sesame/server.rb

@@ -57,6 +57,8 @@ module RDF::Sesame
 
     CONTENT_TYPE_TEXT = {'Content-Type' => 'text/plain'}.freeze
     CONTENT_TYPE_X_FORM = {'Content-Type' => 'application/x-www-form-urlencoded' }.freeze
+    CONTENT_TYPE_SPARQL_QUERY = {'Content-Type' => 'application/sparql-query'}.freeze
+    CONTENT_TYPE_SPARQL_UPDATE = {'Content-Type' => 'application/sparql-update'}.freeze
 
     RESULT_BOOL = 'text/boolean'.freeze
     RESULT_JSON = 'application/sparql-results+json'.freeze

data/lib/rdf/sesame/version.rb

@@ -1,11 +1,10 @@
 module RDF; module Sesame
   module VERSION
     MAJOR = 3
-    MINOR = 0
-    TINY  = 1
-    EXTRA = nil
+    MINOR = 1
+    TINY  = 2
 
-    STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY].compact.join('.')
 
     ##
     # @return [String]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-sesame
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Arto Bendiken
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -131,8 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rdf
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Sesame 2.0 adapter for RDF.rb.