arid_cache 1.3.5 → 1.3.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arid_cache (1.3.4)
+    arid_cache (1.3.5)
       will_paginate
 
 GEM

data/VERSION

@@ -1 +1 @@
-1.3.5
+1.3.6

data/arid_cache.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arid_cache}
-  s.version = "1.3.5"
+  s.version = "1.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Karl Varga"]

data/lib/arid_cache/cache_proxy/result_processor.rb

@@ -66,11 +66,12 @@ module AridCache
             end
             Utilities.object_class(@options[:receiver]).send(@options[:proxy], @result)
           elsif is_activerecord_reflection?
+
             if @options.count_only?
               lazy_cache.count = @result.count
             else
-              lazy_cache.klass = @result.proxy_reflection.klass if @result.respond_to?(:proxy_reflection)
               lazy_cache.ids = @result.collect { |r| r[:id] }
+              lazy_cache.klass = @result.respond_to?(:proxy_reflection) ? @result.proxy_reflection.klass : (is_empty? ? result_klass : @result.first.class)
               lazy_cache.count = @result.size
             end
             lazy_cache
@@ -83,7 +84,7 @@ module AridCache
             lazy_cache.ids = @result
             lazy_cache.count = 0
             lazy_cache.klass = result_klass
-            lazy_cache            
+            lazy_cache
           elsif @result.nil? # so we can distinguish a cached nil vs an empty cache
             lazy_cache.klass = NilClass
             lazy_cache

data/spec/arid_cache/cache_proxy/result_processor_spec.rb

@@ -6,8 +6,9 @@ describe AridCache::CacheProxy::ResultProcessor do
     AridCache::CacheProxy::ResultProcessor.new(value, opts)
   end
 
-  before :all do
+  before :each do
     AridCache.store.delete! # so no options get stored and interfere with other tests
+    AridCache.raw_with_options = true
   end
 
   describe "empty array" do
@@ -364,7 +365,6 @@ describe AridCache::CacheProxy::ResultProcessor do
 
   describe "raw with options handling" do
     before :each do
-      AridCache.raw_with_options = true
       @user = User.make
       @company1 = Company.make
       @company2 = Company.make
@@ -404,4 +404,81 @@ describe AridCache::CacheProxy::ResultProcessor do
       value.should == [@company2.id]
     end
   end
+
+  describe "cached proxy_options result" do
+    before :each do
+      @user = User.make
+      @obj = Array.new([@user])
+      @obj.class_eval do
+        def respond_to?(method)
+          return true if method == :proxy_options
+        end
+      end
+    end
+
+    it "should store a CachedResult" do
+      new_result(@obj).to_cache.should be_a(AridCache::CacheProxy::CachedResult)
+    end
+
+    it "should be a reflection" do
+      new_result(@obj).is_activerecord_reflection?.should be_true
+    end
+
+    it "should set klass" do
+      cache = new_result(@obj).to_cache
+      cache.klass.should be(User)
+    end
+  end
+
+  describe "cached proxy_reflection result" do
+    before :each do
+      @user = User.make
+      @obj = Array.new([@user])
+      stub(@obj).proxy_reflection { stub(Object.new).klass { Company } }
+    end
+
+    it "should be a reflection" do
+      new_result(@obj).is_activerecord_reflection?.should be_true
+    end
+
+    it "should store a CachedResult" do
+      new_result(@obj).to_cache.should be_a(AridCache::CacheProxy::CachedResult)
+    end
+
+    it "should set klass from the proxy_reflection" do
+      cache = new_result(@obj).to_cache
+      cache.klass.should be(Company)
+    end
+  end
+
+  describe "deprecated" do
+    before :each do
+      AridCache.raw_with_options = false
+    end
+
+    describe "cached empty reflection-like result" do
+      before :each do
+        @user = User.make
+        @obj = Array.new([])
+        @obj.class_eval do
+          def respond_to?(method)
+            return true if method == :proxy_options
+          end
+        end
+      end
+
+      it "should store a CachedResult" do
+        new_result(@obj).to_cache.should be_a(AridCache::CacheProxy::CachedResult)
+      end
+
+      it "should be a reflection" do
+        new_result(@obj).is_activerecord_reflection?.should be_true
+      end
+
+      it "should fall back to the receiver class" do
+        cache = new_result(@obj, :receiver => User).to_cache
+        cache.klass.should be(User)
+      end
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: arid_cache
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 3
-  - 5
-  version: 1.3.5
+  - 6
+  version: 1.3.6
 platform: ruby
 authors: 
 - Karl Varga