currmap-sesame 0.1.0 → 0.1.1

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.authors = ["James N. V. Cash"]
     gem.add_dependency 'nokogiri', ">= 0"
     gem.add_development_dependency 'rspec', '>= 0'
+    gem.add_development_dependency 'parseconfig', '>= 0'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -30,6 +31,8 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
+task :spec => :check_dependencies
+
 task :default => :spec
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/sesame.rb

@@ -8,60 +8,69 @@ module Sesame
   class Server
     attr_reader :uri, :repo
     
-    def initialize(host, port, sesamedir, repo, user, pass, options=nil)
+    def initialize(host, port, sesamedir, repo, user, pass, options={})
       @host = host
       @port = port
       @sesamedir = sesamedir
       @repo = repo
       @user = user
       @pass = pass
-      @options = options
+      @opt = Hash.new(false).merge options
       @uri =
         URI.parse("http://#{@host}:#{@port}/#{@sesamedir}/repositories")
     end
-
-    def select(query_str, query_lang="sparql")
-      params = { "query" => query_str, "queryLn" => query_lang }
-      query_params = params.collect { |k,v| "#{k}=#{URI.escape(v.to_s)}" }.
-        reverse.join '&'
-      req = Net::HTTP::Get.new("#{@uri.path}/#{@repo}?#{query_params}",
-                               {'Accept' => 'application/sparql-results+xml' })
+    
+    def process_query_xml(uri, &block)
+      req = Net::HTTP::Get.new(@uri.path + uri, { 'Accept' => 'application/sparql-results+xml'})
       req.basic_auth @user, @pass
       xml = Nokogiri::XML.parse(request(req).body)
-      res = Hash.new
-      # Get variables from query
-      xml.xpath('//xmlns:head/xmlns:variable').each do |var|
-        res[var['name']] = Array.new
+      if !@opt[:return_xml]
+        res = yield xml
+        return res
+      else
+        return xml
       end
-      # Populate result hash by variable
-      xml.xpath('//xmlns:result/xmlns:binding').each do |binding|
-        res[binding['name']] << (binding / 'uri')[0].content
+    end
+
+    def select(query_str, query_lang="sparql")
+      params = { "query" => query_str, "queryLn" => query_lang }
+      query_params =
+        params.collect { |k,v| "#{k}=#{URI.escape(v.to_s)}" }.reverse.join '&'
+      
+      process_query_xml "/#{@repo}?#{query_params}" do |xml|
+        res = Hash.new
+        # Get variables from query
+        xml.xpath('//xmlns:head/xmlns:variable').each do |var|
+          res[var['name']] = Array.new
+        end
+        # Populate result hash by variable
+        xml.xpath('//xmlns:result/xmlns:binding').each do |binding|
+          res[binding['name']] << (binding / 'uri')[0].content
+        end
+        res # res should be the result of the block
       end
-      return res
     end
     
     def list_repos
-      req = Net::HTTP::Get.new(@uri.path,
-                               {'Accept' => "application/sparql-results+xml" })
-      xml = Nokogiri::XML.parse(request(req).body)
-      res = Array.new
-      xml.xpath('//xmlns:binding[@name="id"]/xmlns:literal').each do |repo|
-        res << repo.content
+      process_query_xml "" do |xml|
+        res = Array.new
+        xml.xpath('//xmlns:binding[@name="id"]/xmlns:literal').each do |repo|
+          res << repo.content
+        end
+        res # res should be the result of the block
       end
-      return res
     end
 
     def list_namespaces repo
-      req = Net::HTTP::Get.new("#{@uri.path}/#{repo}/namespaces",
-                               {'Accept' => "application/sparql-results+xml" })
-      xml =  Nokogiri::XML.parse(request(req).body)
-      res = Hash.new
-      xml.xpath('//xmlns:result').each do |result|
-        prefix = result.xpath('.//xmlns:binding[@name="prefix"]/xmlns:literal')[0].content
-        namespc = result.xpath('.//xmlns:binding[@name="namespace"]/xmlns:literal')[0].content
-        res[prefix] = namespc
+      process_query_xml "/#{repo}/namespaces" do |xml|
+        res = Hash.new
+        xml.xpath('//xmlns:result').each do |result|
+          prefix = result.xpath('.//xmlns:binding[@name="prefix"]/xmlns:literal')[0].content
+          namespc = result.xpath('.//xmlns:binding[@name="namespace"]/xmlns:literal')[0].content
+          res[prefix] = namespc
+        end
+        res # res should be the result of the block
       end
-      return res
     end
     
     def request(req)

data/spec/sesame_spec.rb

@@ -5,13 +5,17 @@ require 'parseconfig'
 describe Sesame::Server do
 
   before :all do
-    config = ParseConfig.new "#{File.dirname(__FILE__)}/tests-config"
-    @host = config.get_value('host')
-    @port = config.get_value('port').to_i
-    @sesame_dir = config.get_value('sesame_dir')
-    @repo = config.get_value('repo')
-    @user = config.get_value('username')
-    @pass = config.get_value('password')
+    begin
+      config = ParseConfig.new "#{File.dirname(__FILE__)}/tests-config"
+      @host = config.get_value('host')
+      @port = config.get_value('port').to_i
+      @sesame_dir = config.get_value('sesame_dir')
+      @repo = config.get_value('repo')
+      @user = config.get_value('username')
+      @pass = config.get_value('password')
+    rescue Errno::EACCES
+      puts "Unable to open #{File.dirname(__FILE__)}/tests-config"
+    end
   end
   
   before :each do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - James N. V. Cash
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 -04:00
+date: 2010-05-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,6 +41,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: parseconfig
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Establish an object-database mapping to an OpenRDF Sesame Triple Store database
 email: james.cash@occasionallycogent.com
 executables: []