Fix rubocop linter

Add pstore gem for Ruby 4.0 compatibility

Add logger and ostruct gems for Ruby 4.0 compatibility

Author: patrick204nqh

Gemfile

@@ -27,3 +27,9 @@ end
 if RUBY_VERSION >= '3.4'
   gem 'mutex_m' # TODO: remove this once as-notifications has such a dependency
 end
+
+if RUBY_VERSION >= '4.0'
+  gem 'pstore'
+  gem 'logger'
+  gem 'ostruct'
+end

examples/logging.rb

@@ -34,7 +34,7 @@ def handle_event(event)
 
   app.configure do |config|
     config.adapter = :WEBrick
-    config.adapter_options = {AccessLog: [], Logger: Logger.new('/dev/null')}
+    config.adapter_options = {AccessLog: [], Logger: Logger.new(File::NULL)}
   end
 end
 

lib/webmachine/adapters/webrick.rb

@@ -29,7 +29,7 @@ def run
       class Server < ::WEBrick::HTTPServer
         def initialize(options)
           @application = options[:application]
-          super(options)
+          super
         end
 
         # Handles a request

lib/webmachine/etags.rb

@@ -5,6 +5,7 @@ module Webmachine
   # This class by itself represents a "strong" entity tag.
   class ETag
     include QuotedString
+
     # The pattern for a weak entity tag
     WEAK_ETAG = /^W\/#{QUOTED_STRING}$/.freeze
 

lib/webmachine/headers.rb

@@ -32,7 +32,7 @@ def self.from_cgi(env)
     #   @param [Object]
     # @return [Webmachine::Headers]
     def self.[](*args)
-      super(super(*args).map { |k, v| [k.to_s.downcase, v] })
+      super(super.map { |k, v| [k.to_s.downcase, v] })
     end
 
     # Fetch a header

lib/webmachine/media_type.rb

@@ -6,6 +6,7 @@ module Webmachine
   # Encapsulates a MIME media type, with logic for matching types.
   class MediaType
     extend Translation
+
     # Matches valid media types
     MEDIA_TYPE_REGEX = /^\s*([^;\s]+)\s*((?:;\s*\S+\s*)*)\s*$/.freeze
 
@@ -112,11 +113,8 @@ def minor
     #   ignoring params and taking into account wildcards
     def type_matches?(other)
       other = self.class.parse(other)
-      if [Dispatcher::Route::MATCH_ALL_STR, MATCHES_ALL, type].include?(other.type)
-        true
-      else
-        other.major == major && other.minor == Dispatcher::Route::MATCH_ALL_STR
-      end
+      [Dispatcher::Route::MATCH_ALL_STR, MATCHES_ALL, type].include?(other.type) ||
+        (other.major == major && other.minor == Dispatcher::Route::MATCH_ALL_STR)
     end
   end # class MediaType
 end # module Webmachine

lib/webmachine/streaming/io_encoder.rb

@@ -7,6 +7,7 @@ module Streaming
     # @api private
     class IOEncoder < Encoder
       include Enumerable
+
       CHUNK_SIZE = 8192
       # Iterates over the IO, encoding and yielding individual chunks
       # of the response entity.

spec/webmachine/resource/authentication_spec.rb

@@ -23,6 +23,7 @@ def to_html
     let(:resource) do
       resource_with do
         include Webmachine::Resource::Authentication
+
         attr_accessor :realm
         def is_authorized?(auth)
           basic_auth(auth, @realm || 'Webmachine') { |u, p| u == 'webmachine' && p == 'http' }