Fix compatibility with --enable-frozen-string-literal (#2033)

Ever since Ruby 2.3 it has been possible to enable frozen string literals globally via `RUBYOPT`, and it is scheduled to be the default in Ruby 4. Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
sinatra · Jul 11, 2024 · 973c936 · 973c936
1 parent 319af3a
commit 973c936
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -108,6 +108,7 @@ jobs:
       rack_session: ${{ matrix.rack_session }}
       puma: ${{ matrix.puma }}
       tilt: ${{ matrix.tilt }}
+      RUBYOPT: "--enable-frozen-string-literal --debug-frozen-string-literal"
 
     steps:
     - name: Install dependencies

diff --git a/Gemfile b/Gemfile
@@ -49,7 +49,7 @@ gem 'rdiscount', platforms: [:ruby]
 gem 'rdoc'
 gem 'redcarpet', platforms: [:ruby]
 gem 'simplecov', require: false
-gem 'slim', '~> 4'
+gem 'slim', '~> 5'
 gem 'yajl-ruby', platforms: [:ruby]
 gem 'zeitwerk'
 

diff --git a/sinatra-contrib/lib/sinatra/capture.rb b/sinatra-contrib/lib/sinatra/capture.rb
@@ -92,7 +92,7 @@ def capture(*args, &block)
         with_haml_buffer(buffer) { capture_haml(*args, &block) }
       else
         buf_was = @_out_buf
-        @_out_buf = ''
+        @_out_buf = +''
         begin
           raw = block[*args]
           captured = block.binding.eval('@_out_buf')

diff --git a/sinatra-contrib/lib/sinatra/link_header.rb b/sinatra-contrib/lib/sinatra/link_header.rb
@@ -88,6 +88,8 @@ def link(*urls)
       http_pattern  = ['<%s>', *options].join ';'
       link          = (response['Link'] ||= '')
 
+      link = response['Link'] = +link
+
       urls.map do |url|
         link << "," unless link.empty?
         link << (http_pattern % url)

diff --git a/sinatra-contrib/lib/sinatra/runner.rb b/sinatra-contrib/lib/sinatra/runner.rb
@@ -92,7 +92,7 @@ def get_response(url)
     end
 
     def log
-      @log ||= ''
+      @log ||= +''
       loop { @log << pipe.read_nonblock(1) }
     rescue Exception
       @log

diff --git a/test/integration_helper.rb b/test/integration_helper.rb
@@ -46,7 +46,7 @@ def initialize(server, port, async)
     def run
       return unless installed?
       kill
-      @log     = ""
+      @log     = +""
       super
       at_exit { kill }
     end

diff --git a/test/routing_test.rb b/test/routing_test.rb
@@ -11,7 +11,7 @@ def to_pattern(*)
   end
 
   def params(input)
-    { "one" => "this", "two" => "is", "three" => "a", "four" => "test" }
+    { "one" => +"this", "two" => +"is", "three" => +"a", "four" => +"test" }
   end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ def to_pattern(*) @@
       end
       def params(input)
-        { "one" => "this", "two" => "is", "three" => "a", "four" => "test" }
+        { "one" => +"this", "two" => +"is", "three" => +"a", "four" => +"test" }
       end
     end
@@ Expand Down @@