active_record_slave 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28bf8e5c0b1aa126621369c792755c5bf4c3da94d7aecbd1f60af335908b8078
-  data.tar.gz: 959fa6afaecb8c24934085e2e5b1a018891286b3e0234d293a6cb0a27ca75f9d
+  metadata.gz: ece72c2fdbcd88aa6ef845d9e701fba095239e3becc489b6495b216a1c8d7f02
+  data.tar.gz: 1343f64ddcde6a67efcd0ed0672de9ce2c6af5aab4198016c95938be5025cb99
 SHA512:
-  metadata.gz: d327d0e133592d461d954340bb28111956259ce1333765cdaf756a8e146d73728da556faf38ad994510e86e29f85bbe333c6d468ae0343cb9c92050508fb4cc5
-  data.tar.gz: 1345aaa4edbf866b22372c47bbd1cad0cae08ec42f169b6c4a43fe38eac079500e3803031629ec1d0afcc55984b3df08e8f195f875f3cf4ccb699770249fbee3
+  metadata.gz: d8fd05e7119804c713946d2307cc780905580700db4e01fb04e91372dba5af5a18481b9939c82b6d62b8045730b8cd9d298af29c71c9b21c27b26946daaef875
+  data.tar.gz: a4e85091bf16b789195e50e44cd2a025d6ce30733c9947d770f9e643f9197829ab429d313d9d5b9a5344b5818e18e9639fa66e256552946bca8a28c65b70d4f3

data/README.md

@@ -22,6 +22,7 @@ Production Ready. Actively used in large production environments.
 * Works with any database driver that works with ActiveRecord.
 * Supports all Rails 3, 4, or 5 read apis.
     * Including dynamic finders, AREL, and ActiveRecord::Base.select.
+    * **NOTE**: In Rails 3 and 4, QueryCache is only enabled for BaseConnection by default. In Rails 5, it's enabled for all connections. [(PR)](https://github.com/rails/rails/pull/28869)
 * Transaction aware
     * Detects when a query is inside of a transaction and sends those reads to the master by default.
     * Can be configured to send reads in a transaction to slave databases.

data/lib/active_record_slave.rb

@@ -3,8 +3,8 @@ require 'active_record/base'
 require 'active_record_slave/version'
 require 'active_record_slave/errors'
 require 'active_record_slave/slave'
-require 'active_record_slave/instance_methods'
 require 'active_record_slave/active_record_slave'
+require 'active_record_slave/extensions'
 
 if defined?(Rails)
   require 'active_record_slave/railtie'

data/lib/active_record_slave/active_record_slave.rb

@@ -2,6 +2,13 @@
 # ActiveRecord read from a slave
 #
 module ActiveRecordSlave
+  # Select Methods
+  SELECT_METHODS = [:select, :select_all, :select_one, :select_rows, :select_value, :select_values]
+
+  # In case in the future we are forced to intercept connection#execute if the
+  # above select methods are not sufficient
+  #   SQL_READS = /\A\s*(SELECT|WITH|SHOW|CALL|EXPLAIN|DESCRIBE)/i
+
   # Install ActiveRecord::Slave into ActiveRecord to redirect reads to the slave
   # Parameters:
   #   adapter_class:
@@ -24,7 +31,7 @@ module ActiveRecordSlave
 
       # Inject a new #select method into the ActiveRecord Database adapter
       base = adapter_class || ActiveRecord::Base.connection.class
-      base.send(:include, InstanceMethods)
+      base.include(Extensions)
     else
       ActiveRecord::Base.logger.info "ActiveRecordSlave not installed since no slave database defined"
     end

data/lib/active_record_slave/{instance_methods.rb → extensions.rb}

@@ -1,24 +1,22 @@
+require 'active_support/concern'
 module ActiveRecordSlave
-  # Select Methods
-  SELECT_METHODS = [:select, :select_all, :select_one, :select_rows, :select_value, :select_values]
-
-  # In case in the future we are forced to intercept connection#execute if the
-  # above select methods are not sufficient
-  #   SQL_READS = /\A\s*(SELECT|WITH|SHOW|CALL|EXPLAIN|DESCRIBE)/i
-
-  module InstanceMethods
-    SELECT_METHODS.each do |select_method|
-      # Database Adapter method #exec_query is called for every select call
-      # Replace #exec_query with one that calls the slave connection instead
-      eval <<-METHOD
-      def #{select_method}(sql, name = nil, *args)
-        return super if active_record_slave_read_from_master?
-
-        ActiveRecordSlave.read_from_master do
-          Slave.connection.#{select_method}(sql, "Slave: \#{name || 'SQL'}", *args)
+  module Extensions
+    extend ActiveSupport::Concern
+
+    ActiveRecordSlave::SELECT_METHODS.each do |select_method|
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{select_method}(sql, name = nil, *args)
+          return super if active_record_slave_read_from_master?
+  
+          ActiveRecordSlave.read_from_master do
+            reader_connection.#{select_method}(sql, "Slave: \#{name || 'SQL'}", *args)
+          end
         end
-      end
-      METHOD
+      RUBY
+    end
+
+    def reader_connection
+      Slave.connection
     end
 
     def begin_db_transaction
@@ -63,7 +61,5 @@ module ActiveRecordSlave
       ActiveRecordSlave.read_from_master? ||
         (open_transactions > 0) && !ActiveRecordSlave.ignore_transactions?
     end
-
   end
 end
-

data/lib/active_record_slave/railtie.rb

@@ -16,7 +16,7 @@ module ActiveRecordSlave
     config.active_record_slave = ::ActiveRecordSlave
 
     # Initialize ActiveRecordSlave
-    initializer "load active_record_slave", :after => "active_record.initialize_database" do
+    initializer "load active_record_slave", after: "active_record.initialize_database" do
       ActiveRecordSlave.install!
     end
 

data/lib/active_record_slave/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSlave
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_slave
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 description: 
 email:
 - reidmo@gmail.com
@@ -37,13 +43,15 @@ files:
 - lib/active_record_slave.rb
 - lib/active_record_slave/active_record_slave.rb
 - lib/active_record_slave/errors.rb
-- lib/active_record_slave/instance_methods.rb
+- lib/active_record_slave/extensions.rb
 - lib/active_record_slave/railtie.rb
 - lib/active_record_slave/slave.rb
 - lib/active_record_slave/version.rb
 - test/active_record_slave_test.rb
 - test/database.yml
+- test/test.sqlite3
 - test/test_helper.rb
+- test/test_slave.sqlite3
 homepage: https://github.com/rocketjob/active_record_slave
 licenses:
 - Apache-2.0
@@ -63,12 +71,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Redirect ActiveRecord (Rails) reads to slave databases while ensuring all
   writes go to the master database.
 test_files:
+- test/test_slave.sqlite3
 - test/active_record_slave_test.rb
+- test/test.sqlite3
 - test/database.yml
 - test/test_helper.rb