ar-multidb 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cedb676272cc87f3a21d66c15efd9058e0e13551
-  data.tar.gz: b1dae22e38cfbe06ab71ccaf7abbe6dbfb459c9f
+  metadata.gz: ebc5c80b4af196924f76bb368ffec424b94d6090
+  data.tar.gz: 50c67359cdce94f25a6c64f251423281f79e53b7
 SHA512:
-  metadata.gz: 5662d638ad37ebd926c8a7c369ed60de18f8debbc121cad19c760a9f7301e73b68d1914f0d8920aa9b2e2dcb7a2af01e79b89a1bf65041b5a636b6e239417502
-  data.tar.gz: cb9a4f11337c379216d295d579e1938266377c887e7b4608a07fbcb1dcc78d298502459f8ad3cfb97e0acda5209261e9a869560e926654d213747e3946e0b65b
+  metadata.gz: fe6db0140c93565223db1739c68916ab4334da42ed8b451f75d024456f5aea5194a5885a714b9f29625002e348ed7d60e53f5dba3caaf1e41317194a3a4573aa
+  data.tar.gz: b304471c77b2cc4ef243f21db533fa09a921ad57c4cc183a97ae108fdd54724ab942bd24d1bbd42ca35c77c0fdcbd9d704c635647ff1260c50d1ebae7b40a817

data/.gitignore

@@ -1,4 +1,5 @@
 /pkg
 *~
 \.DS_Store
-*.sqlite
+*.sqlite
+Gemfile.lock

data/lib/multidb/balancer.rb

@@ -102,6 +102,7 @@ module Multidb
 
     class << self
       delegate :use, :current_connection, :disconnect!, to: :balancer
+
       def use(name, &block)
         Multidb.balancer.use(name, &block)
       end

data/lib/multidb/configuration.rb

@@ -1,19 +1,29 @@
 module Multidb
-
-  mattr_reader :configuration
-
   class << self
     delegate :use, :get, :disconnect!, to: :balancer
   end
 
+  def self.init(config)
+    activerecord_config = config.dup.with_indifferent_access
+    default_adapter, configuration_hash = activerecord_config, activerecord_config.delete(:multidb)
+
+    @balancer = Balancer.new(Configuration.new(default_adapter, configuration_hash || {}))
+  end
+
   def self.balancer
-    @balancer ||= create_balancer
+    if @balancer
+      @balancer
+    else
+      raise NotInitializedError, "Balancer not initialized. You need to run Multidb.setup first"
+    end
   end
 
   def self.reset!
-    @balancer, @configuration = nil, nil
+    @balancer = nil
   end
 
+  class NotInitializedError < StandardError; end;
+
   class Configuration
     def initialize(default_adapter, configuration_hash)
       @default_pool = ActiveRecord::Base.connection_pool
@@ -25,30 +35,4 @@ module Multidb
     attr_reader :default_adapter
     attr_reader :raw_configuration
   end
-
-  private
-
-    def self.create_balancer
-      unless @configuration
-        begin
-          connection_pool = ActiveRecord::Base.connection_pool
-        rescue ActiveRecord::ConnectionNotEstablished
-          # Ignore
-        else
-          connection = connection_pool.connection
-
-          # FIXME: This is hacky, but apparently the only way to get at
-          #   the internal configuration hash.
-          activerecord_config = connection.instance_variable_get(:@config).dup.with_indifferent_access
-
-          default_adapter, configuration_hash = activerecord_config, activerecord_config.delete(:multidb)
-
-          @configuration = Configuration.new(default_adapter, configuration_hash || {})
-        end
-      end
-      if @configuration
-        Balancer.new(@configuration)
-      end
-    end
-
 end

data/lib/multidb/model_extensions.rb

@@ -1,24 +1,28 @@
+require 'active_record/base'
+
 module Multidb
   module ModelExtensions
-
     extend ActiveSupport::Concern
 
     included do
       class << self
+        alias_method_chain :establish_connection, :multidb
         alias_method_chain :connection, :multidb
       end
     end
 
     module ClassMethods
+      def establish_connection_with_multidb(spec = nil)
+        establish_connection_without_multidb(spec)
+        Multidb.init(connection_pool.spec.config)
+      end
+
       def connection_with_multidb
-        if (balancer = Multidb.balancer)
-          balancer.current_connection
-        else
-          connection_without_multidb
-        end
+        Multidb.balancer.current_connection
+      rescue Multidb::NotInitializedError
+        connection_without_multidb
       end
     end
-
   end
 end
 

data/lib/multidb/version.rb

@@ -1,3 +1,3 @@
 module Multidb
-  VERSION = '0.1.12'
+  VERSION = '0.1.13'
 end

data/spec/balancer_spec.rb

@@ -3,8 +3,8 @@ require_relative 'spec_helper'
 describe 'Multidb.balancer' do
 
   context 'with no configuration' do
-    it 'returns nothing' do
-      Multidb.balancer.should eq nil
+    it 'raises exception' do
+      -> { Multidb.balancer }.should raise_error(Multidb::NotInitializedError)
     end
   end
 
@@ -29,20 +29,20 @@ describe 'Multidb.balancer' do
   end
 
   describe '#use' do
-    context 'with no configuration' do
-      it 'raises exception' do
-        -> {
-          Multidb.use(:something) do
-          end
-        }.should raise_error(ArgumentError)
-      end
-    end
-
     context 'with configuration' do
       before do
         ActiveRecord::Base.establish_connection(configuration_with_slaves)
       end
 
+      context 'undefined connection' do
+        it 'raises exception' do
+          -> {
+            Multidb.use(:something) do
+            end
+          }.should raise_error(ArgumentError)
+        end
+      end
+
       it 'returns default connection on :default' do
         conn = ActiveRecord::Base.connection
         Multidb.use(:default) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar-multidb
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Alexander Staubo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -77,7 +77,6 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.markdown
 - Rakefile

data/Gemfile.lock

@@ -1,54 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ar-multidb (0.1.11)
-      activerecord (>= 3.0)
-      activesupport (>= 3.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-    activerecord (4.0.2)
-      activemodel (= 4.0.2)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.2)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.1)
-    atomic (1.1.14)
-    builder (3.1.4)
-    diff-lcs (1.2.5)
-    i18n (0.6.9)
-    minitest (4.7.5)
-    multi_json (1.8.4)
-    rake (10.1.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    sqlite3 (1.3.8)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ar-multidb!
-  rake
-  rspec
-  sqlite3