rubocop and ruby 3.4 to ruby 3.0

Author: dorianmariecom

.rubocop.yml

@@ -5,7 +5,7 @@ AllCops:
   - "**/vendor/**/*"
   - "**/db/schema.rb"
   NewCops: enable
-  TargetRubyVersion: 3.4
+  TargetRubyVersion: 3.0
 Layout/ClosingHeredocIndentation:
   Enabled: false
 Layout/FirstArgumentIndentation:

bin/console

@@ -27,5 +27,5 @@ Gem::Specification.new do |s|
 
   s.metadata["rubygems_mfa_required"] = "true"
 
-  s.required_ruby_version = ">= 3.1"
+  s.required_ruby_version = ">= 3.0"
 end

code-ruby.gemspec

@@ -33,13 +33,13 @@ def self.evaluate(...)
   def evaluate
     Timeout.timeout(timeout) do
       Node::Code.new(Code.parse(source)).evaluate(
-        context:,
-        error:,
-        input:,
-        object:,
-        output:,
-        source:,
-        timeout:
+        context: context,
+        error: error,
+        input: input,
+        object: object,
+        output: output,
+        source: source,
+        timeout: timeout
       )
     end
   end

lib/code.rb

@@ -213,8 +213,8 @@ def multi_fetch(hash, *keys)
         keys.to_h { |key| [key, hash.fetch(key)] }
       end
 
-      def sig(args, &)
-        Type::Sig.sig(args, object: self, &)
+      def sig(args, &block)
+        Type::Sig.sig(args, object: self, &block)
 
         Object::Nothing.new
       end

lib/code/concerns/shared.rb

@@ -9,7 +9,7 @@ class KeyValue < Node
         def initialize(parsed)
           return if parsed.blank?
 
-          if name_code = parsed.delete(:name_code)
+          if (name_code = parsed.delete(:name_code))
             if name_code.key?(:code)
               @key =
                 Node::String.new([{ text: name_code.delete(:name).presence }])
@@ -20,15 +20,14 @@ def initialize(parsed)
               @value = @key
               @resolve_key = true
             end
-          elsif statement_code = parsed.delete(:statement_code)
+          elsif (statement_code = parsed.delete(:statement_code))
+            @key =
+              Node::Statement.new(statement_code.delete(:statement).presence)
+
             if statement_code.key?(:code)
-              @key =
-                Node::Statement.new(statement_code.delete(:statement).presence)
               @value = Node::Code.new(statement_code.delete(:code).presence)
               @resolve_key = false
             else
-              @key =
-                Node::Statement.new(statement_code.delete(:statement).presence)
               @value = @key
               @resolve_key = true
             end
@@ -39,14 +38,9 @@ def initialize(parsed)
         end
 
         def evaluate(**args)
-          if resolve_key?
-            key = @key&.resolve(**args) || Object::Nothing.new
-          else
-            key = @key&.evaluate(**args) || Object::Nothing.new
-          end
-
+          key = resolve_key? ? @key&.resolve(**args) : @key&.evaluate(**args)
+          key ||= Object::Nothing.new
           value = @value.evaluate(**args)
-
           [key, value]
         end
 

lib/code/node/dictionary.rb

@@ -36,7 +36,7 @@ def default
 
       def to_h
         {
-          name:,
+          name: name,
           regular?: regular?,
           keyword?: keyword?,
           regular_splat?: regular_splat?,

lib/code/node/function_parameter.rb

@@ -23,23 +23,23 @@ def self.maybe
     end
 
     def self.repeat(minimum = 0, maximum = nil)
-      Type::Repeat.new(self, minimum:, maximum:)
+      Type::Repeat.new(self, minimum: minimum, maximum: maximum)
     end
 
     def self.|(other)
       Type::Or.new(self, other)
     end
 
-    def self.code_new(*)
-      new(*)
+    def self.code_new(*args)
+      new(*args)
     end
 
     def name
       self.class.name
     end
 
-    def code_new(*)
-      self.class.code_new(*)
+    def code_new(*args)
+      self.class.code_new(*args)
     end
   end
 end

lib/code/object.rb

@@ -3,7 +3,7 @@
 class Code
   class Object
     class Boolean < ::Code::Object
-      def initialize(*args, **_kargs, &)
+      def initialize(*args, **_kargs, &_block)
         @raw = (args.first.is_an?(Object) ? args.first.truthy? : !!args.first)
       end
 

lib/code/object/boolean.rb

@@ -3,7 +3,7 @@
 class Code
   class Object
     class Class < Object
-      def initialize(*args, **_kargs, &)
+      def initialize(*args, **_kargs, &_block)
         @raw =
           if args.first.is_a?(Class)
             args.first.raw