multi_db 0.3.0 → 0.3.1

data/README.rdoc

@@ -28,13 +28,15 @@ master database.
 * works with activerecord 2.1, 2.2, 2.3, and 3.0
 
 === Install
+==== Rails 2
+  gem install multi_db
 
-  gem sources --add http://gems.github.com # only if you haven't already added github
-  gem install schoefmax-multi_db
+Then add this to your environment.rb:
+  config.gem 'multi_db', :lib => 'multi_db'
 
-When using Rails, add this to your environment.rb:
-
-  config.gem 'schoefmax-multi_db', :lib => 'multi_db', :source => 'http://gems.github.com'
+==== Rails 3
+put this in your Gemfile
+  gem 'multi_db'
 
 === Setup
 

data/lib/multi_db/active_record_extensions.rb

@@ -18,7 +18,7 @@ module MultiDb
 
     module ClassMethods
       # Make sure transactions always switch to the master
-      def transaction(&block)
+      def transaction(options = {}, &block)
         if self.connection.kind_of?(ConnectionProxy)
           super
         else
@@ -51,4 +51,4 @@ module MultiDb
       end
     end
   end
-end
+end

data/lib/multi_db/connection_proxy.rb

@@ -23,7 +23,7 @@ module MultiDb
     
     class << self
 
-      # defaults to RAILS_ENV if multi_db is used with Rails
+      # defaults to Rails.env if multi_db is used with Rails
       # defaults to 'development' when used outside Rails
       attr_accessor :environment
       
@@ -47,7 +47,7 @@ module MultiDb
       # establishes the connections to the slaves.
       def setup!(scheduler = Scheduler)
         self.master_models ||= DEFAULT_MASTER_MODELS
-        self.environment   ||= (defined?(RAILS_ENV) ? RAILS_ENV : 'development')
+        self.environment   ||= (defined?(Rails) ? Rails.env : 'development')
         self.sticky_slave  ||= false
         
         master = ActiveRecord::Base
@@ -218,4 +218,4 @@ module MultiDb
     end
 
   end
-end
+end

data/lib/multi_db/scheduler.rb

@@ -12,7 +12,7 @@ module MultiDb
       @items     = items
       @blacklist = Array.new(@n, Time.at(0))
       @blacklist_timeout = blacklist_timeout
-      self.current_index = 0
+      self.current_index = rand(@n)
     end
     
     def blacklist!(item)

data/multi_db.gemspec

@@ -1,12 +1,13 @@
+# coding: utf-8
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{multi_db}
-  s.version = "0.3.0"
+  s.version = "0.3.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{2011-05-17}
+  s.date = %q{2012-03-29}
   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"]

data/spec/connection_proxy_spec.rb

@@ -5,8 +5,6 @@ require MULTI_DB_SPEC_DIR + '/../lib/multi_db/observer_extensions'
 require MULTI_DB_SPEC_DIR + '/../lib/multi_db/scheduler'
 require MULTI_DB_SPEC_DIR + '/../lib/multi_db/connection_proxy'
 
-RAILS_ROOT = MULTI_DB_SPEC_DIR
-
 describe MultiDb::ConnectionProxy do
 
   before(:all) do

data/spec/spec_helper.rb

@@ -2,10 +2,14 @@ require 'rubygems'
 gem 'activerecord', '3.0.5'
 %w[tlattr_accessors active_record yaml erb rspec logger].each {|lib| require lib}
 
-RAILS_ENV = ENV['RAILS_ENV'] = 'test'
+module Rails
+  def self.env
+    ActiveSupport::StringInquirer.new("test")
+  end
+end
 
 MULTI_DB_SPEC_DIR = File.dirname(__FILE__)
 MULTI_DB_SPEC_CONFIG = YAML::load(File.open(MULTI_DB_SPEC_DIR + '/config/database.yml'))
 
 ActiveRecord::Base.logger = Logger.new(MULTI_DB_SPEC_DIR + "/debug.log")
-ActiveRecord::Base.configurations = MULTI_DB_SPEC_CONFIG
+ActiveRecord::Base.configurations = MULTI_DB_SPEC_CONFIG

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multi_db
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  hash: 17
+  prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - "Maximilian Sch\xC3\xB6fmann"
@@ -9,29 +15,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +02:00
-default_executable: 
+date: 2012-03-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
         version: 2.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: tlattr_accessors
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 0
+        - 3
         version: 0.0.3
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Connection proxy for ActiveRecord for single master / multiple slave database deployments
 email: max@pragmatic-it.de
 executables: []
@@ -55,7 +72,6 @@ files:
 - spec/scheduler_spec.rb
 - spec/spec_helper.rb
 - multi_db.gemspec
-has_rdoc: true
 homepage: http://github.com/schoefmax/multi_db
 licenses: []
 
@@ -70,21 +86,28 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: multi_db
-rubygems_version: 1.3.5
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 2
 summary: Connection proxy for ActiveRecord for single master / multiple slave database deployments