rdf-sesame 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e40256223226ea6aca7ac314a678ebe951af0782
-  data.tar.gz: 9f1e93a0eb52901a3881c50fd93f9a03c27ad715
+  metadata.gz: 04a330d11664f4d2e8ad1899cccb73672c52909f
+  data.tar.gz: a5f1dc2b3688aa21efaac913008b1500d875e2f5
 SHA512:
-  metadata.gz: a92457e1ba0067058fa2c23480c66d692adfdba488cabcfb2a5bb4c1025acc8835fe56ee38e56f8b0d47d743656d7bde37f58a398fdfe64a091326c9a7bd1eef
-  data.tar.gz: 3fcf0943353f42ef7981ca80416e93c7014a8412123cd9eb2bf8de2028f138055f9aed76488be131e92e8e95d8b40a7bc8ae47ccb4d3807668b1733b0afb6df0
+  metadata.gz: dfc6872515ac83c03eb27ea10feca2aa7bb67cfc06022da8f6cec9dd44422f09dc65ac0f18af86ba04792bff9336c7cbbf2c7ca60e72847f5910a80b9692f47b
+  data.tar.gz: 88bc76971e06250090f68d5cee02dfdceb7bcec6077541d1080f133cca4a082fa2804342f7fc884d02c75da643fc55f02bb0926daecd626ccc4c9825db5ad3fe

data/AUTHORS

@@ -1 +1,2 @@
 * Arto Bendiken <arto.bendiken@gmail.com>
+* Aymeric Brisse <aymeric.brisse@gmail.com>

data/README

@@ -36,7 +36,7 @@ Caveats
 
 * Sesame rewrites blank node identifiers on inserted statements. For
   example, if you supply a `_:foobar` identifier, it becomes something like
-  `_:node156oo6equx12769` as soon as you insert it into a Sesame repository. 
+  `_:node156oo6equx12769` as soon as you insert it into a Sesame repository.
   This means that you can't construct and insert a statement containing a
   blank node term and then expect to successfully be able check for its
   existence using the `Repository#has_statement?` method. This is also the
@@ -46,8 +46,8 @@ Caveats
 Dependencies
 ------------
 
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.0)
-* [JSON](http://rubygems.org/gems/json_pure) (>= 1.4.2)
+* [RDF.rb](http://rubygems.org/gems/rdf) (~> 1.1)
+* [JSON](http://rubygems.org/gems/json_pure) (~> 1.8)
 
 Installation
 ------------
@@ -62,12 +62,12 @@ Download
 
 To get a local working copy of the development repository, do:
 
-    % git clone git://github.com/bendiken/rdf-sesame.git
+    % git clone git://github.com/ruby-rdf/rdf-sesame.git
 
 Alternatively, download the latest development version as a tarball as
 follows:
 
-    % wget http://github.com/bendiken/rdf-sesame/tarball/master
+    % wget https://github.com/ruby-rdf/rdf-sesame/tarball/master
 
 Mailing List
 ------------
@@ -78,11 +78,11 @@ Author
 ------
 
 * [Arto Bendiken](http://github.com/bendiken) - <http://ar.to/>
+* [Aymeric Brisse](http://github.com/abrisse)
 
 Contributors
 ------------
 
-* [Aymeric Brisse](http://github.com/abrisse)
 * [Slava Kravchenko](http://github.com/cordawyn)
 
 License

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/rdf/sesame/repository.rb

@@ -44,6 +44,9 @@ module RDF::Sesame
     # @return [String,Array]
     attr_reader :context
 
+    # Maximum length for GET query
+    MAX_LENGTH_GET_QUERY = 2500
+
     ##
     # Initializes this `Repository` instance.
     #
@@ -279,12 +282,14 @@ module RDF::Sesame
     end
 
     ##
-    # Returns all statements of the given query.
+    # Returns all statements of the given query when the query
+    # is a READ query. Execute a WRITE query and returns the
+    # status of the query.
     #
     # @private
     # @param  [String, #to_s]        query
     # @param  [String, #to_s]        queryLn
-    # @return [RDF::Enumerator]
+    # @return [RDF::Enumerator, Boolean]
     def raw_query(query, queryLn = 'sparql', options={}, &block)
       options = { infer: true }.merge(options)
 
@@ -295,21 +300,34 @@ module RDF::Sesame
       end
     end
 
+    ##
+    # Returns all statements of the given query.
+    #
+    # @private
+    # @param  [String, #to_s]        query
+    # @param  [String, #to_s]        queryLn
+    # @return [RDF::Enumerator]
     def read_query(query, queryLn, options)
       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]
 
-      params = Addressable::URI.form_encode({ :query => query, :queryLn => queryLn, :infer => options[:infer] }).gsub("+", "%20").to_s
-      url = Addressable::URI.parse(path)
-      unless url.normalize.query.nil?
-        url.query = [url.query, params].compact.join('&')
+      parameters = { :query => query, :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
-        url.query = [url.query, params].compact.join('?')
+        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.get(url, options[:format])
 
       results = parse_response(response)
       if block_given?
@@ -319,10 +337,19 @@ module RDF::Sesame
       end
     end
 
+    ##
+    # Execute a WRITE query against the repository.
+    # Returns true if the query was succesful.
+    #
+    # @private
+    # @param  [String, #to_s]        query
+    # @param  [String, #to_s]        queryLn
+    # @param  [Hash]                 options
+    # @return [Boolean]
     def write_query(query, queryLn, options)
       parameters = {}
       parameters[:update] = query
-      response = server.post(path(:statements), Addressable::URI.form_encode(parameters), 'Content-Type' => 'application/x-www-form-urlencoded')
+      response = server.post(path(:statements), Addressable::URI.form_encode(parameters), Server::CONTENT_TYPE_X_FORM)
       response.code == "204"
     end
 
@@ -391,7 +418,7 @@ module RDF::Sesame
     # @see http://www.openrdf.org/doc/sesame2/system/ch08.html#d0e304
     def insert_statements(statements)
       data = statements_to_text_plain(statements)
-      response = server.post(path(:statements, statements_options), data, 'Content-Type' => 'text/plain')
+      response = server.post(path(:statements, statements_options), data, Server::CONTENT_TYPE_TEXT)
       response.code == "204"
     end
 

data/lib/rdf/sesame/server.rb

@@ -54,6 +54,9 @@ module RDF::Sesame
     ACCEPT_BINARY =  {'Accept' => 'application/x-binary-rdf'}.freeze
     ACCEPT_BINARY_TABLE = {'Accept' => 'application/x-binary-rdf-results-table'}.freeze
 
+    CONTENT_TYPE_TEXT = {'Content-Type' => 'text/plain'}.freeze
+    CONTENT_TYPE_X_FORM = {'Content-Type' => 'application/x-www-form-urlencoded' }.freeze
+
     RESULT_BOOL = 'text/boolean'.freeze
     RESULT_JSON = 'application/sparql-results+json'.freeze
     RESULT_XML = 'application/sparql-results+xml'.freeze

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rdf-sesame
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Arto Bendiken
-- Slava Kravchenko
+- Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Sesame 2.0 adapter for RDF.rb.