activerecord_cache 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baa22db3b8750b7947bd677289e81ecb0677ff1e
-  data.tar.gz: ef6677ee5427142f05ec4c37ec0188996c6bfbe9
+  metadata.gz: fecb86dd42b882d6a12115f86055b869d3df8e5b
+  data.tar.gz: 3045d66663380cb8c03727af1a22c90e57858aa5
 SHA512:
-  metadata.gz: e1a5034b7df686f09ffcd126e09f1aaaa12d78a2e1b0e083a1f855e6d384b12f2a841c96c64849b69d6f443633347796c829211c101c5c57abbfdfbfa43c989c
-  data.tar.gz: 63e41cb10b232e2c445d6452411b0a4f11162f17c0cf33766db11d6cf048eb293cb41bbf61005d0615e37e5e5a8ba8eb4ebcaee20fa5f5dd975c444fca9abfb3
+  metadata.gz: ba80e163493cda91b090529fd1d1b81f27d7fc21fa4e99e77bcf8dd010b8592c0c2ddf45391022f1de9ef0aa19bd1b7293bd33eba0146e68720c463d2f538605
+  data.tar.gz: 928688eaed5dc868736abf2c02504996a4dee9da9c77a5364784436a50de61c14de030bafb16a4c6e7c998fa31132a694c8ed355d0e200ca9f2a91634e73d4ca

data/Gemfile.lock

@@ -1,33 +1,33 @@
 PATH
   remote: .
   specs:
-    activerecord_cache (0.0.8)
+    activerecord_cache (0.0.9)
       rails (~> 4.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.1.4)
-      actionpack (= 4.1.4)
-      actionview (= 4.1.4)
+    actionmailer (4.1.5)
+      actionpack (= 4.1.5)
+      actionview (= 4.1.5)
       mail (~> 2.5.4)
-    actionpack (4.1.4)
-      actionview (= 4.1.4)
-      activesupport (= 4.1.4)
+    actionpack (4.1.5)
+      actionview (= 4.1.5)
+      activesupport (= 4.1.5)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.4)
-      activesupport (= 4.1.4)
+    actionview (4.1.5)
+      activesupport (= 4.1.5)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.4)
-      activesupport (= 4.1.4)
+    activemodel (4.1.5)
+      activesupport (= 4.1.5)
       builder (~> 3.1)
-    activerecord (4.1.4)
-      activemodel (= 4.1.4)
-      activesupport (= 4.1.4)
+    activerecord (4.1.5)
+      activemodel (= 4.1.5)
+      activesupport (= 4.1.5)
       arel (~> 5.0.0)
-    activesupport (4.1.4)
+    activesupport (4.1.5)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -46,7 +46,7 @@ GEM
       treetop (~> 1.4.8)
     metaclass (0.0.4)
     mime-types (1.25.1)
-    minitest (5.4.0)
+    minitest (5.4.2)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
@@ -54,19 +54,19 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.4)
-      actionmailer (= 4.1.4)
-      actionpack (= 4.1.4)
-      actionview (= 4.1.4)
-      activemodel (= 4.1.4)
-      activerecord (= 4.1.4)
-      activesupport (= 4.1.4)
+    rails (4.1.5)
+      actionmailer (= 4.1.5)
+      actionpack (= 4.1.5)
+      actionview (= 4.1.5)
+      activemodel (= 4.1.5)
+      activerecord (= 4.1.5)
+      activesupport (= 4.1.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.4)
+      railties (= 4.1.5)
       sprockets-rails (~> 2.0)
-    railties (4.1.4)
-      actionpack (= 4.1.4)
-      activesupport (= 4.1.4)
+    railties (4.1.5)
+      actionpack (= 4.1.5)
+      activesupport (= 4.1.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
@@ -75,7 +75,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
+    sprockets-rails (2.1.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
@@ -86,7 +86,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
 PLATFORMS

data/lib/activerecord_cache.rb

@@ -5,7 +5,6 @@ require File.join(File.dirname(__FILE__), 'activerecord_cache/base')
 require File.join(File.dirname(__FILE__), 'activerecord_cache/finder_methods')
 require File.join(File.dirname(__FILE__), 'activerecord_cache/belongs_to_association')
 require File.join(File.dirname(__FILE__), 'activerecord_cache/belongs_to_preloader')
-require File.join(File.dirname(__FILE__), 'activerecord_cache/relation')
 require File.join(File.dirname(__FILE__), 'activerecord_cache/errors')
 
 require 'activerecord_cache/railtie.rb' if defined?(Rails)

data/lib/activerecord_cache/base.rb

@@ -32,7 +32,15 @@ module ActiveRecordCache
           raise ActiveRecordCache::CacheNotEnabled, message
         end
 
-        Rails.cache.read(cache_key(id)) || where(primary_key => id).first
+        record = Rails.cache.read(cache_key(id))
+
+        unless record
+          # use where to bypass cached finders
+          record = where(primary_key => id).first
+          record.write_to_cache if record
+        end
+
+        record
       end
 
       def find_some_through_cache(ids)
@@ -53,7 +61,12 @@ module ActiveRecordCache
         end
 
         if cache_misses.present?
-          records += where(primary_key => cache_misses).load
+          # use where to bypass cached finders
+          loaded_records = where(primary_key => cache_misses).load
+
+          loaded_records.each(&:write_to_cache)
+
+          records += loaded_records
         end
 
         records

data/lib/activerecord_cache/finder_methods.rb

@@ -14,7 +14,7 @@ module ActiveRecordCache
 
       results = find_some_through_cache(ids)
 
-      raise_record_not_found_exception!(ids, result.size, ids.size) unless results.size == ids.size
+      raise_record_not_found_exception!(ids, results.size, ids.size) unless results.size == ids.size
 
       results
     end

data/lib/activerecord_cache/railtie.rb

@@ -8,7 +8,6 @@ class ActiveRecordCache::Railtie < Rails::Railtie
       ActiveRecord::Base.send(:include, ActiveRecordCache::Base)
       ActiveRecord::Associations::BelongsToAssociation.send(:include, ActiveRecordCache::BelongsToAssociation)
       ActiveRecord::Associations::Preloader::BelongsTo.send(:include, ActiveRecordCache::BelongsToPreloader)
-      ActiveRecord::Relation.send(:include, ActiveRecordCache::Relation)
 
       # FinderMethods only gets included in ActiveRecord::Relation, so extend it there.
       # This gets around some headaches caused by extending modules already included in other classes.

data/lib/activerecord_cache/version.rb

@@ -2,7 +2,7 @@ module ActiveRecordCache
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 8
+    TINY  = 9
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/test/activerecord_cache_test.rb

@@ -14,18 +14,33 @@ class ActiveRecordCacheTest < ActiveSupport::TestCase
     CachedRecord.find(1, 2)
   end
 
-  test "loading all records should persist them to the cache" do
-    Rails.cache.expects(:write).twice
+  test "loading all records should NOT persist them to the cache" do
+    Rails.cache.expects(:write).never
     CachedRecord.all.load    
   end
 
-  test "loading records using a where should persist them to the cache" do
-    Rails.cache.expects(:write).once
+  test "loading records using a where should NOT persist them to the cache" do
+    Rails.cache.expects(:write).never
     CachedRecord.where(:name => 'John').load    
   end
 
 
 
+  # Errors should still be raised
+  test "loading missing records should still throw errors" do
+    bogus_id = 12345
+
+    assert_raises ActiveRecord::RecordNotFound do
+      CachedRecord.find(bogus_id)
+    end
+
+    assert_raises ActiveRecord::RecordNotFound do
+      CachedRecord.find([1, bogus_id])
+    end
+  end
+
+
+
   # Finders should use the cache
   test "#find(id) should use the cache" do
     cache_records(1)
@@ -62,6 +77,15 @@ class ActiveRecordCacheTest < ActiveSupport::TestCase
     assert records.empty?, 'should not find cached record'
   end
 
+  # where + id gets treated like a complex query
+  test "#where(:id => id) does NOT use the cache" do
+    cache_records(1)
+
+    assert_query_count 1 do
+      records = CachedRecord.where(:id => 1).load
+    end
+  end
+
   test "#select(:id) should NOT use the cache" do
     cache_records(1)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - David Doan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,7 +44,6 @@ files:
 - lib/activerecord_cache/errors.rb
 - lib/activerecord_cache/finder_methods.rb
 - lib/activerecord_cache/railtie.rb
-- lib/activerecord_cache/relation.rb
 - lib/activerecord_cache/version.rb
 - test/activerecord_cache_test.rb
 - test/dummy/README.rdoc
@@ -115,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A basic caching plugin for ActiveRecord

data/lib/activerecord_cache/relation.rb

@@ -1,16 +0,0 @@
-module ActiveRecordCache
-  module Relation
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :exec_queries, :caching
-    end
-
-    def exec_queries_with_caching
-      records = exec_queries_without_caching
-      records.each(&:write_to_cache) if @klass.use_activerecord_cache && select_values.empty?
-
-      records
-    end
-  end
-end