berkeley_library-tind 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a9fd385848aff55e56422bc3d3362edade2fb8038b450d84df73b1b9b58c79d
-  data.tar.gz: 0c0015397281e2962fda4ec38212dbc0e6cf8a093d1df63554d546c41a466202
+  metadata.gz: a0c5e5e73cff3d4fa52b47b3edf5f4900a15ccdd29920676cfb7f033551928db
+  data.tar.gz: 6d6699d565c14caf6df51817a57d9ab5be8aa51ea72879cba9dc00a98745365e
 SHA512:
-  metadata.gz: 479141fb298b6a5bab4fdcfd59ff796556980a3d012c0aac438669b71fe0ec4852069c17a2b55de362e65da518cdcbcb96a705cdf98d0f9cd7ec6fbf3f1fd7a3
-  data.tar.gz: 6b98bb655afc4a8c6a660a548165a089f4fe6f17473d020070451e3fd87f16528f14d010ec278df811f61cc93db311eafdc9c980573ce0a754dfec285a93536e
+  metadata.gz: 4e9a96fb603c2dd38f1a237ff4a468aa89f7e577190a59365923392ccd5b815ca162afc7cfd7ade7947aeb001ae52fd09111ab42c874ef937a2571b7bc96545a
+  data.tar.gz: ca40e508696bd12f0d08082bc6bcf59898b041104554245b19d58513d508393e16cd6bb6a15141a83c9e52512a5adb5e77a40d99ce1d5a5bc2184b80284926fa

data/.github/workflows/build.yml

@@ -1,30 +1,44 @@
-name: Build
-on: [ push, pull_request, workflow_dispatch ]
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Build 
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
 jobs:
   test:
+
+    runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-latest ]
-        ruby: [ '2.7', '3.0' ]
-    runs-on: ${{ matrix.os }}
+        ruby-version: ['3.3', '3.4']
 
     steps:
-      - name: Check out repository
-        uses: actions/checkout@v2
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
-      - name: Run checks
-        run: bundle exec rake
+    - uses: actions/checkout@v4
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }} 
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake
 
-      - name: Upload artifacts
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: artifacts
-          path: artifacts/**
+    - name: Upload artifacts
+      if: ${{ always() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: artifacts-${{ matrix.ruby-version }}
+        path: artifacts/**

data/.github/workflows/gem-push.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.2'
+        ruby-version: '3.3'
         bundler-cache: true
 
     - name: Publish to RubyGems

data/.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+    NewCops: enable
+
 inherit_mode:
   merge:
     - Exclude
@@ -295,7 +298,7 @@ Lint/OrAssignmentToConstant: # (new in 1.9)
 Lint/RedundantDirGlobSort: # (new in 1.8)
   Enabled: true
 Lint/SymbolConversion: # (new in 1.9)
-  Enabled: true
+  Enabled: false 
 Lint/ToEnumArguments: # (new in 1.1)
   Enabled: true
 Lint/TripleQuotes: # (new in 1.9)
@@ -305,7 +308,7 @@ Lint/UnexpectedBlockArity: # (new in 1.5)
 Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
   Enabled: true
 Style/ArgumentsForwarding: # (new in 1.1)
-  Enabled: true
+  Enabled: false 
 Style/CollectionCompact: # (new in 1.2)
   Enabled: true
 Style/DocumentDynamicEvalDefinition: # (new in 1.1)
@@ -328,7 +331,232 @@ Style/SwapValues: # (new in 1.1)
 ############################################################
 # Added in RuboCop 1.10
 
-Gemspec/DateAssignment: # (new in 1.10)
+Gemspec/DeprecatedAttributeAssignment:
   Enabled: true
 Style/HashConversion: # (new in 1.10)
-  Enabled: true
+  Enabled: true
+
+#######################################
+# Added in rubocop 1.77
+
+Gemspec/AddRuntimeDependency: # new in 1.65
+  Enabled: true
+Gemspec/AttributeAssignment: # new in 1.77
+  Enabled: true
+Gemspec/DevelopmentDependencies: # new in 1.44
+  Enabled: true
+Gemspec/RequireMFA: # new in 1.23
+  Enabled: true
+Layout/LineContinuationLeadingSpace: # new in 1.31
+  Enabled: true
+Layout/LineContinuationSpacing: # new in 1.31
+  Enabled: true
+Layout/LineEndStringConcatenationIndentation: # new in 1.18
+  Enabled: true
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: true
+Lint/AmbiguousRange: # new in 1.19
+  Enabled: true
+Lint/ArrayLiteralInRegexp: # new in 1.71
+  Enabled: true
+Lint/ConstantOverwrittenInRescue: # new in 1.31
+  Enabled: true
+Lint/ConstantReassignment: # new in 1.70
+  Enabled: true
+Lint/CopDirectiveSyntax: # new in 1.72
+  Enabled: true
+Lint/DuplicateMagicComment: # new in 1.37
+  Enabled: true
+Lint/DuplicateMatchPattern: # new in 1.50
+  Enabled: true
+Lint/DuplicateSetElement: # new in 1.67
+  Enabled: true
+Lint/EmptyInPattern: # new in 1.16
+  Enabled: true
+Lint/HashNewWithKeywordArgumentsAsDefault: # new in 1.69
+  Enabled: true
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+Lint/ItWithoutArgumentsInBlock: # new in 1.59
+  Enabled: true
+Lint/LiteralAssignmentInCondition: # new in 1.58
+  Enabled: true
+Lint/MixedCaseRange: # new in 1.53
+  Enabled: true
+Lint/NonAtomicFileOperation: # new in 1.31
+  Enabled: true
+Lint/NumericOperationWithConstantResult: # new in 1.69
+  Enabled: true
+Lint/RedundantRegexpQuantifiers: # new in 1.53
+  Enabled: true
+Lint/RedundantTypeConversion: # new in 1.72
+  Enabled: true
+Lint/RefinementImportMethods: # new in 1.27
+  Enabled: true
+Lint/RequireRangeParentheses: # new in 1.32
+  Enabled: true
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
+Lint/SharedMutableDefault: # new in 1.70
+  Enabled: true
+Lint/SuppressedExceptionInNumberConversion: # new in 1.72
+  Enabled: true
+Lint/UnescapedBracketInRegexp: # new in 1.68
+  Enabled: true
+Lint/UselessConstantScoping: # new in 1.72
+  Enabled: true
+Lint/UselessDefaultValueArgument: # new in 1.76
+  Enabled: true
+Lint/UselessDefined: # new in 1.69
+  Enabled: true
+Lint/UselessNumericOperation: # new in 1.66
+  Enabled: true
+Lint/UselessOr: # new in 1.76
+  Enabled: true
+Lint/UselessRescue: # new in 1.43
+  Enabled: true
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true
+Metrics/CollectionLiteralLength: # new in 1.47
+  Enabled: true
+Naming/BlockForwarding: # new in 1.24
+  Enabled: false 
+Naming/PredicateMethod: # new in 1.76
+  Enabled: true
+Security/CompoundHash: # new in 1.28
+  Enabled: true
+Security/IoMethods: # new in 1.22
+  Enabled: true
+Style/AmbiguousEndlessMethodDefinition: # new in 1.68
+  Enabled: true
+Style/ArrayIntersect: # new in 1.40
+  Enabled: true
+Style/BitwisePredicate: # new in 1.68
+  Enabled: true
+Style/CollectionQuerying: # new in 1.77
+  Enabled: true
+Style/CombinableDefined: # new in 1.68
+  Enabled: true
+Style/ComparableBetween: # new in 1.74
+  Enabled: true
+Style/ComparableClamp: # new in 1.44
+  Enabled: true
+Style/ConcatArrayLiterals: # new in 1.41
+  Enabled: true
+Style/DataInheritance: # new in 1.49
+  Enabled: true
+Style/DigChain: # new in 1.69
+  Enabled: true
+Style/DirEmpty: # new in 1.48
+  Enabled: true
+Style/EmptyHeredoc: # new in 1.32
+  Enabled: true
+Style/EmptyStringInsideInterpolation: # new in 1.76
+  Enabled: true
+Style/EnvHome: # new in 1.29
+  Enabled: true
+Style/ExactRegexpMatch: # new in 1.51
+  Enabled: true
+Style/FetchEnvVar: # new in 1.28
+  Enabled: true
+Style/FileEmpty: # new in 1.48
+  Enabled: true
+Style/FileNull: # new in 1.69
+  Enabled: true
+Style/FileRead: # new in 1.24
+  Enabled: true
+Style/FileTouch: # new in 1.69
+  Enabled: true
+Style/FileWrite: # new in 1.24
+  Enabled: true
+Style/HashFetchChain: # new in 1.75
+  Enabled: true
+Style/HashSlice: # new in 1.71
+  Enabled: true
+Style/InPatternThen: # new in 1.16
+  Enabled: true
+Style/ItAssignment: # new in 1.70
+  Enabled: true
+Style/ItBlockParameter: # new in 1.75
+  Enabled: true
+Style/KeywordArgumentsMerging: # new in 1.68
+  Enabled: true
+Style/MagicCommentFormat: # new in 1.35
+  Enabled: true
+Style/MapCompactWithConditionalBlock: # new in 1.30
+  Enabled: true
+Style/MapIntoArray: # new in 1.63
+  Enabled: true
+Style/MapToHash: # new in 1.24
+  Enabled: true
+Style/MapToSet: # new in 1.42
+  Enabled: true
+Style/MinMaxComparison: # new in 1.42
+  Enabled: true
+Style/MultilineInPatternThen: # new in 1.16
+  Enabled: true
+Style/NestedFileDirname: # new in 1.26
+  Enabled: true
+Style/NumberedParameters: # new in 1.22
+  Enabled: true
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+Style/ObjectThen: # new in 1.28
+  Enabled: true
+Style/OpenStructUse: # new in 1.23
+  Enabled: true
+Style/OperatorMethodCall: # new in 1.37
+  Enabled: true
+Style/QuotedSymbols: # new in 1.16
+  Enabled: true
+Style/RedundantArrayConstructor: # new in 1.52
+  Enabled: true
+Style/RedundantArrayFlatten: # new in 1.76
+  Enabled: true
+Style/RedundantConstantBase: # new in 1.40
+  Enabled: true
+Style/RedundantCurrentDirectoryInPath: # new in 1.53
+  Enabled: true
+Style/RedundantDoubleSplatHashBraces: # new in 1.41
+  Enabled: true
+Style/RedundantEach: # new in 1.38
+  Enabled: true
+Style/RedundantFilterChain: # new in 1.52
+  Enabled: true
+Style/RedundantFormat: # new in 1.72
+  Enabled: true
+Style/RedundantHeredocDelimiterQuotes: # new in 1.45
+  Enabled: true
+Style/RedundantInitialize: # new in 1.27
+  Enabled: true
+Style/RedundantInterpolationUnfreeze: # new in 1.66
+  Enabled: true
+Style/RedundantLineContinuation: # new in 1.49
+  Enabled: true
+Style/RedundantRegexpArgument: # new in 1.53
+  Enabled: true
+Style/RedundantRegexpConstructor: # new in 1.52
+  Enabled: true
+Style/RedundantSelfAssignmentBranch: # new in 1.19
+  Enabled: true
+Style/RedundantStringEscape: # new in 1.37
+  Enabled: true
+Style/ReturnNilInPredicateMethodDefinition: # new in 1.53
+  Enabled: true
+Style/SafeNavigationChainLength: # new in 1.68
+  Enabled: true
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+Style/SendWithLiteralMethodName: # new in 1.64
+  Enabled: true
+Style/SingleLineDoEndBlock: # new in 1.57
+  Enabled: true
+Style/StringChars: # new in 1.12
+  Enabled: true
+Style/SuperArguments: # new in 1.64
+  Enabled: true
+Style/SuperWithArgsParentheses: # new in 1.58
+  Enabled: true
+Style/YAMLFileRead: # new in 1.53
+  Enabled: true
+

data/.ruby-version

@@ -1 +1 @@
-2.7.5
+3.3.7

data/Dockerfile

@@ -1,7 +1,7 @@
 # =============================================================================
 # Target: base
 
-FROM ruby:2.7-alpine AS base
+FROM ruby:3.3-alpine AS base
 
 RUN apk --no-cache --update upgrade && \
     apk --no-cache add \
@@ -26,11 +26,12 @@ FROM base AS development
 RUN apk --update --no-cache add \
         build-base \
         coreutils \
+        yaml-dev \
         git \
     && rm -rf /var/cache/apk/*
 
 # The base image ships bundler 1.17.2, but we want something more recent
-RUN gem install bundler -v 2.1.4
+RUN gem install bundler -v 2.5.22
 
 # Copy codebase to WORKDIR. Unlike application projects, for a gem project
 # we need to do this before running `bundle install`, in order for the gem

data/Rakefile

@@ -17,4 +17,4 @@ ENV['RAILS_ENV'] = 'test' if ENV['CI']
 # Custom tasks
 
 desc 'Run tests, check test coverage, check code style, check for vulnerabilities, build gem'
-task default: %i[coverage rubocop bundle:audit gem]
+task default: %i[coverage rubocop bundle:audit]

data/berkeley_library-tind.gemspec

@@ -2,14 +2,16 @@ File.expand_path('lib', __dir__).tap do |lib|
   $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 end
 
-ruby_version = '>= 2.7'
+ruby_version = '>= 3.3'
 
 require 'berkeley_library/tind/module_info'
 
 Gem::Specification.new do |spec|
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
   spec.name = BerkeleyLibrary::TIND::ModuleInfo::NAME
-  spec.author = BerkeleyLibrary::TIND::ModuleInfo::AUTHOR
-  spec.email = BerkeleyLibrary::TIND::ModuleInfo::AUTHOR_EMAIL
+  spec.authors = BerkeleyLibrary::TIND::ModuleInfo::AUTHORS
+  spec.email = BerkeleyLibrary::TIND::ModuleInfo::AUTHOR_EMAILS
   spec.summary = BerkeleyLibrary::TIND::ModuleInfo::SUMMARY
   spec.description = BerkeleyLibrary::TIND::ModuleInfo::DESCRIPTION
   spec.license = BerkeleyLibrary::TIND::ModuleInfo::LICENSE
@@ -26,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'berkeley_library-logging', '~> 0.2'
   spec.add_dependency 'berkeley_library-marc', '~> 0.3.0', '>= 0.3.1'
   spec.add_dependency 'berkeley_library-util', '~> 0.1', '>= 0.1.2'
+  spec.add_dependency 'csv', '~> 3.2.2'
   spec.add_dependency 'ice_nine', '~> 0.11'
   spec.add_dependency 'marc', '~> 1.0'
   spec.add_dependency 'rchardet', '~> 1.8'
@@ -33,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rubyzip', '~> 2.3', '< 3.0'
   spec.add_dependency 'typesafe_enum', '~> 0.3'
 
+  # rubocop:disable Gemspec/DevelopmentDependencies
   spec.add_development_dependency 'bundle-audit', '~> 0.1'
   spec.add_development_dependency 'ci_reporter_rspec', '~> 1.0'
   spec.add_development_dependency 'colorize', '~> 0.8'
@@ -41,11 +45,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'roo', '~> 2.8'
   spec.add_development_dependency 'rspec', '~> 3.10'
-  spec.add_development_dependency 'rubocop', '= 1.11'
+  spec.add_development_dependency 'rubocop', '= 1.77'
   spec.add_development_dependency 'rubocop-rake', '~> 0.5'
   spec.add_development_dependency 'rubocop-rspec', '~> 2.2'
-  spec.add_development_dependency 'ruby-prof', '~> 0.17.0'
+  spec.add_development_dependency 'ruby-prof', '~> 1.7'
   spec.add_development_dependency 'simplecov', '~> 0.21'
   spec.add_development_dependency 'simplecov-rcov', '~> 0.2'
   spec.add_development_dependency 'webmock', '~> 3.12'
+  # rubocop:enable Gemspec/DevelopmentDependencies
 end

data/bin/alma-single-tind

@@ -29,7 +29,7 @@ def additional_tind_fields
   txt = 'v001_0064'
   url = 'https://digitalassets.lib.berkeley.edu/pre1912ChineseMaterials/ucb/ready/991032333019706532/991032333019706532_v001_0064.jpg'
   fft = BerkeleyLibrary::TIND::Mapping::TindField.f_fft(url, txt)
-  f = ::MARC::DataField.new('998', ' ', ' ', ['a', 'fake-value'])
+  f = MARC::DataField.new('998', ' ', ' ', ['a', 'fake-value'])
   [fft] << f
 end
 

data/bin/save_tind_records

@@ -30,7 +30,7 @@ def fake_additional_tind_fields1
   txt = '001'
   url = 'https://digitalassets.lib.berkeley.edu/forestry/ucb/images/b142086125_i180839998/b142086125_i180839998_001.jpg'
   fft = BerkeleyLibrary::TIND::Mapping::TindField.f_fft(url, txt)
-  f_998 = ::MARC::DataField.new('998', ' ', ' ', ['a', 'fake-value'])
+  f_998 = MARC::DataField.new('998', ' ', ' ', ['a', 'fake-value'])
   f_035 = BerkeleyLibrary::TIND::Mapping::TindField.f_035('b142086125')
   fields << f_998
   fields << f_035
@@ -43,7 +43,7 @@ def fake_additional_tind_fields2
   url = 'https://digitalassets.lib.berkeley.edu/forestry/ucb/images/b142086125_i180839998/b142086125_i180839998_002.jpg'
   fft = BerkeleyLibrary::TIND::Mapping::TindField.f_fft(url, txt)
 
-  f_998 = ::MARC::DataField.new('998', ' ', ' ', ['a', 'fake-value'])
+  f_998 = MARC::DataField.new('998', ' ', ' ', ['a', 'fake-value'])
 
   f_035 = BerkeleyLibrary::TIND::Mapping::TindField.f_035('b142107827')
   fields << f_998
@@ -63,7 +63,7 @@ end
 
 def save_batch(file, with_tind_xmlwritter)
   setup
-  writer = ::MARC::XMLWriter.new(file)
+  writer = MARC::XMLWriter.new(file)
   writer = BerkeleyLibrary::TIND::MARC::XMLWriter.new(file) if with_tind_xmlwritter
 
   tind_records.each do |record|

data/bin/tind-marc

@@ -47,7 +47,7 @@ other_external_tind_fields.concat tind_fields_from_alma_id
 
 new_subfield1 = BerkeleyLibrary::TIND::Mapping::Util.subfield('a', 'https://digitalassets.lib.berkeley.edu/pre1912ChineseMaterials/ucb/ready/991032333019706532/991032333019706532_v001_0064.jpg')
 new_subfield2 = BerkeleyLibrary::TIND::Mapping::Util.subfield('d', 'v001_0064')
-fft_datafield = BerkeleyLibrary::TIND::Mapping::Util.datafield('FFT', [' ',  ' '], [new_subfield1, new_subfield2])
+fft_datafield = BerkeleyLibrary::TIND::Mapping::Util.datafield('FFT', [' ', ' '], [new_subfield1, new_subfield2])
 ffts = [fft_datafield]
 
 # 5. put all external tind fields together

data/lib/berkeley_library/tind/api/api.rb

@@ -28,7 +28,7 @@ module BerkeleyLibrary
         # Gets the API base URI.
         # @return [URI] the API base URI
         def api_base_uri
-          return if Config.blank?((base_uri = Config.base_uri))
+          return if Config.blank?(base_uri = Config.base_uri)
 
           URIs.append(base_uri, '/api/v1')
         end

data/lib/berkeley_library/tind/api.rb

@@ -1 +1 @@
-Dir.glob(File.expand_path('api/*.rb', __dir__)).sort.each(&method(:require))
+Dir.glob(File.expand_path('api/*.rb', __dir__)).each(&method(:require))

data/lib/berkeley_library/tind/export/column_group.rb

@@ -16,9 +16,9 @@ module BerkeleyLibrary
 
         # Indicators SHOULD NOT be capital letters, but TIND internal fields
         # don't respect that. Thus the /i flag.
-        INDICATOR_RE = /^[0-9a-z ]$/i.freeze
+        INDICATOR_RE = /^[0-9a-z ]$/i
 
-        SUBFIELD_CODE_RE = /^[0-9a-z]$/.freeze
+        SUBFIELD_CODE_RE = /^[0-9a-z]$/
 
         # ------------------------------------------------------------
         # Accessors

data/lib/berkeley_library/tind/export/column_group_list.rb

@@ -42,7 +42,7 @@ module BerkeleyLibrary
         def add_data_fields(marc_record, row)
           # TODO: what about control fields?
           marc_record.data_fields_by_tag.each do |tag, data_fields|
-            next unless can_export_tag(tag)
+            next unless can_export_tag?(tag)
             next if data_fields.empty?
 
             add_fields_at(data_fields, row)
@@ -87,7 +87,7 @@ module BerkeleyLibrary
           tag_column_groups = (column_groups_by_tag[tag] ||= [])
 
           data_fields.inject(0) do |offset, df|
-            next offset unless can_export_df(df)
+            next offset unless can_export_df?(df)
 
             1 + add_data_field(df, row, tag_column_groups, at_or_after: offset)
           end
@@ -108,13 +108,13 @@ module BerkeleyLibrary
           BerkeleyLibrary::Util::Arrays.find_index(in_array: tag_column_groups, start_index: at_or_after) { |cg| cg.maybe_add_at(row, df) }
         end
 
-        def can_export_tag(tag)
+        def can_export_tag?(tag)
           return true unless exportable_only?
 
           Filter.can_export_tag?(tag)
         end
 
-        def can_export_df(df)
+        def can_export_df?(df)
           return true unless exportable_only?
 
           Filter.can_export_data_field?(df)

data/lib/berkeley_library/tind/export/export_format.rb

@@ -13,17 +13,20 @@ module BerkeleyLibrary
 
         def exporter_for(collection, exportable_only: true)
           return CSVExporter.new(collection, exportable_only: exportable_only) if self == ExportFormat::CSV
-          return ODSExporter.new(collection, exportable_only: exportable_only) if self == ExportFormat::ODS
+
+          ODSExporter.new(collection, exportable_only: exportable_only) if self == ExportFormat::ODS
         end
 
         def description
           return 'CSV (comma-separated text)' if self == ExportFormat::CSV
-          return 'LibreOffice/OpenOffice spreadsheet' if self == ExportFormat::ODS
+
+          'LibreOffice/OpenOffice spreadsheet' if self == ExportFormat::ODS
         end
 
         def mime_type
           return 'text/csv' if self == ExportFormat::CSV
-          return 'application/vnd.oasis.opendocument.spreadsheet' if self == ExportFormat::ODS
+
+          'application/vnd.oasis.opendocument.spreadsheet' if self == ExportFormat::ODS
         end
 
         def to_s

data/lib/berkeley_library/tind/export/exporter.rb

@@ -58,12 +58,13 @@ module BerkeleyLibrary
 
         # ------------------------------------------------------------
         # Object overrides
-
+        # rubocop:disable Style/RedundantParentheses
         def respond_to?(*args)
           return false if instance_of?(Exporter) && (args && args.first.to_s == 'export')
 
           super
         end
+        # rubocop:enable Style/RedundantParentheses
 
         # ------------------------------------------------------------
         # Protected methods

data/lib/berkeley_library/tind/export/table.rb

@@ -161,7 +161,7 @@ module BerkeleyLibrary
         private
 
         def log_record_added(marc_record)
-          return logger.debug("Added record no. #{marc_record.record_id}: #{row_count} records total") if marc_record
+          logger.debug("Added record no. #{marc_record.record_id}: #{row_count} records total") if marc_record
         end
 
         def write_csv(out)

data/lib/berkeley_library/tind/export.rb

@@ -1 +1 @@
-Dir.glob(File.expand_path('export/*.rb', __dir__)).sort.each(&method(:require))
+Dir.glob(File.expand_path('export/*.rb', __dir__)).each(&method(:require))

data/lib/berkeley_library/tind/mapping/data/one_to_one_mapping.csv

@@ -23,6 +23,7 @@
 541,541,6,6,,"c,a,d",a,,,,,,,,"_,_",,,,,
 545,545,"6,a","6,a",,,,,,,,,,,"_,_",,,,,
 546,546,"6,a","6,a",,,,,,,,,,,"_,_",,,,,
+561,561,"6,a","6,a",,,,,,,,,,,"_,_",,,,,
 600,600,6,6,,"a,b,c,d,f,j,k,l,m,n,o,p,q,r,s,t",a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
 610,610,6,6,,"a,b,c,d,f,j,k,l,m,n,o,p,q,r,s,t",a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
 611,611,6,6,,"a,b,c,d,f,j,k,l,m,n,o,p,q,r,s,t",a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
@@ -36,4 +37,4 @@
 720,700,"6,a,e","6,a,e",,,,,,,,,,,"1,_",,,,,
 752,651,6,6,,,,,"a,b,c,d,f,g",a,a--a,,,,"_,_",,,,,
 773,773,"6,t,j,k,o","6,t,j,k,o",,,,,,,,,,,"_,_",,,,,
-907,901,"6,a","6,m",,,,,,,,,,,"_,_",,,,,
+907,901,"6,a","6,m",,,,,,,,,,,"_,_",,,,,

data/lib/berkeley_library/tind/mapping/external_tind_field.rb

@@ -81,7 +81,7 @@ module BerkeleyLibrary
 
           def valid_collection_hash?(hash)
             return false unless valid_item?(hash, '336', 1) &&
-            valid_item?(hash, '852', 1) && valid_item?(hash, '980', 1) && valid_item?(hash, '982', 2) && valid_991(hash)
+            valid_item?(hash, '852', 1) && valid_item?(hash, '980', 1) && valid_item?(hash, '982', 2) && valid_991?(hash)
 
             true
           end
@@ -90,7 +90,7 @@ module BerkeleyLibrary
             (hash.key? key) && (hash[key].length == num)
           end
 
-          def valid_991(hash)
+          def valid_991?(hash)
             cout = hash['991'].length
             [0, 1].include?(cout)
           end

data/lib/berkeley_library/tind/mapping/field_catalog_util.rb

@@ -36,7 +36,8 @@ module BerkeleyLibrary
           return [] if including_defined && excluding_defined # not allow to define both including and excluding tags
           return fields unless including_defined || excluding_defined # Neither including nor excluding tags are defined
           return fields_included(fields) if including_defined # including tags defined
-          return fields_exclued(fields) if excluding_defined  # excluding tags defined
+
+          fields_exclued(fields) if excluding_defined # excluding tags defined
         end
 
         private
@@ -72,7 +73,7 @@ module BerkeleyLibrary
 
         def excluding_field?(f)
           return false unless field_6xx?(f)
-          return false unless subfield2_fast(f)
+          return false unless subfield2_fast?(f)
 
           true
         end
@@ -83,7 +84,7 @@ module BerkeleyLibrary
           tag =~ /^6\d{2}$/
         end
 
-        def subfield2_fast(f)
+        def subfield2_fast?(f)
           subject = f['2']
           return false unless subject
 

data/lib/berkeley_library/tind/mapping.rb

@@ -1 +1 @@
-Dir.glob(File.expand_path('mapping/*.rb', __dir__)).sort.each(&method(:require))
+Dir.glob(File.expand_path('mapping/*.rb', __dir__)).each(&method(:require))