rdbi 1.1.0 → 1.2.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54de058484d15e39b1555c43dd208f2ae7d061ba
-  data.tar.gz: 96fd6fa385652f31d50f12cf04f2ee1b7ad4e03e
+  metadata.gz: 0873bbb513296fc6589e4b310c3f1a63b67487a6
+  data.tar.gz: 0dd9ac54aa4530e9d3c889e994f5aa40200fe02b
 SHA512:
-  metadata.gz: 25751397efafcd45de071d2ed98f5669c4bf59b8070e9d64393ddc84fdd67d0e97aecbe6bc53811839dfc82f224e5dfcadefedacdc926287a10319d8b5ab06f6
-  data.tar.gz: eecff757dba45e463dab45b88fb553625350937c6f4847af0280651f5b128ab4e7b50b842258f22318c2c6e575bf4d4f373c2d7667694f27cde43f3ffe201b22
+  metadata.gz: d0b599a20c5d811e4dd75c37b484ed7f2bd90ce20f55e904ad686ecf2cf123ad3e1d3f3451d3cea062c9aa459a70f474ec77d40bd5c77e42953d738b82549ed2
+  data.tar.gz: 614843267785b03369c0019e9a413ba895b0b59c9fb5273501fa48c6c64f0d6ba7dcd3001340c8baea564a0ff0c5a6c7f39a11fc5fbba0957a8b1794db123cd5

data/Manifest.txt

@@ -1,25 +1,35 @@
-.gemtest
-History.txt
-LICENSE
-Manifest.txt
-README.txt
-Rakefile
 docs/external-api.pdf
 docs/external-api.texi
-lib/rdbi.rb
+.gemtest
+History.txt
 lib/rdbi/cursor.rb
 lib/rdbi/database.rb
 lib/rdbi/driver.rb
 lib/rdbi/pool.rb
+lib/rdbi.rb
 lib/rdbi/result.rb
 lib/rdbi/schema.rb
 lib/rdbi/statement.rb
 lib/rdbi/types.rb
+lib/rdbi/version.rb
+LICENSE
+Manifest.txt
 perf/bench.rb
 perf/profile.rb
+Rakefile
 rdbi.gemspec
+README.txt
 test/helper.rb
 test/test_database.rb
+test/test_implicit_load.rb
+test/testlib/rdbi-driver-stringhyphencached.rb
+test/testlib/rdbi-driver-stringhyphen.rb
+test/testlib/rdbi/driver/stringsubdircached.rb
+test/testlib/rdbi/driver/stringsubdir.rb
+test/testlib/rdbi-driver-symbolhyphencached.rb
+test/testlib/rdbi-driver-symbolhyphen.rb
+test/testlib/rdbi/driver/symbolsubdircached.rb
+test/testlib/rdbi/driver/symbolsubdir.rb
 test/test_pool.rb
 test/test_rdbi.rb
 test/test_result.rb

data/Rakefile

@@ -1,53 +1,15 @@
-# -*- ruby -*-
+require 'rake/testtask'
+require 'rubygems/package_task'
 
-require 'rubygems'
-require 'hoe'
+require File.expand_path('../lib/rdbi/version', __FILE__)
 
-Hoe.plugins.delete :rubyforge
-Hoe.plugin :git
-Hoe.plugin :rcov
-Hoe.plugin :roodi
-Hoe.plugin :reek
-
-spec = Hoe.spec 'rdbi' do
-  developer 'Erik Hollensbe', 'erik@hollensbe.org'
-
-  self.rubyforge_name = nil
-
-  self.description = <<-EOF
-  RDBI is a database interface built out of small parts. A micro framework for
-  databases, RDBI works with and extends libraries like 'typelib' and 'epoxy'
-  to provide type conversion and binding facilities. Via a driver/adapter
-  system it provides database access. RDBI itself provides pooling and other
-  enhanced database features.
-  EOF
-
-  self.summary = 'RDBI is a database interface built out of small parts.'
-  self.urls = %w[http://github.com/rdbi/rdbi]
-
-  require_ruby_version ">= 1.8.7"
-
-  extra_dev_deps << ['rdbi-driver-mock']
-  extra_dev_deps << ['test-unit']
-  extra_dev_deps << ['rdoc']
-  extra_dev_deps << ['hanna-nouveau']
-  extra_dev_deps << ['fastercsv']
-  extra_dev_deps << ['hoe-roodi']
-  extra_dev_deps << ['hoe-reek']
-  extra_dev_deps << ['minitest']
-
-  extra_deps << ['epoxy', '>= 0.3.1']
-  extra_deps << ['typelib']
-
-  # waiting on a patch from hoe for this
-  #self.extra_rdoc_args = lambda do |rd|
-    #rd.generator = "hanna"
-  #end
-
-  desc "install a gem without sudo"
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  #t.warning = true
+  t.verbose = true
 end
 
-task :install => [:gem] do
-  sh "gem install pkg/#{spec.name}-#{spec.version}.gem"
+Gem::PackageTask.new(eval(File.read("rdbi.gemspec"))) do
 end
-# vim: syntax=ruby
+
+task :default => :test

data/lib/rdbi.rb

@@ -1,9 +1,7 @@
-require 'epoxy'
+require 'rdbi/version'
 
 module RDBI
 
-  VERSION = '1.1.0'
-
   class << self
     #
     # The last database handle allocated. This may come from pooled connections or regular ones.
@@ -28,7 +26,14 @@ module RDBI
   # connection will be automatically disconnected at the end of the block.
   def self.connect(klass, *args)
 
-    klass = RDBI::Util.class_from_class_or_symbol(klass, self::Driver)
+    klass = case klass
+            when ::Class
+              klass
+            when ::String, ::Symbol
+              Util.resolve_driver(klass)
+            else
+              raise ArgumentError.new("Invalid driver specification")
+            end
 
     driver = klass.new(*args)
     dbh = self.last_dbh = driver.new_handle
@@ -121,6 +126,28 @@ module RDBI::Util
     raise LoadError, "The '#{lib}' gem is required to use this driver. Please install it."
   end
 
+  # Require and swallow errors.  Returns true if module loaded (for the first
+  # time), false if already loaded or unable to load
+  def self.naive_require(lib)
+    require lib
+  rescue LoadError
+    nil
+  end
+
+  # Given a short driver name (e.g., :FauxSQL), return the corresponding
+  # class, attempting to load the driver library if needed.
+  def self.resolve_driver(driver)
+    loop do
+      return ::RDBI::Driver.const_get(driver.to_sym) if ::RDBI::Driver.const_defined?(driver.to_sym)
+      # const_defined? will throw a NameError if driver is not a valid
+      # constant name
+      redo if naive_require("rdbi-driver-#{driver.to_s.downcase}")
+      redo if naive_require("rdbi/driver/#{driver.to_s.downcase}")
+      break
+    end
+    raise ArgumentError.new("Unable to qualify driver #{driver}")
+  end
+
   #
   # This is the loading logic we use to import drivers of various natures.
   #

data/lib/rdbi/database.rb

@@ -257,6 +257,8 @@ class RDBI::Database
   # quoter during bind processing.
   #
   def preprocess_query(query, *binds)
+    require 'epoxy'
+
     self.last_query = query
 
     ep = Epoxy.new(query)

data/lib/rdbi/version.rb

@@ -0,0 +1,3 @@
+module RDBI
+  VERSION = '1.2.0.pre1'
+end

data/rdbi.gemspec

@@ -1,92 +1,34 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+require 'rake' # FileList
+require File.expand_path('../lib/rdbi/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{rdbi}
-  s.version = "0.9.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Erik Hollensbe"]
-  s.date = %q{2010-12-10}
+  s.name        = %q{rdbi}
+  s.version     = RDBI::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Mike Pomraning", "Erik Hollensbe"]
+  s.date        = %q{2013-06-05}
+  s.homepage    = %q{http://github.com/RDBI/rdbi}
+  s.summary     = "A ruby database abstraction layer"
   s.description = %q{RDBI is a rearchitecture of the Ruby/DBI project by its maintainer and others. It intends to fully supplant Ruby/DBI in the future for similar database access needs.}
-  s.email = %q{erik@hollensbe.org}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.txt"
-  ]
-  s.files = [
-    "LICENSE",
-    "README.txt",
-    "Rakefile",
-    "docs/external-api.pdf",
-    "docs/external-api.texi",
-    "lib/rdbi.rb",
-    "lib/rdbi/cursor.rb",
-    "lib/rdbi/database.rb",
-    "lib/rdbi/driver.rb",
-    "lib/rdbi/pool.rb",
-    "lib/rdbi/result.rb",
-    "lib/rdbi/schema.rb",
-    "lib/rdbi/statement.rb",
-    "lib/rdbi/types.rb",
-    "perf/bench.rb",
-    "perf/profile.rb",
-    "rdbi.gemspec",
-    "test/helper.rb",
-    "test/test_database.rb",
-    "test/test_pool.rb",
-    "test/test_rdbi.rb",
-    "test/test_result.rb",
-    "test/test_statement.rb",
-    "test/test_types.rb",
-    "test/test_util.rb"
-  ]
-  s.homepage = %q{http://github.com/RDBI/rdbi}
+  s.email       = ["mjp@pilcrow.madison.wi.us"]
+
+  s.required_rubygems_version = ">= 1.3.6"
+
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{RDBI provides sane query-level database access with low magic.}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_database.rb",
-    "test/test_pool.rb",
-    "test/test_rdbi.rb",
-    "test/test_result.rb",
-    "test/test_statement.rb",
-    "test/test_types.rb",
-    "test/test_util.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.files            = FileList["{lib,docs,perf,test}/**/*.*",
+                                "rdbi.gemspec",
+                                "History.txt",
+                                "Manifest.txt",
+                                "Rakefile",
+                                "LICENSE"].to_a
+  s.test_files       = FileList["test/**/*.*"].to_a
+  s.extra_rdoc_files = [ "LICENSE", "README.txt" ]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rdbi-driver-mock>, [">= 0"])
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<fastercsv>, [">= 0"])
-      s.add_runtime_dependency(%q<methlab>, [">= 0.0.9"])
-      s.add_runtime_dependency(%q<epoxy>, [">= 0.3.1"])
-      s.add_runtime_dependency(%q<typelib>, [">= 0"])
-    else
-      s.add_dependency(%q<rdbi-driver-mock>, [">= 0"])
-      s.add_dependency(%q<test-unit>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<fastercsv>, [">= 0"])
-      s.add_dependency(%q<methlab>, [">= 0.0.9"])
-      s.add_dependency(%q<epoxy>, [">= 0.3.1"])
-      s.add_dependency(%q<typelib>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rdbi-driver-mock>, [">= 0"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<fastercsv>, [">= 0"])
-    s.add_dependency(%q<methlab>, [">= 0.0.9"])
-    s.add_dependency(%q<epoxy>, [">= 0.3.1"])
-    s.add_dependency(%q<typelib>, [">= 0"])
-  end
+  s.add_development_dependency(%q<rdbi-driver-mock>, [">= 0"])
+  s.add_development_dependency(%q<test-unit>, [">= 0"])
+  s.add_development_dependency(%q<rdoc>, [">= 0"])
+  s.add_runtime_dependency(%q<epoxy>, [">= 0.3.1"])
+  s.add_runtime_dependency(%q<typelib>, [">= 0"])
 end
 

data/test/helper.rb

@@ -1,11 +1,12 @@
-require 'rubygems'
-gem 'rdbi-driver-mock'
 require 'test/unit'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'rdbi'
-require 'rdbi/driver/mock'
+require 'rdbi/driver/mock'  # Aaargh 1.0.0 vs .9.x
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'testlib'))
 
 # -- Fake an exceptional statement handle
 module FaultyDB

data/test/test_database.rb

@@ -153,12 +153,12 @@ class TestDatabase < Test::Unit::TestCase
     assert(sth)
     assert_kind_of(RDBI::Statement, sth)
 
-    assert_equal(@dbh.last_statement.object_id, sth.object_id)
+    assert_equal(@dbh.last_statement.query, sth.query)
 
     res = @dbh.execute("some other statement")
     assert(res)
     assert_kind_of(RDBI::Result, res)
-    assert_not_equal(@dbh.last_statement.object_id, sth.object_id)
+    assert_not_equal(@dbh.last_statement.query, sth.query)
     sth.finish
   end
 

data/test/test_implicit_load.rb

@@ -0,0 +1,118 @@
+require 'helper'
+
+#puts RDBI.constants
+
+class TestImplicitLoad < Test::Unit::TestCase
+
+  ConnectTests = {
+    # Mmmph.  It would be nice if suites were run in separate processes
+    "StringHyphen" => { :found_here => 'rdbi-driver-stringhyphen',
+                        :not_here   => 'rdbi/driver/stringhyphen' },
+    :SymbolHyphen  => { :found_here => 'rdbi-driver-symbolhyphen',
+                        :not_here   => 'rdbi/driver/symbolhyphen' },
+    "StringSubdir"  => { :found_here => 'rdbi/driver/stringsubdir',
+                        :not_here   => 'rdbi-driver-stringsubdir' },
+    :SymbolSubdir   => { :found_here => 'rdbi/driver/symbolsubdir',
+                        :not_here   => 'rdbi-driver-symbolsubdir' },
+    "StringHyphenCached"  => { :found_here => 'rdbi-driver-stringhyphencached',
+                               :not_here   => 'rdbi/driver/stringhyphencached' },
+    :SymbolHyphenCached   => { :found_here => 'rdbi-driver-symbolhyphencached',
+                               :not_here   => 'rdbi/driver/symbolhyphencached' },
+    "StringSubdirCached"  => { :found_here => 'rdbi/driver/stringsubdircached',
+                               :not_here   => 'rdbi-driver-stringsubdircached' },
+    :SymbolSubdirCached   => { :found_here => 'rdbi/driver/symbolsubdircached',
+                               :not_here   => 'rdbi-driver-symbolsubdircached' },
+  }
+
+  ConnectTests.each do |spec, feature|
+    meth = 'test_implicit_' + spec.to_s.gsub(/([a-z0-9])([A-Z])/, '\1_\2').downcase
+    how = (spec =~ /Cached/ ? :connect_cached : :connect)
+    define_method meth.to_sym do
+      assert_implicitly_loaded(how, spec, feature[:found_here], feature[:not_here])
+    end
+  end
+
+  def test_01_module_loaded
+    require 'rdbi/driver/mock'
+    RDBI::Driver::Mock
+    assert(module_loaded?('RDBI::Driver::Mock'),
+           "Mock driver unexpectedly not loaded")
+    assert(!module_loaded?('RDBI::Driver::FauxSQL'),
+           "FauxSQL unexpectedly loaded already")
+  end
+
+  def test_02_implicit_load_fail
+    assert(!module_loaded?('RDBI::Driver::NoSuchDriver'))
+    assert_raises(ArgumentError) do
+      RDBI.connect(:NoSuchDriver, {:username=>:a,:password=>:b})
+    end
+    assert(!module_loaded?('RDBI::Driver::NoSuchDriver'))
+  end
+
+  # ========== Utility =========================
+
+  # Is the given module loaded?
+  def module_loaded?(name)
+    names = name.split(/::/)      # ::Foo::Bar -> ["", "Foo", "Bar"]
+    names.shift if names[0] == ""
+    resolved = names.inject(::Kernel) { |mod, n| mod = mod.const_get(n) }
+    resolved.is_a?(::Module)
+  rescue NameError => ne
+    nil
+  end
+
+  # For a given feature 'f' (which was or could be an argument to
+  # Kernel.require), see if it has already been loaded
+  def feature_loaded?(f)
+    #require 'pathname'
+    #f = ::Pathname.new(f).cleanpath
+
+    $LOADED_FEATURES.any? do |loaded|
+      loaded.match('(^|/)' + Regexp.quote(f) + '\.[^/]+$')
+    end
+  end
+
+  def assert_feature_loaded(f, msg = nil)
+    msg ||= "Feature #{f} unexpectedly not loaded"
+    assert(feature_loaded?(f), msg)
+  end
+
+  def assert_feature_not_loaded(f, msg = nil)
+    msg ||= "Feature #{f} unexpectedly already loaded"
+    assert(!feature_loaded?(f), msg)
+  end
+
+  def assert_module_loaded(m, msg = nil)
+    msg ||= "Module #{m} unexpectedly not loaded"
+    assert(module_loaded?(m), msg)
+  end
+
+  def assert_module_not_loaded(m, msg = nil)
+    msg ||= "Module #{m} unexpectedly already loaded"
+    assert(!module_loaded?(m), msg)
+  end
+
+  def assert_implicitly_loaded(connect_method, shortname, found_here, not_here)
+    qualified_name = "RDBI::Driver::#{shortname}"
+
+    assert_module_not_loaded(qualified_name)
+    assert_feature_not_loaded(found_here)
+    assert_feature_not_loaded(not_here)
+
+    conn_args = { :username => :a, :password => :b }
+    conn_args[:pool_name] = shortname.to_sym if connect_method == :connect_cached
+    dbh = ::RDBI.__send__(connect_method, shortname, conn_args)
+    assert_module_loaded(qualified_name)
+
+    klass = ::RDBI::Driver.const_get(shortname)
+
+    assert(dbh.connected?, "connect(#{shortname}) did not return connected DBH")
+    assert_kind_of(klass, dbh.driver,
+                   "DBH.driver was not a #{klass.name}")
+
+    assert_feature_loaded(found_here)
+    assert_feature_not_loaded(not_here)
+  end
+end
+
+# vim: syntax=ruby ts=2 et sw=2 sts=2

data/test/test_pool.rb

@@ -134,23 +134,21 @@ class TestPool < Test::Unit::TestCase
   end
 
   def test_08_enumerable
-    assert_equal(
-      [
-        :test_01,
-        :test_02,
-        :test_03,
-        :test_03_2,
-        :test_04,
-        :test_05,
-        :test_06,
-        :test_07,
-        :test_07_2,
-        :test_07_3
-      ], 
-      RDBI::Pool.keys.map(&:to_s).sort.map(&:to_sym)
-    )
-
-    assert_equal(10, RDBI::Pool.values.count)
+    pool_names = [
+                   :test_01,
+                   :test_02,
+                   :test_03,
+                   :test_03_2,
+                   :test_04,
+                   :test_05,
+                   :test_06,
+                   :test_07,
+                   :test_07_2,
+                   :test_07_3
+                 ]
+    assert( (pool_names - RDBI::Pool.keys).empty?,
+           "RDBI::Pool did not contain at least the expected pool names")
+
     assert_kind_of(RDBI::Pool, RDBI::Pool.values[0])
 
     count = 0
@@ -160,7 +158,6 @@ class TestPool < Test::Unit::TestCase
       assert_kind_of(RDBI::Pool, pool)
     end
 
-    assert_equal(10, count)
     assert_respond_to(RDBI::Pool, :map)
 
     pool = create_pool(:test_08)

data/test/testlib/rdbi-driver-stringhyphen.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'rdbi/driver/mock'
+
+# -- this class is _not_ defined in rdbi/driver/....rb, as is commonly done
+
+class RDBI::Driver::StringHyphen < RDBI::Driver::Mock; end

data/test/testlib/rdbi-driver-stringhyphencached.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'rdbi/driver/mock'
+
+# -- this class is _not_ defined in rdbi/driver/....rb, as is commonly done
+
+class RDBI::Driver::StringHyphenCached < RDBI::Driver::Mock; end

data/test/testlib/rdbi-driver-symbolhyphen.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'rdbi/driver/mock'
+
+# -- this class is _not_ defined in rdbi/driver/....rb, as is commonly done
+
+class RDBI::Driver::SymbolHyphen < RDBI::Driver::Mock; end

data/test/testlib/rdbi-driver-symbolhyphencached.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'rdbi/driver/mock'
+
+# -- this class is _not_ defined in rdbi/driver/....rb, as is commonly done
+
+class RDBI::Driver::SymbolHyphenCached < RDBI::Driver::Mock; end

data/test/testlib/rdbi/driver/stringsubdir.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'rdbi/driver/mock'
+
+# -- this class is _not_ defined in rdbi-driver-....rb, as is commonly done
+
+class RDBI::Driver::StringSubdir < RDBI::Driver::Mock; end

data/test/testlib/rdbi/driver/stringsubdircached.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'rdbi/driver/mock'
+
+# -- this class is _not_ defined in rdbi-driver-....rb, as is commonly done
+
+class RDBI::Driver::StringSubdirCached < RDBI::Driver::Mock; end

data/test/testlib/rdbi/driver/symbolsubdir.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'rdbi/driver/mock'
+
+# -- this class is _not_ defined in rdbi-driver-....rb, as is commonly done
+
+class RDBI::Driver::SymbolSubdir < RDBI::Driver::Mock; end

data/test/testlib/rdbi/driver/symbolsubdircached.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'rdbi/driver/mock'
+
+# -- this class is _not_ defined in rdbi-driver-....rb, as is commonly done
+
+class RDBI::Driver::SymbolSubdirCached < RDBI::Driver::Mock; end

metadata

@@ -1,71 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rdbi
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.pre1
 platform: ruby
 authors:
+- Mike Pomraning
 - Erik Hollensbe
 autorequire: 
 bindir: bin
 cert_chain: []
 date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: epoxy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: typelib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rdbi-driver-mock
   requirement: !ruby/object:Gem::Requirement
@@ -95,35 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hanna-nouveau
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fastercsv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: hoe-roodi
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -137,68 +54,44 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hoe-reek
+  name: epoxy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.3.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: typelib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.6'
-description: |2
-    RDBI is a database interface built out of small parts. A micro framework for
-    databases, RDBI works with and extends libraries like 'typelib' and 'epoxy'
-    to provide type conversion and binding facilities. Via a driver/adapter
-    system it provides database access. RDBI itself provides pooling and other
-    enhanced database features.
+description: RDBI is a rearchitecture of the Ruby/DBI project by its maintainer and
+  others. It intends to fully supplant Ruby/DBI in the future for similar database
+  access needs.
 email:
-- erik@hollensbe.org
+- mjp@pilcrow.madison.wi.us
 executables: []
 extensions: []
 extra_rdoc_files:
-- History.txt
-- Manifest.txt
-- README.txt
-files:
-- .gemtest
-- History.txt
 - LICENSE
-- Manifest.txt
 - README.txt
-- Rakefile
+files:
 - docs/external-api.pdf
 - docs/external-api.texi
 - lib/rdbi.rb
@@ -210,47 +103,70 @@ files:
 - lib/rdbi/schema.rb
 - lib/rdbi/statement.rb
 - lib/rdbi/types.rb
+- lib/rdbi/version.rb
 - perf/bench.rb
 - perf/profile.rb
-- rdbi.gemspec
 - test/helper.rb
 - test/test_database.rb
+- test/test_implicit_load.rb
 - test/test_pool.rb
 - test/test_rdbi.rb
 - test/test_result.rb
 - test/test_statement.rb
 - test/test_types.rb
 - test/test_util.rb
-homepage: http://github.com/rdbi/rdbi
+- test/testlib/rdbi-driver-stringhyphen.rb
+- test/testlib/rdbi-driver-stringhyphencached.rb
+- test/testlib/rdbi-driver-symbolhyphen.rb
+- test/testlib/rdbi-driver-symbolhyphencached.rb
+- test/testlib/rdbi/driver/stringsubdir.rb
+- test/testlib/rdbi/driver/stringsubdircached.rb
+- test/testlib/rdbi/driver/symbolsubdir.rb
+- test/testlib/rdbi/driver/symbolsubdircached.rb
+- rdbi.gemspec
+- History.txt
+- Manifest.txt
+- Rakefile
+- LICENSE
+- README.txt
+homepage: http://github.com/RDBI/rdbi
 licenses: []
 metadata: {}
 post_install_message: 
-rdoc_options:
-- --main
-- README.txt
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
-summary: RDBI is a database interface built out of small parts.
+summary: A ruby database abstraction layer
 test_files:
-- test/test_result.rb
+- test/helper.rb
+- test/test_database.rb
+- test/test_implicit_load.rb
 - test/test_pool.rb
 - test/test_rdbi.rb
+- test/test_result.rb
 - test/test_statement.rb
 - test/test_types.rb
 - test/test_util.rb
-- test/test_database.rb
+- test/testlib/rdbi-driver-stringhyphen.rb
+- test/testlib/rdbi-driver-stringhyphencached.rb
+- test/testlib/rdbi-driver-symbolhyphen.rb
+- test/testlib/rdbi-driver-symbolhyphencached.rb
+- test/testlib/rdbi/driver/stringsubdir.rb
+- test/testlib/rdbi/driver/stringsubdircached.rb
+- test/testlib/rdbi/driver/symbolsubdir.rb
+- test/testlib/rdbi/driver/symbolsubdircached.rb