ar-multidb 0.1.4 → 0.1.5

data/.gitignore

@@ -0,0 +1,3 @@
+/pkg
+*~
+\.DS_Store

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in ar-multidb.gemspec
+gemspec

data/README.markdown

@@ -14,32 +14,31 @@ support in a production environment.
 Randomized balancing of multiple connections within a group is supported. In the
 future, some kind of automatic balancing of read/write queries might be implemented.
 
-Testet with Rails 2.3.11. No guarantees about Rails 3.
+Tested with Rails 2.3.11. No guarantees about Rails 3.
 
 
 Comparison to other ActiveRecord extensions
 ===========================================
 
-Unlike other, more full-featured extensions such as Octopus and Seamless Database Pool,
-Multidb aims to be:
+Compared to other, more full-featured extensions such as Octopus and Seamless Database Pool:
 
-* Implemented using a minimal amount of
-monkeypatching magic. The only part of ActiveRecord that is overriden is
+**Minimal amount of monkeypatching magic**. The only part of ActiveRecord that is overridden is
 `ActiveRecord::Base#connection`.
 
-* Non-invasive. Very small amounts of configuration and changes to the client 
+**Non-invasive**. Very small amounts of configuration and changes to the client 
 application are required.
 
-* Orthogonal. Unlike Octopus, for example, connections follow context:
+**Orthogonal**. Unlike Octopus, for example, connections follow 
+context:
 
-      Multidb.use(:master) do
-        @post = Post.find(1)
-        Multidb.use(:slave) do
-          @post.authors  # This will use the slave
-        end
+    Multidb.use(:master) do
+      @post = Post.find(1)
+      Multidb.use(:slave) do
+        @post.authors  # This will use the slave
       end
+    end
 
-* Low-overhead. Since `connection` is called on every single
+**Low-overhead**. Since `connection` is called on every single
 database operation, it needs to be fast. Which it is: Multidb's implementation of
 `connection` incurs only a single hash lookup in `Thread.current`.
 
@@ -124,12 +123,15 @@ Development mode
 
 In development you will typically want `Multidb.use(:slave)` to still work, but you
 probably don't want to run multiple databases on your development box. To make `use`
-silently fall back to using the default connection, simply set `fallback: true` in
-`database.yml`:
+silently fall back to using the default connection, Multidb can run in fallback
+mode.
 
-    production:
+If you are using Rails, this will be automatically enabled in 'development' and
+'test' environments. Otherwise, simply set `fallback: true` in `database.yml`:
+
+    development:
       adapter: postgresql
-      database: myapp_production
+      database: myapp_development
       username: ohoh
       password: mymy
       host: db1

data/Rakefile

@@ -0,0 +1,21 @@
+require "bundler/gem_tasks"
+
+desc 'Bump version'
+task :bump do
+  if `git status -uno -s --porcelain | wc -l`.to_i > 0
+    abort "You have uncommitted changed."
+  end
+  text = File.read('lib/multidb/version.rb')
+  if text =~ /VERSION = '(.*)'/
+    old_version = $1
+    version_parts = old_version.split('.')
+    version_parts[-1] = version_parts[-1].to_i + 1
+    new_version = version_parts.join('.')
+    text.gsub!(/VERSION = '(.*)'/, "VERSION = '#{new_version}'")
+    File.open('lib/multidb/version.rb', 'w') { |f| f << text }
+    (system("git add lib/multidb/version.rb") and
+      system("git commit -m 'Bump to #{new_version}.'")) or abort "Failed to commit."
+  else
+    abort "Could not find version number"
+  end
+end

data/ar-multidb.gemspec

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "multidb/version"
+
+Gem::Specification.new do |s|
+  s.name        = "ar-multidb"
+  s.version     = Multidb::VERSION
+  s.authors     = ["Alexander Staubo"]
+  s.email       = ["alex@origo.no"]
+  s.homepage    = ""
+  s.summary     = s.description = %q{Multidb is an ActiveRecord extension for switching between multiple database connections, such as master/slave setups.}
+
+  s.rubyforge_project = "ar-multidb"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_runtime_dependency 'activesupport', '>= 2.3'
+  s.add_runtime_dependency 'activerecord', '>= 2.3'
+end

data/init.rb

@@ -0,0 +1,2 @@
+# Init file for running as Rails plugin.
+require 'multidb'

data/lib/multidb.rb

@@ -1,3 +1,6 @@
+require 'active_record'
+require 'active_support/core_ext/module/delegation'
+
 require 'multidb/configuration'
 require 'multidb/model_extensions'
 require 'multidb/balancer'

data/lib/multidb/balancer.rb

@@ -30,24 +30,26 @@ module Multidb
     def initialize(configuration)
       @candidates = {}.with_indifferent_access
       @configuration = configuration
-      (@configuration.raw_configuration[:databases] || {}).each_pair do |name, config|
-        configs = config.is_a?(Array) ? config : [config]
-        configs.each do |config|          
-          candidate = Candidate.new(@configuration.default_adapter.merge(config))
-          @candidates[name] ||= []
-          @candidates[name].push(candidate)
+      if @configuration
+        (@configuration.raw_configuration[:databases] || {}).each_pair do |name, config|
+          configs = config.is_a?(Array) ? config : [config]
+          configs.each do |config|          
+            candidate = Candidate.new(@configuration.default_adapter.merge(config))
+            @candidates[name] ||= []
+            @candidates[name].push(candidate)
+          end
+        end
+        if @configuration.raw_configuration.include?(:fallback)
+          @fallback = @configuration.raw_configuration[:fallback]
+        elsif defined?(Rails)
+          @fallback = %w(development test).include?(Rails.env)
+        else
+          @fallback = false
+        end
+        @default_candidate = Candidate.new(@configuration.default_pool)
+        unless @candidates.include?(:default)
+          @candidates[:default] = [@default_candidate]
         end
-      end
-      if @configuration.raw_configuration.include?(:fallback)
-        @fallback = @configuration.raw_configuration[:fallback]
-      elsif defined?(Rails)
-        @fallback = %w(development test).include?(Rails.env)
-      else
-        @fallback = false
-      end
-      @default_candidate = Candidate.new(@configuration.default_pool)
-      unless @candidates.include?(:default)
-        @candidates[:default] = [@default_candidate]
       end
     end
     

data/lib/multidb/configuration.rb

@@ -3,10 +3,14 @@ module Multidb
   class << self
     
     def configure!
-      activerecord_config = ActiveRecord::Base.connection_pool.connection.instance_variable_get(:@config).dup.with_indifferent_access
-      default_adapter, configuration_hash = activerecord_config, activerecord_config.delete(:multidb)
-      configuration_hash ||= {}
-      @configuration = Configuration.new(default_adapter, configuration_hash)
+      connection_pool = ActiveRecord::Base.connection_pool
+      if connection_pool
+        connection = connection_pool.connection
+        activerecord_config = connection.instance_variable_get(:@config).dup.with_indifferent_access
+        default_adapter, configuration_hash = activerecord_config, activerecord_config.delete(:multidb)
+        configuration_hash ||= {}
+        @configuration = Configuration.new(default_adapter, configuration_hash)
+      end
     end
 
     attr_reader :configuration

data/lib/multidb/version.rb

@@ -0,0 +1,3 @@
+module Multidb
+  VERSION = '0.1.5'
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-multidb
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Alexander Staubo
@@ -15,89 +15,62 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 +02:00
-default_executable: 
+date: 2012-02-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: activesupport
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 2
-        - 2
-        version: "2.2"
-  name: activesupport
+        - 3
+        version: "2.3"
+  type: :runtime
   version_requirements: *id001
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
   name: activerecord
-  version_requirements: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 2
-        - 2
-        version: "2.2"
-  name: activesupport
-  version_requirements: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+        - 3
+        version: "2.3"
   type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
-  name: activerecord
-  version_requirements: *id004
-  prerelease: false
+  version_requirements: *id002
 description: Multidb is an ActiveRecord extension for switching between multiple database connections, such as master/slave setups.
-email: alex@bengler.no
+email: 
+- alex@origo.no
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- Gemfile
 - LICENSE
 - README.markdown
-- VERSION
+- Rakefile
+- ar-multidb.gemspec
+- init.rb
 - lib/ar-multidb.rb
 - lib/multidb.rb
 - lib/multidb/balancer.rb
 - lib/multidb/configuration.rb
 - lib/multidb/model_extensions.rb
-has_rdoc: true
-homepage: http://github.com/alexstaubo/multidb
+- lib/multidb/version.rb
+homepage: ""
 licenses: []
 
 post_install_message: 
@@ -125,8 +98,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.5.0
+rubyforge_project: ar-multidb
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Multidb is an ActiveRecord extension for switching between multiple database connections, such as master/slave setups.

data/VERSION

@@ -1 +0,0 @@
-0.1.4