schoefmax-multi_db 0.2.0 → 0.2.1

data/README.rdoc

@@ -25,14 +25,12 @@ master database.
 
 === Caveats
 
-* works with activerecord 2.1 and 2.2
-* when using Passenger or lightspeed you will probably need to introduce a
-  before_filter which checks if the proxy is setup (see the discussion in the
-  masochism readme: http://github.com/technoweenie/masochism)
+* works only with activerecord 2.1, 2.2 and 2.3
 
 === Install
 
-  gem install schoefmax-multi_db --source http://gems.github.com
+  gem sources --add http://gems.github.com # only if you haven't already added github
+  gem install schoefmax-multi_db
 
 When using Rails, add this to your environment.rb:
 
@@ -86,6 +84,28 @@ for master and slave connections. This can help you finding (some of the) issues
 your application might have with a replicated database setup without actually having
 one on your development machine.
 
+=== Using with Phusion Passenger
+
+With Passengers smart spawning method, child processes forked by the ApplicationSpawner
+won't have the connection proxy set up properly.
+
+To make it work, add this to your <tt>environment.rb</tt> or an initializer script
+(e.g. <tt>config/initializers/connection_proxy.rb</tt>):
+
+  if defined?(PhusionPassenger)
+    PhusionPassenger.on_event(:starting_worker_process) do |forked|
+      if forked
+        # ... set MultiDb configuration options, if any ...
+        MultiDb::ConnectionProxy.setup!
+      end
+    end
+  else # not using passenger (e.g. development/testing)
+    # ... set MultiDb configuration options, if any ...
+    MultiDb::ConnectionProxy.setup!
+  end
+
+Thanks to Nathan Esquenazi for testing this.
+
 === Forcing the master for certain actions
 
 Just add this to your controller:

data/lib/multi_db.rb

@@ -1,4 +1,4 @@
-require 'multi_db/thread_local_accessors'
+require 'tlattr_accessors'
 require 'multi_db/scheduler'
 require 'multi_db/active_record_extensions'
 require 'multi_db/observer_extensions'

data/lib/multi_db/connection_proxy.rb

@@ -13,8 +13,7 @@ module MultiDb
     DEFAULT_MASTER_MODELS = ['CGI::Session::ActiveRecordStore::Session']
 
     attr_accessor :master
-    tlattr_accessor :master_depth
-    tlattr_accessor :current
+    tlattr_accessor :master_depth, :current, true
     
     class << self
 

data/lib/multi_db/scheduler.rb

@@ -5,7 +5,7 @@ module MultiDb
 
     attr :items
     delegate :[], :[]=, :to => :items
-    tlattr_accessor :current_index
+    tlattr_accessor :current_index, true
     
     def initialize(items, blacklist_timeout = 1.minute)
       @n = items.length

data/multi_db.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multi_db}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maximilian Sch\303\266fmann"]
-  s.date = %q{2009-03-08}
+  s.date = %q{2009-03-11}
   s.description = "Connection proxy for ActiveRecord for single master / multiple slave database deployments"
   s.email = "max@pragmatic-it.de"
   s.extra_rdoc_files = ["LICENSE", "README.rdoc"]
-  s.files = ["lib/multi_db.rb", "lib/multi_db/thread_local_accessors.rb", "lib/multi_db/active_record_extensions.rb", "lib/multi_db/connection_proxy.rb", "lib/multi_db/observer_extensions.rb", "lib/multi_db/query_cache_compat.rb", "lib/multi_db/scheduler.rb", "LICENSE", "README.rdoc", "spec/config/database.yml", "spec/connection_proxy_spec.rb", "spec/scheduler_spec.rb", "spec/thread_local_accessors_spec.rb", "spec/spec_helper.rb", "multi_db.gemspec"]
+  s.files = ["lib/multi_db.rb", "lib/multi_db/active_record_extensions.rb", "lib/multi_db/connection_proxy.rb", "lib/multi_db/observer_extensions.rb", "lib/multi_db/query_cache_compat.rb", "lib/multi_db/scheduler.rb", "LICENSE", "README.rdoc", "spec/config/database.yml", "spec/connection_proxy_spec.rb", "spec/scheduler_spec.rb", "spec/spec_helper.rb", "multi_db.gemspec"]
   s.has_rdoc = true
   s.homepage = "http://github.com/schoefmax/multi_db"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "multi_db", "--main", "README.rdoc"]
@@ -24,10 +24,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency('activerecord', [">= 2.1.0"])
+      s.add_runtime_dependency('schoefmax-tlattr_accessors', [">= 0.0.3"])
     else
       s.add_dependency('activerecord', [">= 2.1.0"])
+      s.add_dependency('schoefmax-tlattr_accessors', [">= 0.0.3"])
     end
   else
     s.add_dependency('activerecord', [">= 2.1.0"])
+    s.add_dependency('schoefmax-tlattr_accessors', [">= 0.0.3"])
   end
 end

data/spec/connection_proxy_spec.rb

@@ -2,7 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require MULTI_DB_SPEC_DIR + '/../lib/multi_db/query_cache_compat'
 require MULTI_DB_SPEC_DIR + '/../lib/multi_db/active_record_extensions'
 require MULTI_DB_SPEC_DIR + '/../lib/multi_db/observer_extensions'
-require MULTI_DB_SPEC_DIR + '/../lib/multi_db/thread_local_accessors'
 require MULTI_DB_SPEC_DIR + '/../lib/multi_db/scheduler'
 require MULTI_DB_SPEC_DIR + '/../lib/multi_db/connection_proxy'
 

data/spec/scheduler_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require MULTI_DB_SPEC_DIR + '/../lib/multi_db/thread_local_accessors'
 require MULTI_DB_SPEC_DIR + '/../lib/multi_db/scheduler'
 
 describe MultiDb::Scheduler do

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 gem 'activerecord', '2.2.2'
-%w[active_record yaml erb spec].each {|lib| require lib}
+%w[tlattr_accessors active_record yaml erb spec].each {|lib| require lib}
 
 RAILS_ENV = ENV['RAILS_ENV'] = 'test'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: schoefmax-multi_db
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - "Maximilian Sch\xC3\xB6fmann"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-08 00:00:00 -08:00
+date: 2009-03-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.1.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: schoefmax-tlattr_accessors
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.3
+    version: 
 description: Connection proxy for ActiveRecord for single master / multiple slave database deployments
 email: max@pragmatic-it.de
 executables: []
@@ -33,7 +43,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/multi_db.rb
-- lib/multi_db/thread_local_accessors.rb
 - lib/multi_db/active_record_extensions.rb
 - lib/multi_db/connection_proxy.rb
 - lib/multi_db/observer_extensions.rb
@@ -44,7 +53,6 @@ files:
 - spec/config/database.yml
 - spec/connection_proxy_spec.rb
 - spec/scheduler_spec.rb
-- spec/thread_local_accessors_spec.rb
 - spec/spec_helper.rb
 - multi_db.gemspec
 has_rdoc: true

data/lib/multi_db/thread_local_accessors.rb

@@ -1,32 +0,0 @@
-module MultiDb
-  module ThreadLocalAccessors
-    # Creates thread-local accessors for the given attribute name.
-    #
-    # The first invokation of the setter will make this value the default
-    # for any subsequent threads.
-    def tlattr_accessor(name)
-      ivar = "@_tlattr_#{name}"
-      class_eval %Q{
-        def #{name}
-          if #{ivar}
-            #{ivar}[Thread.current.object_id]
-          else
-            nil
-          end
-        end
-
-        def #{name}=(val)
-          if #{ivar}
-            unless #{ivar}.has_key?(Thread.current.object_id)
-              ObjectSpace.define_finalizer(Thread.current, lambda {|id| #{ivar}.delete(id) })
-            end
-            #{ivar}[Thread.current.object_id] = val
-          else
-            #{ivar} = Hash.new {|h, k| h[k] = val}
-            val
-          end
-        end
-      }, __FILE__, __LINE__
-    end
-  end
-end

data/spec/thread_local_accessors_spec.rb

@@ -1,40 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require MULTI_DB_SPEC_DIR + '/../lib/multi_db/thread_local_accessors.rb'
-
-class Foo
-  extend MultiDb::ThreadLocalAccessors
-  tlattr_accessor :bar
-end
-
-describe MultiDb::ThreadLocalAccessors do
-
-  it "should store values local to the thread" do
-    x = Foo.new
-    x.bar = 2
-    Thread.new do
-      x.bar.should == 2
-      x.bar = 3
-      Thread.new do
-        x.bar.should == 2
-        x.bar = 5
-      end.join
-      x.bar.should == 3
-    end.join
-    x.bar.should == 2
-  end
-
-  it 'should not leak memory' do
-    x = Foo.new
-    n = 6000
-    # create many thread-local values to make sure GC is invoked
-    n.times do
-      Thread.new do
-        x.bar = rand
-      end.join
-    end
-    hash = x.send :instance_variable_get, '@_tlattr_bar'
-    hash.size.should < (n / 2) # it should be a lot lower than n!
-  end
-
-end
-