replidog 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2419525361d0fe6b11f5150aa4641aaa33358978
-  data.tar.gz: 954cdd81a2a5056cf153083d3315e6d5ef39e020
+  metadata.gz: 44af9edc1ca7b64ca4c802cec1e865f31318533b
+  data.tar.gz: 29a251aad399f14c85813e655dc184b46ecab204
 SHA512:
-  metadata.gz: 48aab863f60e64c3efc4aa8f0ca6fe64a3830e0e5b0a3efcfb8a5dd9469aae8b0a8f3c6ff9df1f4767d7afcc43db879488038625d3f51ef25f258f74d97dd1b2
-  data.tar.gz: ff4b99cd46fe00763a8f82caf7fcbf14ba9c33417bb3993799ddcd669f8fcb827ff61349db335243f68d355c3d5026227eba698f022d0dfb4a867963551ae7ac
+  metadata.gz: e8a1858c3e07cbe87e516d80705e448d6afc508a1b5e3c0bc6dc30ebade7cebcb99c8bbe0e03d9465b2b8cdc6247ea08b93d5bcae62633d938530b8808820be0
+  data.tar.gz: 09914f2faa17a58fc50f5428efea7b4acc38246da64c57fa3280610c301a20b2e75f255578e5cc665f88dce212157a2c4aba8ff59ccda4a8521c48d3f12a123f

data/Appraisals

@@ -1,17 +1,24 @@
 appraise "rails32" do
     gem "activerecord", "~> 3.2.0"
+    gem "mysql2", '~> 0.3.20'
 end
 
 appraise "rails4" do
     gem "activerecord", "~> 4.0.0"
+    gem "mysql2", '~> 0.3.20'
 end
 
 appraise "rails41" do
     gem "activerecord", "~> 4.1.0"
+    gem "mysql2", '~> 0.3.20'
 end
 
 appraise "rails42" do
     gem "activerecord", "~> 4.2.0"
 end
+
+appraise "rails5" do
+  gem "activerecord", "~> 5.0.0"
+end
 # vim: ft=ruby
 #

data/README.md

@@ -9,7 +9,7 @@ Based on https://github.com/r7kamura/replicat
 * Multiple master/slave
 * Auto switching between master/slave
 * Supports connection management and query cache
-* Supports Rails 3.2, 4.0, 4,1, 4.2
+* Supports Rails 3.2, 4.0, 4,1, 4.2, 5.0
 
 ## Installation
 

data/gemfiles/rails32.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 3.2.0"
+gem "mysql2", "~> 0.3.20"
 
 gemspec :path => "../"

data/gemfiles/rails4.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.0.0"
+gem "mysql2", "~> 0.3.20"
 
 gemspec :path => "../"

data/gemfiles/rails41.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.1.0"
+gem "mysql2", "~> 0.3.20"
 
 gemspec :path => "../"

data/gemfiles/rails5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0.0"
+
+gemspec :path => "../"

data/lib/replidog/model.rb

@@ -8,28 +8,51 @@ module Replidog
       base.proxy_handler = Replidog::ProxyHandler.new
 
       class << base
-        alias_method_chain(:establish_connection, :replidog)
-        alias_method_chain(:connection, :replidog)
-        alias_method_chain(:connected?, :replidog)
-        alias_method_chain(:clear_reloadable_connections!, :replidog)
-        alias_method_chain(:clear_active_connections!, :replidog)
-        alias_method_chain(:clear_all_connections!, :replidog)
+        alias_method :connected_without_replidog?, :connected?
+        alias_method :connection_without_replidog, :connection
+
+        prepend BaseWithReplidogSupport
       end
     end
 
-    def establish_connection_with_replidog(spec = ENV["DATABASE_URL"])
-      establish_connection_without_replidog(spec)
-      proxy_handler.remove_connection(self)
-      proxy_handler.establish_connection(connection_pool.spec, self)
-    end
+    module BaseWithReplidogSupport
+      def establish_connection(spec = ENV["DATABASE_URL"])
+        super
+        proxy_handler.remove_connection(self)
+        proxy_handler.establish_connection(connection_pool.spec, self)
+      end
 
-    def connection_with_replidog
-      if replicated?
-        proxy_handler.retrieve_proxy(self).tap do |proxy|
-          proxy.current_model = self
+      def connection
+        if replicated?
+          proxy_handler.retrieve_proxy(self).tap do |proxy|
+            proxy.current_model = self
+          end
+        else
+          super
         end
-      else
-        connection_without_replidog
+      end
+
+      def connected?
+        if replicated?
+          connection.connected?
+        else
+          super
+        end
+      end
+
+      def clear_active_connections!
+        super
+        proxy_handler.clear_active_slave_connections! if replicated?
+      end
+
+      def clear_reloadable_connections!
+        super
+        proxy_handler.clear_reloadable_slave_connections! if replicated?
+      end
+
+      def clear_all_connections!
+        super
+        proxy_handler.clear_all_slave_connections! if replicated?
       end
     end
 
@@ -49,29 +72,6 @@ module Replidog
       end
     end
 
-    def connected_with_replidog?
-      if replicated?
-        connection.connected?
-      else
-        connected_without_replidog?
-      end
-    end
-
-    def clear_active_connections_with_replidog!
-      clear_active_connections_without_replidog!
-      proxy_handler.clear_active_slave_connections! if replicated?
-    end
-
-    def clear_reloadable_connections_with_replidog!
-      clear_reloadable_connections_without_replidog!
-      proxy_handler.clear_reloadable_slave_connections! if replicated?
-    end
-
-    def clear_all_connections_with_replidog!
-      clear_all_connections_without_replidog!
-      proxy_handler.clear_all_slave_connections! if replicated?
-    end
-
     private
 
     def _using(connection_name)

data/lib/replidog/proxy.rb

@@ -172,12 +172,10 @@ module Replidog
 
       def create
         spec =
-          if ActiveRecord::VERSION::MAJOR >= 4
-            if ActiveRecord::VERSION::MINOR < 1
-              ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(@configuration, {}).spec
-            else
-              ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new({}).spec(@configuration)
-            end
+          if ActiveRecord::VERSION::MAJOR >= 5 || (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1)
+            ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new({}).spec(@configuration)
+          elsif ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR < 1
+            ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(@configuration, {}).spec
           else
             ActiveRecord::Base::ConnectionSpecification::Resolver.new(@configuration, {}).spec
           end

data/lib/replidog/proxy_handler.rb

@@ -45,24 +45,34 @@ module Replidog
     end
 
     def enable_query_cache!
-      ActiveRecord::Base.connection_handler.connection_pools.each_value do |connection_pool|
+      connection_pool_list_for(ActiveRecord::Base.connection_handler).each do |connection_pool|
         connection_pool.connection.enable_query_cache!
       end
       @proxies.each_value(&:enable_query_cache_for_slaves!)
     end
 
     def disable_query_cache!
-      ActiveRecord::Base.connection_handler.connection_pools.each_value do |connection_pool|
+      connection_pool_list_for(ActiveRecord::Base.connection_handler).each do |connection_pool|
         connection_pool.connection.disable_query_cache!
       end
       @proxies.each_value(&:disable_query_cache_for_slaves!)
     end
 
     def clear_query_cache
-      ActiveRecord::Base.connection_handler.connection_pools.each_value do |connection_pool|
+      connection_pool_list_for(ActiveRecord::Base.connection_handler).each do |connection_pool|
         connection_pool.connection.clear_query_cache
       end
       @proxies.each_value(&:clear_query_cache_for_slaves)
     end
+
+    private
+
+    def connection_pool_list_for(connection_handler)
+      if ActiveRecord::VERSION::MAJOR >= 4
+        connection_handler.connection_pool_list
+      else
+        connection_handler.connection_pools.values
+      end
+    end
   end
 end

data/lib/replidog/version.rb

@@ -1,3 +1,3 @@
 module Replidog
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/spec/dummy/config/environments/test.rb

@@ -8,8 +8,8 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  #config.serve_static_assets = true
+  #config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/spec/spec_helper.rb

@@ -32,7 +32,6 @@ RSpec.configure do |config|
   end
 
   config.run_all_when_everything_filtered = true
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run :focus
 
   config.before(:suite) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: replidog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Manabu Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -279,6 +279,7 @@ files:
 - gemfiles/rails4.gemfile
 - gemfiles/rails41.gemfile
 - gemfiles/rails42.gemfile
+- gemfiles/rails5.gemfile
 - lib/replidog.rb
 - lib/replidog/active_record.rb
 - lib/replidog/model.rb