kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

Deprecate tilt 1.x support for sinatra-contrib

Browse source
This commit is contained in:
Vasiliy Yakliushin 2019-05-01 12:19:44 +02:00
parent 9f6c262591
commit c4ec8837cb
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sinatra-contrib/lib/sinatra/respond_with.rb
View file

@ -173,16 +173,12 @@ module Sinatra
settings.template_engines[ext].each { |e| possible << [e, name] } settings.template_engines[ext].each { |e| possible << [e, name] }
end end
possible.each do |engine, template| possible.each do |engine, template|
# not exactly like Tilt[engine], but does not trigger a require begin
if Tilt.respond_to?(:mappings) klass = Tilt[engine]
klass = Tilt.mappings[Tilt.normalize(engine)].first rescue LoadError
else next
begin
klass = Tilt[engine]
rescue LoadError
next
end
end end
find_template(settings.views, template, klass) do |file| find_template(settings.views, template, klass) do |file|
next unless File.exist? file next unless File.exist? file
return settings.rendering_method(engine) << template.to_sym return settings.rendering_method(engine) << template.to_sym

2
sinatra-contrib/sinatra-contrib.gemspec
View file

@ -39,7 +39,7 @@ EOF
s.add_dependency "sinatra", version s.add_dependency "sinatra", version
s.add_dependency "mustermann", "~> 1.0" s.add_dependency "mustermann", "~> 1.0"
s.add_dependency "backports", ">= 2.8.2" s.add_dependency "backports", ">= 2.8.2"
s.add_dependency "tilt", ">= 1.3", "< 3" s.add_dependency "tilt", "~> 2.0"
s.add_dependency "rack-protection", version s.add_dependency "rack-protection", version
s.add_dependency "multi_json" s.add_dependency "multi_json"