second_level_cache 2.1.13 → 2.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87a71a85a2abc58df0d9cc05f15b2a1c36c92339
-  data.tar.gz: 152a0f37f8793d8bfbb699cdc2887e51860d1143
+  metadata.gz: 7686a42b44f437f2e6fc609d96522d1379b7a200
+  data.tar.gz: ba2e25b305dbfdcd28422f7336a4d626799eb248
 SHA512:
-  metadata.gz: 06a26ebf58a7f3f516c639a5f95abbb95a06dda1b24a8a686718b854f5383e53df75440ec23c2ea16cd5a94a6e7f606d05bfea24f9c547e5be1329efea77dcf9
-  data.tar.gz: aa21915860466947a13ab3c792b83a98e40accc785459ad303a9fc03060d4ba70c673554964512b4baa80de1cb6ae2a3ff3a8f56c33bdff92ee0b59398afdda9
+  metadata.gz: 80c5b721865aa021c8e849b2fd9e55fe76f70b1d4bb9d1f15c8f0219e46ce2f55cc87314c1db8c03fcfc9b1606078d9d23362dbba2a54fb7891877536ca4e081
+  data.tar.gz: a324360eb82ba9b00045aca3e85e6e7c6cef69376b91de60cef776c9c5b432467d1f7728c0dcb59965bf37a6048432a2e463b71e830d2867905586d5c7514fdd

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+2.1.14
+* support has_one with scope
+
 2.1.10
 * read multi from cache for find(ids)
 

data/lib/second_level_cache/active_record/has_one_association.rb

@@ -12,10 +12,13 @@ module SecondLevelCache
 
         def find_target_with_second_level_cache
           return find_target_without_second_level_cache unless klass.second_level_cache_enabled?
-          return find_target_without_second_level_cache if reflection.options[:through] || reflection.scope
-          # TODO: implement cache with has_one through, scope
+
+          return find_target_without_second_level_cache if reflection.options[:through]
+          # TODO: implement cache with has_one through
           if reflection.options[:as]
             cache_record = klass.fetch_by_uniq_keys({reflection.foreign_key => owner[reflection.active_record_primary_key], reflection.type => owner.class.base_class.name})
+          elsif reflection.scope
+            cache_record = klass.fetch_by_uniq_keys(create_scope)
           else
             cache_record = klass.fetch_by_uniq_key(owner[reflection.active_record_primary_key], reflection.foreign_key)
           end

data/lib/second_level_cache/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
-module SecondLevelCache 
-  VERSION = "2.1.13"
+module SecondLevelCache
+  VERSION = "2.1.14"
 end

data/test/has_one_association_test.rb

@@ -31,7 +31,11 @@ class HasOneAssociationTest < ActiveSupport::TestCase
     user.create_namespace(name: 'hooopo')
     group_namespace2 = Namespace.create(user_id: user.id, name: 'rails', kind: 'group')
     assert_not_equal user.namespace, nil
-    clear_user = User.find(user.id)
+    assert_equal user.reload.namespace.name, 'hooopo'
+    clear_user = user.reload
+    assert_no_queries do
+      clear_user.namespace
+    end
     assert_equal clear_user.namespace.name, 'hooopo'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.1.13
+  version: 2.1.14
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport