Merge remote-tracking branch 'upstream/main'

Author: evanlok

.github/workflows/ci.yml

@@ -6,21 +6,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.1', '3.2', '3.3', 'head' ]
+        ruby: [ '3.1', '3.2', 'head' ]
         rails: [ '7.1', 'edge' ]
+        rubyopt: [""]
         include:
-          - ruby: '2.7'
-            rails: '6.1'
-          - ruby: '3.0'
-            rails: '6.1'
+          - ruby: '3.3'
+            rails: '7.1'
+            rubyopt: "--enable-frozen-string-literal"
+        exclude:
           - ruby: '3.1'
-            rails: '7.0'
+            rails: 'edge'
+            rubyopt: ''
 
     env:
       RAILS_VERSION: ${{ matrix.rails }}
+      RUBYOPT: ${{ matrix.rubyopt }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
@@ -29,10 +32,10 @@ jobs:
           bundler-cache: true
 
       - name: Run unit tests
-        run: bundle exec rake test:unit
+        run: bundle exec rake test:unit RUBYOPT="${{ matrix.rubyopt }}"
         timeout-minutes: 3
 
       - name: Run acceptance tests
-        run: bundle exec rake test:acceptance
+        run: bundle exec rake test:acceptance RUBYOPT="${{ matrix.rubyopt }}"
         timeout-minutes: 10
         if: ${{ matrix.rails != 'edge' && matrix.ruby != 'head' }} # Acceptance tests use `gem install rails && rails new`

CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Next Release
 
+## 4.3.0
+
+* Fix reloading issue in Ruby 3.3.
+* Fixed compatibility with `--enable-frozen-string-literal`.
+* Add embeded engines to default reload matcher.
+
 ## 4.2.1
 
 * Added `Spring.connect_timeout` and `Spring.boot_timeout` to allow to increase timeout for larger apps.

lib/spring/application_manager.rb

@@ -126,7 +126,8 @@ def start_wait_thread(pid, child)
         # as if it does we're no longer interested in the child
         loop do
           IO.select([child])
-          break if child.recv(1, Socket::MSG_PEEK).empty?
+          peek = child.recv(1, Socket::MSG_PEEK)
+          break if peek.nil? || peek.empty?
           sleep 0.01
         end
 

lib/spring/json.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 # ### WHY SPRING VENDORS A JSON LIBRARY ###
 #
@@ -13,7 +13,6 @@
 module Spring
   module JSON
     def self.load(string)
-      string.force_encoding("utf-8")
       OkJson.decode(string)
     end
 
@@ -364,7 +363,7 @@ def unquote(q)
             end
           end
           if rubydoesenc?
-            a[w] = '' << uchar
+            a[w] = +'' << uchar
             w += 1
           else
             w += ucharenc(a, w, uchar)

lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "4.2.1"
+  VERSION = "4.3.0"
 end

test/support/acceptance_test.rb

@@ -12,9 +12,9 @@ class AcceptanceTest < ActiveSupport::TestCase
 
       def rails_version
         if ENV['RAILS_VERSION'] == "edge"
-          ">= 7.1.0.alpha"
+          ">= 8.0.0.alpha"
         else
-          "~> #{ENV['RAILS_VERSION'] || "6.1"}.0"
+          "~> #{ENV['RAILS_VERSION'] || "7.1"}.0"
         end
       end
 
@@ -189,7 +189,7 @@ def self.omg
         app.insert_into_test "Foo.omg"
 
         app.await_reload
-        assert_failure app.spring_test_command, stdout: "RuntimeError: omg"
+        assert_failure app.spring_test_command, stdout: "RuntimeError: omg", log: /child \d+ shutdown/
       end
 
       test "app gets reloaded even with a ton of boot output" do

test/support/application.rb

@@ -168,15 +168,15 @@ def read_streams
       end
 
       def read_stream(stream)
-        output = ""
+        output = +""
         while IO.select([stream], [], [], 0.5) && !stream.eof?
           output << stream.readpartial(10240)
         end
         output
       end
 
       def dump_streams(command, streams)
-        output = "$ #{command}\n"
+        output = +"$ #{command}\n"
 
         streams.each do |name, stream|
           unless stream.chomp.empty?

test/unit/json_test.rb

@@ -0,0 +1,12 @@
+require_relative "../helper"
+require 'spring/json'
+
+class JsonTest < ActiveSupport::TestCase
+  test 'can decode unicode characters' do
+    assert_equal({"unicode_example"=>"©"}, Spring::JSON.load('{"unicode_example": "\u00A9"}'))
+  end
+
+  test 'can encode' do
+    assert_equal('{}', Spring::JSON.dump({}))
+  end 
+end