Merge pull request #100 from simplybusiness/ruby-3-4-support

Update Ruby version requirements and logger method signatures

.github/workflows/ruby.yml

@@ -18,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [3.0, 3.1, 3.2, 3.3]
+        ruby-version: [3.1, 3.2, 3.3, 3.4]
 
     steps:
     - uses: actions/checkout@v4

.rubocop.yml

@@ -1,8 +1,10 @@
 inherit_gem:
-  simplycop: .simplycop.yml
+  simplycop:
+    - .simplycop.yml
+    - .simplycop_performance.yml
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
 
 Metrics/BlockLength:
   Max: 250

.ruby-version

@@ -1 +1 @@
-3.2.2
+3.4.1

lib/twiglet/logger.rb

@@ -44,25 +44,25 @@ def configure_validation_error_response(&block)
       @validator.custom_error_handler = block
     end
 
-    def debug(message_or_error = nil, &block)
+    def debug(message_or_error = nil, &)
       message = message_or_error.is_a?(Exception) ? error_message(message_or_error) : message_or_error
 
-      super(message, &block)
+      super(message, &)
     end
 
-    def info(message_or_error = nil, &block)
+    def info(message_or_error = nil, &)
       message = message_or_error.is_a?(Exception) ? error_message(message_or_error) : message_or_error
 
-      super(message, &block)
+      super(message, &)
     end
 
-    def warn(message_or_error = nil, &block)
+    def warn(message_or_error = nil, &)
       message = message_or_error.is_a?(Exception) ? error_message(message_or_error) : message_or_error
 
-      super(message, &block)
+      super(message, &)
     end
 
-    def error(message_or_error = nil, error = nil, &block)
+    def error(message_or_error = nil, error = nil, &)
       message = if error
                   error_message(error, message_or_error)
                 elsif message_or_error.is_a?(Exception)
@@ -71,20 +71,20 @@ def error(message_or_error = nil, error = nil, &block)
                   message_or_error
                 end
 
-      super(message, &block)
+      super(message, &)
     end
 
     def with(default_properties)
       self.class.new(
         @service_name,
-        **@args.merge(default_properties: default_properties)
+        **@args, default_properties: default_properties
       )
     end
 
     def validation_schema(validation_schema)
       self.class.new(
         @service_name,
-        **@args.merge(validation_schema: validation_schema)
+        **@args, validation_schema: validation_schema
       )
     end
 
@@ -94,7 +94,7 @@ def context_provider(&blk)
 
       self.class.new(
         @service_name,
-        **@args.merge(context_providers: new_context_providers)
+        **@args, context_providers: new_context_providers
       )
     end
 

lib/twiglet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Twiglet
-  VERSION = '3.13.5'
+  VERSION = '3.14.0'
 end

test/logger_test.rb

@@ -50,7 +50,7 @@
       :level=,
       :sev_threshold=
     ].each do |call|
-      assert @logger.respond_to?(call), "Logger does not respond to #{call}"
+      assert_respond_to @logger, call, "Logger does not respond to #{call}"
     end
   end
 

twiglet.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.files                 = `git ls-files`.split("\n")
 
   gem.require_paths         = ['lib']
-  gem.required_ruby_version = '>= 3.0'
+  gem.required_ruby_version = ['>= 3.1 ', '< 3.5']
 
   gem.license               = 'Copyright SimplyBusiness'