data_fabric 1.0.1 → 1.0.2

data/Manifest

@@ -19,15 +19,9 @@ example/config/initializers/inflections.rb
 example/config/initializers/mime_types.rb
 example/config/initializers/new_rails_defaults.rb
 example/config/routes.rb
-example/db/development.sqlite3
 example/db/migrate/20080702154628_create_accounts.rb
 example/db/migrate/20080702154820_create_figments.rb
-example/db/s0_development.sqlite3
-example/db/s0_test.sqlite3
-example/db/s1_development.sqlite3
-example/db/s1_test.sqlite3
 example/db/schema.rb
-example/db/test.sqlite3
 example/public/404.html
 example/public/422.html
 example/public/500.html
@@ -61,19 +55,16 @@ example/test/fixtures/accounts.yml
 example/test/functional/accounts_controller_test.rb
 example/test/integration/account_figments_test.rb
 example/test/test_helper.rb
-example/vendor/plugins/data_fabric/init.rb
-example/vendor/plugins/data_fabric/lib/data_fabric.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.example
 test/database_test.rb
 test/shard_test.rb
 test/test_helper.rb
 test/thread_test.rb
 TESTING.rdoc
-TODO
-Manifest

data/Rakefile

@@ -4,57 +4,70 @@ require 'echoe'
 require File.dirname(__FILE__) << "/lib/data_fabric/version"
 
 Echoe.new 'data_fabric' do |p|
-	p.version = DataFabric::Version::STRING
-	p.author = "Mike Perham"
-	p.email  = 'mperham@gmail.com'
-	p.project = 'fiveruns'
-	p.summary = 'Sharding and replication support for ActiveRecord 2.x'
-	p.url = "http://github.com/fiveruns/data_fabric"
-	p.dependencies = ['activerecord >=2.0.2']
-	p.include_rakefile = true
+  p.version = DataFabric::Version::STRING
+  p.author = "Mike Perham"
+  p.email  = 'mperham@gmail.com'
+  p.project = 'fiveruns'
+  p.summary = 'Sharding and replication support for ActiveRecord 2.x'
+  p.url = "http://github.com/fiveruns/data_fabric"
+  p.dependencies = ['activerecord >=2.0.2']
+  p.development_dependencies = []
+  p.rubygems_version = nil
+  p.include_rakefile = true
 end
 
 task :pretest do
-	setup(false)
+  setup(false)
 end
 
 task :create_db do
-	setup(true)
+  setup(true)
 end
 
 task :changelog do
-	`git log | grep -v git-svn-id > History.txt`
+  `git log | grep -v git-svn-id > History.txt`
+end
+
+def load_database_yml
+  filename = "test/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"
+    exit 1
+  end
+  YAML::load(ERB.new(IO.read(filename)).result)
 end
 
 def setup_connection
   require 'active_record'
-  ENV['RAILS_ENV'] = 'test'
-
-  ActiveRecord::Base.configurations = { 'test' => { :adapter => 'mysql', :host => 'localhost', :database => 'mysql' } }
-  ActiveRecord::Base.establish_connection 'test'
+  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
 end
 
-def using_connection(&block)
+def using_connection(database_identifier, &block)
   ActiveRecord::Base.connection.instance_eval(&block)
 end
 
 def setup(create = false)
   setup_connection
-
-  databases = %w( vr_austin_master vr_austin_slave vr_dallas_master vr_dallas_slave )
-  databases.each do |db|
-    using_connection do
-			if create
-				execute "drop database if exists #{db}"
-				execute "create database #{db}"
-			end
-      execute "use #{db}"
+  
+  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}')"
+      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}')"
+      execute "insert into the_whole_burritos (id, name) values (1, '#{db_name}')"
     end  
   end
 end

data/data_fabric.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Data_fabric-1.0.1
+# Gem::Specification for Data_fabric-1.0.2
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: data_fabric
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Mike Perham
 autorequire: 
 bindir: bin
 
-date: 2008-07-09 00:00:00 -05:00
+date: 2008-09-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,16 +25,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.2
     version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: Sharding and replication support for ActiveRecord 2.x
 email: mperham@gmail.com
 executables: []
@@ -46,7 +36,6 @@ extra_rdoc_files:
 - lib/data_fabric/version.rb
 - lib/data_fabric.rb
 - README.rdoc
-- TODO
 files: 
 - CHANGELOG
 - example/app/controllers/accounts_controller.rb
@@ -69,15 +58,9 @@ files:
 - example/config/initializers/mime_types.rb
 - example/config/initializers/new_rails_defaults.rb
 - example/config/routes.rb
-- example/db/development.sqlite3
 - example/db/migrate/20080702154628_create_accounts.rb
 - example/db/migrate/20080702154820_create_figments.rb
-- example/db/s0_development.sqlite3
-- example/db/s0_test.sqlite3
-- example/db/s1_development.sqlite3
-- example/db/s1_test.sqlite3
 - example/db/schema.rb
-- example/db/test.sqlite3
 - example/public/404.html
 - example/public/422.html
 - example/public/500.html
@@ -111,22 +94,19 @@ files:
 - example/test/functional/accounts_controller_test.rb
 - example/test/integration/account_figments_test.rb
 - example/test/test_helper.rb
-- example/vendor/plugins/data_fabric/init.rb
-- example/vendor/plugins/data_fabric/lib/data_fabric.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.example
 - test/database_test.rb
 - test/shard_test.rb
 - test/test_helper.rb
 - test/thread_test.rb
 - TESTING.rdoc
-- TODO
-- Manifest
 - data_fabric.gemspec
 has_rdoc: true
 homepage: http://github.com/fiveruns/data_fabric
@@ -148,9 +128,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - "="
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
+      version: "0"
   version: 
 requirements: []
 

data/example/test/integration/account_figments_test.rb

@@ -10,7 +10,7 @@ class AccountFigmentsTest < ActionController::IntegrationTest
     assert_equal 0, conn0.count_for('figments')
     assert_equal 0, conn1.count_for('figments')
 
-    new_session do |user|
+    new_session(0) do |user|
       user.goes_home
       mike = user.creates_account('mike', '0')
       user.selects_account(mike)
@@ -25,7 +25,7 @@ class AccountFigmentsTest < ActionController::IntegrationTest
     assert_equal 1, conn0.count_for('figments')
     assert_equal 0, conn1.count_for('figments')
 
-    new_session do |user|
+    new_session(1) do |user|
       user.goes_home
       bob = user.creates_account('bob', '1')
       user.selects_account(bob)
@@ -54,10 +54,12 @@ class AccountFigmentsTest < ActionController::IntegrationTest
     conn
   end
 
-  def new_session
+  def new_session(shard)
     open_session do |sess|
-      sess.extend(Operations)
-      yield sess if block_given?
+      DataFabric.activate_shard :shard => shard do
+        sess.extend(Operations)
+        yield sess if block_given?
+      end
     end
   end
 

data/lib/data_fabric.rb

@@ -36,29 +36,41 @@ require 'active_record/version'
 #   end
 # end
 module DataFabric
-  VERSION = "1.0.0"
   
   def self.logger
     ActiveRecord::Base.logger
   end
 
   def self.init
-    logger.info "Loading data_fabric #{VERSION} with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+    logger.info "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
-    shards.each do |key, value|
+
+    # Save the old shard settings to handle nested activation
+    old = Thread.current[:shards].dup
+
+    shards.each_pair do |key, value|
       Thread.current[:shards][key.to_s] = value.to_s
     end
     if block_given?
       begin
         yield
       ensure
-        shards.each do |key, value|
-          Thread.current[:shards].delete(key.to_s)
-        end
+        Thread.current[:shards] = old
       end
     end
   end
@@ -128,7 +140,7 @@ module DataFabric
 
     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, :to => :master
+      :dump_schema_information, :execute, :to => :master
     
     def transaction(start_db_transaction = true, &block)
       with_master { raw_connection.transaction(start_db_transaction, &block) }
@@ -139,10 +151,10 @@ module DataFabric
         raw_connection
         @role_changed = false
       end
-      if logger.debug?
+      if DataFabric.debugging?
         logger.debug("Calling #{method} on #{@cached_connection}")
       end
-      @cached_connection.send(method, *args, &block) 
+      raw_connection.send(method, *args, &block)
     end
     
     def connection_name
@@ -184,8 +196,8 @@ module DataFabric
           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 logger.debug?
-            logger.debug "Switching from #{@current_connection_name} to #{conn_name}"
+          if DataFabric.debugging?
+            logger.debug "Switching from #{@current_connection_name || "(none)"} to #{conn_name}"
           end
           @current_connection_name = conn_name
           conn = @model_class.connection

data/lib/data_fabric/version.rb

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

data/test/{database.yml → database.yml.example}

@@ -1,3 +1,12 @@
+# 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: mysql
   host: localhost

data/test/database_test.rb

@@ -9,8 +9,7 @@ end
 class DatabaseTest < Test::Unit::TestCase
   
   def setup
-    filename = File.join(File.dirname(__FILE__), "database.yml")
-    ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(filename)).result)
+    ActiveRecord::Base.configurations = load_database_yml
   end
 
   def test_live_burrito
@@ -36,4 +35,4 @@ class DatabaseTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/shard_test.rb

@@ -21,4 +21,38 @@ class ShardTest < Test::Unit::TestCase
       assert_equal 'dallas', DataFabric.active_shard(:city)
     end.join
   end
-end
+  
+  def test_activations_can_be_nested
+    DataFabric.activate_shard(:name => 'Belldandy') do
+      DataFabric.activate_shard(:technique => 'Thousand Years of Pain') do
+        DataFabric.activate_shard(:name => 'Lelouche') do
+          DataFabric.activate_shard(:technique => 'Shadow Replication') do
+            assert_equal 'Shadow Replication', DataFabric.active_shard(:technique)
+            assert_equal 'Lelouche', DataFabric.active_shard(:name)
+          end
+          assert_equal 'Thousand Years of Pain', DataFabric.active_shard(:technique)
+          assert_equal 'Lelouche', DataFabric.active_shard(:name)
+        end
+        assert_equal 'Thousand Years of Pain', DataFabric.active_shard(:technique)
+        assert_equal 'Belldandy', DataFabric.active_shard(:name)
+      end
+      assert_raises ArgumentError do
+        DataFabric.active_shard(:technique)
+      end
+      assert_equal 'Belldandy', DataFabric.active_shard(:name)
+    end
+    assert_raises ArgumentError do
+      DataFabric.active_shard(:technique)
+    end
+    assert_raises ArgumentError do
+      DataFabric.active_shard(:name)
+    end
+  end
+  
+  def test_activate_shard_returns_result_of_block
+    result = DataFabric.activate_shard(:gundam => 'Exia') do
+      1234
+    end
+    assert_equal 1234, result
+  end
+end

data/test/test_helper.rb

@@ -1,17 +1,34 @@
-ENV['RAILS_ENV']='test'
-RAILS_ENV='test'
+if !defined?(ROOT_PATH) # Don't evaluate this file twice.
+  ENV['RAILS_ENV'] = 'test'
+  RAILS_ENV = 'test'
+  ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+  DATABASE_YML_PATH = File.join(ROOT_PATH, "test", "database.yml")
+  Dir.chdir(ROOT_PATH)
 
-require 'rubygems'
-require 'test/unit'
+  require 'rubygems'
+  require 'test/unit'
 
-# Bootstrap AR
-gem 'activerecord', '=2.0.2'
-require 'active_record'
-require 'active_record/version'
-ActiveRecord::Base.logger = Logger.new(STDOUT)
-ActiveRecord::Base.logger.level = Logger::WARN
-ActiveRecord::Base.allow_concurrency = false
+  # Bootstrap AR
+  gem 'activerecord', '=2.0.2'
+  require 'active_record'
+  require 'active_record/version'
+  ActiveRecord::Base.logger = Logger.new(STDOUT)
+  ActiveRecord::Base.logger.level = Logger::WARN
+  ActiveRecord::Base.allow_concurrency = false
 
-# Bootstrap DF
-Dependencies.load_paths << File.join(File.dirname(__FILE__), '../lib')
-require 'init'
+  # Bootstrap DF
+  Dependencies.load_paths << File.join(File.dirname(__FILE__), '../lib')
+  require 'init'
+
+  def load_database_yml
+    filename = DATABASE_YML_PATH
+    YAML::load(ERB.new(IO.read(filename)).result)
+  end
+
+  if !File.exist?(DATABASE_YML_PATH)
+    STDERR.puts "\n*** ERROR ***:\n" <<
+      "You must have a 'test/database.yml' file in order to run the unit tests. " <<
+      "An example is provided in 'test/database.yml.example'.\n\n"
+    exit 1
+  end
+end

data/test/thread_test.rb

@@ -18,8 +18,7 @@ class ThreadTest < Test::Unit::TestCase
   end
   
   def xtest_class_and_instance_connections
-    filename = File.join(File.dirname(__FILE__), "database.yml")
-    ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(filename)).result)
+    ActiveRecord::Base.configurations = load_database_yml
 
     cconn = ThreadedEnchilada.connection
     iconn = ThreadedEnchilada.new.connection
@@ -30,7 +29,7 @@ class ThreadTest < Test::Unit::TestCase
     clear_databases
 
     filename = File.join(File.dirname(__FILE__), "database.yml")
-    ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(filename)).result)
+    ActiveRecord::Base.configurations = load_database_yml
 
     counts = {:austin => 0, :dallas => 0}
     threads = []
@@ -88,4 +87,4 @@ class ThreadTest < Test::Unit::TestCase
   def using_connection(&block)
     ActiveRecord::Base.connection.instance_eval(&block)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: data_fabric
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Mike Perham
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-09 00:00:00 -05:00
+date: 2008-09-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.2
     version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: Sharding and replication support for ActiveRecord 2.x
 email: mperham@gmail.com
 executables: []
@@ -43,7 +33,6 @@ extra_rdoc_files:
 - lib/data_fabric/version.rb
 - lib/data_fabric.rb
 - README.rdoc
-- TODO
 files: 
 - CHANGELOG
 - example/app/controllers/accounts_controller.rb
@@ -66,15 +55,9 @@ files:
 - example/config/initializers/mime_types.rb
 - example/config/initializers/new_rails_defaults.rb
 - example/config/routes.rb
-- example/db/development.sqlite3
 - example/db/migrate/20080702154628_create_accounts.rb
 - example/db/migrate/20080702154820_create_figments.rb
-- example/db/s0_development.sqlite3
-- example/db/s0_test.sqlite3
-- example/db/s1_development.sqlite3
-- example/db/s1_test.sqlite3
 - example/db/schema.rb
-- example/db/test.sqlite3
 - example/public/404.html
 - example/public/422.html
 - example/public/500.html
@@ -108,22 +91,19 @@ files:
 - example/test/functional/accounts_controller_test.rb
 - example/test/integration/account_figments_test.rb
 - example/test/test_helper.rb
-- example/vendor/plugins/data_fabric/init.rb
-- example/vendor/plugins/data_fabric/lib/data_fabric.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.example
 - test/database_test.rb
 - test/shard_test.rb
 - test/test_helper.rb
 - test/thread_test.rb
 - TESTING.rdoc
-- TODO
-- Manifest
 - data_fabric.gemspec
 has_rdoc: true
 homepage: http://github.com/fiveruns/data_fabric
@@ -145,9 +125,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - "="
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
+      version: "0"
   version: 
 requirements: []
 

data/TODO

@@ -1 +0,0 @@
-Process or Documentation for how to migrate existing data to shards

data/example/vendor/plugins/data_fabric/init.rb

@@ -1 +0,0 @@
-DataFabric.init

data/example/vendor/plugins/data_fabric/lib/data_fabric.rb

@@ -1,231 +0,0 @@
-require 'active_record'
-require 'active_record/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.
-# 
-# class MyHugeVolumeOfDataModel < ActiveRecord::Base
-#   connection_topology :replicated => true, :shard_by => :city
-# end
-# 
-# There are four supported modes of operation, depending on the options given to the connection_topology method.  The plugin will look for connections in your config/database.yml with the following convention:
-# 
-# No connection topology:
-# #{environment} - this is the default, as with ActiveRecord, e.g. "production"
-# 
-# connection_topology :replicated => true
-# #{environment}_#{role} - no sharding, just replication, where role is "master" or "slave", e.g. "production_master"
-# 
-# connection_topology :shard_by => :city
-# #{group}_#{shard}_#{environment} - sharding, no replication, e.g. "city_austin_production"
-# 
-# connection_topology :replicated => true, :shard_by => :city
-# #{group}_#{shard}_#{environment}_#{role} - sharding with replication, e.g. "city_austin_production_master"
-# 
-# 
-# When marked as replicated, all write and transactional operations for the model go to the master, whereas read operations go to the slave.
-# 
-# Since sharding is an application-level concern, your application must set the shard to use based on the current request or environment.  The current shard for a group is set on a thread local variable.  For example, you can set the shard in an ActionController around_filter based on the user as follows:
-# 
-# class ApplicationController < ActionController::Base
-#   around_filter :select_shard
-#   
-#   private
-#   def select_shard(&action_block)
-#     DataFabric.activate_shard(:city => @current_user.city, &action_block)
-#   end
-# end
-module DataFabric
-  VERSION = "1.0.0"
-  
-  def self.logger
-    ActiveRecord::Base.logger
-  end
-
-  def self.init
-    logger.info "Loading data_fabric #{VERSION} with ActiveRecord #{ActiveRecord::VERSION::STRING}"
-    ActiveRecord::Base.send(:include, self)
-  end
-  
-  def self.activate_shard(shards, &block)
-    ensure_setup
-    shards.each do |key, value|
-      Thread.current[:shards][key.to_s] = value.to_s
-    end
-    if block_given?
-      begin
-        yield
-      ensure
-        shards.each do |key, value|
-          Thread.current[:shards].delete(key.to_s)
-        end
-      end
-    end
-  end
-  
-  # For cases where you can't pass a block to activate_shards, you can
-  # clean up the thread local settings by calling this method at the
-  # end of processing
-  def self.deactivate_shard(shards)
-    ensure_setup
-    shards.each do |key, value|
-      Thread.current[:shards].delete(key.to_s)
-    end
-  end
-  
-  def self.active_shard(group)
-    raise ArgumentError, 'No shard has been activated' unless Thread.current[:shards]
-
-    returning(Thread.current[:shards][group.to_s]) do |shard|
-      raise ArgumentError, "No active shard for #{group}" unless shard
-    end
-  end
-  
-  def self.included(model)
-    # Wire up ActiveRecord::Base
-    model.extend ClassMethods
-  end
-
-  def self.ensure_setup
-    Thread.current[:shards] = {} unless Thread.current[:shards]
-  end
-  
-  # Class methods injected into ActiveRecord::Base
-  module ClassMethods
-    def connection_topology(options)
-      proxy = DataFabric::ConnectionProxy.new(self, options)
-      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}"
-    end
-  end
-  
-  class StringProxy
-    def initialize(&block)
-      @proc = block
-    end
-    def to_s
-      @proc.call
-    end
-  end
-
-  class ConnectionProxy
-    def initialize(model_class, options)
-      @model_class = model_class      
-      @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
-
-      @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, :to => :master
-    
-    def transaction(start_db_transaction = true, &block)
-      with_master { raw_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 logger.debug?
-        logger.debug("Calling #{method} on #{@cached_connection}")
-      end
-      @cached_connection.send(method, *args, &block) 
-    end
-    
-    def connection_name
-      @current_connection_name_builder.join('_')
-    end
-    
-    def disconnect!
-      @cached_connection.disconnect! if @cached_connection
-      @cached_connection = nil
-    end
-    
-    def verify!(arg)
-      @cached_connection.verify!(0) if @cached_connection
-    end
-    
-    def with_master
-      set_role('master')
-      yield
-    ensure
-      set_role('slave')
-    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
-    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 logger.debug?
-            logger.debug "Switching from #{@current_connection_name} to #{conn_name}"
-          end
-          @current_connection_name = conn_name
-          conn = @model_class.connection
-          conn.verify! 0
-          conn
-        end
-        @model_class.active_connections[@model_class.name] = self
-      end
-      @cached_connection
-    end
-    
-    def already_connected_to?(conn_name)
-      conn_name == @current_connection_name and @cached_connection
-    end
-    
-    def set_role(role)
-      if @replicated and @current_role != role
-        @current_role = role
-        @role_changed = true
-      end
-    end
-    
-    def master
-      set_role('master')
-      return raw_connection
-    ensure
-      set_role('slave')
-    end
-    
-    def logger
-      DataFabric.logger
-    end
-  end
-
-  module ActiveRecordConnectionMethods
-    def self.included(base)
-      base.alias_method_chain :reload, :master
-    end
-
-    def reload_with_master(*args, &block)
-      connection.with_master { reload_without_master }
-    end
-  end
-end