From f3b6636263fc9c602117ee0cb79fc1c7722f3043 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Thu, 8 Aug 2024 12:07:20 -0500 Subject: [PATCH] Get rid of unused methods --- .rubocop_todo.yml | 40 +++++--------------- app/services/resource_xml_deserializer.rb | 7 +++- config/initializers/utils.rb | 1 - lib/purl/util.rb | 46 ----------------------- 4 files changed, 16 insertions(+), 78 deletions(-) delete mode 100644 lib/purl/util.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index d267fe80..bbfe0a53 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2024-07-29 18:35:06 UTC using RuboCop version 1.65.0. +# on 2024-08-09 14:49:32 UTC using RuboCop version 1.65.1. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -12,11 +12,6 @@ Lint/DuplicateBranch: Exclude: - 'app/models/purl_version.rb' -# Offense count: 1 -Lint/UriEscapeUnescape: - Exclude: - - 'lib/purl/util.rb' - # Offense count: 2 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode. # AllowedMethods: refine @@ -26,9 +21,9 @@ Metrics/BlockLength: # Offense count: 3 # Configuration parameters: CountComments, CountAsOne. Metrics/ClassLength: - Max: 197 + Max: 192 -# Offense count: 3 +# Offense count: 2 # Configuration parameters: AllowedMethods, AllowedPatterns. Metrics/CyclomaticComplexity: Max: 9 @@ -36,7 +31,7 @@ Metrics/CyclomaticComplexity: # Offense count: 3 # Configuration parameters: AllowedMethods, AllowedPatterns. Metrics/PerceivedComplexity: - Max: 11 + Max: 10 # Offense count: 13 # Configuration parameters: ForbiddenDelimiters. @@ -62,7 +57,7 @@ RSpec/ContextWording: - 'spec/integration/purl_spec.rb' - 'spec/views/purl/_find_it.html.erb_spec.rb' -# Offense count: 50 +# Offense count: 52 # Configuration parameters: CountAsOne. RSpec/ExampleLength: Max: 45 @@ -90,11 +85,11 @@ RSpec/LeadingSubject: - 'spec/model/content_metadata_spec.rb' - 'spec/model/iiif_presentation_manifest_spec.rb' -# Offense count: 73 +# Offense count: 77 RSpec/MultipleExpectations: Max: 19 -# Offense count: 43 +# Offense count: 41 # Configuration parameters: AllowSubject. RSpec/MultipleMemoizedHelpers: Max: 8 @@ -147,13 +142,6 @@ Rails/Presence: Exclude: - 'app/mailers/feedback_mailer.rb' -# Offense count: 1 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: NotNilAndNotEmpty, NotBlank, UnlessBlank. -Rails/Present: - Exclude: - - 'lib/purl/util.rb' - # Offense count: 1 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: EnforcedStyle. @@ -162,45 +150,37 @@ Style/FormatString: Exclude: - 'app/helpers/application_helper.rb' -# Offense count: 52 +# Offense count: 51 # This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: EnforcedStyle. # SupportedStyles: always, always_true, never Style/FrozenStringLiteralComment: Enabled: false -# Offense count: 7 +# Offense count: 6 # This cop supports safe autocorrection (--autocorrect). Style/IfUnlessModifier: Exclude: - 'app/models/iiif3_presentation_manifest.rb' - 'app/models/iiif_presentation_manifest.rb' - - 'lib/purl/util.rb' # Offense count: 1 Style/OpenStructUse: Exclude: - 'spec/model/purl_version_spec.rb' -# Offense count: 1 -# This cop supports safe autocorrection (--autocorrect). -Style/RedundantAssignment: - Exclude: - - 'lib/purl/util.rb' - # Offense count: 1 # This cop supports safe autocorrection (--autocorrect). Style/RedundantBegin: Exclude: - 'app/models/iiif_presentation_manifest.rb' -# Offense count: 4 +# Offense count: 2 # This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: Mode. Style/StringConcatenation: Exclude: - 'app/controllers/purl_controller.rb' - - 'lib/purl/util.rb' # Offense count: 1 # This cop supports safe autocorrection (--autocorrect). diff --git a/app/services/resource_xml_deserializer.rb b/app/services/resource_xml_deserializer.rb index b486208f..147c47fb 100644 --- a/app/services/resource_xml_deserializer.rb +++ b/app/services/resource_xml_deserializer.rb @@ -20,7 +20,7 @@ def self.extract_resources(resource_node, druid) Float::INFINITY end - resource_node.xpath('file|externalFile|resource').select { |node| Purl::Util.file_ready? node }.map do |node| + resource_node.xpath('file|externalFile|resource').select { |node| file_ready? node }.map do |node| case node.name when 'file' Resource.from_file_metadata(node, resource_attributes) @@ -30,6 +30,11 @@ def self.extract_resources(resource_node, druid) end end + # check if file is ready (deliver = yes or publish = yes) + def self.file_ready?(file) + file && (file['deliver'] != 'no' || file['publish'] != 'no') + end + class Resource ## # Extract attributes from `...` in content metadata diff --git a/config/initializers/utils.rb b/config/initializers/utils.rb index 216dd97f..367c7dc8 100644 --- a/config/initializers/utils.rb +++ b/config/initializers/utils.rb @@ -1,2 +1 @@ require 'dor/util' -require 'purl/util' diff --git a/lib/purl/util.rb b/lib/purl/util.rb deleted file mode 100644 index cec01f83..00000000 --- a/lib/purl/util.rb +++ /dev/null @@ -1,46 +0,0 @@ -module Purl - module Util - # get id from JP2 filename - def get_jp2_id(filename) - filename = filename.gsub(/\.jp2$/i, '') - filename - end - - # check if file is ready (deliver = yes or publish = yes) - def file_ready?(file) - file && (file['deliver'] != 'no' || file['publish'] != 'no') - end - - # construct base URL using stacks URL - def get_img_base_url(pid, deliverable_file) - img_id = get_jp2_id(deliverable_file.filename.to_s) - base_url = deliverable_file.imagesvc.to_s - - base_url = Settings.stacks.url + '/image/' + pid + '/' + img_id if base_url.empty? - - base_url - end - - # get file label (if available) or jp2 id - def get_file_label(deliverable_file) - label = get_jp2_id(deliverable_file.filename.to_s) - - label = deliverable_file.label.to_s unless deliverable_file.label.blank? - - label.truncate(45) - end - - # get file URL (for type != image) - def get_file_url(pid, deliverable_file) - url = deliverable_file.url || '' - - if url.blank? - url = Settings.stacks.url + '/file/druid:' + pid + '/' + ERB::Util.url_encode(deliverable_file.filename) - end - - URI.encode(url) - end - - module_function :get_jp2_id, :get_img_base_url, :get_file_label, :get_file_url, :file_ready? - end -end