active_record_multiple_query_cache 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2c39557d189b8d85b4e35ee4ae6f356d862cdfc
-  data.tar.gz: 7b46a465aa2b57d19e007cdca200c57c3a59880d
+  metadata.gz: 9b5f3b62f168811516395c3f2c8ee96304bcc426
+  data.tar.gz: be142483ce01190fcdc349f03685f5d6265c4655
 SHA512:
-  metadata.gz: 897508b3089e9ff1a6f7cc7b99203df4de7db7e6fc1ef1100cb7e6c5928ec03fe27fcfa9d28d5be27adac0ffcb510db758fe4fdf9795c6bfdffb01e950f76286
-  data.tar.gz: cd1d2b0bb823a05e477077a14c5687dbbd74116621a94b2afe594074eebef80b47bba5453bb23895567a6f1806e13e43e5af73ef1af696f5dc312364f45bb725
+  metadata.gz: b1adfaea3133d213471891c30e9bf68763b9ffe51bf00fe0f4eb6c234750f8a91fa1cd811daa20c3b0130ec0c35bef2dd56ec06774d2eee057ffb941897b0144
+  data.tar.gz: 6bd90e7b9caaa1af70cb9d4d119116642220e27b4db687232396e754fb005b81dd0d5a11e0be55662b6b26a10782af25df0de8afe32ff00a4c248893343e4966

data/active_record_multiple_query_cache.gemspec

@@ -20,12 +20,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency('activerecord', '>= 4.2')
+  spec.add_dependency('rack')
 
   # for test
-  spec.add_development_dependency('sqlite3')
-  spec.add_development_dependency('rack')
-
   spec.add_development_dependency('bundler')
   spec.add_development_dependency('rake')
   spec.add_development_dependency('rspec')
+  spec.add_development_dependency('sqlite3')
 end

data/lib/active_record_multiple_query_cache/base.rb

@@ -0,0 +1,17 @@
+module ActiveRecordMultipleQueryCache
+  class Base
+    def initialize(active_record_base_name_or_class)
+      @active_record_base_name_or_class = active_record_base_name_or_class
+    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/rails4_query_cache.rb

@@ -2,21 +2,16 @@ require 'rack'
 require 'active_support/core_ext/string/inflections'
 
 module ActiveRecordMultipleQueryCache
-  class Rails4QueryCache
-    def initialize(active_record_base_class)
-      active_record_base_class = active_record_base_class.constantize if active_record_base_class.is_a?(String)
-      @active_record_base_class = active_record_base_class
-    end
-
+  class Rails4QueryCache < Base
     def new(app)
       @app = app
       self
     end
 
     def call(env)
-      connection = @active_record_base_class.connection
+      connection = active_record_base_class.connection
       enabled = connection.query_cache_enabled
-      connection_id = @active_record_base_class.connection_id
+      connection_id = active_record_base_class.connection_id
       connection.enable_query_cache!
 
       response = @app.call(env)
@@ -35,15 +30,15 @@ module ActiveRecordMultipleQueryCache
     end
 
     def to_s
-      %{#<#{self.class} @active_record_class: "#{@active_record_base_class}">}
+      %{#<#{self.class} active_record_class: "#{active_record_base_class}">}
     end
 
     private
 
     def restore_query_cache_settings(connection_id, enabled)
-      @active_record_base_class.connection_id = connection_id
-      @active_record_base_class.connection.clear_query_cache
-      @active_record_base_class.connection.disable_query_cache! unless enabled
+      active_record_base_class.connection_id = connection_id
+      active_record_base_class.connection.clear_query_cache
+      active_record_base_class.connection.disable_query_cache! unless enabled
     end
   end
 end

data/lib/active_record_multiple_query_cache/rails5_query_cache.rb

@@ -1,9 +1,5 @@
 module ActiveRecordMultipleQueryCache
-  class Rails5QueryCache
-    def initialize(active_record_base_name_or_class)
-      @active_record_base_name_or_class = active_record_base_name_or_class
-    end
-
+  class Rails5QueryCache < Base
     def run
       caching_pool = active_record_base_class.connection.pool
       caching_was_enabled = caching_pool.query_cache_enabled
@@ -16,15 +12,5 @@ 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.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/lib/active_record_multiple_query_cache.rb

@@ -1,12 +1,13 @@
 require 'active_record_multiple_query_cache/version'
-require 'active_record_multiple_query_cache/rails4_query_cache'
 
 module ActiveRecordMultipleQueryCache
+  autoload :Base, 'active_record_multiple_query_cache/base'
   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)
     if rails.gem_version >= Gem::Version.new('5.0.0')
+      require 'active_support/executor'
       executor = ActiveSupport::Executor
       hook = Rails5QueryCache.new(activerecord_base_class_name)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_multiple_query_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - alpaca-tc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,13 +25,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,6 +112,7 @@ files:
 - bin/console
 - bin/setup
 - lib/active_record_multiple_query_cache.rb
+- lib/active_record_multiple_query_cache/base.rb
 - lib/active_record_multiple_query_cache/rails4_query_cache.rb
 - lib/active_record_multiple_query_cache/rails5_query_cache.rb
 - lib/active_record_multiple_query_cache/version.rb