Merge branch 'master' into jakarta-update

Author: chadlwilson

.github/workflows/maven.yml

@@ -32,10 +32,10 @@ jobs:
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     - name: Set up JDK
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'temurin'
@@ -83,10 +83,10 @@ jobs:
       JRUBY_VERSION: ${{ matrix.jruby_version }}
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set up JDK
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           java-version: ${{ matrix.java_version }}
           distribution: 'temurin'

History.md

@@ -23,7 +23,11 @@
 - Change context listener to throw, in case of an exception during initialization, by default
 - Change rails context listener to assume a thread-safe application by default
 
-## 1.2.5 (UNRELEASED)
+## 1.2.6 (UNRELEASED)
+
+- Add missing block-only signature for debug logging
+
+## 1.2.5
 
 - Fix use of jruby-rack under Java 8 (#324)
 - Fix deprecated usages of JRuby runtime

examples/camping/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/jruby/warbler.git
-  revision: f10ed60aefe3bf498917bfd18de780fb7d240f65
+  revision: 523237b6d931efcd6f13a79692f6aa46ad997443
   branch: master
   specs:
     warbler (2.0.5)
@@ -9,7 +9,7 @@ GIT
       ostruct (= 0.6.2)
       rake (>= 13.0.3)
       rexml (~> 3.0)
-      rubyzip (>= 1.0.0)
+      rubyzip (>= 3.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +19,7 @@ GEM
       mab (>= 0.0.3)
       rack (>= 1.0)
     jruby-jars (9.4.14.0)
-    jruby-rack (1.2.3)
+    jruby-rack (1.2.5)
     mab (0.0.3)
     markaby (0.9.4)
       builder
@@ -29,8 +29,8 @@ GEM
       rack (< 3)
       webrick
     rake (13.3.0)
-    rexml (3.4.1)
-    rubyzip (2.4.1)
+    rexml (3.4.3)
+    rubyzip (3.1.0)
     webrick (1.9.1)
 
 PLATFORMS

examples/rails7/Gemfile.lock

@@ -74,11 +74,11 @@ GEM
       tzinfo (~> 2.0, >= 2.0.5)
     base64 (0.3.0)
     benchmark (0.4.1)
-    bigdecimal (3.2.2-java)
+    bigdecimal (3.2.3-java)
     builder (3.3.0)
     cgi (0.5.0-java)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
     crass (1.0.6)
     date (3.4.1-java)
     drb (2.2.3)
@@ -108,7 +108,7 @@ GEM
     marcel (1.0.4)
     mini_mime (1.1.5)
     minitest (5.25.5)
-    net-imap (0.5.9)
+    net-imap (0.5.10)
       date
       net-protocol
     net-pop (0.1.2)

examples/sinatra/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     base64 (0.3.0)
     jruby-jars (9.4.14.0)
-    jruby-rack (1.2.4)
+    jruby-rack (1.2.5)
     mustermann (3.0.4)
       ruby2_keywords (~> 0.0.1)
     rack (2.2.17)

pom.xml

@@ -283,7 +283,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>versions-maven-plugin</artifactId>
-        <version>2.18.0</version>
+        <version>2.19.0</version>
         <configuration>
           <ignoredVersions>.*-(alpha|beta|M)[-0-9]+</ignoredVersions>
         </configuration>

src/main/java/org/jruby/rack/ext/Logger.java

@@ -242,6 +242,11 @@ public IRubyObject debug(final ThreadContext context,
         return context.runtime.newBoolean( add(DEBUG, context, msg, block) );
     }
 
+    @JRubyMethod(name = "debug")
+    public IRubyObject debug(final ThreadContext context, final Block block) {
+        return debug(context, context.nil, block);
+    }
+
     //
     // :call-seq:
     // info(message)

src/spec/ruby/jruby/rack/logger_spec.rb

@@ -86,6 +86,26 @@
     expect(logger.warn?).to be true
   end
 
+  [:debug, :info, :warn, :error, :fatal].each do |level|
+    it "logs at #{level} level" do
+      logger.public_send(level, 'message')
+      expect(real_logger.logged_content).to eql "#{level.to_s.upcase}: message\n"
+
+      real_logger.reset
+      logger.public_send(level, 'message') { 'ignored' }
+      expect(real_logger.logged_content).to eql "#{level.to_s.upcase}: message\n"
+
+      real_logger.reset
+      logger.public_send(level, nil) { 'message' }
+      expect(real_logger.logged_content).to eql "#{level.to_s.upcase}: message\n"
+
+
+      real_logger.reset
+      logger.public_send(level) { 'message' }
+      expect(real_logger.logged_content).to eql "#{level.to_s.upcase}: message\n"
+    end
+  end
+
   it "disables real logger's formatting when formatter is set" do
     real_logger.formatting = true
     expect(real_logger.formatting?).to be true