Fix using rack v3

.github/workflows/ci.yml

@@ -10,14 +10,14 @@ jobs:
   protoc:
     runs-on: ubuntu-latest
     steps:
-      - uses: arduino/setup-protoc@v1
+      - uses: arduino/setup-protoc@v3
         with:
-          version: '3.x'
+          version: '29.3'
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: ^1.16
-      - run: go install google.golang.org/protobuf/cmd/protoc-gen-go
+          go-version: 1.24.1
+      - run: go install google.golang.org/protobuf/cmd/protoc-gen-go@1.36.5
       - run: protoc -I=. --go_out=pb --go_opt=paths=source_relative --ruby_out=ruby/lib/umbra/pb ./umbra.proto
       - run: git add . && git diff --staged --exit-code
 

README.md

@@ -41,13 +41,13 @@ A minimal rack application using `umbra` would look like this:
 ```ruby
 # /config.ru
 require 'rack'
-require 'rack/lobster'
+require 'rackup/lobster'
 require 'umbra'
 
 Umbra.configure
 
 use Umbra::Middleware
-run Rack::Lobster.new
+run Rackup::Lobster.new
 
 ```
 

ruby/config.ru

@@ -2,12 +2,12 @@ lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require "rack"
-require "rack/lobster"
+require "rackup/lobster"
 require "puma"
 require "umbra"
 require "pry"
 
 Umbra.configure
 
 use Umbra::Middleware
-run Rack::Lobster.new
+run Rackup::Lobster.new

ruby/lib/umbra.rb

@@ -59,6 +59,8 @@ def reset!
     private
 
     def request_body(env)
+      return nil unless env.key?("rack.input")
+
       io = env.fetch("rack.input")
       io.rewind
       body = io.read

ruby/lib/umbra/config.rb

@@ -1,3 +1,5 @@
+require "logger"
+
 module Umbra
   class Config
     attr_accessor :publisher, :request_selector, :encoder, :error_handler, :redis_options, :logger

ruby/lib/umbra/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Umbra
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

ruby/spec/integration_spec.rb

@@ -7,7 +7,7 @@
     allow(Umbra).to receive(:redis).and_return(redis)
   end
 
-  let(:app) { Rack::Builder.parse_file("config.ru").first }
+  let(:app) { Rack::Builder.parse_file("config.ru") }
   let(:redis) do
     Class.new {
       attr_reader :messages
@@ -39,7 +39,7 @@ def publish(channel, message)
     expect(redis.messages.count).to eq(1)
   end
 
-  fit "publishes the expected protobuf message" do
+  it "publishes the expected protobuf message" do
     post "/", "request-body"
 
     sleep(0.1)

ruby/umbra-rb.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rackup", ">=2", "< 3"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "puma"