second_level_cache 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3ff0808eae35d2e443ca1160f93eaa9f23f9b1267e4338d3d89fca45715d0fbf
-  data.tar.gz: 1daad06b799d5506b2dff7cb23c898af371612cb38cc8963d24ea9276c66b30b
+SHA1:
+  metadata.gz: 53372ad4a8c4950dde0b32e9307ae5a104f23bc6
+  data.tar.gz: 13065046314c304e6409c93fe7a10e92d597cece
 SHA512:
-  metadata.gz: 564bd8a1dfeebb096450334bca5c077df923ffc6120e72d025188c1d47b8a705e003ff24f0698b59b0b60d32c877a90cb158286299c0683142bbe6612b31416d
-  data.tar.gz: efaf40b630af426f52538468c96b6d7ea24e14ed4137c3fedccadcc8de7c2c9c82c86b6ccf48d98a7c712e8d470ad997cb902199412f517ed5ebfa0187538cbe
+  metadata.gz: 422b464203cc111ad3ffa58fe36116ae4438988a0e0630f361bdec6db9c2b614feeb1b4d713b4b211c2b9646dfaf61ec673d7d5107189bdd582de12240691b48
+  data.tar.gz: eaae2b651b0746200f05567a65450a1326ce4496d3120872de7b75b7d352011252236f1504ae03383922cc7bd477429a9252c60174f8724cecfc492f43035828

data/README.md

@@ -1,7 +1,6 @@
 # SecondLevelCache
 
 [![Gem Version](https://badge.fury.io/rb/second_level_cache.svg)](http://badge.fury.io/rb/second_level_cache)
-[![Dependency Status](https://gemnasium.com/hooopo/second_level_cache.svg)](https://gemnasium.com/hooopo/second_level_cache)
 [![Build Status](https://travis-ci.org/hooopo/second_level_cache.svg?branch=master)](https://travis-ci.org/hooopo/second_level_cache)
 [![Code Climate](https://codeclimate.com/github/hooopo/second_level_cache.svg)](https://codeclimate.com/github/hooopo/second_level_cache)
 

data/lib/second_level_cache.rb

@@ -11,6 +11,24 @@ module SecondLevelCache
     block_given? ? yield(Config) : Config
   end
 
+  def self.without_second_level_cache
+    old_cache_enabled = SecondLevelCache.cache_enabled?
+    SecondLevelCache.cache_enabled = false
+
+    yield
+  ensure
+    SecondLevelCache.cache_enabled = old_cache_enabled
+  end
+
+  def self.cache_enabled?
+    cache_enabled = Thread.current[:slc_cache_enabled]
+    cache_enabled.nil? ? true : cache_enabled
+  end
+
+  def self.cache_enabled=(cache_enabled)
+    Thread.current[:slc_cache_enabled] = cache_enabled
+  end
+
   class << self
     delegate :logger, :cache_store, :cache_key_prefix, to: Config
   end

data/lib/second_level_cache/active_record/finder_methods.rb

@@ -56,7 +56,7 @@ module SecondLevelCache
         end
 
         record = super(limit)
-        record&.write_second_level_cache
+        record&.write_second_level_cache if select_all_column?
         record
       end
 

data/lib/second_level_cache/mixin.rb

@@ -20,19 +20,14 @@ module SecondLevelCache
 
       def second_level_cache_enabled?
         if defined? @second_level_cache_enabled
-          @second_level_cache_enabled == true
+          @second_level_cache_enabled == true && SecondLevelCache.cache_enabled?
         else
           false
         end
       end
 
-      def without_second_level_cache
-        old = @second_level_cache_enabled
-        @second_level_cache_enabled = false
-
-        yield if block_given?
-      ensure
-        @second_level_cache_enabled = old
+      def without_second_level_cache(&blk)
+        SecondLevelCache.without_second_level_cache(&blk) if blk
       end
 
       # Get MD5 digest of this Model schema

data/lib/second_level_cache/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SecondLevelCache
-  VERSION = "2.4.3"
+  VERSION = "2.4.4"
 end

data/second_level_cache.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'activesupport', ['>= 5.2.0.rc', '< 6']
   gem.add_runtime_dependency 'activerecord', ['>= 5.2.0.rc', '< 6']
 
-  gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'sqlite3', '< 1.4'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'database_cleaner'

data/test/fetch_by_uniq_key_test.rb

@@ -42,6 +42,11 @@ class FetchByUinqKeyTest < ActiveSupport::TestCase
     end
   end
 
+  def test_should_return_nil_when_record_not_found
+    assert_not_nil Post.fetch_by_uniq_keys(topic_id: 2, slug: "foobar")
+    assert_nil Post.fetch_by_uniq_keys(topic_id: 3, slug: "foobar")
+  end
+
   def test_should_work_with_fetch_by_uniq_key
     user = User.fetch_by_uniq_key(@user.name, :name)
     assert_equal user, @user

data/test/finder_methods_test.rb

@@ -72,4 +72,10 @@ class FinderMethodsTest < ActiveSupport::TestCase
       assert_equal @user, User.unscoped.where(id: @user.id).last
     end
   end
+
+  def test_should_not_write_cache_for_first
+    @user = User.select("id").first
+    @user = User.find(@user.id)
+    assert_equal "csdn", @user.name
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -54,16 +54,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: 'SecondLevelCache is a write-through and read-through caching library inspired