cached_resource 2.3.1 → 2.3.2

data/lib/cached_resource/caching.rb

@@ -36,7 +36,7 @@ module CachedResource
         object = find_without_cache(*arguments)
         cache_collection_synchronize(object, *arguments) if cached_resource.collection_synchronize
         cache_write(key, object)
-        object
+        cache_read(key)
       end
 
       # If this is a pure, unadulterated "all" request
@@ -82,7 +82,11 @@ module CachedResource
       def cache_read(key)
         key = cache_key(Array(key)) unless key.is_a? String
         object = cached_resource.cache.read(key).try do |cache|
-          cache.dup.tap { |o| o.instance_variable_set(:@persisted, cache.persisted?) if cache.respond_to?(:persisted?) }
+          if cache.is_a? Enumerable
+            cache.map { |record| full_dup(record) }
+          else
+            full_dup(cache)
+          end
         end
         object && cached_resource.logger.info("#{CachedResource::Configuration::LOGGER_PREFIX} READ #{key}")
         object
@@ -102,6 +106,14 @@ module CachedResource
         "#{name.parameterize.gsub("-", "/")}/#{arguments.join('/')}".downcase
       end
 
+      # Make a full duplicate of an ActiveResource record.
+      # Currently just dups the record then copies the persisted state.
+      def full_dup(record)
+        record.dup.tap do |o|
+          o.instance_variable_set(:@persisted, record.persisted?)
+        end
+      end
+
     end
   end
 end

data/lib/cached_resource/version.rb

@@ -1,3 +1,3 @@
 module CachedResource
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 end

data/spec/cached_resource/caching_spec.rb

@@ -96,6 +96,66 @@ describe CachedResource do
       ActiveResource::HttpMock.requests.length.should == 2
     end
 
+    it "should not return a frozen object on first request" do
+      result1 = Thing.find(1)
+      result1.should_not be_frozen
+    end
+
+    it "should not return frozen object on a subsequent request" do
+      result1 = Thing.find(1)
+      result2 = Thing.find(1)
+      result2.should_not be_frozen
+    end
+
+    it "should not freeze first requested object on a subsequent request" do
+      result1 = Thing.find(1)
+      result2 = Thing.find(1)
+      result1.should_not be_frozen
+    end
+
+    shared_examples "collection_freezing" do
+      it "should not return a frozen collection on first request" do
+        Thing.cached_resource.cache.clear
+        collection1 = Thing.all
+        collection1.should_not be_frozen
+      end
+
+      it "should not return a frozen collection on a subsequent request" do
+        Thing.cached_resource.cache.clear
+        collection1 = Thing.all
+        collection2 = Thing.all
+        collection2.should_not be_frozen
+      end
+
+      it "should not freeze first requested collection on a subsequent request" do
+        Thing.cached_resource.cache.clear
+        result1 = Thing.all
+        result2 = Thing.all
+        result1.should_not be_frozen
+      end
+
+      it "should not return frozen members on first request" do
+        Thing.cached_resource.cache.clear
+        collection1 = Thing.all
+        collection1.first.should_not be_frozen
+      end
+
+      it "should not return frozen members on a subsequent request" do
+        Thing.cached_resource.cache.clear
+        collection1 = Thing.all
+        collection2 = Thing.all
+        collection2.first.should_not be_frozen
+      end
+
+      it "should not freeze members on a subsequent request" do
+        Thing.cached_resource.cache.clear
+        collection1 = Thing.all
+        member1 = Thing.find(1)
+        collection1.first.should_not be_frozen
+      end
+
+    end
+
     describe "when collection synchronize is enabled" do
       before(:each) do
         Thing.cached_resource.cache.clear
@@ -111,6 +171,8 @@ describe CachedResource do
         Thing.all
       end
 
+      include_examples "collection_freezing"
+
       it "should write cache entries for its members" do
         result = Thing.find(1)
         # only the all request should have been made
@@ -210,6 +272,8 @@ describe CachedResource do
         Thing.all
       end
 
+      include_examples "collection_freezing"
+
       it "should not write cache entries for its members" do
         result = Thing.find(1)
         # both the all in the before each and this request should have been made

metadata

@@ -1,101 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cached_resource
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 2.3.2
   prerelease: 
-  segments: 
-  - 2
-  - 3
-  - 1
-  version: 2.3.1
 platform: ruby
-authors: 
+authors:
 - Andrew Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activeresource
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activeresource
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: nilio
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nilio
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Enables request-based caching for ActiveResource
 email: email@suspi.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -114,38 +115,35 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/Ahsizara/cached_resource
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1173904428179810862
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -1173904428179810862
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Caching for ActiveResource
-test_files: 
+test_files:
 - spec/cached_resource/caching_spec.rb
 - spec/cached_resource/configuration_spec.rb
 - spec/spec_helper.rb