From 0d56f1f90f29340b75cc399c5c080d7c9973294a Mon Sep 17 00:00:00 2001 From: Vipul A M Date: Sun, 21 Jul 2013 03:16:32 +0530 Subject: [PATCH] change `.` indentation to fix jruby syntax error --- lib/sinatra/base.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb index e200121a..69058781 100644 --- a/lib/sinatra/base.rb +++ b/lib/sinatra/base.rb @@ -22,8 +22,8 @@ module Sinatra # Returns an array of acceptable media types for the response def accept @env['sinatra.accept'] ||= begin - @env['HTTP_ACCEPT'].to_s.scan(HEADER_VALUE_WITH_PARAMS) - .map! { |e| AcceptEntry.new(e) }.sort + @env['HTTP_ACCEPT'].to_s.scan(HEADER_VALUE_WITH_PARAMS). + map! { |e| AcceptEntry.new(e) }.sort end end @@ -804,8 +804,8 @@ module Sinatra # render layout if layout - options.merge!(:views => views, :layout => false, :eat_errors => eat_errors, :scope => scope) - .merge!(layout_options) + options.merge!(:views => views, :layout => false, :eat_errors => eat_errors, :scope => scope). + merge!(layout_options) catch(:layout_missing) { return render(layout_engine, layout, options, locals) { output } } end