Skip to content

Commit ac93df6

Browse files
committedOct 27, 2014
out_buf is saved by slim/temple now
1 parent 4329f41 commit ac93df6

File tree

3 files changed

+12
-32
lines changed

3 files changed

+12
-32
lines changed
 

‎Gemfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
source 'https://rubygems.org'
22
gem 'thin'
33
gem 'sinatra', '~> 1.4.5'
4-
gem 'slim', github: 'slim-template/slim'
5-
gem 'temple', github: 'judofyr/temple'
4+
gem 'slim'

‎Gemfile.lock

+9-20
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
GIT
2-
remote: git://github.com/judofyr/temple.git
3-
revision: df3edcbc46cd7cd77d7d8439894abdffc08f5ccd
4-
specs:
5-
temple (0.6.8)
6-
7-
GIT
8-
remote: git://github.com/slim-template/slim.git
9-
revision: 26758c571ed79d379c46566cc2739caa2142b217
10-
specs:
11-
slim (2.0.3)
12-
temple (~> 0.6.6)
13-
tilt (>= 1.3.3, < 2.1)
14-
151
GEM
162
remote: https://rubygems.org/
173
specs:
@@ -24,17 +10,20 @@ GEM
2410
rack (~> 1.4)
2511
rack-protection (~> 1.4)
2612
tilt (~> 1.3, >= 1.3.4)
27-
thin (1.6.2)
28-
daemons (>= 1.0.9)
29-
eventmachine (>= 1.0.0)
30-
rack (>= 1.0.0)
13+
slim (2.1.0)
14+
temple (~> 0.6.9)
15+
tilt (>= 1.3.3, < 2.1)
16+
temple (0.6.10)
17+
thin (1.6.3)
18+
daemons (~> 1.0, >= 1.0.9)
19+
eventmachine (~> 1.0)
20+
rack (~> 1.0)
3121
tilt (1.4.1)
3222

3323
PLATFORMS
3424
ruby
3525

3626
DEPENDENCIES
3727
sinatra (~> 1.4.5)
38-
slim!
39-
temple!
28+
slim
4029
thin

‎app.rb

+2-10
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,8 @@ def render(engine, template, options = {}, locals = {}, &block)
2020
# so we also support the :stream option.
2121
options[:streaming] ||= options.delete(:stream)
2222

23-
# We are not streaming. Call super implementation and
24-
# just ensure that the @_out_buf is restored afterwards.
25-
unless options[:streaming]
26-
old = @_out_buf
27-
begin
28-
return super
29-
ensure
30-
@_out_buf = old
31-
end
32-
end
23+
# We are not streaming. Call super implementation
24+
return super unless options[:streaming]
3325

3426
# Engine specific stuff, currently only :slim
3527
case engine

0 commit comments

Comments
 (0)
Please sign in to comment.