cached_resource 5.0.0 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2afcc694c9c8dbe55afacbf55e921b1c4ec51355
-  data.tar.gz: dd4ede0e4ed5106e4cf63478b32704f4353b660b
+SHA256:
+  metadata.gz: 769d5356d807aba4f41cc6be8c2d256921d028b1f205350f0e77024a4db15829
+  data.tar.gz: 89d9d4bb95b3f325265124bc2d6dd877f68ce0fe6eabe5af2eb9d85327c03ca8
 SHA512:
-  metadata.gz: 31c69e1b927ade3909af93adb83aa4afa5c0a1aafeead453da29b19a08131a78cbb1bc447bf3dcac256413f22ee20b8c2e23ee59e08f866a4998fb92b67b89c9
-  data.tar.gz: 22e9439b077f55f8b24517b1a1b094be8673eb3a88e89cfb4cee81e32e14a64d65b9e255471bbc25b5d08356457a6befff6a7cb935921b8a240f043fe18ae6f4
+  metadata.gz: 6f2574db0f3bd31b1204a361c0c24c9494860947a63e9de90e5dc02762e2d78a034e6e68b380e763af574b2a5d0fc64c3107dbb86644de85fdfe0f8b16ff257c
+  data.tar.gz: 06c1087d5b036408ef7729e728ad27f8ae59dc2ec954a388fbbe455dc399fcc06b6d69a0bfa9f949c4e86761241a9a15a63d8956c18a1a3d696c4d9669a660d1

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
 sudo: false
+before_install:
+  - gem install bundler:1.17.3
 cache: bundler
 
 rvm:

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2017 Morgan Brown
+Copyright (c) 2018 Morgan Brown
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,8 +1,11 @@
-# CachedResource [![Build Status](https://secure.travis-ci.org/mhgbrown/cached_resource.png)](http://travis-ci.org/mhgbrown/cached_resource)
+# CachedResource [![Build Status](https://travis-ci.org/mhgbrown/cached_resource.svg?branch=master)](http://travis-ci.org/mhgbrown/cached_resource)
 CachedResource is a Ruby gem whose goal is to increase the performance of interacting with web services via ActiveResource by caching responses based on request parameters.  It can help reduce the lag created by making repeated requests across a network.
 
 ## Installation
-	gem install cached_resource
+
+```ruby
+gem install cached_resource
+```
 
 ## Compatibility
 CachedResource supports the following Ruby versions:
@@ -24,15 +27,19 @@ For previously supported versions, use 4.2.0 or below.
 ## Configuration
 **Set up CachedResource across all ActiveResources:**
 
-	class ActiveResource::Base
-		cached_resource
-	end
+```ruby
+class ActiveResource::Base
+  cached_resource
+end
+```
 
 Or set up CachedResource for a single class:
 
-	class MyActiveResource < ActiveResource::Base
-		cached_resource
-	end
+```ruby
+class MyActiveResource < ActiveResource::Base
+  cached_resource
+end
+```
 
 ### Options
 CachedResource accepts the following options:
@@ -49,91 +56,121 @@ CachedResource accepts the following options:
 
 You can set them like this:
 
-	cached_resource :cache => MyCacheStore.new, :ttl => 60, :collection_synchronize => true, :logger => MyLogger.new
+```ruby
+cached_resource :cache => MyCacheStore.new, :ttl => 60, :collection_synchronize => true, :logger => MyLogger.new
+```
 
 You can also change them on the fly.
 
 Turn CachedResource off.  This will cause all responses to be retrieved normally (i.e. via the network). All responses will still be cached.
 
-	MyActiveResource.cached_resource.off!
+```ruby
+  MyActiveResource.cached_resource.off!
+```
 
 Turn CachedResource on.
-
-	MyActiveResource.cached_resource.on!
+```ruby
+MyActiveResource.cached_resource.on!
+```
 
 Set the cache expiry time to 60 seconds.
 
-	MyActiveResource.cached_resource.ttl = 60
+```ruby
+MyActiveResource.cached_resource.ttl = 60
+```
 
 Enable cache expiry time randomization, allowing it to fall randomly between 60 and 120 seconds.
 
-	MyActiveResource.cached_resource.ttl_randomization = true
+```ruby
+MyActiveResource.cached_resource.ttl_randomization = true
+```
 
 Change the cache expiry time randomization scale so that the cache expiry time falls randomly between 30 and 180 seconds.
 
-	MyActiveResource.cached_resource.ttl_randomization_scale = 0.5..3
-
+```ruby
+MyActiveResource.cached_resource.ttl_randomization_scale = 0.5..3
+```
 Enable collection synchronization.  This will cause a call to `MyActiveResource.all` to also create cache entries for each of its members.  So, for example, a later call to `MyActiveResource.find(1)` will be read from the cache instead of requested from the remote service.
 
-	MyActiveResource.cached_resource.collection_synchronize = true
-
+```ruby
+MyActiveResource.cached_resource.collection_synchronize = true
+```
 Change the arguments that identify the principal collection request.  If for some reason you are concerned with a collection that is retrieved at a "non-standard" URL, you may specify the Ruby arguments that produce that URL.  When `collection_synchronize` is `true`, the collection returned from a request that matches these arguments will be cached and later updated when one of its members or a subset is retrieved.
 
-	MyActiveResource.cached_resource.collection_arguments = [:all, :params => {:name => "Bob"}]
-
+```ruby
+MyActiveResource.cached_resource.collection_arguments = [:all, :params => {:name => "Bob"}]
+```
 Set a different logger.
 
-	MyActiveResource.cached_resource.logger = MyLogger.new
-
+```ruby
+MyActiveResource.cached_resource.logger = MyLogger.new
+```
 Set a different cache store.
 
-	MyActiveResource.cached_resource.cache = MyCacheStore.new
+```ruby
+MyActiveResource.cached_resource.cache = MyCacheStore.new
+```
 
 ### Caveats
 If you set up CachedResource across all ActiveResources or any subclass of ActiveResource that will be inherited by other classes and you want some of those others to have independent CachedResource configurations, then check out the example below:
 
-	class ActiveResource::Base
-		cached_resource
-	end
-
-	class MyActiveResource < ActiveResource::Base
-		self.cached_resource = CachedResource::Configuration.new(:collection_synchronize => true)
-	end
-
+```ruby
+class ActiveResource::Base
+  cached_resource
+end
+```
+
+```ruby
+class MyActiveResource < ActiveResource::Base
+  self.cached_resource = CachedResource::Configuration.new(:collection_synchronize => true)
+end
+```
 ## Usage
 Sit back and relax! If you need to reload a particular request you can pass `:reload => true` into the options hash like this:
 
-	MyActiveResource.find(:all, :reload => true)
-
+```ruby
+MyActiveResource.find(:all, :reload => true)
+```
 If you need to clear the entire cache just do the following:
 
-	MyActiveResource.clear_cache
-
+```ruby
+MyActiveResource.clear_cache
+```
 ---
 Sometimes you might have a case the resource pathing is non-unique per call. This can create a situation where your caching the same result for multiple calls:
 
-	MyActiveResource.find(:one, from: "/admin/shop.json")
+```ruby
+MyActiveResource.find(:one, from: "/admin/shop.json")
+```
 
 Since resources are cached with an argument based key, you may pass in extra data to be appended to the cache key:
 
-	MyActiveResource.find(:one, from: "/admin/shop.json", uid: "unique value")
-
+```ruby
+MyActiveResource.find(:one, from: "/admin/shop.json", uid: "unique value")
+```
 ## Testing
-	rake
 
-## Credit/Inspiration
-* quamen and [this gist](http://gist.github.com/947734)
-* latimes and [this plugin](http://github.com/latimes/cached_resource)
+```ruby
+rake
+```
 
-## Feedback/Problems
-Feedback is greatly appreciated! Check out this project's [issue tracker](https://github.com/Ahsizara/cached_resource/issues) if you've got anything to say.
+or to test all supported environments, make sure appraisal is setup
 
-## Future Considerations
-This may change at any time.
+```ruby
+bundle exec appraisal install
+```
 
-* Callbacks on before and after reload
-* Consider checksums to improve the determination of freshness/changédness
+and then run
 
+```ruby
+bundle exec appraisal rake
+```
 
+For more details, head over to the [appraisal](https://github.com/thoughtbot/appraisal) documentation.
 
+## Credit/Inspiration
+* quamen and [this gist](http://gist.github.com/947734)
+* latimes and [this plugin](http://github.com/latimes/cached_resource)
 
+## Feedback/Problems
+Feedback is greatly appreciated! Check out this project's [issue tracker](https://github.com/Ahsizara/cached_resource/issues) if you've got anything to say.

data/gemfiles/4.2.gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: ..
   specs:
-    cached_resource (4.2.0)
-      activeresource (>= 3.2)
-      activesupport (>= 3.2)
+    cached_resource (5.1.3)
+      activeresource (>= 4.0)
+      activesupport (>= 4.0)
       nilio (>= 1.0)
-      rake
 
 GEM
   remote: http://rubygems.org/
@@ -94,7 +93,7 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rails-observers (0.1.4)
+    rails-observers (0.1.5)
       activemodel (>= 4.0)
     railties (4.2.9)
       actionpack (= 4.2.9)
@@ -134,7 +133,8 @@ DEPENDENCIES
   appraisal
   cached_resource!
   rails (~> 4.2.0)
+  rake
   rspec
 
 BUNDLED WITH
-   1.15.1
+   1.17.3

data/gemfiles/5.0.gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: ..
   specs:
-    cached_resource (4.2.0)
-      activeresource (>= 3.2)
-      activesupport (>= 3.2)
+    cached_resource (5.1.3)
+      activeresource (>= 4.0)
+      activesupport (>= 4.0)
       nilio (>= 1.0)
-      rake
 
 GEM
   remote: http://rubygems.org/
@@ -38,19 +37,18 @@ GEM
       globalid (>= 0.3.6)
     activemodel (5.0.2)
       activesupport (= 5.0.2)
-    activemodel-serializers-xml (1.0.1)
+    activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
-      activerecord (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
     activerecord (5.0.2)
       activemodel (= 5.0.2)
       activesupport (= 5.0.2)
       arel (~> 7.0)
-    activeresource (5.0.0)
-      activemodel (>= 5.0, < 6)
+    activeresource (5.1.1)
+      activemodel (>= 5.0, < 7)
       activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 5.0, < 6)
+      activesupport (>= 5.0, < 7)
     activesupport (5.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
@@ -144,7 +142,8 @@ DEPENDENCIES
   appraisal
   cached_resource!
   rails (~> 5.0.0)
+  rake
   rspec
 
 BUNDLED WITH
-   1.15.1
+   1.17.3

data/gemfiles/5.1.gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: ..
   specs:
-    cached_resource (4.2.0)
-      activeresource (>= 3.2)
-      activesupport (>= 3.2)
+    cached_resource (5.1.3)
+      activeresource (>= 4.0)
+      activesupport (>= 4.0)
       nilio (>= 1.0)
-      rake
 
 GEM
   remote: http://rubygems.org/
@@ -38,19 +37,18 @@ GEM
       globalid (>= 0.3.6)
     activemodel (5.1.2)
       activesupport (= 5.1.2)
-    activemodel-serializers-xml (1.0.1)
+    activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
-      activerecord (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
     activerecord (5.1.2)
       activemodel (= 5.1.2)
       activesupport (= 5.1.2)
       arel (~> 8.0)
-    activeresource (5.0.0)
-      activemodel (>= 5.0, < 6)
+    activeresource (5.1.1)
+      activemodel (>= 5.0, < 7)
       activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 5.0, < 6)
+      activesupport (>= 5.0, < 7)
     activesupport (5.1.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
@@ -144,7 +142,8 @@ DEPENDENCIES
   appraisal
   cached_resource!
   rails (~> 5.1.0)
+  rake
   rspec
 
 BUNDLED WITH
-   1.15.1
+   1.17.3

data/lib/cached_resource/cached_resource.rb

@@ -31,8 +31,8 @@ module CachedResource
       # self.cached_resource = CachedResource::Configuration.new(options={})
       def inherited(child)
         child.cached_resource = self.cached_resource if defined?(@cached_resource)
+        super
       end
     end
-
   end
-end
+end

data/lib/cached_resource/caching.rb

@@ -7,7 +7,7 @@ module CachedResource
     included do
       class << self
         alias_method :find_without_cache, :find
-        alias_method :find, :find_with_cache      
+        alias_method :find, :find_with_cache
       end
     end
 
@@ -84,13 +84,19 @@ module CachedResource
 
       # Read a entry from the cache for the given key.
       def cache_read(key)
-        object = cached_resource.cache.read(key).try do |cache|
-          if cache.is_a? Enumerable
-            restored = cache.map { |record| full_dup(record) }
-            next restored unless respond_to?(:collection_parser)
-            collection_parser.new(restored)
-          else
-            full_dup(cache)
+        object = cached_resource.cache.read(key).try do |json_cache|
+
+          json = ActiveSupport::JSON.decode(json_cache)
+
+          unless json.nil?
+            cache = json_to_object(json)
+            if cache.is_a? Enumerable
+              restored = cache.map { |record| full_dup(record) }
+              next restored unless respond_to?(:collection_parser)
+              collection_parser.new(restored)
+            else
+              full_dup(cache)
+            end
           end
         end
         object && cached_resource.logger.info("#{CachedResource::Configuration::LOGGER_PREFIX} READ #{key}")
@@ -99,7 +105,7 @@ module CachedResource
 
       # Write an entry to the cache for the given key and value.
       def cache_write(key, object)
-        result = cached_resource.cache.write(key, object, :race_condition_ttl => cached_resource.race_condition_ttl, :expires_in => cached_resource.generate_ttl)
+        result = cached_resource.cache.write(key, object_to_json(object), :race_condition_ttl => cached_resource.race_condition_ttl, :expires_in => cached_resource.generate_ttl)
         result && cached_resource.logger.info("#{CachedResource::Configuration::LOGGER_PREFIX} WRITE #{key}")
         result
       end
@@ -124,6 +130,24 @@ module CachedResource
         end
       end
 
+      def json_to_object(json)
+        if json.is_a? Array
+          json.map { |attrs|
+            self.new(attrs["object"], attrs["persistence"]) }
+        else
+          self.new(json["object"], json["persistence"])
+        end
+      end
+
+      def object_to_json(object)
+        if object.is_a? Enumerable
+           object.map { |o| { :object => o, :persistence => o.persisted? } }.to_json
+        elsif object.nil?
+          nil.to_json
+        else
+          { :object => object, :persistence => object.persisted? }.to_json
+        end
+      end
     end
   end
 end

data/lib/cached_resource/version.rb

@@ -1,3 +1,3 @@
 module CachedResource
-  VERSION = "5.0.0"
+  VERSION = "5.1.3"
 end

data/spec/cached_resource/cached_resource_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+RSpec.describe CachedResource do
+  before do
+    class BaseThing < ActiveResource::Base
+    end
+
+    class FirstChildThing < BaseThing
+      self.site = 'http://api.first-child-thing.com'
+      cached_resource
+    end
+
+    class SecondChildThing < BaseThing
+      self.site = 'http://api.second-child-thing.com'
+    end
+  end
+
+  after do
+    [:BaseThing, :FirstChildThing, :SecondChildThing].each do |klass|
+      Object.send(:remove_const, klass)
+    end
+  end
+
+  describe '.inherited' do
+    it 'should include descendants when calling .descendants' do
+      BaseThing.descendants.sort_by { |klass| klass.name }.should == [FirstChildThing, SecondChildThing]
+    end
+  end
+end

data/spec/cached_resource/caching_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe CachedResource do
 
+  def read_from_cache(key)
+    Thing.send(:cache_read, key)
+  end
+
   before(:each) do
     class Thing < ActiveResource::Base
       self.site = "http://api.thing.com"
@@ -15,10 +19,13 @@ describe CachedResource do
     @thing3 = {:thing => {:id => 3, :name => "Stu"}}
     @string_thing = {:thing => {:id => "fded", :name => "Lev"}}
     @other_string_thing = {:thing => {:id => "fded", :name => "Lon"}}
+    @date_thing = {:thing => {:id => 4, :created_at => Time.utc(2020).iso8601}}
     @thing_json = @thing.to_json
     @other_thing_json = @other_thing.to_json
     @string_thing_json = @string_thing.to_json
     @other_string_thing_json = @other_string_thing.to_json
+    @date_thing_json = @date_thing.to_json
+    @nil_thing = nil.to_json
   end
 
   after(:each) do
@@ -38,32 +45,41 @@ describe CachedResource do
         mock.get "/things/1.json", {}, @thing_json
         mock.get "/things/1.json?foo=bar", {}, @thing_json
         mock.get "/things/fded.json", {}, @string_thing_json
+        mock.get "/things.json?name=42", {}, @nil_thing, 404
+        mock.get "/things/4.json", {}, @date_thing_json
       end
     end
 
     it "should cache a response" do
       result = Thing.find(1)
-      Thing.cached_resource.cache.read("thing/1").should == result
+
+      read_from_cache("thing/1").should == result
+    end
+
+    it "should cache a nil response" do
+      result = Thing.find(:all, :params => { :name => '42' })
+      read_from_cache("thing/all/name/42").should == nil
     end
 
     it "should cache a response for a string primary key" do
       result = Thing.find("fded")
-      Thing.cached_resource.cache.read("thing/fded").should == result
+      read_from_cache("thing/fded").should == result
     end
 
     it "should cache without whitespace in keys" do
       result = Thing.find(1, :from => 'path', :params => { :foo => 'bar' })
-      Thing.cached_resource.cache.read('thing/1/{:from=>"path",:params=>{:foo=>"bar"}}').should == result
+      read_from_cache('thing/1/{:from=>"path",:params=>{:foo=>"bar"}}').should == result
     end
 
     it "should empty the cache when clear_cache is called" do
       result = Thing.find(1)
       Thing.clear_cache
-      Thing.cached_resource.cache.read("thing/1").should == nil
+      read_from_cache("thing/1").should == nil
     end
 
     it "should cache a response with the same persistence" do
       result1 = Thing.find(1)
+      result1.persisted?.should be true
       result2 = Thing.find(1)
       result1.persisted?.should == result2.persisted?
     end
@@ -108,7 +124,7 @@ describe CachedResource do
       # make a request
       Thing.find(1)
       # get the cached result of the request
-      old_result = Thing.cached_resource.cache.read("thing/1")
+      old_result = read_from_cache("thing/1")
 
       # change the response
       ActiveResource::HttpMock.reset!
@@ -117,7 +133,7 @@ describe CachedResource do
       end
 
       Thing.find(1, :reload => true)
-      new_result = Thing.cached_resource.cache.read("thing/1")
+      new_result = read_from_cache("thing/1")
       # since active resources are equal if and only if they
       # are the same object or an instance of the same class,
       # not new?, and have the same id.
@@ -153,10 +169,23 @@ describe CachedResource do
       result1.should_not be_frozen
     end
 
+    describe "when ActiveSupport.parse_json_times is enabled" do
+      before(:all) do
+        Time.zone = 'UTC'
+        ActiveSupport.parse_json_times = true
+      end
+
+      it "should convert date times to objects when reading from cache" do
+        Thing.find(4)
+
+        read_from_cache("thing/4").created_at.should == @date_thing[:thing][:created_at]
+      end
+    end
+
     shared_examples "collection_return_type" do
       if ActiveResource::VERSION::MAJOR >= 4
         it "should return an ActiveResource::Collection" do
-          cached = Thing.cached_resource.cache.read("thing/all")
+          cached = read_from_cache("thing/all")
           cached.should be_instance_of(ActiveResource::Collection)
         end
 
@@ -165,12 +194,12 @@ describe CachedResource do
           class CustomCollection < ActiveResource::Collection; end
           Thing.collection_parser = CustomCollection
           Thing.all
-          cached = Thing.cached_resource.cache.read("thing/all")
+          cached = read_from_cache("thing/all")
           cached.should be_instance_of(CustomCollection)
         end
       else
         it "should return an Array" do
-          cached = Thing.cached_resource.cache.read("thing/all")
+          cached = read_from_cache("thing/all")
           cached.should be_instance_of(Array)
         end
       end
@@ -222,8 +251,8 @@ describe CachedResource do
     shared_examples "collection_cache_clearing" do
       it "should empty the cache when clear_cache is called" do
         Thing.clear_cache
-        Thing.cached_resource.cache.read("thing/all").should == nil
-        Thing.cached_resource.cache.read("thing/1").should == nil
+        read_from_cache("thing/all").should == nil
+        read_from_cache("thing/1").should == nil
       end
 
     end
@@ -254,8 +283,8 @@ describe CachedResource do
         # only the all request should have been made
         ActiveResource::HttpMock.requests.length.should == 1
         # the result should be cached with the appropriate key
-        Thing.cached_resource.cache.read("thing/1").should == result
-        Thing.cached_resource.cache.read("thing/fded").should == string_result
+        read_from_cache("thing/1").should == result
+        read_from_cache("thing/fded").should == string_result
       end
 
       include_examples "collection_cache_clearing"
@@ -274,11 +303,11 @@ describe CachedResource do
         Thing.all(:reload => true)
         # get the updated result, read from the cache
         result = Thing.find(1)
-        Thing.cached_resource.cache.read("thing/all")[0].should == result
-        Thing.cached_resource.cache.read("thing/all")[0].name.should == result.name
+        read_from_cache("thing/all")[0].should == result
+        read_from_cache("thing/all")[0].name.should == result.name
         string_result = Thing.find("fded")
-        Thing.cached_resource.cache.read("thing/all")[1].should == string_result
-        Thing.cached_resource.cache.read("thing/all")[1].name.should == string_result.name
+        read_from_cache("thing/all")[1].should == string_result
+        read_from_cache("thing/all")[1].name.should == string_result.name
       end
 
       it "should update the collection when an individual request is reloaded" do
@@ -291,11 +320,11 @@ describe CachedResource do
 
         # reload the individual
         result = Thing.find(1, :reload => true)
-        Thing.cached_resource.cache.read("thing/all")[0].should == result
-        Thing.cached_resource.cache.read("thing/all")[0].name.should == result.name
+        read_from_cache("thing/all")[0].should == result
+        read_from_cache("thing/all")[0].name.should == result.name
         string_result = Thing.find("fded", :reload => true)
-        Thing.cached_resource.cache.read("thing/all")[1].should == string_result
-        Thing.cached_resource.cache.read("thing/all")[1].name.should == string_result.name
+        read_from_cache("thing/all")[1].should == string_result
+        read_from_cache("thing/all")[1].name.should == string_result.name
       end
 
       it "should update both the collection and the member cache entries when a subset of the collection is retrieved" do
@@ -312,20 +341,20 @@ describe CachedResource do
         # make a request for a subset of the "mother" collection
         result = Thing.find(:all, :params => {:name => "Ari"})
         # the collection should be updated to reflect the server change
-        Thing.cached_resource.cache.read("thing/all")[0].should == result[0]
-        Thing.cached_resource.cache.read("thing/all")[0].name.should == result[0].name
+        read_from_cache("thing/all")[0].should == result[0]
+        read_from_cache("thing/all")[0].name.should == result[0].name
         # the individual should be updated to reflect the server change
-        Thing.cached_resource.cache.read("thing/1").should == result[0]
-        Thing.cached_resource.cache.read("thing/1").name.should == result[0].name
+        read_from_cache("thing/1").should == result[0]
+        read_from_cache("thing/1").name.should == result[0].name
 
         # make a request for a subset of the "mother" collection
         result = Thing.find(:all, :params => {:name => "Lon"})
         # the collection should be updated to reflect the server change
-        Thing.cached_resource.cache.read("thing/all")[1].should == result[0]
-        Thing.cached_resource.cache.read("thing/all")[1].name.should == result[0].name
+        read_from_cache("thing/all")[1].should == result[0]
+        read_from_cache("thing/all")[1].name.should == result[0].name
         # the individual should be updated to reflect the server change
-        Thing.cached_resource.cache.read("thing/fded").should == result[0]
-        Thing.cached_resource.cache.read("thing/fded").name.should == result[0].name
+        read_from_cache("thing/fded").should == result[0]
+        read_from_cache("thing/fded").name.should == result[0].name
       end
 
       it "should maintain the order of the collection when updating it" do
@@ -407,12 +436,12 @@ describe CachedResource do
         # reload the individual
         result = Thing.find(1, :reload => true)
         # the ids are the same, but the names should be different
-        Thing.cached_resource.cache.read("thing/all")[0].name.should_not == result.name
+        read_from_cache("thing/all")[0].name.should_not == result.name
 
         # reload the individual
         string_result = Thing.find("fded", :reload => true)
         # the ids are the same, but the names should be different
-        Thing.cached_resource.cache.read("thing/all")[1].name.should_not == string_result.name
+        read_from_cache("thing/all")[1].name.should_not == string_result.name
       end
     end
 
@@ -452,12 +481,12 @@ describe CachedResource do
 
     it "should cache a response" do
       result = Thing.find(1)
-      Thing.cached_resource.cache.read("thing/1").should == result
+      read_from_cache("thing/1").should == result
     end
 
     it "should cache a response for a string primary key" do
       result = Thing.find("fded")
-      Thing.cached_resource.cache.read("thing/fded").should == result
+      read_from_cache("thing/fded").should == result
     end
 
     it "should always remake the request" do
@@ -476,7 +505,7 @@ describe CachedResource do
 
     it "should rewrite the cache for each request" do
       Thing.find(1)
-      old_result = Thing.cached_resource.cache.read("thing/1")
+      old_result = read_from_cache("thing/1")
 
       # change the response
       ActiveResource::HttpMock.reset!
@@ -485,7 +514,7 @@ describe CachedResource do
       end
 
       Thing.find(1)
-      new_result = Thing.cached_resource.cache.read("thing/1")
+      new_result = read_from_cache("thing/1")
       # since active resources are equal if and only if they
       # are the same object or an instance of the same class,
       # not new?, and have the same id.
@@ -494,7 +523,7 @@ describe CachedResource do
 
     it "should rewrite the cache for each request for a string primary key" do
       Thing.find("fded")
-      old_result = Thing.cached_resource.cache.read("thing/fded")
+      old_result = read_from_cache("thing/fded")
 
       # change the response
       ActiveResource::HttpMock.reset!
@@ -503,7 +532,7 @@ describe CachedResource do
       end
 
       Thing.find("fded")
-      new_result = Thing.cached_resource.cache.read("thing/fded")
+      new_result = read_from_cache("thing/fded")
       # since active resources are equal if and only if they
       # are the same object or an instance of the same class,
       # not new?, and have the same id.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cached_resource
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.3
 platform: ruby
 authors:
 - Morgan Brown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-01 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -120,6 +120,7 @@ files:
 - lib/cached_resource/caching.rb
 - lib/cached_resource/configuration.rb
 - lib/cached_resource/version.rb
+- spec/cached_resource/cached_resource_spec.rb
 - spec/cached_resource/caching_spec.rb
 - spec/cached_resource/configuration_spec.rb
 - spec/spec_helper.rb
@@ -142,12 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Caching for ActiveResource
-test_files:
-- spec/cached_resource/caching_spec.rb
-- spec/cached_resource/configuration_spec.rb
-- spec/spec_helper.rb
+test_files: []