mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 16:35:48 +00:00
ae871c4d46
* Make Array-creation behavior of Paginable more predictable Paginable.paginate_by_id usually returns ActiveRecord::Relation, but it returns an Array if min_id option is present. The behavior caused problems fixed with the following commits: -552e886b64-b63ede5005-64ef37b89dTo prevent from recurring similar problems, this commit introduces two changes: - The scope now always returns an Array whether min_id option is present or not. - The scope is renamed to to_a_paginated_by_id to clarify it returns an Array. * Transform Paginable.to_a_paginated_by_id from a scope to a class method https://api.rubyonrails.org/classes/ActiveRecord/Scoping/Named/ClassMethods.html#method-i-scope > The method is intended to return an ActiveRecord::Relation object, which > is composable with other scopes. Paginable.to_a_paginated_by_id returns an Array and is not appropriate as a scope.
55 lines
2 KiB
Ruby
55 lines
2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module CacheConcern
|
|
extend ActiveSupport::Concern
|
|
|
|
def render_with_cache(**options)
|
|
raise ArgumentError, 'only JSON render calls are supported' unless options.key?(:json) || block_given?
|
|
|
|
key = options.delete(:key) || [[params[:controller], params[:action]].join('/'), options[:json].respond_to?(:cache_key) ? options[:json].cache_key : nil, options[:fields].nil? ? nil : options[:fields].join(',')].compact.join(':')
|
|
expires_in = options.delete(:expires_in) || 3.minutes
|
|
body = Rails.cache.read(key, raw: true)
|
|
|
|
if body
|
|
render(options.except(:json, :serializer, :each_serializer, :adapter, :fields).merge(json: body))
|
|
else
|
|
if block_given?
|
|
options[:json] = yield
|
|
elsif options[:json].is_a?(Symbol)
|
|
options[:json] = send(options[:json])
|
|
end
|
|
|
|
render(options)
|
|
Rails.cache.write(key, response.body, expires_in: expires_in, raw: true)
|
|
end
|
|
end
|
|
|
|
def set_cache_headers
|
|
response.headers['Vary'] = public_fetch_mode? ? 'Accept' : 'Accept, Signature'
|
|
end
|
|
|
|
def cache_collection(raw, klass)
|
|
return raw unless klass.respond_to?(:with_includes)
|
|
|
|
raw = raw.cache_ids.to_a if raw.is_a?(ActiveRecord::Relation)
|
|
cached_keys_with_value = Rails.cache.read_multi(*raw).transform_keys(&:id)
|
|
uncached_ids = raw.map(&:id) - cached_keys_with_value.keys
|
|
|
|
klass.reload_stale_associations!(cached_keys_with_value.values) if klass.respond_to?(:reload_stale_associations!)
|
|
|
|
unless uncached_ids.empty?
|
|
uncached = klass.where(id: uncached_ids).with_includes.each_with_object({}) { |item, h| h[item.id] = item }
|
|
|
|
uncached.each_value do |item|
|
|
Rails.cache.write(item, item)
|
|
end
|
|
end
|
|
|
|
raw.map { |item| cached_keys_with_value[item.id] || uncached[item.id] }.compact
|
|
end
|
|
|
|
def cache_collection_paginated_by_id(raw, klass, limit, options)
|
|
cache_collection raw.cache_ids.to_a_paginated_by_id(limit, options), klass
|
|
end
|
|
end
|