chore(deps): bump rubyzip from 2.4.1 to 3.2.2

Author: adi-herwana-nus

Gemfile

@@ -199,7 +199,7 @@ gem 'filename'
 # Required by CarrierWave, for image resizing
 gem 'mini_magick'
 # Library for reading and writing zip files
-gem 'rubyzip', require: 'zip'
+gem 'rubyzip', '~> 3.0', require: 'zip'
 # Manipulating XML files, needed for programming evaluation test report parsing.
 gem 'nokogiri', '>= 1.18.8'
 

Gemfile.lock

@@ -216,9 +216,9 @@ GEM
     docker-api (2.4.0)
       excon (>= 0.64.0)
       multi_json
-    docx (0.9.1)
+    docx (0.10.0)
       nokogiri (~> 1.13, >= 1.13.0)
-      rubyzip (~> 2.0)
+      rubyzip (>= 2.0, < 4)
     domain_name (0.6.20240107)
     dotenv (3.1.7)
     dotenv-rails (3.1.7)
@@ -608,16 +608,16 @@ GEM
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
-    rubyzip (2.4.1)
+    rubyzip (3.2.2)
     sanitize (7.0.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.16.8)
     securerandom (0.4.1)
-    selenium-webdriver (4.22.0)
+    selenium-webdriver (4.43.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
+      rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)
     should_not (1.1.0)
     shoulda-matchers (7.0.1)
@@ -779,7 +779,7 @@ DEPENDENCIES
   rubocop-rails
   ruby-oembed
   ruby-openai
-  rubyzip
+  rubyzip (~> 3.0)
   rwordnet!
   sanitize (>= 4.6.3)
   settings_on_rails!

app/services/course/assessment/submission/base_zip_download_service.rb

@@ -42,7 +42,7 @@ def zip_file_path
   #
   # @return [String] The path to the zip file.
   def zip_base_dir
-    Zip::File.open(zip_file_path, Zip::File::CREATE) do |zip_file|
+    Zip::File.open(zip_file_path, create: true) do |zip_file|
       Dir["#{@base_dir}/**/**"].each do |file|
         zip_file.add(file.sub(File.join("#{@base_dir}/"), ''), file)
       end

app/services/course/assessment/submission/ssid_zip_download_service.rb

@@ -137,7 +137,7 @@ def zip_base_dir
     answer_partitions = partition_answers_by_size(answer_size_hash)
     @zip_files = answer_partitions.map.with_index do |partition, index|
       output_file = "#{@base_dir}_#{index}.zip"
-      Zip::File.open(output_file, Zip::File::CREATE) do |zip_file|
+      Zip::File.open(output_file, create: true) do |zip_file|
         partition.each do |answer_dir|
           Dir["#{answer_dir}/**/**"].each do |file|
             zip_file.add(file.sub(File.join("#{@base_dir}/"), ''), file)

app/services/course/material/zip_download_service.rb

@@ -39,7 +39,7 @@ def download_to_base_dir
   #
   # @return [String] The path to the zip file.
   def zip_base_dir
-    Zip::File.open(zip_file_path, Zip::File::CREATE) do |zip_file|
+    Zip::File.open(zip_file_path, create: true) do |zip_file|
       Dir["#{@base_dir}/**/**"].each do |file|
         zip_file.add(file.sub(File.join("#{@base_dir}/"), ''), file)
       end

lib/autoload/course/assessment/programming_package.rb

@@ -50,30 +50,29 @@ class Course::Assessment::ProgrammingPackage
   #
   # @overload initialize(path)
   #   @param [String|Pathname] path The path to the package on disk.
-  # @overload initialize(stream)
-  #   @param [IO] stream The stream to the file.
-  def initialize(path_or_stream)
-    case path_or_stream
+  # @overload initialize(file)
+  #   @param [File] file The file object.
+  def initialize(path_or_file)
+    case path_or_file
     when String, Pathname
-      @path = path_or_stream
-    when IO
-      @stream = path_or_stream
+      @path = path_or_file
+    when File
+      @file_stream_obj = path_or_file
     else
-      raise ArgumentError, 'Invalid path or stream object'
+      raise ArgumentError, 'Invalid path or File object'
     end
   end
 
   # Gets the file path to the provided package.
   #
-  # @return [String] The path to the file.
-  # @return [nil] If the package is associated with a stream.
+  # @return [String] The path to the file, or the underlying path of the File object.
   def path
     if @file
       @file.name
     elsif @path
       @path.to_s
-    elsif @stream.is_a?(File)
-      @stream.path
+    elsif @file_stream_obj
+      @file_stream_obj.path
     end
   end
 
@@ -170,8 +169,8 @@ def unzip_file(destination)
     ensure_file_open!
     @file.each do |entry|
       entry_path = File.join(destination, entry.name)
-      FileUtils.mkdir_p(File.dirname(entry_path))
-      @file.extract(entry, entry_path) unless File.exist?(entry_path)
+      FileUtils.mkdir_p(destination)
+      @file.extract(entry, destination_directory: destination) unless File.exist?(entry_path)
     end
   end
 
@@ -210,19 +209,14 @@ def test_reports
 
   # Ensures that the zip file is open.
   #
-  # When a stream is open, some atypical code is required because Rubyzip doesn't support streams
-  # in its API too well -- the entries in memory and loaded from stream are different.
-  #
   # @raise [IllegalStateError] when the zip file is not open and it cannot be opened.
   def ensure_file_open!
     return if @file
 
     if @path
       @file = Zip::File.open(@path.to_s)
-    elsif @stream
-      @file = Zip::File.new(@stream&.path, true)
-      @file.read_from_stream(@stream)
-      @file.instance_variable_set(:@stored_entries, @file.instance_variable_get(:@entry_set).dup)
+    elsif @file_stream_obj
+      @file = Zip::File.open_buffer(@file_stream_obj)
     end
     raise IllegalStateError unless @file
   end

spec/libraries/course/assessment/programming_package_spec.rb

@@ -11,13 +11,9 @@
                                        'empty_programming_question_template.zip')
 
   def temp_package_path
-    temp_package_stream.tap(&:close).path
-  end
-
-  def temp_package_stream
-    package_path = Rails.application.config.x.temp_folder.join('spec/packages')
-    FileUtils.mkdir_p(package_path) unless Dir.exist?(package_path)
-    Tempfile.create('programming_package', package_path)
+    package_dir = Rails.application.config.x.temp_folder.join('spec/packages')
+    FileUtils.mkdir_p(package_dir) unless Dir.exist?(package_dir)
+    package_dir.join("programming_package_#{SecureRandom.hex}").to_s
   end
 
   def open_package(path)
@@ -34,14 +30,9 @@ def open_package(path)
       end
     end
 
-    context 'when a file stream is specified' do
-      let(:package_stream) { temp_package_stream }
-      subject { open_package(package_stream) }
-      before do
-        IO.copy_stream(self.class::PACKAGE_PATH, package_stream)
-        package_stream.seek(0)
-      end
-
+    context 'when a File object is specified' do
+      let(:package_path) { File.new(self.class::PACKAGE_PATH, 'rb') }
+      after { package_path.close }
       it 'opens the file' do
         expect(subject.submission_files).not_to be_empty
       end
@@ -65,6 +56,7 @@ def open_package(path)
 
       context 'when a File is given' do
         let(:package_path) { File.new(self.class::PACKAGE_PATH, 'rb') }
+        after { package_path.close }
         it 'returns the path to the File' do
           expect(subject.path).to eq(self.class::PACKAGE_PATH)
         end