cached_resource 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c76de5ea977a9387d2c796a1935aa80aa33cc559
-  data.tar.gz: 747fb41b327ea8117ff01cce745f9ee0b0d4e468
+  metadata.gz: 649cd7b534f3afc2628e4400f3b08e05769ed68b
+  data.tar.gz: 4e47e85d1ae399953ae9544bfe8b0ae0de9c99c7
 SHA512:
-  metadata.gz: 8068e71dc7aefadec576363763c94499d7fe88d7fd75f37480db7453ca72fae889716ae897e86905040a25c26b4a206e89e0d2948dbf4618a4f367cdb45f51a4
-  data.tar.gz: 37efb08196caa091b6d8cb1f56e0134f6d5c4b5662135d1fce5c000a1d61c85fbb234fb8793050c7e8ddbd794cdee34bb2b415007ac50cbf2d9165f8c5003b3c
+  metadata.gz: dabb024419aeb48a493fe0d4b1bdffdf7177b17a6c4fbcd573f8fbe99ee756acbbfb809daf8dd8a314843ab32bde126b9e5609b941864e5bc95f99949d6e00fe
+  data.tar.gz: 6008d2ed179cd97d1187cfe4a0f15922a48e1b5ae88af77f857643ac05e76eb8d2326675ecaeca2b78b4d3df75d6fb3c294a5492d65458a6d4bf0a7453fb36e5

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

@@ -121,19 +121,15 @@ Since resources are cached with an argument based key, you may pass in extra dat
 ## Testing
 	rake
 
+or to test all supported environments
+
+	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.
-
-## Future Considerations
-This may change at any time.
-
-* Callbacks on before and after reload
-* Consider checksums to improve the determination of freshness/changédness
-
-
-
-

data/gemfiles/4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    cached_resource (5.0.0)
+    cached_resource (5.1.0)
       activeresource (>= 4.0)
       activesupport (>= 4.0)
       nilio (>= 1.0)

data/gemfiles/5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    cached_resource (5.0.0)
+    cached_resource (5.1.0)
       activeresource (>= 4.0)
       activesupport (>= 4.0)
       nilio (>= 1.0)

data/gemfiles/5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    cached_resource (5.0.0)
+    cached_resource (5.1.0)
       activeresource (>= 4.0)
       activesupport (>= 4.0)
       nilio (>= 1.0)

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,7 +84,8 @@ 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|
+        object = cached_resource.cache.read(key).try do |json_cache|
+          cache = json_to_object(JSON.parse(json_cache))
           if cache.is_a? Enumerable
             restored = cache.map { |record| full_dup(record) }
             next restored unless respond_to?(:collection_parser)
@@ -99,7 +100,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, :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 +125,14 @@ module CachedResource
         end
       end
 
+      def json_to_object(json)
+        if json.is_a? Array
+          json.map { |attrs| self.new(attrs) }
+        else
+          self.new(json)
+        end
+      end
+
     end
   end
 end

data/lib/cached_resource/version.rb

@@ -1,3 +1,3 @@
 module CachedResource
-  VERSION = "5.0.1"
+  VERSION = "5.1.0"
 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"
@@ -43,23 +47,24 @@ 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 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
@@ -108,7 +113,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 +122,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.
@@ -156,7 +161,7 @@ describe CachedResource do
     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 +170,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 +227,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 +259,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 +279,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 +296,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 +317,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 +412,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 +457,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 +481,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 +490,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 +499,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 +508,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.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Morgan Brown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2018-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource