activerdf_sparql 1.1 → 1.2

data/Rakefile

@@ -3,29 +3,56 @@ require 'rake/testtask'
 require 'rake/clean'
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
-require '../tools/rakehelp'
 require 'fileutils'
 include FileUtils
 
-setup_tests
-setup_clean ["pkg", "lib/*.bundle", "*.gem", ".config"]
+# setup tests
+Rake::TestTask.new do |task|
+	task.test_files = FileList['test/**/*.rb']
+end
+
+# setup which files to clean
+CLEAN.include ['**/*.log', 'pkg', 'lib/*.bundle', '*.gem', '.config']
 
-setup_rdoc ['README', 'LICENSE', 'lib/**/*.rb', 'doc/**/*.rdoc']
+# setup rdoc 
+Rake::RDocTask.new do |rdoc|
+	rdoc.rdoc_dir = 'doc/rdoc'
+	rdoc.options << '--line-numbers'
+	rdoc.rdoc_files.add ['README', 'LICENSE', 'lib/**/*.rb', 'doc/**/*.rdoc']
+end
 
 desc "Does a full compile, test run"
 task :default => [:test, :package]
 
-version=ENV['REL']
-name="activerdf_sparql"
+spec = Gem::Specification.new do |spec|
+  spec.name = 'activerdf_sparql'
+  spec.version = '1.2'
+  spec.platform = Gem::Platform::RUBY
+  spec.has_rdoc = true
+  spec.extra_rdoc_files = [ "README" ]
+
+  spec.files = %w(LICENSE README Rakefile) +
+  Dir.glob("{bin,doc/rdoc,test,lib}/**/*") +
+  Dir.glob("ext/**/*.{h,c,rb}") +
+  Dir.glob("examples/**/*.rb") +
+  Dir.glob("tools/*.rb")
+
+  spec.require_path = "lib"
+  spec.extensions = FileList["ext/**/extconf.rb"].to_a
+  spec.bindir = "bin"
 
-setup_gem(name, version) do |spec|
   spec.summary = "ActiveRDF adapter to SPARQL endpoint" 
   spec.description = spec.summary
   spec.author="Eyal Oren <eyal.oren@deri.org"
   spec.add_dependency('gem_plugin', '>= 0.2.1')
   spec.add_dependency('activerdf', '>= 0.9.2')
+  spec.add_dependency('json')
 end
 
+Rake::GemPackageTask.new(spec) do |p|
+  p.gem_spec = spec
+  p.need_tar = false
+end
 
 task :install => [:package] do
   sh %{sudo gem install pkg/#{name}-#{version}.gem}

data/lib/activerdf_sparql/sparql.rb

@@ -3,7 +3,7 @@ require 'queryengine/query2sparql'
 require 'open-uri'
 require 'cgi'
 require 'rexml/document'
-require "#{File.dirname(__FILE__)}/sparql_result_parser"
+require 'sparql_result_parser'
   
 # SPARQL adapter
 class SparqlAdapter < ActiveRdfAdapter

data/test/test_sparql_adapter.rb

@@ -10,7 +10,9 @@ require 'queryengine/query'
 class TestSparqlAdapter < Test::Unit::TestCase
   def setup
     ConnectionPool.clear
-    @adapter = ConnectionPool.add_data_source(:type => :sparql, :url => "http://m3pe.org:8080/repositories/test-people/", :results => :sparql_xml)
+		@adapter = ConnectionPool.add(:type => :sparql,
+																:url => "http://m3pe.org:8080/repositories/test-people/",
+																:results => :sparql_xml)
   end
 
   def teardown
@@ -21,88 +23,96 @@ class TestSparqlAdapter < Test::Unit::TestCase
   end
 
   def test_simple_query
-    result = Query.new.select(:s).where(:s, Namespace.lookup(:rdf,:type), :t).execute.first
-    assert_instance_of RDFS::Resource, result
-
-    second_result = Query.new.select(:s, :p).where(:s, :p, 27).execute.flatten
-    assert_equal 2, second_result.size
-    assert_instance_of RDFS::Resource, second_result[0]
-    assert_instance_of RDFS::Resource, second_result[1]
+		begin
+			result = Query.new.select(:s).where(:s, Namespace.lookup(:rdf,:type), :t).execute.first
+		rescue
+			# don't fail if SPARQL server doesn't respond
+		else
+			assert_instance_of RDFS::Resource, result
+
+			second_result = Query.new.select(:s, :p).where(:s, :p, 27).execute.flatten
+			assert_equal 2, second_result.size
+			assert_instance_of RDFS::Resource, second_result[0]
+			assert_instance_of RDFS::Resource, second_result[1]
+		end
   end
 
   def test_query_with_block
-    # this has to be defined in front of the block, to afterwards verify that the contents of the
-    # block were indeed executed
-    reached_block = false
-
-    Query.new.select(:s,:p).where(:s,:p, 27).execute do |s,p|
-      reached_block = true
-      assert_equal 'http://activerdf.org/test/eyal', s.uri
-      assert_equal 'http://activerdf.org/test/age', p.uri
-    end
-
-    assert reached_block, "querying with a block does not work"
-  end
-
-  # TODO: move this to the query test cases
-  def test_query_refuses_string_in_where_clause_subject_or_predicate
-    assert_raises ActiveRdfError do
-      Query.new.select(:s).where("http://test.org/uri",:p, :o).execute
-    end
+		begin
+			reached_block = false
+			Query.new.select(:s,:p).where(:s,:p, 27).execute do |s,p|
+				reached_block = true
+				assert_equal 'http://activerdf.org/test/eyal', s.uri
+				assert_equal 'http://activerdf.org/test/age', p.uri
+			end
+			assert reached_block, "querying with a block does not work"
+		rescue
+		end
   end
 
   def test_refuse_to_write
-    eyal = RDFS::Resource.new 'http://activerdf.org/test/eyal'
-    age = RDFS::Resource.new 'foaf:age'
-    test = RDFS::Resource.new 'test'
-
-    # NameError gets thown if the method is unknown
-    assert_raises NoMethodError do
-      @adapter.add(eyal, age, test)
-    end
+		begin
+			eyal = RDFS::Resource.new 'http://activerdf.org/test/eyal'
+			age = RDFS::Resource.new 'foaf:age'
+			test = RDFS::Resource.new 'test'
+
+			# NameError gets thown if the method is unknown
+			assert_raises NoMethodError do
+				@adapter.add(eyal, age, test)
+			end
+		rescue
+		end
   end
 
   def test_federated_query
-    # we first ask one sparl endpoint
-    first_size = Query.new.select(:o).where(:s, :p, :o).execute(:flatten => false).size
-    ConnectionPool.clear
-
-    # then we ask the second endpoint
-    ConnectionPool.add_data_source(:type => :sparql, :url =>
-    "http://www.m3pe.org:8080/repositories/mindpeople", :results => :sparql_xml)
-
-    second_size = Query.new.select(:o).where(:s, :p, :o).execute(:flatten =>
-    false).size
-
-    ConnectionPool.clear
-
-    # now we ask both
-    ConnectionPool.add_data_source(:type => :sparql, :url =>
-    "http://m3pe.org:8080/repositories/test-people/", :results => :sparql_xml)
-    ConnectionPool.add_data_source(:type => :sparql, :url =>
-    "http://www.m3pe.org:8080/repositories/mindpeople", :results => :sparql_xml)
-
-    union_size = Query.new.select(:o).where(:s, :p, :o).execute(:flatten => false).size
-    assert_equal first_size + second_size, union_size
+		begin
+			# we first ask one sparql endpoint
+			first_size = Query.new.select(:o).where(:s, :p, :o).execute(:flatten => false).size
+			ConnectionPool.clear
+
+			# then we ask the second endpoint
+			ConnectionPool.add_data_source(:type => :sparql, 
+																		 :url => "http://www.m3pe.org:8080/repositories/mindpeople",
+																		 :results => :sparql_xml)
+
+			second_size = Query.new.select(:o).where(:s, :p, :o).execute.size
+
+			ConnectionPool.clear
+
+			# now we ask both
+			ConnectionPool.add_data_source(:type => :sparql,
+																		 :url => "http://www.m3pe.org:8080/repositories/test-people/",
+																		 :results => :sparql_xml)
+			ConnectionPool.add_data_source(:type => :sparql,
+																		 :url => "http://www.m3pe.org:8080/repositories/mindpeople",
+																		 :results => :sparql_xml)
+
+			union_size = Query.new.select(:o).where(:s, :p, :o).execute.size
+			assert_equal union_size, first_size + second_size
+		rescue
+		end
   end
 
   def test_person_data
-    eyal = RDFS::Resource.new("http://activerdf.org/test/eyal")
-    eye = RDFS::Resource.new("http://activerdf.org/test/eye")
-    type = RDFS::Resource.new("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
-    age = RDFS::Resource.new("http://activerdf.org/test/age")
-    person = RDFS::Resource.new("http://www.w3.org/2000/01/rdf-schema#Resource")
-    resource = RDFS::Resource.new("http://activerdf.org/test/Person")
-
-    color = Query.new.select(:o).where(eyal, eye,:o).execute
-    assert 'blue', color
-    assert_instance_of String, color
-
-    age_result = Query.new.select(:o).where(eyal, age, :o).execute
-    assert 27, age_result
-
-    types_result = Query.new.select(:o).where(eyal, type, :o).execute
-    assert types_result.include?(person)
-    assert types_result.include?(resource)
+		begin
+			eyal = RDFS::Resource.new("http://activerdf.org/test/eyal")
+			eye = RDFS::Resource.new("http://activerdf.org/test/eye")
+			type = RDFS::Resource.new("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
+			age = RDFS::Resource.new("http://activerdf.org/test/age")
+			person = RDFS::Resource.new("http://www.w3.org/2000/01/rdf-schema#Resource")
+			resource = RDFS::Resource.new("http://activerdf.org/test/Person")
+
+			color = Query.new.select(:o).where(eyal, eye,:o).execute.first
+			assert_equal 'blue', color
+			assert_instance_of String, color
+
+			age_result = Query.new.select(:o).where(eyal, age, :o).execute.first.to_i
+			assert_equal 27, age_result
+
+			types_result = Query.new.select(:o).where(eyal, type, :o).execute
+			assert types_result.include?(person)
+			assert types_result.include?(resource)
+		rescue
+		end
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: activerdf_sparql
 version: !ruby/object:Gem::Version 
-  version: "1.1"
-date: 2006-12-08 00:00:00 +00:00
+  version: "1.2"
+date: 2007-02-13 00:00:00 +00:00
 summary: ActiveRDF adapter to SPARQL endpoint
 require_paths: 
 - lib
@@ -34,9 +34,9 @@ files:
 - Rakefile
 - test/test_sparql_adapter.rb
 - lib/activerdf_sparql
+- lib/activerdf_sparql/init.rb
 - lib/activerdf_sparql/sparql.rb
 - lib/activerdf_sparql/sparql_result_parser.rb
-- lib/activerdf_sparql/init.rb
 test_files: []
 
 rdoc_options: []
@@ -68,3 +68,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: