From e0a695453a5ea95d911efc632552956de8b84891 Mon Sep 17 00:00:00 2001 From: Masayuki Morita Date: Tue, 1 Mar 2016 16:34:34 +0900 Subject: [PATCH 1/2] Adjust the arguments of find_templates() for Rails 4.2.5.2, 4.1.14.2 and 3.2.22.2 Rails 4.2.5.2, 4.1.14.2 and 3.2.22.2 have been released and these include a break change for find_templates(). This patch adjusts the arguments of find_templates(). refs: http://weblog.rubyonrails.org/2016/2/29/Rails-4-2-5-2-4-1-14-2-3-2-22-2-have-been-released/ --- lib/mobylette/resolvers/chained_fallback_resolver.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mobylette/resolvers/chained_fallback_resolver.rb b/lib/mobylette/resolvers/chained_fallback_resolver.rb index 24cca05..1ded722 100644 --- a/lib/mobylette/resolvers/chained_fallback_resolver.rb +++ b/lib/mobylette/resolvers/chained_fallback_resolver.rb @@ -39,13 +39,13 @@ def replace_fallback_formats_chain(formats) # Private: finds the right template on the filesystem, # using fallback if needed # - def find_templates(name, prefix, partial, details) + def find_templates(name, prefix, partial, details, outside_app_allowed = false) # checks if the format has a fallback chain if @fallback_formats.has_key?(details[:formats].first) details = details.dup details[:formats] = Array.wrap(@fallback_formats[details[:formats].first]) end - super(name, prefix, partial, details) + super(name, prefix, partial, details, outside_app_allowed) end # Helper for building query glob string based on resolver's pattern. From fb68a6055a92a671a9188e664f17e998a123c55b Mon Sep 17 00:00:00 2001 From: Masayuki Morita Date: Sat, 5 Mar 2016 15:07:49 +0900 Subject: [PATCH 2/2] Consider the backward compatibility with older Rails --- lib/mobylette/resolvers/chained_fallback_resolver.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/mobylette/resolvers/chained_fallback_resolver.rb b/lib/mobylette/resolvers/chained_fallback_resolver.rb index 1ded722..de55221 100644 --- a/lib/mobylette/resolvers/chained_fallback_resolver.rb +++ b/lib/mobylette/resolvers/chained_fallback_resolver.rb @@ -39,13 +39,19 @@ def replace_fallback_formats_chain(formats) # Private: finds the right template on the filesystem, # using fallback if needed # - def find_templates(name, prefix, partial, details, outside_app_allowed = false) + def find_templates(name, prefix, partial, details, outside_app_allowed = nil) # checks if the format has a fallback chain if @fallback_formats.has_key?(details[:formats].first) details = details.dup details[:formats] = Array.wrap(@fallback_formats[details[:formats].first]) end - super(name, prefix, partial, details, outside_app_allowed) + + if outside_app_allowed.nil? + # Consider the backward compatibility with older Rails + super(name, prefix, partial, details) + else + super(name, prefix, partial, details, outside_app_allowed) + end end # Helper for building query glob string based on resolver's pattern.