lib/jsonapi/cached_resource_fragment.rb in jsonapi-resources-0.9.0.beta1 vs lib/jsonapi/cached_resource_fragment.rb in jsonapi-resources-0.9.0.beta2

@@ -4,18 +4,18 @@
       serializer_config_key = serializer.config_key(resource_klass).gsub("/", "_")
       context_json = resource_klass.attribute_caching_context(context).to_json
       context_b64 = JSONAPI.configuration.resource_cache_digest_function.call(context_json)
       context_key = "ATTR-CTX-#{context_b64.gsub("/", "_")}"
 
-      results = self.lookup(resource_klass, serializer_config_key, context_key, cache_ids)
+      results = self.lookup(resource_klass, serializer_config_key, context, context_key, cache_ids)
 
       miss_ids = results.select{|k,v| v.nil? }.keys
       unless miss_ids.empty?
         find_filters = {resource_klass._primary_key => miss_ids.uniq}
         find_options = {context: context}
         resource_klass.find(find_filters, find_options).each do |resource|
-          (id, cr) = write(resource_klass, resource, serializer, serializer_config_key, context_key)
+          (id, cr) = write(resource_klass, resource, serializer, serializer_config_key, context, context_key)
           results[id] = cr
         end
       end
 
       if JSONAPI.configuration.resource_cache_usage_report_function
@@ -27,32 +27,20 @@
       end
 
       return results
     end
 
-    def self.from_cache_value(resource_klass, h)
-      new(
-        resource_klass,
-        h.fetch(:id),
-        h.fetch(:type),
-        h.fetch(:fetchable),
-        h.fetch(:rels, nil),
-        h.fetch(:links, nil),
-        h.fetch(:attrs, nil),
-        h.fetch(:meta, nil)
-      )
-    end
-
-    attr_reader :resource_klass, :id, :type, :fetchable_fields, :relationships,
+    attr_reader :resource_klass, :id, :type, :context, :fetchable_fields, :relationships,
                 :links_json, :attributes_json, :meta_json,
                 :preloaded_fragments
 
-    def initialize(resource_klass, id, type, fetchable_fields, relationships,
+    def initialize(resource_klass, id, type, context, fetchable_fields, relationships,
                    links_json, attributes_json, meta_json)
       @resource_klass = resource_klass
       @id = id
       @type = type
+      @context = context
       @fetchable_fields = Set.new(fetchable_fields)
 
       # Relationships left uncompiled because we'll often want to insert included ids on retrieval
       @relationships = relationships
 
@@ -74,36 +62,56 @@
         attrs: attributes_json.try(:to_s),
         meta: meta_json.try(:to_s)
       }
     end
 
+    def to_real_resource
+      rs = Resource.resource_for(self.type).find_by_keys([self.id], {context: self.context})
+      return rs.try(:first)
+    end
+
     private
 
-    def self.lookup(resource_klass, serializer_config_key, context_key, cache_ids)
+    def self.lookup(resource_klass, serializer_config_key, context, context_key, cache_ids)
       type = resource_klass._type
 
       keys = cache_ids.map do |(id, cache_key)|
         [type, id, cache_key, serializer_config_key, context_key]
       end
 
       hits = JSONAPI.configuration.resource_cache.read_multi(*keys).reject{|_,v| v.nil? }
       return keys.each_with_object({}) do |key, hash|
         (_, id, _, _) = key
         if hits.has_key?(key)
-          hash[id] = self.from_cache_value(resource_klass, hits[key])
+          hash[id] = self.from_cache_value(resource_klass, context, hits[key])
         else
           hash[id] = nil
         end
       end
     end
 
-    def self.write(resource_klass, resource, serializer, serializer_config_key, context_key)
+    def self.from_cache_value(resource_klass, context, h)
+      new(
+        resource_klass,
+        h.fetch(:id),
+        h.fetch(:type),
+        context,
+        h.fetch(:fetchable),
+        h.fetch(:rels, nil),
+        h.fetch(:links, nil),
+        h.fetch(:attrs, nil),
+        h.fetch(:meta, nil)
+      )
+    end
+
+    def self.write(resource_klass, resource, serializer, serializer_config_key, context, context_key)
       (id, cache_key) = resource.cache_id
       json = serializer.object_hash(resource) # No inclusions passed to object_hash
       cr = self.new(
         resource_klass,
         json['id'],
         json['type'],
+        context,
         resource.fetchable_fields,
         json['relationships'],
         json['links'],
         json['attributes'],
         json['meta']