data_fabric 1.0.2 → 1.1.0

data/CHANGELOG

@@ -1 +1,14 @@
+DataFabric changelog
+
+v1.1.0 - 2008-11-22
+
+- Cache connections so we don't have to reconnect constantly. (Justin Balthrop, Geni)
+- Clean up logging API (not backwards-compatible)
+- Verify wrapped connections automatically so cached mysql connections older than 8 hours
+  don't die due to timeout.
+- Please note this version is not Rails 2.2-compatible.  DataFabric 2.0 will be.
+
+
+Detailed commit history:
+
 http://github.com/fiveruns/data_fabric/commits/master

data/Manifest

@@ -62,7 +62,8 @@ Manifest
 Rakefile
 README.rdoc
 test/connection_test.rb
-test/database.yml.example
+test/database.yml
+test/database.yml.mysql
 test/database_test.rb
 test/shard_test.rb
 test/test_helper.rb

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'echoe'
 
+#gem 'rails', '=2.0.2'
+
 require File.dirname(__FILE__) << "/lib/data_fabric/version"
 
 Echoe.new 'data_fabric' do |p|
@@ -8,14 +10,16 @@ Echoe.new 'data_fabric' do |p|
   p.author = "Mike Perham"
   p.email  = 'mperham@gmail.com'
   p.project = 'fiveruns'
-  p.summary = 'Sharding and replication support for ActiveRecord 2.x'
+  p.summary = 'Sharding and replication support for ActiveRecord 2.0 and 2.1'
   p.url = "http://github.com/fiveruns/data_fabric"
-  p.dependencies = ['activerecord >=2.0.2']
+#  p.dependencies = ['activerecord >=2.0.2']
   p.development_dependencies = []
   p.rubygems_version = nil
   p.include_rakefile = true
 end
 
+task :test => [:pretest]
+
 task :pretest do
   setup(false)
 end
@@ -33,7 +37,7 @@ def load_database_yml
   if !File.exist?(filename)
     STDERR.puts "\n*** ERROR ***:\n" <<
       "You must have a 'test/database.yml' file in order to create the test database. " <<
-      "An example is provided in 'test/database.yml.example'.\n\n"
+      "An example is provided in 'test/database.yml.mysql'.\n\n"
     exit 1
   end
   YAML::load(ERB.new(IO.read(filename)).result)
@@ -42,12 +46,12 @@ end
 def setup_connection
   require 'active_record'
   ActiveRecord::Base.configurations = load_database_yml
-  ActiveRecord::Base.establish_connection('fiveruns_city_austin_test_master')
   ActiveRecord::Base.logger = Logger.new(STDOUT)
-  ActiveRecord::Base.logger.level = Logger::DEBUG
+  ActiveRecord::Base.logger.level = Logger::INFO
 end
 
 def using_connection(database_identifier, &block)
+  ActiveRecord::Base.establish_connection(database_identifier)
   ActiveRecord::Base.connection.instance_eval(&block)
 end
 
@@ -56,18 +60,30 @@ def setup(create = false)
   
   ActiveRecord::Base.configurations.each_pair do |identifier, config|
     using_connection(identifier) do
-      db_name = config['database']
-      if create
-        execute "drop database if exists #{db_name}"
-        execute "create database #{db_name}"
-      end
-      execute "use #{db_name}"
-      execute "drop table if exists the_whole_burritos"
-      execute "drop table if exists enchiladas"
-      execute "create table enchiladas (id integer not null auto_increment, name varchar(30) not null, primary key(id))"
-      execute "insert into enchiladas (id, name) values (1, '#{db_name}')"
-      execute "create table the_whole_burritos (id integer not null auto_increment, name varchar(30) not null, primary key(id))"
-      execute "insert into the_whole_burritos (id, name) values (1, '#{db_name}')"
+      send("create_#{config['adapter']}", create, config['database'])
     end  
   end
 end
+
+def create_sqlite3(create, db_name)
+  execute "drop table if exists the_whole_burritos"
+  execute "drop table if exists enchiladas"
+  execute "create table enchiladas (id integer not null primary key, name varchar(30) not null)"
+  execute "insert into enchiladas (id, name) values (1, '#{db_name}')"
+  execute "create table the_whole_burritos (id integer not null primary key, name varchar(30) not null)"
+  execute "insert into the_whole_burritos (id, name) values (1, '#{db_name}')"
+end
+
+def create_mysql(create, db_name)
+  if create
+    execute "drop database if exists #{db_name}"
+    execute "create database #{db_name}"
+  end
+  execute "use #{db_name}"
+  execute "drop table if exists the_whole_burritos"
+  execute "drop table if exists enchiladas"
+  execute "create table enchiladas (id integer not null auto_increment, name varchar(30) not null, primary key(id))"
+  execute "insert into enchiladas (id, name) values (1, '#{db_name}')"
+  execute "create table the_whole_burritos (id integer not null auto_increment, name varchar(30) not null, primary key(id))"
+  execute "insert into the_whole_burritos (id, name) values (1, '#{db_name}')"
+end

data/TESTING.rdoc

@@ -4,10 +4,10 @@ data_fabric has two layers of tests: unit tests and integration tests.
 == Running the Unit Tests
 
 The unit tests test both with and without an actual database.  test/database_test.rb
-tests against a MySQL database.  The other unit tests mock AR so no actual database is 
-required.  You must customize test/database.yml to point to your MySQL database.  
-"rake pretest" will set up MySQL to run the tests but you will need to customize
-the connection settings in the Rakefile pretest task.
+tests against a database.  The other unit tests mock AR so no actual database is 
+required.  You can use the standard test/database.yml which tests against SQLite3
+or customize the provided test/database.yml.mysql.  The "rake create_db" task will
+set up the necessary databases and tables.
 
 
 == Running the Integration Tests
@@ -27,6 +27,4 @@ then be able to run the example application's tests.
 
 == Submitting Bugs
 
-If you think you've found a problem with data_fabric, please write a unit or integration test
-which reproduces the problem.  This should make tracking down and fixing the bug relatively
-easy and provides a regression test for future releases.
+If you think you've found a problem with data_fabric, contact me at mperham AT gmail.com.

data/data_fabric.gemspec

@@ -1,146 +1,32 @@
+# -*- encoding: utf-8 -*-
 
-# Gem::Specification for Data_fabric-1.0.2
-# Originally generated by Echoe
+Gem::Specification.new do |s|
+  s.name = %q{data_fabric}
+  s.version = "1.1.0"
 
---- !ruby/object:Gem::Specification 
-name: data_fabric
-version: !ruby/object:Gem::Version 
-  version: 1.0.2
-platform: ruby
-authors: 
-- Mike Perham
-autorequire: 
-bindir: bin
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Mike Perham"]
+  s.date = %q{2008-11-22}
+  s.description = %q{Sharding and replication support for ActiveRecord 2.0 and 2.1}
+  s.email = %q{mperham@gmail.com}
+  s.extra_rdoc_files = ["CHANGELOG", "lib/data_fabric/version.rb", "lib/data_fabric.rb", "README.rdoc"]
+  s.files = ["CHANGELOG", "example/app/controllers/accounts_controller.rb", "example/app/controllers/application.rb", "example/app/controllers/figments_controller.rb", "example/app/helpers/accounts_helper.rb", "example/app/helpers/application_helper.rb", "example/app/helpers/figments_helper.rb", "example/app/models/account.rb", "example/app/models/figment.rb", "example/app/views/accounts/index.html.erb", "example/app/views/layouts/application.html.erb", "example/config/boot.rb", "example/config/database.yml", "example/config/environment.rb", "example/config/environments/development.rb", "example/config/environments/production.rb", "example/config/environments/test.rb", "example/config/initializers/inflections.rb", "example/config/initializers/mime_types.rb", "example/config/initializers/new_rails_defaults.rb", "example/config/routes.rb", "example/db/migrate/20080702154628_create_accounts.rb", "example/db/migrate/20080702154820_create_figments.rb", "example/db/schema.rb", "example/public/404.html", "example/public/422.html", "example/public/500.html", "example/public/dispatch.cgi", "example/public/dispatch.fcgi", "example/public/dispatch.rb", "example/public/favicon.ico", "example/public/images/rails.png", "example/public/javascripts/application.js", "example/public/javascripts/controls.js", "example/public/javascripts/dragdrop.js", "example/public/javascripts/effects.js", "example/public/javascripts/prototype.js", "example/public/robots.txt", "example/Rakefile", "example/script/about", "example/script/console", "example/script/dbconsole", "example/script/destroy", "example/script/generate", "example/script/performance/benchmarker", "example/script/performance/profiler", "example/script/performance/request", "example/script/plugin", "example/script/process/inspector", "example/script/process/reaper", "example/script/process/spawner", "example/script/runner", "example/script/server", "example/test/fixtures/accounts.yml", "example/test/functional/accounts_controller_test.rb", "example/test/integration/account_figments_test.rb", "example/test/test_helper.rb", "init.rb", "lib/data_fabric/version.rb", "lib/data_fabric.rb", "Manifest", "Rakefile", "README.rdoc", "test/connection_test.rb", "test/database.yml", "test/database.yml.mysql", "test/database_test.rb", "test/shard_test.rb", "test/test_helper.rb", "test/thread_test.rb", "TESTING.rdoc", "data_fabric.gemspec"]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/fiveruns/data_fabric}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Data_fabric", "--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{fiveruns}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Sharding and replication support for ActiveRecord 2.0 and 2.1}
+  s.test_files = ["test/connection_test.rb", "test/database_test.rb", "test/shard_test.rb", "test/test_helper.rb", "test/thread_test.rb"]
 
-date: 2008-09-30 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.2
-    version: 
-description: Sharding and replication support for ActiveRecord 2.x
-email: mperham@gmail.com
-executables: []
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
 
-extensions: []
-
-extra_rdoc_files: 
-- CHANGELOG
-- lib/data_fabric/version.rb
-- lib/data_fabric.rb
-- README.rdoc
-files: 
-- CHANGELOG
-- example/app/controllers/accounts_controller.rb
-- example/app/controllers/application.rb
-- example/app/controllers/figments_controller.rb
-- example/app/helpers/accounts_helper.rb
-- example/app/helpers/application_helper.rb
-- example/app/helpers/figments_helper.rb
-- example/app/models/account.rb
-- example/app/models/figment.rb
-- example/app/views/accounts/index.html.erb
-- example/app/views/layouts/application.html.erb
-- example/config/boot.rb
-- example/config/database.yml
-- example/config/environment.rb
-- example/config/environments/development.rb
-- example/config/environments/production.rb
-- example/config/environments/test.rb
-- example/config/initializers/inflections.rb
-- example/config/initializers/mime_types.rb
-- example/config/initializers/new_rails_defaults.rb
-- example/config/routes.rb
-- example/db/migrate/20080702154628_create_accounts.rb
-- example/db/migrate/20080702154820_create_figments.rb
-- example/db/schema.rb
-- example/public/404.html
-- example/public/422.html
-- example/public/500.html
-- example/public/dispatch.cgi
-- example/public/dispatch.fcgi
-- example/public/dispatch.rb
-- example/public/favicon.ico
-- example/public/images/rails.png
-- example/public/javascripts/application.js
-- example/public/javascripts/controls.js
-- example/public/javascripts/dragdrop.js
-- example/public/javascripts/effects.js
-- example/public/javascripts/prototype.js
-- example/public/robots.txt
-- example/Rakefile
-- example/script/about
-- example/script/console
-- example/script/dbconsole
-- example/script/destroy
-- example/script/generate
-- example/script/performance/benchmarker
-- example/script/performance/profiler
-- example/script/performance/request
-- example/script/plugin
-- example/script/process/inspector
-- example/script/process/reaper
-- example/script/process/spawner
-- example/script/runner
-- example/script/server
-- example/test/fixtures/accounts.yml
-- example/test/functional/accounts_controller_test.rb
-- example/test/integration/account_figments_test.rb
-- example/test/test_helper.rb
-- init.rb
-- lib/data_fabric/version.rb
-- lib/data_fabric.rb
-- Manifest
-- Rakefile
-- README.rdoc
-- test/connection_test.rb
-- test/database.yml.example
-- test/database_test.rb
-- test/shard_test.rb
-- test/test_helper.rb
-- test/thread_test.rb
-- TESTING.rdoc
-- data_fabric.gemspec
-has_rdoc: true
-homepage: http://github.com/fiveruns/data_fabric
-post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Data_fabric
-- --main
-- README.rdoc
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-requirements: []
-
-rubyforge_project: fiveruns
-rubygems_version: 1.2.0
-specification_version: 2
-summary: Sharding and replication support for ActiveRecord 2.x
-test_files: 
-- test/connection_test.rb
-- test/database_test.rb
-- test/shard_test.rb
-- test/test_helper.rb
-- test/thread_test.rb
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/lib/data_fabric/version.rb

@@ -1,5 +1,5 @@
 module DataFabric
 	module Version
-		STRING = "1.0.2"
+		STRING = "1.1.0"
 	end
 end

data/lib/data_fabric.rb

@@ -1,5 +1,6 @@
 require 'active_record'
 require 'active_record/version'
+require 'data_fabric/version'
 
 # DataFabric adds a new level of flexibility to ActiveRecord connection handling.
 # You need to describe the topology for your database infrastructure in your model(s).  As with ActiveRecord normally, different models can use different topologies.
@@ -36,27 +37,17 @@ require 'active_record/version'
 #   end
 # end
 module DataFabric
-  
-  def self.logger
-    ActiveRecord::Base.logger
-  end
+
+  # Set this logger to log DataFabric operations.
+  # The logger should quack like a standard Ruby Logger.
+  mattr_accessor :logger
 
   def self.init
-    logger.info "Loading data_fabric #{DataFabric::Version::STRING} with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+    logger = ActiveRecord::Base.logger unless logger
+    log { "Loading data_fabric #{DataFabric::Version::STRING} with ActiveRecord #{ActiveRecord::VERSION::STRING}" }
     ActiveRecord::Base.send(:include, self)
   end
   
-  mattr_writer :debugging
-  @@debugging = false
-  
-  def self.debugging?
-    if @@debugging.nil? && logger
-      logger.debug?
-    else
-      !!@@debugging
-    end
-  end
-  
   def self.activate_shard(shards, &block)
     ensure_setup
 
@@ -93,6 +84,11 @@ module DataFabric
     end
   end
   
+  def self.shard_active_for?(group)
+    return true unless group
+    Thread.current[:shards] and Thread.current[:shards][group.to_s]
+  end
+
   def self.included(model)
     # Wire up ActiveRecord::Base
     model.extend ClassMethods
@@ -101,7 +97,11 @@ module DataFabric
   def self.ensure_setup
     Thread.current[:shards] = {} unless Thread.current[:shards]
   end
-  
+
+  def self.log(level=Logger::INFO, &block)
+    logger && logger.add(level, &block)
+  end
+
   # Class methods injected into ActiveRecord::Base
   module ClassMethods
     def data_fabric(options)
@@ -109,9 +109,8 @@ module DataFabric
       ActiveRecord::Base.active_connections[name] = proxy
       
       raise ArgumentError, "data_fabric does not support ActiveRecord's allow_concurrency = true" if allow_concurrency
-      DataFabric.logger.info "Creating data_fabric proxy for class #{name}"
+      DataFabric.log { "Creating data_fabric proxy for class #{name}" }
     end
-    alias :connection_topology :data_fabric # legacy
   end
   
   class StringProxy
@@ -126,109 +125,97 @@ module DataFabric
   class ConnectionProxy
     def initialize(model_class, options)
       @model_class = model_class      
-      @replicated = options[:replicated]
+      @replicated  = options[:replicated]
       @shard_group = options[:shard_by]
-      @prefix = options[:prefix]
-      @current_role = 'slave' if @replicated
-      @current_connection_name_builder = connection_name_builder
-      @cached_connection = nil
-      @current_connection_name = nil
-      @role_changed = false
+      @prefix      = options[:prefix]
+      @role        = 'slave' if @replicated
 
       @model_class.send :include, ActiveRecordConnectionMethods if @replicated
     end
-
+    
     delegate :insert, :update, :delete, :create_table, :rename_table, :drop_table, :add_column, :remove_column, 
       :change_column, :change_column_default, :rename_column, :add_index, :remove_index, :initialize_schema_information,
-      :dump_schema_information, :execute, :to => :master
+      :dump_schema_information, :execute, :execute_ignore_duplicate, :to => :master
     
+    def cache(&block)
+      connection.cache(&block)
+    end
+
     def transaction(start_db_transaction = true, &block)
-      with_master { raw_connection.transaction(start_db_transaction, &block) }
+      with_master { connection.transaction(start_db_transaction, &block) }
     end
 
     def method_missing(method, *args, &block)
-      unless @cached_connection and !@role_changed
-        raw_connection
-        @role_changed = false
-      end
-      if DataFabric.debugging?
-        logger.debug("Calling #{method} on #{@cached_connection}")
-      end
-      raw_connection.send(method, *args, &block)
+      DataFabric.log(Logger::DEBUG) { "Calling #{method} on #{connection}" }
+      connection.send(method, *args, &block)
     end
     
     def connection_name
-      @current_connection_name_builder.join('_')
+      connection_name_builder.join('_')
     end
     
     def disconnect!
-      @cached_connection.disconnect! if @cached_connection
-      @cached_connection = nil
+      if connected?
+        connection.disconnect! 
+        cached_connections[connection_name] = nil
+      end
     end
     
     def verify!(arg)
-      @cached_connection.verify!(0) if @cached_connection
+      connection.verify!(arg) if connected?
     end
     
     def with_master
+      # Allow nesting of with_master.
+      old_role = @role
       set_role('master')
       yield
     ensure
-      set_role('slave')
+      set_role(old_role)
+    end
+
+  private
+
+    def cached_connections
+      @cached_connections ||= {}
     end
 
-    private
-    
     def connection_name_builder
-      clauses = []
-      clauses << @prefix if @prefix
-      clauses << @shard_group if @shard_group
-      clauses << StringProxy.new { DataFabric.active_shard(@shard_group) } if @shard_group
-      clauses << RAILS_ENV
-      clauses << StringProxy.new { @current_role } if @replicated
-      clauses
+      @connection_name_builder ||= begin
+        clauses = []
+        clauses << @prefix if @prefix
+        clauses << @shard_group if @shard_group
+        clauses << StringProxy.new { DataFabric.active_shard(@shard_group) } if @shard_group
+        clauses << RAILS_ENV
+        clauses << StringProxy.new { @role } if @replicated
+        clauses
+      end
     end
     
-    def raw_connection
-      conn_name = connection_name
-      unless already_connected_to? conn_name 
-        @cached_connection = begin 
-          config = ActiveRecord::Base.configurations[conn_name]
-          raise ArgumentError, "Unknown database config: #{conn_name}, have #{ActiveRecord::Base.configurations.inspect}" unless config
-          @model_class.establish_connection config
-          if DataFabric.debugging?
-            logger.debug "Switching from #{@current_connection_name || "(none)"} to #{conn_name}"
-          end
-          @current_connection_name = conn_name
-          conn = @model_class.connection
-          conn.verify! 0
-          conn
-        end
+    def connection
+      name = connection_name
+      if not connected?
+        config = ActiveRecord::Base.configurations[name]
+        raise ArgumentError, "Unknown database config: #{name}, have #{ActiveRecord::Base.configurations.inspect}" unless config
+        DataFabric.log { "Connecting to #{name}" }
+        @model_class.establish_connection(config)
+        cached_connections[name] = @model_class.connection
         @model_class.active_connections[@model_class.name] = self
       end
-      @cached_connection
+      cached_connections[name].verify!(3600)
+      cached_connections[name]
     end
-    
-    def already_connected_to?(conn_name)
-      conn_name == @current_connection_name and @cached_connection
+
+    def connected?
+      DataFabric.shard_active_for?(@shard_group) and cached_connections[connection_name]
     end
-    
+
     def set_role(role)
-      if @replicated and @current_role != role
-        @current_role = role
-        @role_changed = true
-      end
+      @role = role if @replicated
     end
     
     def master
-      set_role('master')
-      return raw_connection
-    ensure
-      set_role('slave')
-    end
-    
-    def logger
-      DataFabric.logger
+      with_master { return connection }
     end
   end
 

data/test/connection_test.rb

@@ -2,15 +2,15 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 require 'flexmock/test_unit'
 
 class PrefixModel < ActiveRecord::Base
-  connection_topology :prefix => 'prefix'
+  data_fabric :prefix => 'prefix'
 end
 
 class ShardModel < ActiveRecord::Base
-  connection_topology :shard_by => :city
+  data_fabric :shard_by => :city
 end
 
 class TheWholeEnchilada < ActiveRecord::Base
-  connection_topology :prefix => 'fiveruns', :replicated => true, :shard_by => :city
+  data_fabric :prefix => 'fiveruns', :replicated => true, :shard_by => :city
 end
 
 class AdapterMock < ActiveRecord::ConnectionAdapters::AbstractAdapter
@@ -43,7 +43,7 @@ end
 class ConnectionTest < Test::Unit::TestCase
 
   def test_should_install_into_arbase
-    assert PrefixModel.methods.include?('connection_topology')
+    assert PrefixModel.methods.include?('data_fabric')
   end
   
   def test_prefix_connection_name

data/test/database.yml

@@ -0,0 +1,24 @@
+# The unit tests make use of the data populated in these databases.
+#
+# Notes:
+# - The database identifiers (e.g. "fiveruns_city_austin_test_master") MUST NOT
+#   be changed! Everything else may be changed.
+# - The user defined for "fiveruns_city_austin_test_master" MUST have the
+#   privilege to create and drop databases and tables.
+
+
+fiveruns_city_austin_test_master:
+  adapter: sqlite3
+  database: test/vr_austin_master.db
+
+fiveruns_city_austin_test_slave:
+  adapter: sqlite3
+  database: test/vr_austin_slave.db
+
+fiveruns_city_dallas_test_master:
+  adapter: sqlite3
+  database: test/vr_dallas_master.db
+
+fiveruns_city_dallas_test_slave:
+  adapter: sqlite3
+  database: test/vr_dallas_slave.db

data/test/database_test.rb

@@ -3,7 +3,7 @@ require 'flexmock/test_unit'
 require 'erb'
 
 class TheWholeBurrito < ActiveRecord::Base
-  connection_topology :prefix => 'fiveruns', :replicated => true, :shard_by => :city
+  data_fabric :prefix => 'fiveruns', :replicated => true, :shard_by => :city
 end
 
 class DatabaseTest < Test::Unit::TestCase
@@ -18,11 +18,11 @@ class DatabaseTest < Test::Unit::TestCase
 
       # Should use the slave
       burrito = TheWholeBurrito.find(1)
-      assert_equal 'vr_dallas_slave', burrito.name
+      assert_match 'vr_dallas_slave', burrito.name
       
       # Should use the master
       burrito.reload
-      assert_equal 'vr_dallas_master', burrito.name
+      assert_match 'vr_dallas_master', burrito.name
 
       # ...but immediately set it back to default to the slave
       assert_equal 'fiveruns_city_dallas_test_slave', TheWholeBurrito.connection.connection_name
@@ -30,7 +30,7 @@ class DatabaseTest < Test::Unit::TestCase
       # Should use the master
       TheWholeBurrito.transaction do
         burrito = TheWholeBurrito.find(1)
-        assert_equal 'vr_dallas_master', burrito.name
+        assert_match 'vr_dallas_master', burrito.name
         burrito.save!
       end
     end

data/test/thread_test.rb

@@ -11,7 +11,7 @@ class ThreadTest < Test::Unit::TestCase
         class ThreadedEnchilada < ActiveRecord::Base
           self.allow_concurrency = true
           set_table_name :enchiladas
-          connection_topology :prefix => 'fiveruns', :replicated => true, :shard_by => :city
+          data_fabric :prefix => 'fiveruns', :replicated => true, :shard_by => :city
         end
       }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: data_fabric
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Mike Perham
@@ -9,20 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-30 00:00:00 -05:00
+date: 2008-11-22 00:00:00 -06:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.2
-    version: 
-description: Sharding and replication support for ActiveRecord 2.x
+dependencies: []
+
+description: Sharding and replication support for ActiveRecord 2.0 and 2.1
 email: mperham@gmail.com
 executables: []
 
@@ -98,7 +89,8 @@ files:
 - Rakefile
 - README.rdoc
 - test/connection_test.rb
-- test/database.yml.example
+- test/database.yml
+- test/database.yml.mysql
 - test/database_test.rb
 - test/shard_test.rb
 - test/test_helper.rb
@@ -132,10 +124,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fiveruns
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Sharding and replication support for ActiveRecord 2.x
+summary: Sharding and replication support for ActiveRecord 2.0 and 2.1
 test_files: 
 - test/connection_test.rb
 - test/database_test.rb