master_slave 3.2.0 → 4.0.0

data/lib/master_slave/base.rb

@@ -5,11 +5,6 @@ module MasterSlave
     included do
       cattr_accessor :slave_connection_names
       self.slave_connection_names = []
-
-      class << self
-        alias_method :connection_without_master_slave, :connection
-        alias_method :connection, :connection_with_master_slave
-      end
     end
 
     module ClassMethods
@@ -31,18 +26,16 @@ module MasterSlave
         end
       end
 
-      def connection_with_master_slave
+      def connection
         slave_block        = MasterSlave::RuntimeRegistry.slave_block
         current_slave_name = MasterSlave::RuntimeRegistry.current_slave_name
 
-        if defined?(Rails) && Rails.env.test?
-          connection_without_master_slave
-        elsif slave_block && current_slave_name
+        if slave_block && current_slave_name
           pool_name  = MasterSlave::ConnectionHandler.connection_pool_name(current_slave_name)
           ar_proxy   = MasterSlave::ConnectionHandler::ArProxy.new(pool_name)
           ActiveRecord::Base.connection_handler.retrieve_connection(ar_proxy)
         else
-          connection_without_master_slave
+          super
         end
       end
 

data/lib/master_slave/connection_handler.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module MasterSlave
   class ConnectionHandler
 
@@ -25,12 +24,10 @@ module MasterSlave
       def setup_connection
         ActiveRecord::Base.slave_connection_names ||= []
         MasterSlave.config.slave_names.each do |slave_name|
-          # activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +128
           ActiveRecord::Base.slave_connection_names << slave_name.to_s.strip
-          configuration = MasterSlave.config.slave_config(slave_name).symbolize_keys
-
-          resolver = ActiveRecord::Base::ConnectionSpecification::Resolver.new(configuration, nil)
+          spec = MasterSlave.config.slave_config(slave_name).symbolize_keys
 
+          resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new spec, spec
           spec = resolver.spec
 
           unless ActiveRecord::Base.respond_to?(spec.adapter_method)
@@ -38,15 +35,8 @@ module MasterSlave
           end
 
           ar_proxy = ArProxy.new(connection_pool_name(slave_name))
-
-          # activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +179
-          # activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +424
-          # remove_connection 时会调用方法内部 ar_proxy.name
           ActiveRecord::Base.remove_connection(ar_proxy)
-
-          # activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +373
-          # establish_connection 时，使用 ar_proxy.name
-          ActiveRecord::Base.connection_handler.establish_connection ar_proxy.name, spec
+          ActiveRecord::Base.connection_handler.establish_connection ar_proxy, spec
         end
       end
     end

data/lib/master_slave/railtie.rb

@@ -3,18 +3,18 @@ module MasterSlave
 
     config.after_initialize do
       if File.exist?(MasterSlave::Configuration.config_file)
-        Rails.logger.info "\033[32mmaster_slave is on!\033[0m"
+        puts "\033[32mmaster_slave is on!\033[0m"
         ActiveRecord::Base.send :include, MasterSlave::Base
         MasterSlave::ConnectionHandler.setup
       else
-        Rails.logger.error "\033[31mNo such file #{MasterSlave::Configuration.config_file}\033[0m"
-        Rails.logger.error "\033[31mPlease execute `rails g master_slave:config`\033[0m"
-        Rails.logger.error "\033[31mmaster_slave is off!\033[0m"
+        puts "\033[31mNo such file #{MasterSlave::Configuration.config_file}\033[0m"
+        puts "\033[31mPlease execute `rails g master_slave:config`\033[0m"
+        puts "\033[31mmaster_slave is off!\033[0m"
       end
     end
 
     generators do
-      require File.expand_path('../../rails/generators/config_generator', __FILE__)
+      require File.join(__dir__, '../', 'rails/generators/config_generator')
     end
   end
 end

data/lib/master_slave/runtime_registry.rb

@@ -1,28 +1,4 @@
-begin
-  require 'active_support/per_thread_registry'
-rescue LoadError
-  module ActiveSupport
-    module PerThreadRegistry
-      protected
-
-        def method_missing(name, *args, &block) # :nodoc:
-          # Caches the method definition as a singleton method of the receiver.
-          define_singleton_method(name) do |*a, &b|
-            per_thread_registry_instance.public_send(name, *a, &b)
-          end
-
-          send(name, *args, &block)
-        end
-
-      private
-
-        def per_thread_registry_instance
-          Thread.current[name] ||= new
-        end
-    end
-  end
-end
-
+require 'active_support/per_thread_registry'
 module MasterSlave
   class RuntimeRegistry
     extend ActiveSupport::PerThreadRegistry

data/lib/master_slave/version.rb

@@ -1,3 +1,3 @@
 module MasterSlave
-  VERSION = '3.2.0'
+  VERSION = '4.0.0'
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: master_slave
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0
   prerelease: 
 platform: ruby
 authors:
-- Tumayun, Zhangyuan
+- Tumayun
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -16,17 +16,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 description: mysql separate read and write.
 email: tumayun.2010@gmail.com
 executables: []