From 4b77084a178665c3732ee7251d15cf18ed2fea6c Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Mon, 16 Apr 2018 13:35:57 -0400 Subject: [PATCH] Use ActiveSupport's try as some versions of backports have wrong implementation --- sinatra-contrib/lib/sinatra/capture.rb | 2 +- sinatra-contrib/sinatra-contrib.gemspec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sinatra-contrib/lib/sinatra/capture.rb b/sinatra-contrib/lib/sinatra/capture.rb index e219a931..ea2f44ab 100644 --- a/sinatra-contrib/lib/sinatra/capture.rb +++ b/sinatra-contrib/lib/sinatra/capture.rb @@ -1,6 +1,6 @@ require 'sinatra/base' require 'sinatra/engine_tracking' -require 'backports' +require 'active_support/core_ext/object/try.rb' module Sinatra # diff --git a/sinatra-contrib/sinatra-contrib.gemspec b/sinatra-contrib/sinatra-contrib.gemspec index ad34754c..f66eebf3 100644 --- a/sinatra-contrib/sinatra-contrib.gemspec +++ b/sinatra-contrib/sinatra-contrib.gemspec @@ -24,6 +24,7 @@ Gem::Specification.new do |s| s.add_dependency "sinatra", version s.add_dependency "mustermann", "~> 1.0" s.add_dependency "backports", "~> 2.8.2" + s.add_dependency "activesupport", ">= 4.0.0" s.add_dependency "tilt", ">= 1.3", "< 3" s.add_dependency "rack-protection", version s.add_dependency "multi_json"