rdbxml 0.1 → 0.5

data/README

@@ -2,8 +2,8 @@
 
 This package provides wrapper functions to the C++ APIS for BDB XML (Dbxml) and
 BDB (Db) as well as pure-Ruby convenience functions (RDBXML).  While the wrapper
-layer should be more or less complete, the Ruby interface only supports basic
-documents operations in this version of the library.
+layer should be more or less complete, the Ruby interface is still a work in
+progress.
 
 == Requirements
 * Rake[http://rake.rubyforge.org] >= 7.0
@@ -14,7 +14,7 @@ documents operations in this version of the library.
 === The Easy Way
 
 RDBXML is distributed as a Ruby Gem for easy installation, e.g.
-    sudo gem install rdbxml
+  sudo gem install rdbxml
 
 This will attempt to find the DBXML libaries/headers in the standard paths (plus
 /usr/local/) and will use the interface files taken from the dbxml-2.2.13
@@ -39,10 +39,11 @@ Sleepycat[http://dev.sleepycat.com/downloads/releasehistorybdbxml.html]), e.g.:
   sudo ldconfig
 
 This will ensure that you have the correct versions of the various BDB and
-BDBXML libraries, as well as the current SWIG Interface definitions included in the
+BDBXML libraries, as well as the current SWIG Interface definitions included in
 the DBXML distribution.
 
-You then pass the location of the (built) DBXML distribution to the RDBXML build system:
+You then pass the location of the (built) DBXML distribution to the RDBXML build
+system:
   DBXML_DIST=/tmp/dbxml-2.2.13 sudo gem install rdbxml
 
 This will build, test, and install the RDBXML gem.
@@ -68,13 +69,12 @@ This will build, test, and install the RDBXML gem.
 
 == Disclaimer
 
-This is an *alpha* relesae, intended to test the build system and the BDBXML API
-wrappers.  The Ruby-style interface is not yet terribly useful (you can read and
-write whole documents), but I wanted to get this basic version released before I
-went back and started adding functionality.
-
-Please report any issues on the RDBXML Website[http://rubyforge.org/projects/rdbxml].
+This release is still far from feature completeness, and is primarily
+intended to test the build system and the BDBXML API wrappers.  Please report
+any issues on the RDBXML Website[http://rubyforge.org/projects/rdbxml].
 
 Author::    Steve Sloan (mailto:steve@finagle.org)
+Website::   http://rdbxml.rubyforge.org
+Rubyforge:: http://rubyforge.org/projects/rdbxml
 Copyright:: Copyright (c) 2006 Steve Sloan
 License::   MIT

data/Rakefile

@@ -23,7 +23,6 @@ end
 
 desc "Build the interface extension"
 task :extensions => [:db, :dbxml]
-CLEAN.include 'ext/*_wrap.cc'
 
 desc "Build the BDB interface extension"
 Rake::SWIGExtensionTask.new :db do |t|
@@ -34,16 +33,16 @@ end
 desc "Build the BDBXML interface extension"
 Rake::SWIGExtensionTask.new :dbxml do |t|
   t.dir = 'ext'
-  t.deps << 'dbxml_ruby.i'
+  t.deps[:dbxml] << :dbxml_ruby
   t.link_libs += ['db', 'db_cxx', 'dbxml', 'xquery', 'xerces-c', 'pathan']
 end
 
 task :test => :extensions
 Rake::TestTask.new do |t|
   t.libs << "ext"
-  t.test_files = FileList['test/*_test.rb']
+  t.test_files = FileList['test/test_*.rb']
   t.verbose = true
-  CLEAN.include 'test/*_test.db'
+  CLEAN.include 'test/test_*.db'
 end
 
 task :install => [:test, :clean] do end
@@ -55,15 +54,15 @@ rd = Rake::RDocTask.new :rdoc do |rdoc|
   rdoc.rdoc_files.include 'README', 'MIT-LICENSE'
   rdoc.rdoc_files.include 'lib/**/*.rb'
   rdoc.rdoc_files.include 'docs/**/*.rb', 'docs/**/*.rdoc'
-rdoc.rdoc_files.include 'rake/**/*.rb'
+  rdoc.rdoc_files.include 'rake/**/*task.rb'
 end
 
-GEM_VERSION = '0.1'
+GEM_VERSION = '0.5'
 GEM_FILES = rd.rdoc_files + FileList[
   'Rakefile',
   'ext/**/*.i',
   'rake/**/*.rb',
-  'test/**/*_test.rb',
+  'test/**/test_*.rb',
 ]
 
 spec = Gem::Specification.new do |s|
@@ -77,7 +76,7 @@ spec = Gem::Specification.new do |s|
   END
   s.files = GEM_FILES.to_a.delete_if {|f| f.include?('.svn')}
   s.autorequire = 'rdbxml'
-  s.test_files = Dir["test/*_test.rb"]
+  s.test_files = Dir["test/test_*.rb"]
   s.add_dependency 'rake', '> 0.7.0'
 
   s.extensions << './extconf.rb'
@@ -95,6 +94,6 @@ end
 task :default => :extensions
 task :all => :extensions
 
-#load 'publish.rf' if File.exist? 'publish.rf'
+load 'publish.rf' if File.exist? 'publish.rf'
 
 

data/ext/dbxml_ruby.i

@@ -1,6 +1,27 @@
 %module dbxml
 %include "std_string.i"
 
+%alias XmlManager::createQueryContext "create_query_context";
+
+%alias XmlContainer::getManager "manager";
+
+%alias XmlDocument::getContentAsString "to_s";
+%alias XmlDocument::getName "name";
+%alias XmlDocument::setName "name=";
+%alias XmlDocument::getContent "content";
+%alias XmlDocument::setContent "content=";
+
+%alias XmlQueryContext::getNamespace "get_namespace";
+%alias XmlQueryContext::setNamespace "set_namespace";
+%alias XmlQueryContext::getDefaultCollection "default_collection";
+%alias XmlQueryContext::setDefaultCollection "default_collection=";
+%alias XmlQueryContext::getVariableValue "[]";
+%alias XmlQueryContext::setVariableValue "[]=";
+
+%alias XmlValue::asString "to_s";
+%alias XmlValue::asNumber "to_f";
+%alias XmlValue::asDocument "to_doc";
+
 %exception {
   try {
     $action

data/lib/rdbxml.rb

@@ -38,14 +38,95 @@ module RDBXML
   end
 end
 
-class Dbxml::XmlManager
-  # Opens the container named +name+, creating it if it doesn't exist.
-  def []( name )
-    openContainer name.to_s, Dbxml::DB_CREATE
+class Dbxml::XmlValue
+  def to_i ;   self.to_f.to_i ; end
+
+  def ==( that )
+    if isNumber
+      self.asNumber == that
+    elsif isBoolean
+      self.asBoolean == that
+    else
+      self.asString == that.to_s
+    end
+  end
+end
+
+class Dbxml::XmlResults
+  include Enumerable
+
+  def each( &block )
+    self.reset
+    while self.hasNext
+      yield self.next
+    end
+  end
+
+  def first
+    self.reset
+    self.hasNext ? self.next : nil
+  end
+
+  def to_s
+    collect { |v| v.to_s }.join "\n"
+  end
+end
+
+class Dbxml::XmlDocument
+  @@namespaces = {}
+
+  class MetaData
+    include Enumerable
+
+    def initialize(doc)
+      @doc = doc
+    end
+
+    def [](name, ns = '')
+      v = XmlValue.new
+      @doc.getMetaData( ns, name.to_s, v ) ? v : nil
+    end
+
+    def []=(name, *args)
+      opts = {}
+      val = args.pop
+      ns = args.shift || ''
+      if val
+        @doc.setMetaData ns, name.to_s, XmlValue.new(val)
+      else
+        delete name, ns
+      end
+    end
+
+    def delete(name, ns = '')
+#puts "removeMetaData: #{name.inspect}, #{ns.inspect}"
+      @doc.removeMetaData ns, name.to_s
+    end
+
+    def each(&block)
+      i = @doc.getMetaDataIterator
+      while (xmd = i.next)
+        yield xmd.get_name.to_sym, xmd.get_value, xmd.get_uri
+      end
+    end
+
+    def size
+      s = 0
+      i = @doc.getMetaDataIterator
+      while i.next  do  s += 1  end
+      s
+    end
+  end
+
+  def meta
+    @Meta ||= MetaData.new(self)
   end
+
 end
 
 class Dbxml::XmlContainer
+  include Enumerable
+
   # Returns the document named +name+, or +nil+ if it doesn't exist.
   def []( name )
     begin
@@ -56,24 +137,52 @@ class Dbxml::XmlContainer
     end
   end
 
-  # Creates/updates the document named +name+ with the string +content+.
+  # Creates/updates the document named +name+ with +content+ (either String or XmlDocument).
   def []=( name, content )
+    doc = nil
+    if String === content
+      doc = manager.createDocument
+      doc.name = name
+      doc.content = content
+    elsif content.kind_of? XmlDocument
+      doc = content
+    else
+      raise ArgumentError, "content must be a String or XmlDocument"
+    end
+    self << doc
+  end
+
+  # Creates/updates the document +doc+.
+  def <<( doc )
     ctx = getManager.createUpdateContext
     begin
-      putDocument name, content, ctx, 0
+      putDocument doc, ctx, 0
     rescue XmlException => ex
       raise unless ex.to_s =~ /document exists/i
-      doc = getManager.createDocument
-      doc.setName name
-      doc.setContent content
-      updateDocument doc, ctx
+      d = self[doc.name]
+      d.content = doc.content
+      updateDocument d, ctx
     end
   end
+
+  # Iterates over each document in the collection
+  def each( &block )
+    getAllDocuments.each(block)
+  end
 end
 
-class Dbxml::XmlDocument
-  # Returns the document XML as a string.
-  def to_s
-    getContentAsString
+class Dbxml::XmlManager
+  # Opens the container named +name+, creating it if it doesn't exist.
+  def []( name )
+    openContainer name.to_s, Dbxml::DB_CREATE
+  end
+
+  def query( xquery, opts = {}, &block )
+    opts[:ctx] ||= create_query_context
+    q = self.prepare xquery, opts[:ctx]
+    res = q.execute( opts[:ctx], 0 )
+#puts "#{xquery} -> #{res}"
+    res.each(block)  if block_given?
+    res
   end
 end

data/rake/extensiontask.rb

@@ -10,9 +10,10 @@ module Rake
   # from rbconfig (note: examples assume *nix file extensions).
   #
   # *Note*: Strings vs Symbols
-  # In places where filenames are expected (i.e. lib_name and objs), +String+s are used
-  # as verbatim filenames, while, +Symbol+s have the platform-dependant extension
-  # appended (e.g. '.so' for libraries and '.o' for objects).
+  # In places where filenames are expected (e.g. lib_name and objs), Strings are used
+  # as verbatim filenames, while, Symbols have the platform-dependant extension
+  # appended (e.g. '.so' for libraries and '.o' for objects).  Also, only Symbols
+  # have #dir prepended to them.
   #
   # Example:
   #   desc "build sample extension"
@@ -20,8 +21,6 @@ module Rake
   #   Rake::ExtensionTask.new :sample => :foo do |t|
   #     # all extension files under this directory
   #     t.dir = 'ext'
-  #     # don't include, but rebuild library if it changes
-  #     t.deps << 'config.h'
   #     # link libraries (libbar.so)
   #     t.link_libs << 'bar'
   #   end
@@ -40,10 +39,6 @@ module Rake
     # Object files to build and link into the extension.
     attr_accessor :objs
 
-    # Depency files that aren't linked into the library, but cause it to be
-    # rebuilt when they change.
-    attr_accessor :deps
-
     # The directory where the extension files (source, output, and
     # intermediate) are stored.
     attr_accessor :dir
@@ -55,20 +50,6 @@ module Rake
     # Additional link libraries
     attr_accessor :link_libs
 
-
-    # List of paths to object files to build
-    def output_objs
-      @objs.collect do |o|
-        f = (Symbol === o) ? "#{o}.#{env[:objext]}" : o
-        File.join( dir, f )
-      end
-    end
-
-    # Path to the output library file
-    def output_lib
-      File.join( dir, lib_name )
-    end
-
     # Same arguments as Rake::define_task
     def initialize( args, &blk )
       @env = @@DefaultEnv.dup
@@ -83,22 +64,25 @@ module Rake
     #
     # Defaults:
     # - lib_name: name.so
-    # - objs: name.o
+    # - objs: name.o (<- name.{c,cxx,cpp,cc})
     # - dir: .
+    # - link_libs: <none>
     def set_defaults
-      @lib_name = (Symbol === name) ? "#{name}.#{env[:dlext]}" : name
-      @objs = [name.to_sym]
-      @dir = '.'
-      @deps, @link_libs = [], []
+      @lib_name ||= name.to_sym
+      @objs ||= [name.to_sym]
+      @dir ||= '.'
+      @link_libs ||= []
     end
 
     # Defines the library task.
     def define_tasks
-      task name => (deps.collect { |d| File.join( dir, d ) } << output_lib)  do end
+      output_objs = @objs.collect { |obj| filepath obj, :objext }
+      output_lib = filepath lib_name, :dlext
 
-      file output_lib => output_objs  do |t|
-        sh_cmd :ldshared, {'-L' => :libdirs}, '-o', t.name, t.prerequisites,
-                          {'-l' => link_libs}, :libs, :dlibs
+      task name => output_lib  do end
+      file output_lib => output_objs do |t|
+        sh_cmd :ldshared, {'-L' => :libdirs}, '-o', output_lib, output_objs,
+                          {'-l' => link_libs}, :libs #, :dldlibs, :librubyarg_shared
       end
 
       CLEAN.include output_objs
@@ -132,21 +116,24 @@ module Rake
       @@DefaultEnv = {
         :cxx => ENV['CXX'] || 'c++',
         :cxxflags => ENV['CXXFLAGS'] || '',
-
         :c_exts => ['c'],
         :cpp_exts => ['cc', 'cxx', 'cpp'],
-        :swig => 'swig',
-        :swig_flags => ['-ruby', '-c++'],
-        :swig_includedirs => ['.'],
-
-        :includedirs => [], #['/usr/local/include'],
-        :libdirs => [], #['/usr/local/lib'],
+        :includedirs => [],
+        :libdirs => [],
       }
       Config::CONFIG.each { |k, v| @@DefaultEnv[k.downcase.to_sym] = v }
     end
 
   protected
 
+    # Handles convenience filenames:
+    # * f (String) => f
+    # * f (Symbol) => dir/f.ext
+    def filepath( f, ext )
+      ext = env[ext]  if Symbol === ext
+      Symbol === f ? File.join( dir, "#{f}.#{ext}" ) : f
+    end
+
     # Convenience function for cnstructing command lines for build tools.
     def optify( *opts )
       return optify(*opts.first)  if opts.size == 1 and opts.first.kind_of? Array

data/rake/swigextensiontask.rb

@@ -4,7 +4,7 @@ require 'rake/extensiontask'
 module Rake
 
   # Create a build task that will generate a Ruby wrapper extension from
-  # a SWIG interface definition.  Requires SWIG[http://www.swig.org] version 1.3.x.
+  # SWIG interface definition(s).  Requires SWIG[http://www.swig.org] version 1.3.x.
   #
   # See ExtensionTask for more information.
   #
@@ -13,8 +13,8 @@ module Rake
   #   Rake::SWIGExtensionTask.new :dbxml do |t|
   #     # keep it all under ext/
   #     t.dir = 'ext'
-  #     # dbxml.i includes dbxml_ruby.i -- rebuild if it changes
-  #     t.deps << 'dbxml_ruby.i'
+  #     # dbxml.i includes dbxml_ruby.i so rebuild if it changes
+  #     t.deps[:dbxml] << :dbxml_ruby
   #     # link in dbxml libraries
   #     t.link_libs += ['db', 'db_cxx', 'dbxml', 'xquery', 'xerces-c', 'pathan']
   #   end
@@ -23,28 +23,66 @@ module Rake
   # Copyright:: Copyright (c) 2006 Steve Sloan
   # License::   GPL
   class SWIGExtensionTask < ExtensionTask
+
+    # An Array of interface filenames (Symbol or String) to build and link into
+    # the extension.
+    attr_accessor :ifaces
+
+    # A Hash of interface filenames and their dependencies, i.e. files which
+    # are not built or linked, but cause the corresponding interface to be
+    # rebuild if any of them change.
+    attr_accessor :deps
+
     # Defaults:
     # - lib_name: name.so
-    # - objs: name_wrap.o
-    # - deps: name.i
+    # - ifaces: name.i
+    # - deps: <none>
     # - dir: .
+    # - link_libs: <none>
     def set_defaults
       super
-      @lib_name = (Symbol === name) ? "#{name}.#{env[:dlext]}" : name
-      @objs = ["#{name}_wrap".to_sym]
-      @deps = ["#{name}.i"]
+      @objs ||= []
+      @ifaces ||= [name.to_sym]
+      @deps ||= Hash.new []
+   end
+
+    def define_tasks
+      for iface in @ifaces
+        deps = @deps[iface]
+        iface = filepath(iface, :swigext)
+        src = iface.sub(/\.#{env[:swigext]}$/, env[:swig_cppext])
+
+        deps = [deps]  unless deps.kind_of? Enumerable
+        if deps and deps.any?
+          file src => deps.collect { |dep| filepath(dep, :swigext) } << iface
+        end
+        CLEAN.include src
+
+        @objs << src.sub(/\.[^.]+$/, '.'+env[:objext])
+      end
+      super
     end
 
     # Add rule for generating C++ wrapper code (_wrap.cc) from SWIG interface definition (.i).
     def define_rules
       verify_swig_version
-      Rake::Task.create_rule( '_wrap.cc' => [proc {|t| t.gsub /_wrap\.cc$/, '.i' }] )  do |r|
+      super
+      Rake::Task.create_rule(
+        /#{env[:swig_cppext]}$/ => [proc {|t| t.sub /#{env[:swig_cppext]}$/, '.'+env[:swigext] }]
+      )  do |r|
         sh_cmd :swig, :swig_flags, {'-I' => :swig_includedirs}, {'-I' => :includedirs},
                 '-o', r.name, r.sources
       end
-      super
     end
 
+    ExtensionTask.env.update(
+      :swig => 'swig',
+      :swigext => 'i',
+      :swig_cppext => '_wrap.cc',
+      :swig_flags => ['-ruby', '-c++'],
+      :swig_includedirs => ['.']
+    )
+
   protected
 
     # Raise an exception unless we have SWIG version 1.3 or later.

data/test/test_rdbxml.rb

@@ -0,0 +1,186 @@
+require 'test/unit'
+require 'fileutils'
+require 'rdbxml'
+
+class XmlValueTest < Test::Unit::TestCase
+  def test_new_i
+    v = XmlValue.new 123
+    assert v.isNumber, v.getType
+    assert !v.isString && !v.isBoolean && !v.isBinary && !v.isNode
+    assert_equal v, 123
+  end
+
+  def test_new_f
+    v = XmlValue.new 123.456
+    assert v.isNumber
+    assert !v.isString && !v.isBoolean && !v.isBinary && !v.isNode
+    assert_equal v, 123.456
+  end
+
+  def test_new_s
+    v = XmlValue.new 'foo'
+    assert v.isString
+    assert !v.isNumber && !v.isBoolean && !v.isBinary && !v.isNode
+    assert_equal v, 'foo'
+  end
+
+  def test_new_b
+    v = XmlValue.new true
+    assert v.isBoolean
+    assert !v.isNumber && !v.isString && !v.isBinary && !v.isNode
+    assert_equal v, true
+
+    v = XmlValue.new false
+    assert v.isBoolean
+    assert !v.isNumber && !v.isString && !v.isBinary && !v.isNode
+    assert_equal v, false
+  end
+
+  def test_to_s
+    assert_equal '123', XmlValue.new(123).to_s
+    assert_equal '456.789', XmlValue.new(456.789).to_s
+    assert_equal 'foo', XmlValue.new('foo').to_s
+  end
+
+  def test_to_i
+    assert_equal 123, XmlValue.new(123).to_i
+    assert_equal 456, XmlValue.new(456.789).to_i
+    assert_raise(FloatDomainError) { XmlValue.new('foo').to_i }
+  end
+
+  def test_to_f
+    assert_equal 123.0, XmlValue.new(123).to_f
+    assert_equal 456.789, XmlValue.new(456.789).to_f
+    assert XmlValue.new('foo').to_f.nan?
+  end
+end
+
+class XmlResultsTest < Test::Unit::TestCase
+  def setup
+    @db = RDBXML::XmlManager.new
+    @rng = 3..9
+    @res = @db.query "(#{@rng.first} to #{@rng.last})"
+  end
+
+  def test_to_s
+    assert_equal @rng.to_a.join("\n"), @res.to_s
+  end
+
+  def test_size
+    assert_equal @rng.last - @rng.first + 1, @res.size
+  end
+
+  def test_to_a
+    assert_equal @rng.to_a.first, @res.to_a.first
+    assert_equal @rng.to_a, @res.to_a
+  end
+
+  def test_first
+    assert_equal @rng.first, @res.first
+    assert_equal @rng.first.to_s, @res.first.to_s
+  end
+
+  def test_each
+    v = @rng.first
+    @res.each do |r|
+      assert_equal r, v
+      v += 1
+    end
+  end
+end
+
+class XmlDocumentTest < Test::Unit::TestCase
+  def setup
+    @dir = File.join( File.dirname(__FILE__), File.basename(__FILE__, '.rb') + '.db' )
+    Dir.mkdir @dir  unless File.exists? @dir
+    @env = RDBXML::env(@dir)
+    @db = RDBXML::XmlManager.new @env, 0
+    @docs = @db['test']
+  end
+
+  def test_metadata
+    doc = @db.createDocument
+    doc.name = "Test#{rand(10000)}"
+    doc.content = '<test>This is a test</test>'
+    doc.meta[:foo] = 123
+    doc.meta['bar:stuff', 'http://nowhere.invalid/namespaces/bar'] = 'Some Stuff'
+    doc.meta['baaz:stuff', 'http://nowhere.invalid/namespaces/baaz'] = 'Other Stuff'
+
+    assert_equal doc.meta[:foo], 123
+    assert_equal doc.meta['bar:stuff', 'http://nowhere.invalid/namespaces/bar'], 'Some Stuff'
+    assert_equal doc.meta['baaz:stuff', 'http://nowhere.invalid/namespaces/baaz'], 'Other Stuff'
+    @docs << doc
+
+    doc = @docs[doc.name]
+    assert_equal 4, doc.meta.size
+    doc.meta[:foo] = nil
+    doc.meta['bar:stuff', 'http://nowhere.invalid/namespaces/bar'] = nil
+    doc.meta.delete 'baaz:stuff', 'http://nowhere.invalid/namespaces/baaz'
+
+    assert_nil doc.meta[:foo]
+    assert_nil doc.meta['bar:stuff', 'http://nowhere.invalid/namespaces/bar']
+    assert_nil doc.meta['baaz:stuff', 'http://nowhere.invalid/namespaces/baaz']
+
+#    @docs << doc
+#    doc = @docs[doc.name]
+#    assert_nil doc.meta[:foo]
+#    assert_nil doc.meta['bar:stuff', 'http://nowhere.invalid/namespaces/bar']
+#    assert_nil doc.meta['baaz:stuff', 'http://nowhere.invalid/namespaces/baaz']
+#    assert_equal 1, doc.meta.size
+  end
+end
+
+class XmlContainerTest < Test::Unit::TestCase
+  def setup
+    @dir = File.join( File.dirname(__FILE__), File.basename(__FILE__, '.rb') + '.db' )
+    Dir.mkdir @dir  unless File.exists? @dir
+    @env = RDBXML::env(@dir)
+
+    @db = RDBXML::XmlManager.new @env, 0
+    @db.setDefaultContainerType RDBXML::XmlContainer::WholedocContainer
+    @container = 'test'
+    @docs = @db['test']
+
+    @doc_name = "Test#{rand(10000)}"
+    @content = '<test>This is a test</test>'
+  end
+
+  def test_put_get_document
+    assert_not_nil @docs
+
+    @docs[@doc_name] = @content
+    doc = @docs[@doc_name]
+    assert_not_nil doc
+    assert_equal doc.to_s, @content
+  end
+
+  def test_append_get_document
+    assert_not_nil @docs
+
+    doc = @db.createDocument
+    doc.name, doc.content = @doc_name, @content
+    @docs << doc
+
+    doc = @docs[@doc_name]
+    assert_not_nil doc
+    assert_equal doc.to_s, @content
+  end
+
+  def test_update_document
+    assert_not_nil @docs
+
+    for content in [@content, @content.upcase]
+      @docs[@doc_name] = content
+      doc = @docs[@doc_name]
+      assert_not_nil doc
+      assert_equal doc.to_s, content
+    end
+  end
+
+  def test_query
+    xq = "count(collection('#{@container}')/*)"
+    ctx = @db.createQueryContext
+    q = @db.prepare xq, ctx
+    res = q.execute ctx, 0
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rdbxml
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2006-05-07 00:00:00 -07:00
+  version: "0.5"
+date: 2006-05-14 00:00:00 -07:00
 summary: Provides wrappers for the BDBXML (and BDB) C++ APIs, plus pure Ruby extensions
 require_paths: 
 - lib
@@ -40,13 +40,13 @@ files:
 - ext/dbxml.i
 - ext/db.i
 - ext/dbxml_ruby.i
-- test/db_test.rb
-- test/dbxml_test.rb
-- test/rdbxml_test.rb
+- test/test_rdbxml.rb
+- test/test_db.rb
+- test/test_dbxml.rb
 test_files: 
-- test/db_test.rb
-- test/dbxml_test.rb
-- test/rdbxml_test.rb
+- test/test_rdbxml.rb
+- test/test_db.rb
+- test/test_dbxml.rb
 rdoc_options: 
 - --line-numbers
 - --inline-source

data/test/rdbxml_test.rb

@@ -1,40 +0,0 @@
-require 'test/unit'
-require 'fileutils'
-require 'rdbxml'
-
-class RDBXMLTest < Test::Unit::TestCase
-
-  def setup
-    @dir = File.join( File.dirname(__FILE__), File.basename(__FILE__, '.rb') + '.db' )
-    Dir.mkdir @dir  unless File.exists? @dir
-    @env = RDBXML::env(@dir)
-
-    @db = RDBXML::XmlManager.new @env, 0
-    @db.setDefaultContainerType RDBXML::XmlContainer::WholedocContainer
-    @docs = @db['test']
-
-    @name = "test document ##{rand(10000)}"
-    @content = '<test>This is a test</test>'
-  end
-
-  def test_put_get_document
-    assert_not_nil @docs
-
-    @docs[name] = @content
-    doc = @docs[name]
-    assert_not_nil doc
-    assert_equal doc.to_s, @content
-  end
-
-  def test_update_document
-    assert_not_nil @docs
-
-    for content in [@content, @content.upcase]
-      @docs[name] = content
-      doc = @docs[name]
-      assert_not_nil doc
-      assert_equal doc.to_s, content
-    end
-  end
-
-end