activerdf_rdflite 1.4 → 1.4.1

data/lib/activerdf_rdflite/rdflite.rb

@@ -7,6 +7,8 @@ require 'active_rdf'
 require 'federation/connection_pool'
 require 'uuidtools'
 require 'queryengine/ntriples_parser'
+require 'open-uri'
+require 'mime/types'
 
 $activerdflog.info "loading RDFLite adapter"
 
@@ -93,7 +95,7 @@ class RDFLite < ActiveRdfAdapter
   # close adapter and remove it from the ConnectionPool
   def close
     ConnectionPool.remove_data_source(self)
-    # TODO: close rdflite data source
+    @db.close
   end
 
 	# deletes triple(s,p,o,c) from datastore
@@ -159,14 +161,30 @@ class RDFLite < ActiveRdfAdapter
 	end
 
 	# loads triples from file in ntriples format
-	def load(file)
-		ntriples = File.readlines(file)
-		$activerdflog.debug "read #{ntriples.size} triples from file #{file}"
-
-		# use filename as context
-		context = internalise(RDFS::Resource.new("file:#{file}"))
-
-		add_ntriples(ntriples, context)
+	def load(location)
+    context = if URI.parse(location).host
+                location
+              else
+                internalise(RDFS::Resource.new("file:#{location}"))
+              end
+
+    case MIME::Types.of(location)
+    when MIME::Types['application/rdf+xml']
+      # check if rapper available
+      begin 
+        # can only parse rdf/xml with redland
+        # die otherwise
+        require 'rdf/redland'
+        model = Redland::Model.new
+        Redland::Parser.new.parse_into_model(model, location)
+        add_ntriples(model.to_string('ntriples'), location)
+      rescue LoadError
+        raise ActiveRdfError, "cannot parse remote rdf/xml file without Redland: please install Redland (librdf.org) and its Ruby bindings"
+      end
+    else
+      data = open(location).read
+      add_ntriples(data, context)
+    end
 	end
 
 	# adds ntriples from given context into datastore

data/test/test_rdflite.rb

@@ -19,8 +19,6 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
   def test_registration
     adapter = ConnectionPool.add_data_source(:type => :rdflite)
 		assert_instance_of RDFLite, adapter
-		# we cant garantuee that the rdflite adapter can do keyword search
-		# assert adapter.keyword_search?
 	end
 
 	def test_initialise
@@ -28,10 +26,6 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
 		assert !adapter.keyword_search? 
 	end
 
-	def test_initialise_with_user_params
-		#TODO: FIXME
-	end
-
 	def test_duplicate_registration
     adapter1 = ConnectionPool.add_data_source(:type => :rdflite)
     adapter2 = ConnectionPool.add_data_source(:type => :rdflite)
@@ -122,6 +116,14 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
     adapter = ConnectionPool.add_data_source :type => :rdflite
 		adapter.load(File.dirname(File.expand_path(__FILE__)) + '/test_data.nt')
 		assert_equal 32, adapter.size
+
+    adapter.clear
+    adapter.load('http://www.w3.org/2000/10/rdf-tests/rdfcore/ntriples/test.nt')
+    assert_equal 30, adapter.size
+
+    adapter.clear
+    adapter.load('http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema.rdf')
+    assert_equal 76, adapter.size
 	end
 
 	def test_load_bnodes

metadata

@@ -1,88 +1,133 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.4
+specification_version: 1
+name: activerdf_rdflite
+version: !ruby/object:Gem::Version 
+  version: 1.4.1
+date: 2007-11-01 00:00:00 +00:00
+summary: an RDF database for usage in ActiveRDF (based on sqlite3)
+require_paths: 
+- lib
+email: 
 homepage: 
-extensions: []
-executables: []
-version: !ruby/object:Gem::Version
-  version: !str 1.4
+rubyforge_project: 
+description: an RDF database for usage in ActiveRDF (based on sqlite3)
+autorequire: 
+default_executable: 
+bindir: bin
+has_rdoc: true
+required_ruby_version: !ruby/object:Gem::Version::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
+  version: 
+platform: ruby
+signing_key: 
+cert_chain: 
 post_install_message: 
-date: 2007-09-01 22:00:00 +00:00
+authors: 
+- Eyal Oren <eyal.oren@deri.org
 files: 
 - LICENSE
 - README
 - CHANGELOG
-- test/test_bnode_data.nt
+- doc/rdoc/classes
+- doc/rdoc/classes/FetchingAdapter.src
+- doc/rdoc/classes/FetchingAdapter.src/M000015.html
+- doc/rdoc/classes/RDFLite.src
+- doc/rdoc/classes/RDFLite.src/M000001.html
+- doc/rdoc/classes/RDFLite.src/M000002.html
+- doc/rdoc/classes/RDFLite.src/M000003.html
+- doc/rdoc/classes/RDFLite.src/M000004.html
+- doc/rdoc/classes/RDFLite.src/M000005.html
+- doc/rdoc/classes/RDFLite.src/M000006.html
+- doc/rdoc/classes/RDFLite.src/M000007.html
+- doc/rdoc/classes/RDFLite.src/M000008.html
+- doc/rdoc/classes/RDFLite.src/M000009.html
+- doc/rdoc/classes/RDFLite.src/M000010.html
+- doc/rdoc/classes/RDFLite.src/M000011.html
+- doc/rdoc/classes/RDFLite.src/M000012.html
+- doc/rdoc/classes/String.src
+- doc/rdoc/classes/String.src/M000016.html
+- doc/rdoc/classes/SuggestingAdapter.src
+- doc/rdoc/classes/SuggestingAdapter.src/M000013.html
+- doc/rdoc/classes/SuggestingAdapter.src/M000014.html
+- doc/rdoc/classes/FetchingAdapter.html
+- doc/rdoc/classes/RDFLite.html
+- doc/rdoc/classes/String.html
+- doc/rdoc/classes/SuggestingAdapter.html
+- doc/rdoc/files
+- doc/rdoc/files/lib
+- doc/rdoc/files/lib/activerdf_rdflite
+- doc/rdoc/files/lib/activerdf_rdflite/fetching_rb.html
+- doc/rdoc/files/lib/activerdf_rdflite/init_rb.html
+- doc/rdoc/files/lib/activerdf_rdflite/rdflite_rb.html
+- doc/rdoc/files/lib/activerdf_rdflite/suggesting_rb.html
+- doc/rdoc/files/LICENSE.html
+- doc/rdoc/files/README.html
+- doc/rdoc/created.rid
+- doc/rdoc/fr_class_index.html
+- doc/rdoc/fr_file_index.html
+- doc/rdoc/fr_method_index.html
+- doc/rdoc/index.html
+- doc/rdoc/rdoc-style.css
 - test/test_data.nt
+- test/test_rdflite.rb
 - test/test_escaped_data.nt
 - test/test_fetching.rb
-- test/test_rdflite.rb
+- test/test_bnode_data.nt
 - lib/activerdf_rdflite
+- lib/activerdf_rdflite/rdflite.rb
 - lib/activerdf_rdflite/fetching.rb
 - lib/activerdf_rdflite/init.rb
-- lib/activerdf_rdflite/rdflite.rb
 - lib/activerdf_rdflite/suggesting.rb
-rubygems_version: 0.9.4
-rdoc_options: []
-signing_key: 
-cert_chain: 
-name: activerdf_rdflite
-has_rdoc: true
-platform: ruby
-summary: an RDF database for usage in ActiveRDF (based on sqlite3)
-default_executable: 
-bindir: bin
-required_ruby_version: !ruby/object:Gem::Version::Requirement
-  version: 
-  requirements: 
-  - - '>'
-    - !ruby/object:Gem::Version
-      version: 0.0.0
-require_paths: 
-- lib
-specification_version: 1
 test_files: []
+
+rdoc_options: []
+
+extra_rdoc_files: 
+- README
+executables: []
+
+extensions: []
+
+requirements: []
+
 dependencies: 
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: gem_plugin
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement
-    version: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - '>='
-      - !ruby/object:Gem::Version
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.2.1
-- !ruby/object:Gem::Dependency
+    version: 
+- !ruby/object:Gem::Dependency 
   name: uuidtools
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement
-    version: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - '>'
-      - !ruby/object:Gem::Version
+    - - ">"
+      - !ruby/object:Gem::Version 
         version: 0.0.0
-- !ruby/object:Gem::Dependency
+    version: 
+- !ruby/object:Gem::Dependency 
   name: activerdf
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement
-    version: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - '>='
-      - !ruby/object:Gem::Version
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.6.4
-- !ruby/object:Gem::Dependency
+    version: 
+- !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement
-    version: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - '>='
-      - !ruby/object:Gem::Version
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.2.1
-description: an RDF database for usage in ActiveRDF (based on sqlite3)
-authors: 
-- Eyal Oren <eyal.oren@deri.org
-email: 
-extra_rdoc_files: 
-- README
-requirements: []
-rubyforge_project: 
-autorequire: 
+    version: