Merge pull request #1160 from tdiary/support-rack-3-1

Support Rack 3.1
tdiary · Jan 16, 2025 · 1e36f03 · 1e36f03
2 parents 2306401 + b32774c
commit 1e36f03
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rack', "< 3.1"
+gem 'rack'
 gem 'rackup'
 gem 'hikidoc'
 gem 'fastimage'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -90,7 +90,7 @@ GEM
     power_assert (2.0.5)
     public_suffix (6.0.1)
     racc (1.8.1)
-    rack (3.0.11)
+    rack (3.1.8)
     rack-test (2.2.0)
       rack (>= 1.3)
     racksh (1.0.1)
@@ -175,7 +175,7 @@ DEPENDENCIES
   mime-types
   octokit
   pit
-  rack (< 3.1)
+  rack
   racksh
   rackup
   rake

diff --git a/lib/tdiary/dispatcher.rb b/lib/tdiary/dispatcher.rb
@@ -68,7 +68,7 @@ def update
 	private
 
 		def adopt_rack_request_to_plain_old_tdiary_style( env )
-			body = env["rack.input"].read
+			body = env["rack.input"]&.read || ""
 			env["rack.input"] = StringIO.new(body)
 			req = TDiary::Request.new( env )
 			req.params # fill params to tdiary_request

diff --git a/lib/tdiary/rack/static.rb b/lib/tdiary/rack/static.rb
@@ -1,11 +1,11 @@
-require 'rack/file'
+require 'rack/files'
 
 module TDiary
 	module Rack
 		class Static
 			def initialize( app, base_dir )
 				@app = app
-				@file = base_dir.map{|dir| ::Rack::File.new(dir) }
+				@file = base_dir.map{|dir| ::Rack::Files.new(dir) }
 			end
 
 			def call( env )

diff --git a/lib/tdiary/tasks/jasmine.rake b/lib/tdiary/tasks/jasmine.rake
@@ -1,4 +1,5 @@
 begin
+	require_relative "../../rack/server"
 	require 'jasmine'
 	load 'jasmine/tasks/jasmine.rake'
 rescue LoadError