From d718cf31bcd2257da7b2d5d00d2ebff14341c146 Mon Sep 17 00:00:00 2001 From: Eric O Date: Tue, 24 Dec 2024 01:46:20 -0500 Subject: [PATCH] Rubocop updates --- .rubocop.yml | 3 +++ lib/derivativo/conversion/office_helpers.rb | 2 +- lib/derivativo/utils/shell_utils.rb | 4 +++- spec/derivativo/utils/uri_utils_spec.rb | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 867d5c1..002b454 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -36,6 +36,8 @@ Metrics/AbcSize: - lib/derivativo/access_generator.rb - app/jobs/derivative_request_jobs/derivative_request_job.rb - lib/derivativo/conversion/ffmpeg_helpers.rb + - lib/derivativo/utils/shell_utils.rb + - lib/derivativo/conversion/office_helpers.rb Metrics/CyclomaticComplexity: Exclude: @@ -49,6 +51,7 @@ Metrics/MethodLength: - app/jobs/derivative_request_jobs/prepare_derivative_request_job.rb - lib/derivativo/poster_generator.rb - lib/derivativo/conversion/office_helpers.rb + - lib/derivativo/utils/shell_utils.rb Metrics/ParameterLists: Enabled: false diff --git a/lib/derivativo/conversion/office_helpers.rb b/lib/derivativo/conversion/office_helpers.rb index f1c798d..d9c39bf 100644 --- a/lib/derivativo/conversion/office_helpers.rb +++ b/lib/derivativo/conversion/office_helpers.rb @@ -7,7 +7,7 @@ module OfficeHelpers SIZE_THRESHOLD_FOR_LARGE_OFFICE_CONVERSION_DOC_TIMEOUT = 5.megabytes SMALL_OFFICE_CONVERSION_DOC_TIMEOUT = 30.seconds - LARGE_OFFICE_CONVERSION_DOC_TIMEOUT = 120.seconds + LARGE_OFFICE_CONVERSION_DOC_TIMEOUT = 120.seconds # Converts an input office output audiovisual file def self.office_convert_to_pdf(src_file_path:, dst_file_path:) diff --git a/lib/derivativo/utils/shell_utils.rb b/lib/derivativo/utils/shell_utils.rb index 24d9952..e442df4 100644 --- a/lib/derivativo/utils/shell_utils.rb +++ b/lib/derivativo/utils/shell_utils.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Derivativo::Utils::ShellUtils def self.run_with_timeout(cmd, timeout_in_seconds) stdout_str = '' @@ -5,7 +7,7 @@ def self.run_with_timeout(cmd, timeout_in_seconds) begin read_out, write_out = IO.pipe read_err, write_err = IO.pipe - pid = Process.spawn(cmd, pgroup: true, :out => write_out, :err => write_err) + pid = Process.spawn(cmd, pgroup: true, out: write_out, err: write_err) Timeout.timeout(timeout_in_seconds) do Process.waitpid(pid) diff --git a/spec/derivativo/utils/uri_utils_spec.rb b/spec/derivativo/utils/uri_utils_spec.rb index ce8b8cf..7f55b69 100644 --- a/spec/derivativo/utils/uri_utils_spec.rb +++ b/spec/derivativo/utils/uri_utils_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe Derivativo::Utils::UriUtils do @@ -13,7 +15,7 @@ describe '.location_uri_to_file_path' do { - 'file:///a/b/c.png' => '/a/b/c.png', + 'file:///a/b/c.png' => '/a/b/c.png' }.each do |location_uri, expected_file_path| it 'converts as expected ' do expect(described_class.location_uri_to_file_path(location_uri)).to eq(expected_file_path)