From 628fd15f9374cb8f3922682b1351c185393faa7d Mon Sep 17 00:00:00 2001 From: Dominique d'Argent Date: Fri, 4 Jul 2014 12:00:38 +0200 Subject: [PATCH 1/3] Fix compatibility with Rails 4.1 by forward-porting a require statement to load FileSystemResolver * Fixes #44 * I've transplanted this commit from netzpirat/haml_coffee_assets@7167b263e9bf852b2c63906752cb521f2ec89fc7 * This fixes mobylette-3.5/lib/mobylette/resolvers/chained_fallback_resolver.rb:3:in `': uninitialized constant ActionView::FileSystemResolver (NameError) * For more details, see rails @ 3fbff78 (rails/rails@3fbff78#diff-90f6f2b6859f5da65e11631ebcdf3f09) --- lib/mobylette/resolvers/chained_fallback_resolver.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/mobylette/resolvers/chained_fallback_resolver.rb b/lib/mobylette/resolvers/chained_fallback_resolver.rb index 24cca05..44fd0bb 100644 --- a/lib/mobylette/resolvers/chained_fallback_resolver.rb +++ b/lib/mobylette/resolvers/chained_fallback_resolver.rb @@ -1,3 +1,6 @@ +require 'action_view' +require 'action_view/template/resolver' + module Mobylette module Resolvers class ChainedFallbackResolver < ::ActionView::FileSystemResolver From 11a24251c1dd0ec91e5e6531a53847784c76a947 Mon Sep 17 00:00:00 2001 From: Maximilian Szengel Date: Thu, 9 Feb 2017 13:15:09 +0100 Subject: [PATCH 2/3] Fix rails compatiblity --- lib/mobylette/resolvers/chained_fallback_resolver.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/mobylette/resolvers/chained_fallback_resolver.rb b/lib/mobylette/resolvers/chained_fallback_resolver.rb index 44fd0bb..5d7e261 100644 --- a/lib/mobylette/resolvers/chained_fallback_resolver.rb +++ b/lib/mobylette/resolvers/chained_fallback_resolver.rb @@ -27,9 +27,9 @@ def initialize(formats = {}, view_paths = ['app/views']) # ... # } # - # It will add the fallback chain array of the + # It will add the fallback chain array of the # request.format to the resolver. - # + # # If the format.request is not defined in formats, # it will behave as a normal FileSystemResovler. # @@ -42,11 +42,11 @@ 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]) + details[:formats] = Array.wrap(@fallback_formats[details[:formats].first]) end super(name, prefix, partial, details) end From ced170e7957772904d9d60114afe14062808ef68 Mon Sep 17 00:00:00 2001 From: Maximilian Szengel Date: Thu, 23 Mar 2017 16:00:34 +0100 Subject: [PATCH 3/3] Fix deprecation warning --- lib/mobylette/respond_to_mobile_requests.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/mobylette/respond_to_mobile_requests.rb b/lib/mobylette/respond_to_mobile_requests.rb index a47ece6..3f99aa1 100644 --- a/lib/mobylette/respond_to_mobile_requests.rb +++ b/lib/mobylette/respond_to_mobile_requests.rb @@ -33,7 +33,7 @@ module RespondToMobileRequests helper_method :is_mobile_view? helper_method :request_device? - before_filter :handle_mobile + before_action :handle_mobile cattr_accessor :mobylette_options @@mobylette_options = Hash.new @@ -101,7 +101,7 @@ def mobylette_config # Private: Configures how the resolver shall handle fallbacks. # - # if options has a :fallback_chains key, it will use it + # if options has a :fallback_chains key, it will use it # as the fallback rules for the resolver, the format should # be a hash, where each key defines a array of formats. # Example: @@ -213,7 +213,7 @@ def set_mobile_format return device if request_device?(device) end end - :mobile + :mobile end end