active_record_multiple_query_cache 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00050eb28914caff20e2c4a00c6597a734effcf1
-  data.tar.gz: f7ccb81d7ab5034ee4d270c1eb1fca9162aa7271
+  metadata.gz: d2c39557d189b8d85b4e35ee4ae6f356d862cdfc
+  data.tar.gz: 7b46a465aa2b57d19e007cdca200c57c3a59880d
 SHA512:
-  metadata.gz: 85d1785a38917b157d5d94bda59446cab464750ca4f9fb818a47d0fe20bf6ed8ec3337c390aafc8582b459458a9b78aaf50948e1aa72b77f0e2990a7014c09f5
-  data.tar.gz: 4b64956e9d7995e7208625a257c645d1eb135d6cd333bc0b17cc9ca937b1faa2e6d21143975d3aa81d58753138a0ac8e3a4f720501a98262eedcd4abd8125634
+  metadata.gz: 897508b3089e9ff1a6f7cc7b99203df4de7db7e6fc1ef1100cb7e6c5928ec03fe27fcfa9d28d5be27adac0ffcb510db758fe4fdf9795c6bfdffb01e950f76286
+  data.tar.gz: cd1d2b0bb823a05e477077a14c5687dbbd74116621a94b2afe594074eebef80b47bba5453bb23895567a6f1806e13e43e5af73ef1af696f5dc312364f45bb725

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "activerecord_multiple_query_cache"
+require 'bundler/setup'
+require 'active_record_multiple_query_cache'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "activerecord_multiple_query_cache"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/active_record_multiple_query_cache/rails5_query_cache.rb

@@ -1,13 +1,11 @@
 module ActiveRecordMultipleQueryCache
   class Rails5QueryCache
-    def initialize(active_record_base_class)
-      activerecord_base_class = active_record_base_class.constantize if active_record_base_class.is_a?(String)
-
-      @active_record_base_class = active_record_base_class
+    def initialize(active_record_base_name_or_class)
+      @active_record_base_name_or_class = active_record_base_name_or_class
     end
 
     def run
-      caching_pool = @active_record_base_class.connection_pool
+      caching_pool = active_record_base_class.connection.pool
       caching_was_enabled = caching_pool.query_cache_enabled
 
       caching_pool.enable_query_cache!
@@ -18,5 +16,15 @@ module ActiveRecordMultipleQueryCache
     def complete((caching_pool, caching_was_enabled))
       caching_pool.disable_query_cache! unless caching_was_enabled
     end
+
+    private
+
+    def active_record_base_class
+      @active_record_base_class ||= if @active_record_base_name_or_class.is_a?(String)
+                                      @active_record_base_name_or_class.constantize
+                                    else
+                                      @active_record_base_name_or_class
+                                    end
+    end
   end
 end

data/lib/active_record_multiple_query_cache/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordMultipleQueryCache
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'.freeze
 end

data/lib/active_record_multiple_query_cache.rb

@@ -5,14 +5,14 @@ module ActiveRecordMultipleQueryCache
   autoload :Rails4QueryCache, 'active_record_multiple_query_cache/rails4_query_cache'
   autoload :Rails5QueryCache, 'active_record_multiple_query_cache/rails5_query_cache'
 
-  def self.install_query_cache(activerecord_base_class_name, rails = Rails)
+  def self.install_query_cache(activerecord_base_class_name, rails = ::Rails)
     if rails.gem_version >= Gem::Version.new('5.0.0')
       executor = ActiveSupport::Executor
-      query_cache = Rails5QueryCache.new(activerecord_base_class_name)
+      hook = Rails5QueryCache.new(activerecord_base_class_name)
 
       executor.register_hook(hook)
     else
-      middleware = ActiveRecordMultipleQueryCache::Rails4QueryCache.new(activerecord_base_class_name)
+      middleware = Rails4QueryCache.new(activerecord_base_class_name)
       rails.configuration.app_middleware.insert_after('::ActionDispatch::Callbacks', middleware)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_multiple_query_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - alpaca-tc