iq_triplestorage 0.2.1 → 0.2.2

data/lib/iq_triplestorage.rb

@@ -1,5 +1,5 @@
 module IqTriplestorage
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 
   class BaseAdaptor
     attr_reader :host
@@ -10,13 +10,13 @@ module IqTriplestorage
       @password = options[:password]
     end
 
-    def http_request(method, path, body, headers={})
+    def http_request(method, path, body=nil, headers={})
       uri = URI.join("#{@host}/", path)
 
       req = Net::HTTP.const_get(method.to_s.downcase.capitalize).new(uri.to_s)
       req.basic_auth(@username, @password) if (@username && @password)
       headers.each { |key, value| req[key] = value }
-      req.body = body
+      req.body = body if body
 
       return Net::HTTP.new(uri.host, uri.port).request(req)
     end

data/lib/iq_triplestorage/sesame_adaptor.rb

@@ -16,11 +16,18 @@ class IqTriplestorage::SesameAdaptor < IqTriplestorage::BaseAdaptor
     path = "/repositories/#{CGI.escape(@repo)}/statements"
     path = URI.join("#{@host}/", path[1..-1]).path
 
+    del_params = triples_by_graph.keys.
+        map { |graph| val = CGI.escape("<#{graph}>"); "context=#{val}" }.
+        join("&")
+    res = http_request("DELETE", "#{path}?#{del_params}")
+    return false unless res.code == "204"
+
     data = triples_by_graph.map do |graph_uri, ntriples|
       "<#{graph_uri}> {\n#{ntriples}\n}\n"
     end.join("\n\n")
-
-    http_request("POST", path, data, { "Content-Type" => "application/x-trig" })
+    res = http_request("POST", path, data,
+          { "Content-Type" => "application/x-trig" })
+    return res.code == "204"
   end
 
 end

data/test/sesame_test.rb

@@ -9,9 +9,7 @@ class SesameTest < WebTestCase
   def setup
     super
     WebMock.stub_request(:any, /.*example.org.*/).with(&@request_handler).
-        to_return do |req|
-          { :status => req.uri.to_s.end_with?("/rdf_sink") ? 200 : 201 }
-        end
+        to_return { |req| { :status => 204 } }
 
     @host = "http://example.org/sesame"
     @repo = "test"
@@ -28,11 +26,19 @@ class SesameTest < WebTestCase
       "http://example.com/bar" => "<ggg> <hhh> <iii> .\n<jjj> <kkk> <lll> ."
     }
 
+    @observers << lambda do |req|
+      assert_equal :delete, req.method
+      assert_equal "/sesame/repositories/#{CGI.escape(@repo)}/statements",
+          req.uri.path
+      # XXX: currently cannot test query parameters due to WebMock issues:
+      # https://github.com/bblimke/webmock/issues/226
+      # https://github.com/bblimke/webmock/issues/227
+      #assert_equal "context=...", req.uri.query
+    end
     @observers << lambda do |req|
       assert_equal :post, req.method
-      path = req.uri.path
-      assert path.
-          start_with?("/sesame/repositories/#{CGI.escape(@repo)}/statements")
+      assert_equal "/sesame/repositories/#{CGI.escape(@repo)}/statements",
+          req.uri.path
       assert_equal "application/x-trig", req.headers["Content-Type"]
       data.each do |graph_uri, ntriples|
         assert req.body.include?(<<-EOS)
@@ -42,7 +48,7 @@ class SesameTest < WebTestCase
         EOS
       end
     end
-    assert @adaptor.batch_update(data)
+    assert_equal true, @adaptor.batch_update(data)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iq_triplestorage
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -42,18 +42,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3716524453347900390
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3716524453347900390
 requirements: []
 rubyforge_project: iq_triplestorage
 rubygems_version: 1.8.23