update deps to support 1.8.7

sinatra · May 15, 2015 · 2dc03c8 · 2dc03c8
1 parent 54a23c5
commit 2dc03c8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -2,14 +2,20 @@ source "https://rubygems.org" unless ENV['QUICK']
 gemspec
 
 gem 'sinatra', :github => 'sinatra/sinatra'
-gem 'temple', :github => 'zzak/temple', :branch => 'sinatra-contrib-bug'
+gem 'temple', :github => 'zzak/temple', :branch => '0-6-patched'
 
 group :development, :test do
   platform :ruby_18, :jruby do
     gem 'json'
+    gem 'rdoc'
   end
 
   platform :ruby do
+    gem 'execjs', '2.0.0'
+    gem 'nokogiri', '1.5.10'
+    gem 'redcarpet', '2.3.0'
+    gem 'slim', '2.1.0'
+    gem 'liquid', '2.6.1'
     gem 'yajl-ruby'
   end
 

diff --git a/lib/sinatra/respond_with.rb b/lib/sinatra/respond_with.rb
@@ -1,6 +1,8 @@
 require 'sinatra/json'
 require 'sinatra/base'
 
+$KCODE = "UTF-8"
+
 module Sinatra
   #
   # = Sinatra::RespondWith