second_level_cache 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eac9a34cfad42e9f20c89eea21bd8f35db5869a9
-  data.tar.gz: d74fa93c9a2c93b18d5f35de3af34fbe08d29543
+  metadata.gz: f6a4e2dad0ed044548798d38f155a9c9f153408e
+  data.tar.gz: 4ffb77cc2f17e40d53f3943686f87427c60cd626
 SHA512:
-  metadata.gz: 2d278145d9eb185c95150e89e22c9a6cf1e43de72b90d3cd9050db513762a9b5fa4027deb72d1617bd6570417d957c03a06b73cff1725cab90651a4f9486582c
-  data.tar.gz: 6c9836d37d7a3952b09737f6661941c5c8cc1db606ace0548dc464774daee9a35ec26b0fc8f9324716c0072830b8edd7a5d92bb1f4a05a5777504c4a4b8afdc0
+  metadata.gz: 2b60fb3e4e71c77541c568c9b6b29c1840bfe4838b7ef50c7c754b78464ddd41ba2133a80964590d2f259019add8bca1bf5d221d14f6473f3fe69893d27ed92f
+  data.tar.gz: de72573534de9d3acd65d5716adfce3e8a26885bd9c94e9808bca70bc371efadbe3c9f46d38c2e0aea6e16d5afbcdb6e9fd9852d47b714e983cdbc491fec4361

data/README.md

@@ -1,9 +1,9 @@
 # SecondLevelCache
 
-[![Gem Version](https://badge.fury.io/rb/second_level_cache.png)](http://badge.fury.io/rb/second_level_cache)
-[![Dependency Status](https://gemnasium.com/hooopo/second_level_cache.png)](https://gemnasium.com/hooopo/second_level_cache)
-[![Build Status](https://travis-ci.org/hooopo/second_level_cache.png?branch=master)](https://travis-ci.org/hooopo/second_level_cache)
-[![Code Climate](https://codeclimate.com/github/hooopo/second_level_cache.png)](https://codeclimate.com/github/hooopo/second_level_cache)
+[![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)
 
 SecondLevelCache is a write-through and read-through caching library inspired by Cache Money and cache_fu, support ActiveRecord 4.
 
@@ -17,7 +17,7 @@ Write-Through: As objects are created, updated, and deleted, all of the caches a
 In your gem file:
 
 ```ruby
-gem "second_level_cache", "~> 2.1.8"
+gem "second_level_cache", "~> 2.1.9"
 ```
 
 For ActiveRecord 3:
@@ -91,13 +91,13 @@ ActiveRecord::Base.transaction do
    user.save
    account.save
    Rails.logger.info "info"
-end # <- Cache write 
+end # <- Cache write
 
 # if you want to do something after user and account's write_second_level_cache operation, do this way:
 ActiveRecord::Base.transaction do
    user.save
    account.save
-end # <- Cache write 
+end # <- Cache write
 Rails.logger.info "info"
 ```
 
@@ -114,7 +114,7 @@ In production env, we recommend to use [Dalli](https://github.com/mperham/dalli)
  config.cache_store = [:dalli_store, APP_CONFIG["memcached_host"], {:namespace => "ns", :compress => true}]
 ```
 
-## Tips: 
+## Tips:
 
 * When you want to clear only second level cache apart from other cache for example fragment cache in cache store,
 you can only change the `cache_key_prefix`:
@@ -130,7 +130,7 @@ class User < ActiveRecord::Base
 end
 ```
 
-* It provides a great feature, not hits db when fetching record via unique key(not primary key). 
+* It provides a great feature, not hits db when fetching record via unique key(not primary key).
 
 ```ruby
 # this will fetch from cache

data/lib/second_level_cache/active_record/has_one_association.rb

@@ -12,8 +12,8 @@ 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]
-          # TODO: implement cache with has_one through
+          return find_target_without_second_level_cache if reflection.options[:through] || reflection.scope
+          # TODO: implement cache with has_one through, scope
           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})
           else

data/lib/second_level_cache/version.rb

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

data/test/has_one_association_test.rb

@@ -24,4 +24,14 @@ class HasOneAssociationTest < ActiveSupport::TestCase
     #   clean_user.forked_from_user
     # end
   end
+
+  def test_has_one_with_conditions
+    user = User.create name: 'hooopo', email: 'hoooopo@gmail.com'
+    group_namespace1 = Namespace.create(user_id: user.id, name: 'ruby-china', kind: 'group')
+    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 clear_user.namespace.name, 'hooopo'
+  end
 end

data/test/model/user.rb

@@ -15,6 +15,13 @@ ActiveRecord::Base.connection.create_table(:forked_user_links, :force => true) d
   t.timestamps null: false
 end
 
+ActiveRecord::Base.connection.create_table(:namespaces, :force => true) do |t|
+  t.integer :user_id
+  t.string  :kind
+  t.string  :name
+  t.timestamps null: false
+end
+
 class User < ActiveRecord::Base
   CacheVersion = 3
   serialize :options, Array
@@ -25,10 +32,18 @@ class User < ActiveRecord::Base
   has_one  :account
   has_one  :forked_user_link, foreign_key: 'forked_to_user_id'
   has_one  :forked_from_user, through: :forked_user_link
+  has_many :namespaces
+  has_one  :namespace, -> { where(kind: nil) }
   has_many :books
   has_many :images, :as => :imagable
 end
 
+class Namespace < ActiveRecord::Base
+  acts_as_cached(:version => 1, :expires_in => 3.day)
+
+  belongs_to :user
+end
+
 class ForkedUserLink < ActiveRecord::Base
   belongs_to :forked_from_user, class_name: User
   belongs_to :forked_to_user, class_name: User

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport