rubocop: address style issues

Author: anarchivist

lib/berkeley_library/av/metadata/field.rb

@@ -48,7 +48,7 @@ def same_metadata?(other)
           raise ArgumentError, "Not a #{class_name(self)}: #{other}" unless other.is_a?(Field)
 
           %i[tag query subfields_separator subfield_order].all? do |attr|
-            (other.respond_to?(attr) && send(attr) == other.send(attr))
+            other.respond_to?(attr) && send(attr) == other.send(attr)
           end
         end
 

lib/berkeley_library/av/metadata/fields.rb

@@ -75,7 +75,7 @@ def to_field(json_field)
               label: json_field['labels']['en'],
               tag:,
               spec: marc_spec,
-              subfields_separator: (params['subfields_separator'] || ' '),
+              subfields_separator: params['subfields_separator'] || ' ',
               subfield_order: params['subfield_order'].to_s.split(',')
             )
           end

lib/berkeley_library/av/metadata/source.rb

@@ -34,7 +34,8 @@ def name
 
         def catalog_link_text
           return LINK_TEXT_ALMA if self == ALMA
-          return LINK_TEXT_TIND if self == TIND
+
+          LINK_TEXT_TIND if self == TIND
         end
 
         def display_uri_for(metadata)
@@ -46,7 +47,8 @@ def display_uri_for(metadata)
 
         def find_bib_number(metadata)
           return alma_bib_number(metadata.marc_record) if self == Source::ALMA
-          return tind_bib_number(metadata.marc_record) if self == Source::TIND
+
+          tind_bib_number(metadata.marc_record) if self == Source::TIND
         end
 
         private
@@ -58,7 +60,8 @@ def canonical_record_id_for(metadata)
 
         def canonical_record_id_accessor
           return :alma_id if self == ALMA
-          return :tind_id if self == TIND
+
+          :tind_id if self == TIND
         end
 
         def tind_bib_number(marc_record)

lib/berkeley_library/av/track.rb

@@ -35,7 +35,7 @@ def to_s
       end
 
       def inspect
-        "\#<#{self.class.name} #{self}>"
+        "#<#{self.class.name} #{self}>"
       end
 
       # @return [Array<MARC::Subfield>]
@@ -90,7 +90,7 @@ def group_values(subfields)
         end
 
         def group_subfields(subfields)
-          single_track = subfields.lazy.select { |sf| sf.code.to_sym == SUBFIELD_CODE_PATH }.one?
+          single_track = subfields.lazy.one? { |sf| sf.code.to_sym == SUBFIELD_CODE_PATH }
           return [group_together(subfields)] if single_track
 
           group_on_paths(subfields)

spec/lib/berkeley_library/av/config_spec.rb

@@ -11,7 +11,7 @@ module AV
 
       describe :configured? do
         it 'defaults to false' do
-          expect(AV.configured?).to eq(false)
+          expect(AV.configured?).to be(false)
         end
 
         it 'returns true if and only if all values are configured' do
@@ -25,12 +25,12 @@ module AV
             wowza_base_uri: 'http://wowza.example.edu'
           }
           settings.each { |setting, value| Config.send("#{setting}=", value) }
-          expect(AV.configured?).to eq(true)
+          expect(AV.configured?).to be(true)
 
           aggregate_failures do
             settings.each do |setting, value|
-              Config.instance_variable_set("@#{setting}".to_sym, nil)
-              expect(AV.configured?).to eq(false), "Clearing #{setting} did not set configured? to false"
+              Config.instance_variable_set(:"@#{setting}", nil)
+              expect(AV.configured?).to be(false), "Clearing #{setting} did not set configured? to false"
               Config.send("#{setting}=", value)
             end
           end
@@ -49,8 +49,7 @@ module AV
           rails_config = Struct.new(*settings.keys, keyword_init: true).new(**settings)
 
           # Mock Rails config
-          expect(defined?(Rails)).to be_nil # just to be sure
-          Object.send(:const_set, 'Rails', Struct.new(:application).new)
+          stub_const('Rails', Struct.new(:application).new)
           Rails.application = Struct.new(:config).new
           Rails.application.config = rails_config
 
@@ -60,9 +59,8 @@ module AV
             end
           end
 
-          expect(AV.configured?).to eq(true)
-        ensure
-          Object.send(:remove_const, 'Rails')
+          expect(AV.configured?).to be(true)
+
         end
       end
 
@@ -100,7 +98,7 @@ module AV
 
           expected = []
           settings.each_key do |setting|
-            Config.instance_variable_set("@#{setting}".to_sym, nil)
+            Config.instance_variable_set(:"@#{setting}", nil)
             expected << setting
             expect(Config.missing).to eq(expected)
           end
@@ -246,11 +244,7 @@ module AV
           rails = double(Object)
           allow(rails).to receive(:application).and_return(application)
 
-          Object.const_set(:Rails, rails)
-        end
-
-        after do
-          Object.send(:remove_const, :Rails)
+          stub_const('Rails', rails)
         end
 
         describe :avplayer_base_uri do

spec/lib/berkeley_library/av/metadata/metadata_spec.rb

@@ -44,28 +44,28 @@ module AV
           bib_number = 'b18538031'
           stub_sru_request(bib_number)
           metadata = Metadata.for_record(record_id: bib_number)
-          expect(metadata.calnet_or_ip?).to eq(true)
+          expect(metadata.calnet_or_ip?).to be(true)
         end
 
         it 'detects restricted video' do
           bib_number = 'b25207857'
           stub_sru_request(bib_number)
           metadata = Metadata.for_record(record_id: bib_number)
-          expect(metadata.calnet_or_ip?).to eq(true)
+          expect(metadata.calnet_or_ip?).to be(true)
         end
 
         it 'detects CalNet restrictions' do
           bib_number = 'b24659129'
           stub_sru_request(bib_number)
           metadata = Metadata.for_record(record_id: bib_number)
-          expect(metadata.calnet_or_ip?).to eq(true)
+          expect(metadata.calnet_or_ip?).to be(true)
         end
 
         it 'detects unrestricted audio' do
           bib_number = 'b23161018'
           stub_sru_request(bib_number)
           metadata = Metadata.for_record(record_id: bib_number)
-          expect(metadata.calnet_or_ip?).to eq(false)
+          expect(metadata.calnet_or_ip?).to be(false)
         end
       end
 
@@ -75,89 +75,89 @@ module AV
           bib_number = 'b18538031'
           stub_sru_request(bib_number)
           metadata = Metadata.for_record(record_id: bib_number)
-          expect(metadata.calnet_or_ip?).to eq(true)
+          expect(metadata.calnet_or_ip?).to be(true)
         end
 
         it 'finds "UCB Access" (capitalized)' do
           bib_number = 'b25716973'
           stub_sru_request(bib_number)
           metadata = Metadata.for_record(record_id: bib_number)
-          expect(metadata.calnet_or_ip?).to eq(true)
-          expect(metadata.calnet_only?).to eq(false)
+          expect(metadata.calnet_or_ip?).to be(true)
+          expect(metadata.calnet_only?).to be(false)
         end
 
         it 'returns "Requires CalNet"' do
           bib_number = 'b24659129'
           stub_sru_request(bib_number)
           metadata = Metadata.for_record(record_id: bib_number)
-          expect(metadata.calnet_or_ip?).to eq(true)
-          expect(metadata.calnet_only?).to eq(true)
+          expect(metadata.calnet_or_ip?).to be(true)
+          expect(metadata.calnet_only?).to be(true)
         end
 
         it 'returns "Freely available" for unrestricted audio' do
           bib_number = 'b23161018'
           stub_sru_request(bib_number)
           metadata = Metadata.for_record(record_id: bib_number)
-          expect(metadata.calnet_or_ip?).to eq(false)
-          expect(metadata.calnet_only?).to eq(false)
+          expect(metadata.calnet_or_ip?).to be(false)
+          expect(metadata.calnet_only?).to be(false)
         end
 
         it 'extracts UCB restrictions from a TIND 856' do
           marc_record = MARC::XMLReader.new('spec/data/record-(cityarts)00002.xml').first
           metadata = Metadata.new(record_id: 'record-(cityarts)00002', source: Metadata::Source::TIND, marc_record:)
-          expect(metadata.calnet_or_ip?).to eq(true)
-          expect(metadata.calnet_only?).to eq(false)
+          expect(metadata.calnet_or_ip?).to be(true)
+          expect(metadata.calnet_only?).to be(false)
         end
 
         it 'extracts UCB restrictions from an Alma 956' do
           marc_record = MARC::XMLReader.new('spec/data/alma/991054360089706532-sru.xml').first
           metadata = Metadata.new(record_id: '991047179369706532', source: Metadata::Source::ALMA, marc_record:)
-          expect(metadata.calnet_or_ip?).to eq(true)
-          expect(metadata.calnet_only?).to eq(false)
+          expect(metadata.calnet_or_ip?).to be(true)
+          expect(metadata.calnet_only?).to be(false)
         end
 
         it 'extracts CalNet restrictions from an Alma 956' do
           marc_record = MARC::XMLReader.new('spec/data/alma/991047179369706532-sru.xml').first
           metadata = Metadata.new(record_id: '991054360089706532', source: Metadata::Source::ALMA, marc_record:)
-          expect(metadata.calnet_or_ip?).to eq(true)
-          expect(metadata.calnet_only?).to eq(true)
+          expect(metadata.calnet_or_ip?).to be(true)
+          expect(metadata.calnet_only?).to be(true)
         end
 
         it 'extracts restrictions from a 998$r' do
           marc_record = MARC::XMLReader.new('spec/data/alma/991005939359706532-sru.xml').first
           metadata = Metadata.new(record_id: '991005939359706532', source: Metadata::Source::ALMA, marc_record:)
-          expect(metadata.calnet_or_ip?).to eq(false) # just to be sure
-          expect(metadata.calnet_only?).to eq(false) # just to be sure
+          expect(metadata.calnet_or_ip?).to be(false) # just to be sure
+          expect(metadata.calnet_only?).to be(false) # just to be sure
 
           marc_record['998'].append(MARC::Subfield.new('r', 'UCB access. Requires CalNet.'))
           metadata = Metadata.new(record_id: '991005939359706532', source: Metadata::Source::ALMA, marc_record:)
-          expect(metadata.calnet_or_ip?).to eq(true)
-          expect(metadata.calnet_only?).to eq(true)
+          expect(metadata.calnet_or_ip?).to be(true)
+          expect(metadata.calnet_only?).to be(true)
         end
 
         it 'extracts restrictions from multiple subfields 998$r' do
           marc_record = MARC::XMLReader.new('spec/data/alma/991005939359706532-sru.xml').first
           metadata = Metadata.new(record_id: '991005939359706532', source: Metadata::Source::ALMA, marc_record:)
-          expect(metadata.calnet_or_ip?).to eq(false) # just to be sure
-          expect(metadata.calnet_only?).to eq(false) # just to be sure
+          expect(metadata.calnet_or_ip?).to be(false) # just to be sure
+          expect(metadata.calnet_only?).to be(false) # just to be sure
 
           marc_record['998'].append(MARC::Subfield.new('r', 'UCB access.'))
           marc_record['998'].append(MARC::Subfield.new('r', 'Requires CalNet.'))
           metadata = Metadata.new(record_id: '991005939359706532', source: Metadata::Source::ALMA, marc_record:)
-          expect(metadata.calnet_or_ip?).to eq(true)
-          expect(metadata.calnet_only?).to eq(true)
+          expect(metadata.calnet_or_ip?).to be(true)
+          expect(metadata.calnet_only?).to be(true)
         end
 
         it 'accepts "CalNet" anywhere in the 998$r' do
           marc_record = MARC::XMLReader.new('spec/data/alma/991005939359706532-sru.xml').first
           metadata = Metadata.new(record_id: '991005939359706532', source: Metadata::Source::ALMA, marc_record:)
-          expect(metadata.calnet_or_ip?).to eq(false) # just to be sure
-          expect(metadata.calnet_only?).to eq(false) # just to be sure
+          expect(metadata.calnet_or_ip?).to be(false) # just to be sure
+          expect(metadata.calnet_only?).to be(false) # just to be sure
 
           marc_record['998'].append(MARC::Subfield.new('r', 'some string with CalNet in it somewhere'))
           metadata = Metadata.new(record_id: '991005939359706532', source: Metadata::Source::ALMA, marc_record:)
-          expect(metadata.calnet_only?).to eq(true)
-          expect(metadata.calnet_or_ip?).to eq(false) # just to be sure
+          expect(metadata.calnet_only?).to be(true)
+          expect(metadata.calnet_or_ip?).to be(false) # just to be sure
         end
       end
 
@@ -177,7 +177,7 @@ module AV
                 body: AV::Metadata::Source::ALMA.catalog_link_text
               )
             ]
-            expect(catalog_value.entries).to contain_exactly(*expected_links)
+            expect(catalog_value.entries).to match_array(expected_links)
           end
 
           it 'injects a TIND URL if not present (1/2)' do
@@ -194,7 +194,7 @@ module AV
                 body: Metadata::Source::TIND.catalog_link_text
               )
             ]
-            expect(catalog_value.entries).to contain_exactly(*expected_links)
+            expect(catalog_value.entries).to match_array(expected_links)
           end
 
           it 'injects a TIND URL if not present (2/2)' do
@@ -211,7 +211,7 @@ module AV
                 body: Metadata::Source::TIND.catalog_link_text
               )
             ]
-            expect(catalog_value.entries).to contain_exactly(*expected_links)
+            expect(catalog_value.entries).to match_array(expected_links)
           end
 
           # TODO: suppress these?
@@ -233,7 +233,7 @@ module AV
                 body: Metadata::Source::TIND.catalog_link_text
               )
             ]
-            expect(catalog_value.entries).to contain_exactly(*expected_links)
+            expect(catalog_value.entries).to match_array(expected_links)
           end
 
           it 'works for TIND-only records' do
@@ -250,7 +250,7 @@ module AV
                 url: 'https://digicoll.lib.berkeley.edu/record/21937'
               )
             ]
-            expect(catalog_value.entries).to contain_exactly(*expected_links)
+            expect(catalog_value.entries).to match_array(expected_links)
           end
 
         end

spec/lib/berkeley_library/av/record_spec.rb

@@ -177,6 +177,7 @@ module AV
       end
 
       describe :from_metadata do
+        # rubocop:disable RSpec/ExampleLength
         it 'loads the metadata' do
           marc_xml = File.read('spec/data/record-(pacradio)01469.xml')
           search_url = 'https://digicoll.lib.berkeley.edu/api/v1/search?p=035__a%3A%22%28pacradio%2901469%22&format=xml'
@@ -220,6 +221,7 @@ module AV
             expect(record.title).to eq(metadata.title)
             expect(record.bib_number).to eq(metadata.bib_number)
           end
+          # rubocop:enable RSpec/ExampleLength
         end
 
         it "raises #{AV::RecordNotFound} if the record cannot be found" do
@@ -234,6 +236,7 @@ module AV
         end
       end
 
+      # rubocop:disable RSpec/ExampleLength
       describe :calnet_or_ip? do
         it 'returns true for restricted, false for unrestricted' do
           restricted = %w[b18538031 b24071548 (cityarts)00002 (cityarts)00773]
@@ -251,32 +254,33 @@ module AV
           aggregate_failures 'restrictions' do
             restricted.each do |record_id|
               record = Record.from_metadata(collection: 'test', record_id:)
-              expect(record.calnet_or_ip?).to eq(true), "Expected #{record_id} to be restricted, was not"
+              expect(record.calnet_or_ip?).to be(true), "Expected #{record_id} to be restricted, was not"
             end
 
             unrestricted.each do |record_id|
               record = Record.from_metadata(collection: 'test', record_id:)
-              expect(record.calnet_or_ip?).to eq(false), "Expected #{record_id} not to be restricted, was"
+              expect(record.calnet_or_ip?).to be(false), "Expected #{record_id} not to be restricted, was"
             end
           end
         end
       end
+      # rubocop:enable RSpec/ExampleLength
 
       describe :calnet_only? do
         it 'returns true for CalNet-only records' do
           mms_id = '991047179369706532'
           stub_sru_request(mms_id)
           record = Record.from_metadata(collection: 'test', record_id: mms_id)
-          expect(record.calnet_or_ip?).to eq(true)
-          expect(record.calnet_only?).to eq(true)
+          expect(record.calnet_or_ip?).to be(true)
+          expect(record.calnet_only?).to be(true)
         end
 
         it 'returns false for records open to UCB IP addresses' do
           mms_id = '991054360089706532'
           stub_sru_request(mms_id)
           record = Record.from_metadata(collection: 'test', record_id: mms_id)
-          expect(record.calnet_or_ip?).to eq(true)
-          expect(record.calnet_only?).to eq(false)
+          expect(record.calnet_or_ip?).to be(true)
+          expect(record.calnet_only?).to be(false)
         end
       end
     end