ar-multidb 0.1.13 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebc5c80b4af196924f76bb368ffec424b94d6090
-  data.tar.gz: 50c67359cdce94f25a6c64f251423281f79e53b7
+  metadata.gz: ea08a6b114f52250b4d917e901839dd063dab40b
+  data.tar.gz: 6cdde3b0f316fdbb1b68379944fb0eadb91afa25
 SHA512:
-  metadata.gz: fe6db0140c93565223db1739c68916ab4334da42ed8b451f75d024456f5aea5194a5885a714b9f29625002e348ed7d60e53f5dba3caaf1e41317194a3a4573aa
-  data.tar.gz: b304471c77b2cc4ef243f21db533fa09a921ad57c4cc183a97ae108fdd54724ab942bd24d1bbd42ca35c77c0fdcbd9d704c635647ff1260c50d1ebae7b40a817
+  metadata.gz: 547ad2beb0fd69f417e0670e404623a8d08a09e66e65bf954a34a34374e51c1db529420d35c686b8fd740afb0cdb2f10724a4538f5f3205b1c3b5af86418afdb
+  data.tar.gz: 4e1869077ee855daf7d1fdc95e374d0944e731ca962d97cc8a1546b771f2f20bd065b6b8bfb7904985b1a452fe5e8f94deb0079c4ad0e2b229a90a80fdd63a93

data/.gitignore

@@ -3,3 +3,5 @@
 \.DS_Store
 *.sqlite
 Gemfile.lock
+Gemfile.local
+.rspec

data/.travis.yml

@@ -1,3 +1,12 @@
-rvm:
-  - 1.9.3
-  - 2.0
+sudo: false
+language: ruby
+
+matrix:
+  fast_finish: true
+  include:
+    - rvm: 2.2
+      gemfile: gemfiles/activerecord40.gemfile
+    - rvm: 2.4.3
+      gemfile: gemfiles/activerecord42.gemfile
+    - rvm: 2.5.0
+      gemfile: Gemfile

data/Gemfile

@@ -3,7 +3,8 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in ar-multidb.gemspec
 gemspec
 
-group :test do
-  # For travis-ci.org
-  gem "rake"
+local_gemfile = "Gemfile.local"
+
+if File.exist?(local_gemfile)
+  eval(File.read(local_gemfile)) # rubocop:disable Security/Eval
 end

data/README.markdown

@@ -14,8 +14,8 @@ Randomized balancing of multiple connections within a group is supported. In the
 
 ## Requirements
 
-* Ruby 1.9.3 or later.
-* ActiveRecord 3.0 or later. (Earlier versions can use the gem version 0.1.10.)
+* Ruby 2.2 or later.
+* ActiveRecord 4.0 or later. (Earlier versions can use the gem version 0.1.13 for Rails 3.2 and 0.1.10 for older version)
 
 ## Comparison to other ActiveRecord extensions
 

data/ar-multidb.gemspec

@@ -17,9 +17,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'activesupport', '>= 3.0'
-  s.add_runtime_dependency 'activerecord', '>= 3.0'
+  s.add_runtime_dependency 'activesupport', '>= 4.0', '<= 6.0'
+  s.add_runtime_dependency 'activerecord', '>= 4.0', '<= 6.0'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'rake'
 end

data/gemfiles/activerecord40.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 4.0.0'
+
+gemspec path: '..'

data/gemfiles/activerecord42.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 4.2'
+
+gemspec path: '..'

data/lib/multidb/balancer.rb

@@ -1,7 +1,9 @@
 module Multidb
 
   class Candidate
-    def initialize(target)
+    def initialize(name, target)
+      @name = name
+
       if target.is_a?(Hash)
         adapter = target[:adapter]
         begin
@@ -14,8 +16,16 @@ module Multidb
         else
           spec_class = ActiveRecord::Base::ConnectionSpecification
         end
-        @connection_pool = ActiveRecord::ConnectionAdapters::ConnectionPool.new(
-          spec_class.new(target, "#{adapter}_connection"))
+
+        spec =
+          if ActiveRecord::VERSION::MAJOR >= 5
+            # ActiveRecord 5.0.1 introduced `name` to initialize
+            spec_class.new(name, target, "#{adapter}_connection")
+          else
+            spec_class.new(target, "#{adapter}_connection")
+          end
+
+          @connection_pool = ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec)
       else
         @connection_pool = target
       end
@@ -29,36 +39,43 @@ module Multidb
       end
     end
 
-    attr_reader :connection_pool
+    attr_reader :connection_pool, :name
   end
 
   class Balancer
 
     def initialize(configuration)
       @candidates = {}.with_indifferent_access
-      @configuration = configuration
-      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]
+      @default_configuration = configuration
+
+      if @default_configuration
+
+        append(@default_configuration.raw_configuration[:databases] || {})
+
+        if @default_configuration.raw_configuration.include?(:fallback)
+          @fallback = @default_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)
+        @default_candidate = Candidate.new('default', @default_configuration.default_pool)
         unless @candidates.include?(:default)
           @candidates[:default] = [@default_candidate]
         end
       end
     end
+    
+    def append(databases)
+      databases.each_pair do |name, config|
+        configs = config.is_a?(Array) ? config : [config]
+        configs.each do |config|
+          candidate = Candidate.new(name, @default_configuration.default_adapter.merge(config))
+          @candidates[name] ||= []
+          @candidates[name].push(candidate)
+        end
+      end
+    end
 
     def disconnect!
       @candidates.values.flatten.each do |candidate|
@@ -84,6 +101,7 @@ module Multidb
               Thread.current[:multidb_connection], connection
             begin
               result = yield
+              result = result.to_a if result.is_a?(ActiveRecord::Relation)
             ensure
               Thread.current[:multidb_connection] = previous_connection
             end
@@ -118,4 +136,4 @@ module Multidb
 
   end
 
-end
+end

data/lib/multidb/model_extensions.rb

@@ -1,26 +1,25 @@
 require 'active_record/base'
 
 module Multidb
+  module Connection
+    def establish_connection(spec = nil)
+      super(spec)
+      Multidb.init(connection_pool.spec.config)
+    end
+
+    def connection
+      Multidb.balancer.current_connection
+    rescue Multidb::NotInitializedError
+      super
+    end
+  end
+
   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
-        Multidb.balancer.current_connection
-      rescue Multidb::NotInitializedError
-        connection_without_multidb
+        prepend Multidb::Connection
       end
     end
   end

data/lib/multidb/version.rb

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

data/spec/balancer_spec.rb

@@ -26,6 +26,23 @@ describe 'Multidb.balancer' do
 
       Multidb.balancer.current_connection.should eq conn
     end
+  
+    context 'with additional configurations' do
+      before do
+        additional_configuration = {slave4: { database: 'spec/test-slave4.sqlite' }}
+        Multidb.balancer.append(additional_configuration)
+      end
+
+      it 'makes the new database available' do
+        Multidb.use(:slave4) do
+          conn = ActiveRecord::Base.connection
+          conn.should eq Multidb.balancer.current_connection
+          list = conn.execute('pragma database_list')
+          list.length.should eq 1
+          File.basename(list[0]['file']).should eq 'test-slave4.sqlite'
+        end
+      end
+    end
   end
 
   describe '#use' do
@@ -65,6 +82,16 @@ describe 'Multidb.balancer' do
         end
       end
 
+      it 'returns results instead of relation' do
+        class FooBar < ActiveRecord::Base; end
+        res = Multidb.use(:slave1) do
+          ActiveRecord::Migration.verbose = false
+          ActiveRecord::Schema.define(version: 1) { create_table :foo_bars }
+          FooBar.where(id: 42)
+        end
+        res.should eq []
+      end
+
       it 'returns supports nested slave connection' do
         Multidb.use(:slave1) do
           Multidb.use(:slave2) do

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require_relative 'helpers'
 
 RSpec.configure do |config|
   config.include Helpers
+  config.expect_with(:rspec) { |c| c.syntax = :should }
   config.before :each do
     ActiveRecord::Base.clear_all_connections!
     Multidb.reset!

metadata

@@ -1,69 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: ar-multidb
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: '0.3'
 platform: ruby
 authors:
 - Alexander Staubo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Multidb is an ActiveRecord extension for switching between multiple database
@@ -74,13 +100,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
 - ar-multidb.gemspec
+- gemfiles/activerecord40.gemfile
+- gemfiles/activerecord42.gemfile
 - lib/ar-multidb.rb
 - lib/multidb.rb
 - lib/multidb/balancer.rb
@@ -99,17 +127,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ar-multidb
-rubygems_version: 2.0.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Multidb is an ActiveRecord extension for switching between multiple database
@@ -118,4 +146,3 @@ test_files:
 - spec/balancer_spec.rb
 - spec/helpers.rb
 - spec/spec_helper.rb
-has_rdoc: