data_fabric 1.2.7 → 1.3.0

data/example30/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/example30/test/performance/browsing_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+require 'rails/performance_test_help'
+
+# Profiling results for each test method are written to tmp/performance.
+class BrowsingTest < ActionDispatch::PerformanceTest
+  def test_homepage
+    get '/'
+  end
+end

data/example30/test/test_helper.rb

@@ -0,0 +1,13 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end

data/lib/data_fabric.rb

@@ -1,5 +1,7 @@
 require 'active_record'
 require 'active_record/version'
+require 'active_record/connection_adapters/abstract/connection_pool'
+require 'active_record/connection_adapters/abstract/connection_specification'
 require 'data_fabric/version'
 
 # DataFabric adds a new level of flexibility to ActiveRecord connection handling.
@@ -38,20 +40,12 @@ require 'data_fabric/version'
 # end
 module DataFabric
 
-  # Set this logger to log DataFabric operations.
-  # The logger should quack like a standard Ruby Logger.
-  mattr_accessor :logger
-
-  def self.init
-    logger = ActiveRecord::Base.logger unless logger
-    log { "Loading data_fabric #{DataFabric::Version::STRING} with ActiveRecord #{ActiveRecord::VERSION::STRING}" }
-
-    if ActiveRecord::VERSION::STRING < '2.2.0'
-      require 'data_fabric/ar20'
-    else
-      require 'data_fabric/ar22'
-    end
-    ActiveRecord::Base.send(:include, DataFabric::Extensions)
+  def self.logger
+    @logger ||= ActiveRecord::Base.logger || Logger.new('/dev/null')
+  end
+  
+  def self.logger=(log)
+    @logger = log
   end
   
   def self.activate_shard(shards, &block)
@@ -85,9 +79,9 @@ module DataFabric
   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
+    shard = Thread.current[:shards][group.to_s]
+    raise ArgumentError, "No active shard for #{group}" unless shard
+    shard
   end
   
   def self.shard_active_for?(group)
@@ -99,8 +93,7 @@ module DataFabric
     Thread.current[:shards] = {} unless Thread.current[:shards]
   end
 
-  def self.log(level=Logger::INFO, &block)
-    logger && logger.add(level, &block)
-  end
-
 end
+
+require 'data_fabric/extensions'
+ActiveRecord::Base.send(:include, DataFabric::Extensions)

data/lib/data_fabric/{ar22.rb → connection_proxy.rb}

@@ -1,49 +1,47 @@
+module DataFabric
+  module ActiveRecordConnectionMethods
+    def self.included(base)
+      base.alias_method_chain :reload, :master
+    end
 
-class ActiveRecord::ConnectionAdapters::ConnectionHandler
-  def clear_active_connections_with_data_fabric!
-    clear_active_connections_without_data_fabric!
-    DataFabric::ConnectionProxy.shard_pools.each_value { |pool| pool.release_connection }
+    def reload_with_master(*args, &block)
+      connection.with_master { reload_without_master }
+    end
   end
-  alias_method_chain :clear_active_connections!, :data_fabric
-end
 
-module DataFabric
-  module Extensions
-    def self.included(model)
-      # Wire up ActiveRecord::Base
-      model.extend ClassMethods
-      ConnectionProxy.shard_pools = {}
-    end
-
-    # Class methods injected into ActiveRecord::Base
-    module ClassMethods
-      def data_fabric(options)
-        DataFabric.log { "Creating data_fabric proxy for class #{name}" }
-        @proxy = DataFabric::ConnectionProxy.new(self, options)
-        
-        class << self
-          def connection
-            @proxy || superclass.connection
-          end
-
-          def connected?
-            @proxy.connected?
-          end
-
-          def remove_connection(klass=self)
-            DataFabric.log(Logger::WARN) { "remove_connection not implemented by data_fabric" }
-          end
-
-          def connection_pool
-            raise "dynamic connection switching means you cannot get direct access to a pool"
-          end
-        end
-      end
+  class StringProxy
+    def initialize(&block)
+      @proc = block
+    end
+    def to_s
+      @proc.call
+    end
+  end
+  
+  class PoolProxy
+    def initialize(proxy)
+      @proxy = proxy
+    end
+    def connection
+      @proxy
+    end
+    def release_connection
+      DataFabric.logger.debug { 'data_fabric does not implement release_connection' }
+    end
+    def spec
+      @proxy.spec
+    end
+    def with_connection
+      yield @proxy
+    end
+    def connected?
+      @proxy.connected?
     end
   end
 
   class ConnectionProxy
     cattr_accessor :shard_pools
+    attr_accessor :spec
     
     def initialize(model_class, options)
       @model_class = model_class      
@@ -73,7 +71,7 @@ module DataFabric
     end
 
     def method_missing(method, *args, &block)
-      DataFabric.log(Logger::DEBUG) { "Calling #{method} on #{connection}" }
+      DataFabric.logger.debug { "Calling #{method} on #{connection}" }
       connection.send(method, *args, &block)
     end
 
@@ -94,6 +92,10 @@ module DataFabric
       current_pool.connected?
     end
 
+    def connection
+      current_pool.connection
+    end
+
   private
 
     def in_transaction?
@@ -114,7 +116,7 @@ module DataFabric
       config = config.symbolize_keys
       adapter_method = "#{config[:adapter]}_connection"
       initialize_adapter(config[:adapter])
-      ActiveRecord::Base::ConnectionSpecification.new(config, adapter_method)
+      @spec = ActiveRecord::Base::ConnectionSpecification.new(config, adapter_method)
     end
     
     def initialize_adapter(adapter)
@@ -143,10 +145,6 @@ module DataFabric
       end
     end
     
-    def connection
-      current_pool.connection
-    end
-
     def set_role(role)
       Thread.current[:data_fabric_role] = role
     end
@@ -160,22 +158,4 @@ module DataFabric
     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
-
-  class StringProxy
-    def initialize(&block)
-      @proc = block
-    end
-    def to_s
-      @proc.call
-    end
-  end
-end
+end

data/lib/data_fabric/extensions.rb

@@ -0,0 +1,29 @@
+require 'data_fabric/connection_proxy'
+
+class ActiveRecord::ConnectionAdapters::ConnectionHandler
+  def clear_active_connections_with_data_fabric!
+    clear_active_connections_without_data_fabric!
+    DataFabric::ConnectionProxy.shard_pools.each_value { |pool| pool.release_connection }
+  end
+  alias_method_chain :clear_active_connections!, :data_fabric
+end
+
+module DataFabric
+  module Extensions
+    def self.included(model)
+      DataFabric.logger.info { "Loading data_fabric #{DataFabric::Version::STRING} with ActiveRecord #{ActiveRecord::VERSION::STRING}" }
+
+      # Wire up ActiveRecord::Base
+      model.extend ClassMethods
+      ConnectionProxy.shard_pools = {}
+    end
+
+    # Class methods injected into ActiveRecord::Base
+    module ClassMethods
+      def data_fabric(options)
+        DataFabric.logger.info { "Creating data_fabric proxy for class #{name}" }
+        connection_handler.connection_pools[name] = PoolProxy.new(ConnectionProxy.new(self, options))
+      end
+    end
+  end
+end

data/lib/data_fabric/version.rb

@@ -1,5 +1,5 @@
 module DataFabric
   module Version
-    STRING = '1.2.7'
+    STRING = '1.3.0'
   end
 end

data/test/connection_test.rb

@@ -14,21 +14,29 @@ class TheWholeEnchilada < ActiveRecord::Base
 end
 
 class AdapterMock < ActiveRecord::ConnectionAdapters::AbstractAdapter
-  # Minimum required to perform a find with no results
+  # Minimum required to perform a find with no results.
+  # Works on 2.3.10, 3.0.0 and 3.0.3.
    def columns(table_name, name=nil)
-     []
+     [ActiveRecord::ConnectionAdapters::Column.new('id', 0, :integer, false)]
+   end
+   def primary_key(name)
+     :id
+   end
+   def adapter_name
+     'mysql'
    end
    def select(sql, name=nil)
      []
    end
    def execute(sql, name=nil)
-     0
+     []
    end
-   
-   def name
-     'fake-db'
+   def tables
+     ["enchiladas", "the_whole_burritos"]
+   end
+   def table_exists?(name)
+     true
    end
-  
    def method_missing(name, *args)
      raise ArgumentError, "#{self.class.name} missing '#{name}': #{args.inspect}"
    end
@@ -98,11 +106,8 @@ class ConnectionTest < Test::Unit::TestCase
   private
   
   def setup_configuration_for(clazz, name)
-    if ar22?
-      flexmock(ActiveRecord::ConnectionAdapters::ConnectionPool).new_instances.should_receive(:new_connection).and_return(AdapterMock.new(RawConnection.new))
-    else
-      flexmock(clazz).should_receive(:mysql_connection).and_return(AdapterMock.new(RawConnection.new))      
-    end
+    flexmock(ActiveRecord::ConnectionAdapters::ConnectionPool).new_instances.should_receive(
+      :new_connection).and_return(AdapterMock.new(RawConnection.new))
     ActiveRecord::Base.configurations ||= HashWithIndifferentAccess.new
     ActiveRecord::Base.configurations[name] = HashWithIndifferentAccess.new({ :adapter => 'mysql', :database => name, :host => 'localhost'})
   end

data/test/database_test.rb

@@ -10,21 +10,13 @@ class DatabaseTest < Test::Unit::TestCase
   
   def setup
     ActiveRecord::Base.configurations = load_database_yml
-    if ar22?
-      DataFabric::ConnectionProxy.shard_pools.clear
-    end
+    DataFabric::ConnectionProxy.shard_pools.clear
   end
 
-  def test_ar22_features
-    return unless ar22?
-
+  def test_features
     DataFabric.activate_shard :city => :dallas do
       assert_equal 'fiveruns_city_dallas_test_slave', TheWholeBurrito.connection.connection_name
-
-      assert_raises RuntimeError do
-        TheWholeBurrito.connection_pool
-      end
-
+      assert_equal DataFabric::PoolProxy, TheWholeBurrito.connection_pool.class
       assert !TheWholeBurrito.connected?
 
       # Should use the slave

data/test/test_helper.rb

@@ -6,6 +6,8 @@ Dir.chdir(ROOT_PATH)
 
 require 'rubygems'
 require 'test/unit'
+require 'erb'
+require 'logger'
 
 version = ENV['AR_VERSION']
 if version
@@ -18,20 +20,13 @@ require 'active_record/version'
 ActiveRecord::Base.logger = Logger.new(STDOUT)
 ActiveRecord::Base.logger.level = Logger::WARN
 
-# Bootstrap DF
-deps = defined?(ActiveSupport::Dependencies) ? ActiveSupport::Dependencies : Dependencies
-deps.load_paths << File.join(File.dirname(__FILE__), '../lib')
-require 'init'
+require 'data_fabric'
 
 def load_database_yml
   filename = DATABASE_YML_PATH
   YAML::load(ERB.new(IO.read(filename)).result)
 end
 
-def ar22?
-  ActiveRecord::VERSION::STRING >= '2.2.0'
-end
-
 if !File.exist?(DATABASE_YML_PATH)
   puts "\n*** ERROR ***:\n" <<
     "You must have a 'test/database.yml' file in order to run the unit tests. " <<

data/test/thread_test.rb

@@ -5,20 +5,6 @@ class ThreadTest < Test::Unit::TestCase
   
   MUTEX = Mutex.new
 
-  if ActiveRecord::VERSION::STRING < '2.2.0'
-    def test_concurrency_not_allowed
-      assert_raise ArgumentError do
-        Object.class_eval %{
-          class ThreadedEnchilada < ActiveRecord::Base
-            self.allow_concurrency = true
-            set_table_name :enchiladas
-            data_fabric :prefix => 'fiveruns', :replicated => true, :shard_by => :city
-          end
-        }
-      end
-    end
-  end
-  
   def test_class_and_instance_connections
     Object.class_eval %{
       class ThreadedEnchilada < ActiveRecord::Base

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 7
-  version: 1.2.7
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Mike Perham
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 -07:00
+date: 2010-11-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: flexmock
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,20 +30,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: flexmock
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-description: 
+description: Sharding and replication support for ActiveRecord 2.x
 email: mperham@gmail.com
 executables: []
 
@@ -52,62 +39,10 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- CHANGELOG
-- README.rdoc
-- Rakefile
-- TESTING.rdoc
-- example/Rakefile
-- 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/robots.txt
-- 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
-- example23/Rakefile
+- lib/data_fabric/connection_proxy.rb
+- lib/data_fabric/extensions.rb
+- lib/data_fabric/version.rb
+- lib/data_fabric.rb
 - example23/app/controllers/accounts_controller.rb
 - example23/app/controllers/application_controller.rb
 - example23/app/controllers/figments_controller.rb
@@ -127,17 +62,8 @@ files:
 - example23/config/initializers/new_rails_defaults.rb
 - example23/config/locales/en.yml
 - example23/config/routes.rb
-- example23/db/development.sqlite3
 - example23/db/migrate/20080702154628_create_accounts.rb
 - example23/db/migrate/20080702154820_create_figments.rb
-- example23/db/s0_development.sqlite3
-- example23/db/s0_test.sqlite3
-- example23/db/s1_development.sqlite3
-- example23/db/s1_test.sqlite3
-- example23/db/schema.rb
-- example23/db/test.sqlite3
-- example23/log/development.log
-- example23/log/test.log
 - example23/public/404.html
 - example23/public/422.html
 - example23/public/500.html
@@ -148,6 +74,7 @@ files:
 - example23/public/images/rails.png
 - example23/public/index.html
 - example23/public/robots.txt
+- example23/Rakefile
 - example23/script/about
 - example23/script/console
 - example23/script/dbconsole
@@ -167,19 +94,55 @@ files:
 - example23/test/integration/account_figments_test.rb
 - example23/test/performance/browsing_test.rb
 - example23/test/test_helper.rb
-- example23/vendor/plugins/data_fabric/init.rb
-- example23/vendor/plugins/data_fabric/lib/data_fabric.rb
-- example23/vendor/plugins/data_fabric/lib/data_fabric/ar20.rb
-- example23/vendor/plugins/data_fabric/lib/data_fabric/ar22.rb
-- example23/vendor/plugins/data_fabric/lib/data_fabric/dash.rb
-- example23/vendor/plugins/data_fabric/lib/data_fabric/version.rb
-- init.rb
-- lib/data_fabric.rb
-- lib/data_fabric/ar20.rb
-- lib/data_fabric/ar22.rb
-- lib/data_fabric/dash.rb
-- lib/data_fabric/version.rb
-- rails/init.rb
+- example30/app/controllers/accounts_controller.rb
+- example30/app/controllers/application_controller.rb
+- example30/app/controllers/figments_controller.rb
+- example30/app/helpers/application_helper.rb
+- example30/app/models/account.rb
+- example30/app/models/figment.rb
+- example30/app/views/accounts/index.html.erb
+- example30/app/views/layouts/application.html.erb
+- example30/config/application.rb
+- example30/config/boot.rb
+- example30/config/database.yml
+- example30/config/environment.rb
+- example30/config/environments/development.rb
+- example30/config/environments/production.rb
+- example30/config/environments/test.rb
+- example30/config/initializers/backtrace_silencers.rb
+- example30/config/initializers/inflections.rb
+- example30/config/initializers/mime_types.rb
+- example30/config/initializers/secret_token.rb
+- example30/config/initializers/session_store.rb
+- example30/config/locales/en.yml
+- example30/config/routes.rb
+- example30/config.ru
+- example30/db/development.sqlite3
+- example30/db/migrate/20080702154628_create_accounts.rb
+- example30/db/migrate/20080702154820_create_figments.rb
+- example30/db/s0_development.sqlite3
+- example30/db/s0_test.sqlite3
+- example30/db/s1_development.sqlite3
+- example30/db/s1_test.sqlite3
+- example30/db/schema.rb
+- example30/db/seeds.rb
+- example30/db/test.sqlite3
+- example30/Gemfile
+- example30/Gemfile.lock
+- example30/log/development.log
+- example30/log/test.log
+- example30/Rakefile
+- example30/README
+- example30/script/rails
+- example30/test/fixtures/accounts.yml
+- example30/test/functional/accounts_controller_test.rb
+- example30/test/integration/account_figments_test.rb
+- example30/test/performance/browsing_test.rb
+- example30/test/test_helper.rb
+- CHANGELOG
+- README.rdoc
+- Rakefile
+- TESTING.rdoc
 - test/connection_test.rb
 - test/database.yml
 - test/database.yml.mysql
@@ -187,13 +150,17 @@ files:
 - test/shard_test.rb
 - test/test_helper.rb
 - test/thread_test.rb
+- test/vr_austin_master.db
+- test/vr_austin_slave.db
+- test/vr_dallas_master.db
+- test/vr_dallas_slave.db
 has_rdoc: true
 homepage: http://github.com/mperham/data_fabric
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -221,7 +188,13 @@ specification_version: 3
 summary: Sharding and replication support for ActiveRecord 2.x
 test_files: 
 - 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
+- test/vr_austin_master.db
+- test/vr_austin_slave.db
+- test/vr_dallas_master.db
+- test/vr_dallas_slave.db