sinatra · twalpole · Mar 6, 2016 · zzak · Apr 13, 2016 · zzak
diff --git a/examples/chat.rb b/examples/chat.rb
@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby -I ../lib -I lib
 # coding: utf-8
+# frozen_string_literal: true
 require 'sinatra'
 set :server, 'thin'
 connections = []

diff --git a/examples/simple.rb b/examples/simple.rb
@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby -I ../lib -I lib
+# frozen_string_literal: true
 require 'sinatra'
 get('/') { 'this is a simple app' }
diff --git a/lib/sinatra.rb b/lib/sinatra.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'sinatra/main'
 
 enable :inline_templates
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -348,7 +348,7 @@ def attachment(filename = nil, disposition = :attachment)
       response['Content-Disposition'] = disposition.to_s
       if filename
         params = '; filename="%s"' % File.basename(filename)
-        response['Content-Disposition'] << params
+        response['Content-Disposition'] += params
         ext = File.extname(filename)
         content_type(ext) unless response['Content-Type'] or ext.empty?
       end
@@ -842,6 +842,7 @@ def compile_template(engine, data, options, views)
           body, path, line = settings.templates[data]
           if body
             body = body.call if body.respond_to?(:call)
+            body = body.dup if body.frozen?
             template.new(path, line.to_i, options) { body }
           else
             found = false
@@ -857,7 +858,12 @@ def compile_template(engine, data, options, views)
             template.new(path, 1, options)
           end
         when Proc, String
-          body = data.is_a?(String) ? Proc.new { data } : data
+          body = if data.is_a?(String)
+            data = data.dup if data.frozen?
+            Proc.new { data }
+          else
+            data
+          end
           path, line = settings.caller_locations.first
           template.new(path, line.to_i, options, &body)
         else

diff --git a/lib/sinatra/main.rb b/lib/sinatra/main.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'sinatra/base'
 
 module Sinatra

diff --git a/lib/sinatra/version.rb b/lib/sinatra/version.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sinatra
   VERSION = '2.0.0-alpha'
 end
diff --git a/test/asciidoctor_test.rb b/test/asciidoctor_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/base_test.rb b/test/base_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 class BaseTest < Minitest::Test

diff --git a/test/builder_test.rb b/test/builder_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/coffee_test.rb b/test/coffee_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/compile_test.rb b/test/compile_test.rb
@@ -1,4 +1,5 @@
 # I like coding: UTF-8
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 class CompileTest < Minitest::Test

diff --git a/test/contest.rb b/test/contest.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2009 Damian Janowski and Michel Martens for Citrusbyte
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/test/creole_test.rb b/test/creole_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/delegator_test.rb b/test/delegator_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 class DelegatorTest < Minitest::Test

diff --git a/test/encoding_test.rb b/test/encoding_test.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 require 'erb'
 

diff --git a/test/erb_test.rb b/test/erb_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 class ERBTest < Minitest::Test

diff --git a/test/extensions_test.rb b/test/extensions_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 class ExtensionsTest < Minitest::Test

diff --git a/test/filter_test.rb b/test/filter_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 class BeforeFilterTest < Minitest::Test

diff --git a/test/haml_test.rb b/test/haml_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/helper.rb b/test/helper.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ENV['RACK_ENV'] = 'test'
 Encoding.default_external = "UTF-8" if defined? Encoding
 

diff --git a/test/helpers_test.rb b/test/helpers_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 require 'date'
 require 'json'

diff --git a/test/integration/app.rb b/test/integration/app.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 $stderr.puts "loading"
 require 'sinatra'
 

diff --git a/test/integration_helper.rb b/test/integration_helper.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'sinatra/base'
 require 'rbconfig'
 require 'open-uri'

diff --git a/test/integration_test.rb b/test/integration_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 require File.expand_path('../integration_helper', __FILE__)
 

diff --git a/test/less_test.rb b/test/less_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/liquid_test.rb b/test/liquid_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/mapped_error_test.rb b/test/mapped_error_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 class FooError < RuntimeError

diff --git a/test/markaby_test.rb b/test/markaby_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/markdown_test.rb b/test/markdown_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 MarkdownTest = proc do

diff --git a/test/mediawiki_test.rb b/test/mediawiki_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/middleware_test.rb b/test/middleware_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 class MiddlewareTest < Minitest::Test

diff --git a/test/nokogiri_test.rb b/test/nokogiri_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/rabl_test.rb b/test/rabl_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/rack_test.rb b/test/rack_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 require 'rack'
 

diff --git a/test/radius_test.rb b/test/radius_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/rdoc_test.rb b/test/rdoc_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/readme_test.rb b/test/readme_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Tests to check if all the README examples work.
 require File.expand_path('../helper', __FILE__)
 

diff --git a/test/request_test.rb b/test/request_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 require 'stringio'
 

diff --git a/test/response_test.rb b/test/response_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require File.expand_path('../helper', __FILE__)
 

diff --git a/test/result_test.rb b/test/result_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 class ResultTest < Minitest::Test

diff --git a/test/route_added_hook_test.rb b/test/route_added_hook_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 module RouteAddedTest

diff --git a/test/routing_test.rb b/test/routing_test.rb
@@ -1,4 +1,5 @@
 # I like coding: UTF-8
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 # Helper method for easy route pattern matching testing

diff --git a/test/sass_test.rb b/test/sass_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/scss_test.rb b/test/scss_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/server_test.rb b/test/server_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 require 'stringio'
 

diff --git a/test/settings_test.rb b/test/settings_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 class SettingsTest < Minitest::Test

diff --git a/test/sinatra_test.rb b/test/sinatra_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 class SinatraTest < Minitest::Test

diff --git a/test/slim_test.rb b/test/slim_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/static_test.rb b/test/static_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 class StaticTest < Minitest::Test

diff --git a/test/streaming_test.rb b/test/streaming_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 class StreamingTest < Minitest::Test

diff --git a/test/stylus_test.rb b/test/stylus_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/templates_test.rb b/test/templates_test.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 File.delete(File.dirname(__FILE__) + '/views/layout.test') rescue nil
 

diff --git a/test/textile_test.rb b/test/textile_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/views/ascii.erb b/test/views/ascii.erb
@@ -1,2 +1,3 @@
+<%# frozen_string_literal: true %>
 This file has no unicode in it!
 <%= value %>
diff --git a/test/views/calc.html.erb b/test/views/calc.html.erb
@@ -1 +1,2 @@
-<%= 1 + 1 %>
+<%# frozen_string_literal: true %>
+<%= 1 + 1 %>
diff --git a/test/views/error.erb b/test/views/error.erb
@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 Hello <%= 'World' %>
 <% raise 'Goodbye' unless defined?(french) && french %>
 <% raise 'Au revoir' if defined?(french) && french %>
diff --git a/test/views/error.haml b/test/views/error.haml
@@ -1,3 +1,4 @@
+-# frozen_string_literal: true
 %h1 Hello From Haml
 = raise 'goodbye' unless defined?(french) && french
 = raise 'au revoir' if defined?(french) && french
diff --git a/test/views/hello.erb b/test/views/hello.erb
@@ -1 +1,2 @@
+<%# frozen_string_literal: true %>
 Hello <%= 'World' %>
diff --git a/test/views/hello.haml b/test/views/hello.haml
@@ -1 +1,2 @@
+-# frozen_string_literal: true
 %h1 Hello From Haml
diff --git a/test/views/layout2.erb b/test/views/layout2.erb
@@ -1,2 +1,3 @@
+<%# frozen_string_literal: true %>
 ERB Layout!
 <%= yield %>
diff --git a/test/views/layout2.haml b/test/views/layout2.haml
@@ -1,2 +1,3 @@
+-# frozen_string_literal: true
 %h1 HAML Layout!
 %p= yield
diff --git a/test/views/utf8.erb b/test/views/utf8.erb
@@ -1,2 +1,3 @@
+<%# frozen_string_literal: true %>
 <h1><%= value %></h1>
 Ingen vill veta var du köpt din tröja.
diff --git a/test/wlang_test.rb b/test/wlang_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin

diff --git a/test/yajl_test.rb b/test/yajl_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../helper', __FILE__)
 
 begin