iq_triplestorage 0.2.0 → 0.2.1

data/lib/iq_triplestorage.rb

@@ -1,3 +1,25 @@
 module IqTriplestorage
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
+
+  class BaseAdaptor
+    attr_reader :host
+
+    def initialize(host, options={})
+      @host = URI.parse(host).normalize
+      @username = options[:username]
+      @password = options[:password]
+    end
+
+    def http_request(method, path, body, 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
+
+      return Net::HTTP.new(uri.host, uri.port).request(req)
+    end
+
+  end
 end

data/lib/iq_triplestorage/sesame_adaptor.rb

@@ -3,14 +3,12 @@ require "cgi"
 
 require "iq_triplestorage"
 
-class IqTriplestorage::SesameAdaptor
-  attr_reader :host
+class IqTriplestorage::SesameAdaptor < IqTriplestorage::BaseAdaptor
 
-  def initialize(host, repository, options={})
-    @host = URI.parse(host).normalize
-    @repo = repository
-    @username = options[:username]
-    @password = options[:username]
+  def initialize(host, options={})
+    super
+    @repo = options[:repository]
+    raise(ArgumentError, "repository must not be nil") if @repo.nil?
   end
 
   # expects a hash of N-Triples by graph URI
@@ -25,19 +23,4 @@ class IqTriplestorage::SesameAdaptor
     http_request("POST", path, data, { "Content-Type" => "application/x-trig" })
   end
 
-  # converts N-Triples to N-Quads
-  def triples_to_quads(triples, context)
-  end
-
-  def http_request(method, path, body, headers={}) # XXX: largely duplicates VirtuosoAdaptor's
-    uri = URI.join("#{@host.to_s}/", 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
-
-    return Net::HTTP.new(uri.host, uri.port).request(req)
-  end
-
 end

data/lib/iq_triplestorage/virtuoso_adaptor.rb

@@ -1,97 +1,82 @@
 require "net/http"
 
-module IqTriplestorage
-  class VirtuosoAdaptor
+require "iq_triplestorage"
 
-    def initialize(host, port, username, password)
-      # validate to avoid nasty errors
-      raise(ArgumentError, "username must not be nil") if username.nil?
+class IqTriplestorage::VirtuosoAdaptor < IqTriplestorage::BaseAdaptor
 
-      @host = host
-      @port = port
-      @username = username
-      @password = password
-    end
-
-    def reset(uri)
-      return sparql_pull("CLEAR GRAPH <#{uri}>") # XXX: s/CLEAR/DROP/ was rejected (405)
-    end
-
-    # expects a hash of N-Triples by graph URI
-    def batch_update(triples_by_graph)
-      # apparently Virtuoso gets confused when mixing CLEAR and INSERT queries,
-      # so we have to do use separate requests
+  def initialize(host, options={})
+    super
+    # validate to avoid nasty errors
+    raise(ArgumentError, "username must not be nil") if @username.nil?
+  end
 
-      reset_queries = triples_by_graph.keys.map do |graph_uri|
-        "CLEAR GRAPH <#{graph_uri}>" # XXX: duplicates `reset`
-      end
-      success = sparql_query(reset_queries)
-      return false unless success
+  def reset(uri)
+    return sparql_pull("CLEAR GRAPH <#{uri}>") # XXX: s/CLEAR/DROP/ was rejected (405)
+  end
 
-      insert_queries = triples_by_graph.map do |graph_uri, ntriples|
-        "INSERT IN GRAPH <#{graph_uri}> {\n#{ntriples}\n}"
-      end
-      success = sparql_query(insert_queries)
+  # expects a hash of N-Triples by graph URI
+  def batch_update(triples_by_graph)
+    # apparently Virtuoso gets confused when mixing CLEAR and INSERT queries,
+    # so we have to do use separate requests
 
-      return success
+    reset_queries = triples_by_graph.keys.map do |graph_uri|
+      "CLEAR GRAPH <#{graph_uri}>" # XXX: duplicates `reset`
     end
+    success = sparql_query(reset_queries)
+    return false unless success
 
-    # uses push method if `rdf_data` is provided, pull otherwise
-    def update(uri, rdf_data=nil, content_type=nil)
-      reset(uri)
-
-      if rdf_data
-        res = sparql_push(uri, rdf_data.strip, content_type)
-      else
-        res = sparql_pull(%{LOAD "#{uri}" INTO GRAPH <#{uri}>})
-      end
-
-      return res
+    insert_queries = triples_by_graph.map do |graph_uri, ntriples|
+      "INSERT IN GRAPH <#{graph_uri}> {\n#{ntriples}\n}"
     end
+    success = sparql_query(insert_queries)
 
-    def sparql_push(uri, rdf_data, content_type)
-      raise TypeError, "missing content type" unless content_type
-
-      filename = uri.gsub(/[^0-9A-Za-z]/, "_") # XXX: too simplistic?
-      path = "/DAV/home/#{@username}/rdf_sink/#{filename}"
+    return success
+  end
 
-      res = http_request("PUT", path, rdf_data, { # XXX: is PUT correct here?
-        "Content-Type" => content_type
-      })
+  # uses push method if `rdf_data` is provided, pull otherwise
+  def update(uri, rdf_data=nil, content_type=nil)
+    reset(uri)
 
-      return res.code == "201"
+    if rdf_data
+      res = sparql_push(uri, rdf_data.strip, content_type)
+    else
+      res = sparql_pull(%{LOAD "#{uri}" INTO GRAPH <#{uri}>})
     end
 
-    def sparql_pull(query)
-      path = "/DAV/home/#{@username}/rdf_sink" # XXX: shouldn't this be /sparql?
-      res = http_request("POST", path, query, {
-        "Content-Type" => "application/sparql-query"
-      })
-      return res.code == "200" # XXX: always returns 409
-    end
+    return res
+  end
 
-    # query is a string or an array of strings
-    def sparql_query(query)
-      query = query.join("\n\n") + "\n" rescue query
-      path = "/DAV/home/#{@username}/query"
+  def sparql_push(uri, rdf_data, content_type)
+    raise TypeError, "missing content type" unless content_type
 
-      res = http_request("POST", path, query, {
-        "Content-Type" => "application/sparql-query"
-      })
+    filename = uri.gsub(/[^0-9A-Za-z]/, "_") # XXX: too simplistic?
+    path = "/DAV/home/#{@username}/rdf_sink/#{filename}"
 
-      return res.code == "201"
-    end
+    res = http_request("PUT", path, rdf_data, { # XXX: is PUT correct here?
+      "Content-Type" => content_type
+    })
 
-    def http_request(method, path, body, headers={})
-      uri = URI.parse("#{@host}:#{@port}#{path}")
+    return res.code == "201"
+  end
 
-      req = Net::HTTP.const_get(method.downcase.capitalize).new(uri.to_s)
-      req.basic_auth(@username, @password)
-      headers.each { |key, value| req[key] = value }
-      req.body = body
+  def sparql_pull(query)
+    path = "/DAV/home/#{@username}/rdf_sink" # XXX: shouldn't this be /sparql?
+    res = http_request("POST", path, query, {
+      "Content-Type" => "application/sparql-query"
+    })
+    return res.code == "200" # XXX: always returns 409
+  end
 
-      return Net::HTTP.new(uri.host, uri.port).request(req)
-    end
+  # query is a string or an array of strings
+  def sparql_query(query)
+    query = query.join("\n\n") + "\n" rescue query
+    path = "/DAV/home/#{@username}/query"
 
+    res = http_request("POST", path, query, {
+      "Content-Type" => "application/sparql-query"
+    })
+
+    return res.code == "201"
   end
+
 end

data/test/base_test.rb

@@ -0,0 +1,29 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+
+require "iq_triplestorage"
+
+class BaseTest < MiniTest::Unit::TestCase
+
+  def test_version
+    assert IqTriplestorage::VERSION.is_a?(String)
+  end
+
+  def test_host_normalization
+    host = "http://example.org"
+    adaptor = IqTriplestorage::BaseAdaptor.new(host)
+    assert_equal "/", adaptor.host.path
+
+    host = "http://example.org/"
+    adaptor = IqTriplestorage::BaseAdaptor.new(host)
+    assert_equal "/", adaptor.host.path
+
+    host = "http://example.org/foo"
+    adaptor = IqTriplestorage::BaseAdaptor.new(host)
+    assert_equal "/foo", adaptor.host.path
+
+    host = "http://example.org/foo/"
+    adaptor = IqTriplestorage::BaseAdaptor.new(host)
+    assert_equal "/foo/", adaptor.host.path
+  end
+
+end

data/test/sesame_test.rb

@@ -13,33 +13,15 @@ class SesameTest < WebTestCase
           { :status => req.uri.to_s.end_with?("/rdf_sink") ? 200 : 201 }
         end
 
-    @username = "foo"
-    @password = "bar"
     @host = "http://example.org/sesame"
     @repo = "test"
+    @username = "foo"
+    @password = "bar"
 
-    @adaptor = IqTriplestorage::SesameAdaptor.new(@host, @repo,
+    @adaptor = IqTriplestorage::SesameAdaptor.new(@host, :repository => @repo,
         :username => @username, :password => @password)
   end
 
-  def test_host_normalization
-    host = "http://example.org"
-    adaptor = IqTriplestorage::SesameAdaptor.new(host, "dummy")
-    assert_equal "/", adaptor.host.path
-
-    host = "http://example.org/"
-    adaptor = IqTriplestorage::SesameAdaptor.new(host, "dummy")
-    assert_equal "/", adaptor.host.path
-
-    host = "http://example.org/foo"
-    adaptor = IqTriplestorage::SesameAdaptor.new(host, "dummy")
-    assert_equal "/foo", adaptor.host.path
-
-    host = "http://example.org/foo/"
-    adaptor = IqTriplestorage::SesameAdaptor.new(host, "dummy")
-    assert_equal "/foo/", adaptor.host.path
-  end
-
   def test_batch
     data = {
       "http://example.com/foo" => "<aaa> <bbb> <ccc> .\n<ddd> <eee> <fff> .",

data/test/virtuoso_test.rb

@@ -13,12 +13,11 @@ class VirtuosoTest < WebTestCase
           { :status => req.uri.to_s.end_with?("/rdf_sink") ? 200 : 201 }
         end
 
+    @host = "http://example.org:8080"
     @username = "foo"
     @password = "bar"
-    @host = "example.org"
-    @port = 80
-    @adaptor = IqTriplestorage::VirtuosoAdaptor.new("http://#{@host}", @port,
-        @username, @password)
+    @adaptor = IqTriplestorage::VirtuosoAdaptor.new(@host,
+        :username => @username, :password => @password)
   end
 
   def test_reset
@@ -121,7 +120,7 @@ INSERT IN GRAPH <#{graph_uri}> {
   end
 
   def ensure_basics(req) # TODO: rename
-    assert_equal "#{@host}:#{@port}", "#{req.uri.hostname}:#{req.uri.port}"
+    assert_equal @host, "#{req.uri.scheme}://#{req.uri.hostname}:#{req.uri.port}"
 
     if auth_header = req.headers["Authorization"]
       auth = Base64.encode64([@username, @password].join(":")).strip

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iq_triplestorage
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -26,7 +26,7 @@ files:
 - lib/iq_triplestorage.rb
 - lib/iq_triplestorage/sesame_adaptor.rb
 - lib/iq_triplestorage/virtuoso_adaptor.rb
-- test/core_test.rb
+- test/base_test.rb
 - test/sesame_test.rb
 - test/test_helper.rb
 - test/virtuoso_test.rb
@@ -44,7 +44,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -492828564790801431
+      hash: -3716524453347900390
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -492828564790801431
+      hash: -3716524453347900390
 requirements: []
 rubyforge_project: iq_triplestorage
 rubygems_version: 1.8.23
@@ -61,7 +61,7 @@ signing_key:
 specification_version: 3
 summary: IqTriplestorage - library for interacting with RDF triplestores / quadstores
 test_files:
-- test/core_test.rb
+- test/base_test.rb
 - test/sesame_test.rb
 - test/test_helper.rb
 - test/virtuoso_test.rb

data/test/core_test.rb

@@ -1,11 +0,0 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
-
-require "iq_triplestorage"
-
-class CoreTest < MiniTest::Unit::TestCase
-
-  def test_version
-    assert IqTriplestorage::VERSION.is_a?(String)
-  end
-
-end