stanford-mods 2.2.0 → 2.2.1

data/lib/stanford-mods/searchworks_languages.rb

@@ -484,7 +484,7 @@ SEARCHWORKS_LANGUAGES = {
   'uig' => 'Uighur',
   'ukr' => 'Ukrainian',
   'umb' => 'Umbundu',
-  #'und' => 'Undetermined',
+  # 'und' => 'Undetermined',
   'urd' => 'Urdu',
   'uzb' => 'Uzbek',
   'vai' => 'Vai',
@@ -514,6 +514,6 @@ SEARCHWORKS_LANGUAGES = {
   'znd' => 'Zande',
   'zul' => 'Zulu',
   'zun' => 'Zuni',
-  #'zxx' => 'null',
+  # 'zxx' => 'null',
   'zza' => 'Zaza'
-}
+}.freeze

data/lib/stanford-mods/searchworks_subjects.rb

@@ -6,7 +6,6 @@ require 'mods'
 module Stanford
   module Mods
     class Record < ::Mods::Record
-
       # Values are the contents of:
       #   subject/geographic
       #   subject/hierarchicalGeographic
@@ -28,7 +27,7 @@ module Stanford
         trans_code_vals = @mods_ng_xml.subject.geographicCode.translated_value
         if trans_code_vals
           trans_code_vals.each { |val|
-            result << val if !result.include?(val)
+            result << val unless result.include?(val)
           }
         end
 
@@ -68,7 +67,7 @@ module Stanford
       # @return [Array<String>] values for the topic_search Solr field for this document or nil if none
       def topic_search
         @topic_search ||= begin
-          vals = self.term_values(:genre) || []
+          vals = term_values(:genre) || []
           vals.concat(subject_topics) if subject_topics
           vals.empty? ? nil : vals
         end
@@ -96,13 +95,13 @@ module Stanford
       # geographic_search values with trailing comma, semicolon, and backslash (and any preceding spaces) removed
       # @return [Array<String>] values for the geographic_facet Solr field for this document or nil if none
       def geographic_facet
-        geographic_search.map { |val| val.sub(/[\\,;]$/, '').strip } unless !geographic_search
+        geographic_search.map { |val| val.sub(/[\\,;]$/, '').strip } if geographic_search
       end
 
       # subject/temporal values with trailing comma, semicolon, and backslash (and any preceding spaces) removed
       # @return [Array<String>] values for the era_facet Solr field for this document or nil if none
       def era_facet
-        subject_temporal.map { |val| val.sub(/[\\,;]$/, '').strip } unless !subject_temporal
+        subject_temporal.map { |val| val.sub(/[\\,;]$/, '').strip } if subject_temporal
       end
 
       # Values are the contents of:
@@ -112,14 +111,14 @@ module Stanford
       # @return [Array<String>] values for the geographic_search Solr field for this document or nil if none
       def geographic_search
         @geographic_search ||= begin
-          result = self.sw_geographic_search
+          result = sw_geographic_search
 
           # TODO:  this should go into stanford-mods ... but then we have to set that gem up with a Logger
           # print a message for any unrecognized encodings
-          xvals = self.subject.geographicCode.translated_value
-          codes = self.term_values([:subject, :geographicCode])
+          xvals = subject.geographicCode.translated_value
+          codes = term_values([:subject, :geographicCode])
           if codes && codes.size > xvals.size
-            self.subject.geographicCode.each { |n|
+            subject.geographicCode.each { |n|
               if n.authority != 'marcgac' && n.authority != 'marccountry'
                 sw_logger.info("#{druid} has subject geographicCode element with untranslated encoding (#{n.authority}): #{n.to_xml}")
               end
@@ -153,12 +152,12 @@ module Stanford
       def subject_other_subvy_search
         @subject_other_subvy_search ||= begin
           vals = subject_temporal ? Array.new(subject_temporal) : []
-          gvals = self.term_values([:subject, :genre])
+          gvals = term_values([:subject, :genre])
           vals.concat(gvals) if gvals
 
           # print a message for any temporal encodings
-          self.subject.temporal.each { |n|
-            sw_logger.info("#{druid} has subject temporal element with untranslated encoding: #{n.to_xml}") if !n.encoding.empty?
+          subject.temporal.each { |n|
+            sw_logger.info("#{druid} has subject temporal element with untranslated encoding: #{n.to_xml}") unless n.encoding.empty?
           }
 
           vals.empty? ? nil : vals
@@ -180,29 +179,28 @@ module Stanford
 
       # convenience method for subject/name/namePart values (to avoid parsing the mods for the same thing multiple times)
       def subject_names
-        @subject_names ||= self.sw_subject_names
+        @subject_names ||= sw_subject_names
       end
 
       # convenience method for subject/occupation values (to avoid parsing the mods for the same thing multiple times)
       def subject_occupations
-        @subject_occupations ||= self.term_values([:subject, :occupation])
+        @subject_occupations ||= term_values([:subject, :occupation])
       end
 
       # convenience method for subject/temporal values (to avoid parsing the mods for the same thing multiple times)
       def subject_temporal
-        @subject_temporal ||= self.term_values([:subject, :temporal])
+        @subject_temporal ||= term_values([:subject, :temporal])
       end
 
       # convenience method for subject/titleInfo values (to avoid parsing the mods for the same thing multiple times)
       def subject_titles
-        @subject_titles ||= self.sw_subject_titles
+        @subject_titles ||= sw_subject_titles
       end
 
       # convenience method for subject/topic values (to avoid parsing the mods for the same thing multiple times)
       def subject_topics
-        @subject_topics ||= self.term_values([:subject, :topic])
+        @subject_topics ||= term_values([:subject, :topic])
       end
-
     end
   end
 end

data/lib/stanford-mods/version.rb

@@ -1,6 +1,6 @@
 module Stanford
   module Mods
     # this is the Ruby Gem version
-    VERSION = "2.2.0"
+    VERSION = "2.2.1".freeze
   end
 end

data/spec/date_parsing_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 describe "date parsing methods" do
-
   unparseable = [ # here to remind us of what they might look like in our data
     nil,
     '',
@@ -106,11 +105,11 @@ describe "date parsing methods" do
     'No. 15 1792' => '1792',
     's.a. [1712]' => '1712',
     'publié le 24 floréal [1796]' => '1796',
-    "Fructidor l'an 3.e [i.e. 1795]" => '1795',
+    "Fructidor l'an 3.e [i.e. 1795]" => '1795'
   }
   # example string as key, expected parsed value as value
   specific_month = {
-    '1975-05' => '1975',     # vs 1918-27
+    '1975-05' => '1975', # vs 1918-27
     '1996 Jun' => '1996',
     'February 1798' => '1798',
     'March, 1794' => '1794',
@@ -262,7 +261,7 @@ describe "date parsing methods" do
     'March 22 d. 1794' => '1794',
     'N. 7 1796' => '1796',
     'N[ovember] 21st 1786' => '1786',
-    'Oct. the 2.d 1793' => '1793',
+    'Oct. the 2.d 1793' => '1793'
   }
   # example string as key, expected parsed value as value
   specific_day_2_digit_year = {
@@ -285,12 +284,12 @@ describe "date parsing methods" do
     '1901, c1900' => ['1901', '1900'], # pub date is one without the c,
     '1627 [i.e. 1646]' => ['1627', '1646'],
     '1698/1715' => ['1698', '1715'],
-    '1965,1968' => ['1965', '1968'],  # revs
+    '1965,1968' => ['1965', '1968'], # revs
     '1965|1968' => ['1965', '1968'], # revs
     '1789 ou 1790]' => ['1789', '1790'],
     '1689 [i.e. 1688-89]' => ['1689', '1688'],
     '1598 or 1599' => ['1598', '1599'],
-    '1890 [c1884]' => ['1890', '1884'],  # pub date is one without the c
+    '1890 [c1884]' => ['1890', '1884'], # pub date is one without the c
     '1873,c1868' => ['1873', '1868'], # # pub date is one without the c
     '1872-1877 [t.5, 1874]' => ['1872', '1873', '1874', '1875', '1876', '1877'],
     '1809 [ca. 1810]' => ['1809', '1810'],
@@ -324,7 +323,7 @@ describe "date parsing methods" do
   }
   # example string as key, expected parsed value as value
   multiple_years_4_digits_once = {
-    '1918-20' => ['1918', '1919', '1920'],   # vs. 1961-04
+    '1918-20' => ['1918', '1919', '1920'], # vs. 1961-04
     '1965-8' => ['1965', '1966', '1967', '1968'], # revs
     '[1846-51]' => ['1846', '1847', '1848', '1849', '1850', '1851']
   }
@@ -416,8 +415,8 @@ describe "date parsing methods" do
       .merge(century_only)
       .merge(brackets_in_middle_of_year)
       .merge(invalid_but_can_get_year).each do |example, expected|
-      expected = expected.to_i.to_s if expected.match(/^\d+$/)
-      expected = "#{expected} A.D." if expected.match(/^\d{1,3}$/)
+      expected = expected.to_i.to_s if expected =~ /^\d+$/
+      expected = "#{expected} A.D." if expected =~ /^\d{1,3}$/
       it "#{expected} for single value #{example}" do
         expect(Stanford::Mods::DateParsing.new(example).date_str_for_display).to eq expected
       end
@@ -425,7 +424,7 @@ describe "date parsing methods" do
 
     decade_only
       .merge(decade_only_4_digits).each do |example, expected|
-      expected = "#{expected.first.to_i}s" if expected.first.match(/^\d+$/)
+      expected = "#{expected.first.to_i}s" if expected.first =~ /^\d+$/
       it "#{expected} for decade #{example}" do
         expect(Stanford::Mods::DateParsing.new(example).date_str_for_display).to eq expected
       end
@@ -445,7 +444,7 @@ describe "date parsing methods" do
           expect(Stanford::Mods::DateParsing.new(example).date_str_for_display).to eq exp
         end
       else
-        expected = "#{expected.to_i} A.D." if expected.match(/^\d+$/)
+        expected = "#{expected.to_i} A.D." if expected =~ /^\d+$/
         it "#{expected} for #{example}" do
           expect(Stanford::Mods::DateParsing.new(example).date_str_for_display).to eq expected
         end
@@ -601,9 +600,9 @@ describe "date parsing methods" do
       'random text' => false,
       nil => false
     }.each do |example, expected|
-        it "#{expected} for #{example}" do
-          expect(Stanford::Mods::DateParsing.year_str_valid?(example)).to eq expected
-        end
+      it "#{expected} for #{example}" do
+        expect(Stanford::Mods::DateParsing.year_str_valid?(example)).to eq expected
+      end
     end
   end
 
@@ -625,9 +624,9 @@ describe "date parsing methods" do
       'random text' => false,
       nil => false
     }.each do |example, expected|
-        it "#{expected} for #{example}" do
-          expect(Stanford::Mods::DateParsing.year_int_valid?(example)).to eq expected
-        end
+      it "#{expected} for #{example}" do
+        expect(Stanford::Mods::DateParsing.year_int_valid?(example)).to eq expected
+      end
     end
     it 'true for 0000' do
       expect(Stanford::Mods::DateParsing.year_int_valid?(0000)).to eq true
@@ -796,7 +795,7 @@ describe "date parsing methods" do
 
   context '#display_str_for_early_numeric' do
     early_numeric_dates.each do |example, expected|
-      expected = expected.to_i.to_s if expected.match(/^\d+$/)
+      expected = expected.to_i.to_s if expected =~ /^\d+$/
       if example.start_with?('-') || example == '0'
         exp = "#{example[1..-1].to_i + 1} B.C."
         it "#{exp} for #{example}" do
@@ -897,5 +896,4 @@ describe "date parsing methods" do
       end
     end
   end
-
 end

data/spec/fixtures/searchworks_imprint_data.rb

@@ -1297,4 +1297,4 @@ SEARCHWORKS_IMPRINT_DATA = {
   # water
   # wilpf?
   # yotsuba
-}
+}.freeze

data/spec/fixtures/searchworks_pub_date_data.rb

@@ -976,4 +976,4 @@ SEARCHWORKS_PUB_DATE_DATA = {
   # water
   # wilpf?
   # yotsuba
-}
+}.freeze

data/spec/fixtures/spotlight_pub_date_data.rb

@@ -313,4 +313,4 @@ SPOTLIGHT_PUB_DATE_DATA = {
         '<dateIssued encoding="marc">1786</dateIssued>' +
         mods_origin_info_end_str => ['1786', '1786']
     }
-}
+}.freeze

data/spec/geo_spatial_spec.rb

@@ -1,8 +1,5 @@
 # encoding: utf-8
-require 'spec_helper'
-
 describe "Cartographic coordinates" do
-
   let(:smods_rec) { Stanford::Mods::Record.new }
   let(:no_coord)  do
     <<-EOF
@@ -16,7 +13,7 @@ describe "Cartographic coordinates" do
       </mods>
     EOF
   end
-  let(:with_coords)  do
+  let(:with_coords) do
     <<-EOF
       <mods xmlns="#{Mods::MODS_NS}">
         <subject>
@@ -28,7 +25,6 @@ describe "Cartographic coordinates" do
       </mods>
     EOF
   end
-
   let(:with_bad_data) do
     <<-EOF
       <mods xmlns="#{Mods::MODS_NS}">
@@ -42,6 +38,10 @@ describe "Cartographic coordinates" do
     EOF
   end
 
+  it 'has access to logger' do
+    expect(smods_rec.logger).to be_a Logger
+  end
+
   context "coordinates" do
     it "returns empty array if no coordinates in the mods" do
       smods_rec.from_str(no_coord)
@@ -83,3 +83,49 @@ describe "Cartographic coordinates" do
     end
   end
 end # describe Cartographic coordinates
+
+describe '#geo_extension_as_envelope' do
+  let(:modsbody) { '' }
+  let(:mods) do
+    rec = Stanford::Mods::Record.new
+    rec.from_str %(<mods xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.loc.gov/mods/v3" version="3.5"
+      xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-5.xsd">#{modsbody}</mods>)
+    rec
+  end
+
+  it 'without data, returns emtpy array' do
+    expect(mods.geo_extensions_as_envelope).to eq []
+  end
+
+  describe 'with data' do
+    let(:modsbody) do
+      <<-EOF
+        <extension displayLabel="geo">
+          <rdf:RDF xmlns:gml="http://www.opengis.net/gml/3.2/" xmlns:dc="http://purl.org/dc/elements/1.1/">
+            <rdf:Description rdf:about="http://purl.stanford.edu/cw222pt0426">
+            <dc:format>image/jpeg</dc:format>
+            <dc:type>Image</dc:type>
+            <gml:boundedBy>
+              <gml:Envelope>
+                <gml:lowerCorner>-122.191292 37.4063388</gml:lowerCorner>
+                <gml:upperCorner>-122.149475 37.4435369</gml:upperCorner>
+              </gml:Envelope>
+            </gml:boundedBy>
+            </rdf:Description>
+          </rdf:RDF>
+        </extension>
+      EOF
+    end
+
+    it 'logs error and returns emtpy array' do
+      allow(mods.mods_ng_xml).to receive(:extension).and_raise(RuntimeError)
+      expect(mods.logger).to receive(:warn).with(/failure parsing.*RuntimeError/)
+      expect(mods.geo_extensions_as_envelope).to eq []
+    end
+
+    it 'extract envelope strings' do
+      expect(mods.geo_extensions_as_envelope).to eq ["ENVELOPE(-122.191292, -122.149475, 37.4435369, 37.4063388)"]
+    end
+  end
+end

data/spec/imprint_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 def stanford_mods_imprint(smods_rec)
   Stanford::Mods::Imprint.new(smods_rec.origin_info)
 end
@@ -59,7 +57,7 @@ describe Stanford::Mods::Imprint do
     end
 
     context 'date_is_decade?' do
-      [ '156u',
+      ['156u',
         '167-?]',
         '[171-?]',
         '[189-]',
@@ -78,7 +76,7 @@ describe Stanford::Mods::Imprint do
           expect(imp.send(:date_is_decade?, element)).to be_truthy
         end
       end
-      [ '1950s',
+      ['1950s',
         "1950's",
         'before 1950s after'
       ].each do |example|
@@ -136,7 +134,7 @@ describe Stanford::Mods::Imprint do
     end
 
     context 'date_is_century?' do
-      [ '17uu',
+      ['17uu',
         '17--?',
         'before [16--] after'
       ].each do |example|
@@ -149,7 +147,7 @@ describe Stanford::Mods::Imprint do
           expect(imp.send(:date_is_century?, element)).to be_truthy
         end
       end
-      [ '18th century CE',
+      ['18th century CE',
         "before 5th century after"
       ].each do |example|
         it 'false when no century string to change' do

data/spec/lib/stanford-mods/coordinate_spec.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require 'spec_helper'
-
 describe Stanford::Mods::Coordinate do
   describe '#valid' do
     it 'is valid for well-formed coordinates' do

data/spec/name_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "name/author concepts" do
   let(:smods_rec) { Stanford::Mods::Record.new }
   let(:mods_start) { "<mods xmlns=\"#{Mods::MODS_NS}\">" }

data/spec/origin_info_spec.rb

@@ -1,5 +1,4 @@
 describe "computations from /originInfo field" do
-
   let(:smods_rec) { Stanford::Mods::Record.new }
 
   # used for single examples
@@ -24,7 +23,7 @@ describe "computations from /originInfo field" do
           <dateCreated>1999</dateCreated>' +
         mods_origin_info_end_str
       smods_rec.from_str(mods_str)
-      expect(smods_rec.send(method_sym)).to eq method_sym.to_s.match(/int/) ? 2005 : '2005'
+      expect(smods_rec.send(method_sym)).to eq method_sym.to_s =~ /int/ ? 2005 : '2005'
     end
     it 'respects ignore_approximate param' do
       mods_str = mods_origin_info_start_str +
@@ -32,8 +31,8 @@ describe "computations from /originInfo field" do
         '<dateCreated point="end">1599</dateCreated>' +
         mods_origin_info_end_str
       smods_rec.from_str(mods_str)
-      expect(smods_rec.send(method_sym, true)).to eq method_sym.to_s.match(/int/) ? 1599 : '1599'
-      expect(smods_rec.send(method_sym, false)).to eq method_sym.to_s.match(/int/) ? 1000 : '1000'
+      expect(smods_rec.send(method_sym, true)).to eq method_sym.to_s =~ /int/ ? 1599 : '1599'
+      expect(smods_rec.send(method_sym, false)).to eq method_sym.to_s =~ /int/ ? 1000 : '1000'
     end
     it 'nil if ignore_approximate and all dates are approximate' do
       mods_str = mods_origin_info_start_str +
@@ -42,7 +41,7 @@ describe "computations from /originInfo field" do
         mods_origin_info_end_str
       smods_rec.from_str(mods_str)
       expect(smods_rec.send(method_sym, true)).to eq nil
-      expect(smods_rec.send(method_sym, false)).to eq method_sym.to_s.match(/int/) ? 1000 : '1000'
+      expect(smods_rec.send(method_sym, false)).to eq method_sym.to_s =~ /int/ ? 1000 : '1000'
     end
     it 'respects ignore_approximate even for keyDate' do
       mods_str = mods_origin_info_start_str +
@@ -50,8 +49,8 @@ describe "computations from /originInfo field" do
         '<dateCreated point="end">1599</dateCreated>' +
         mods_origin_info_end_str
       smods_rec.from_str(mods_str)
-      expect(smods_rec.send(method_sym, true)).to eq method_sym.to_s.match(/int/) ? 1599 : '1599'
-      expect(smods_rec.send(method_sym, false)).to eq method_sym.to_s.match(/int/) ? 1000 : '1000'
+      expect(smods_rec.send(method_sym, true)).to eq method_sym.to_s =~ /int/ ? 1599 : '1599'
+      expect(smods_rec.send(method_sym, false)).to eq method_sym.to_s =~ /int/ ? 1000 : '1000'
     end
     it 'uses dateCaptured if no dateIssued or dateCreated' do
       # for web archive seed files
@@ -60,19 +59,18 @@ describe "computations from /originInfo field" do
         '<dateCaptured encoding="w3cdtf" point="end">20151218111111</dateCaptured>' +
         mods_origin_info_end_str
       smods_rec.from_str(mods_str)
-      expect(smods_rec.send(method_sym)).to eq method_sym.to_s.match(/int/) ? 2015 : '2015'
+      expect(smods_rec.send(method_sym)).to eq method_sym.to_s =~ /int/ ? 2015 : '2015'
     end
     context 'spotlight actual data' do
       require 'fixtures/spotlight_pub_date_data'
       SPOTLIGHT_PUB_DATE_DATA.each_pair.each do |coll_name, coll_data|
         # papyri - the only Spotlight data with BC dates
-        unless coll_name == 'papyri' && method_sym == :pub_year_int
-          coll_data.each_pair do |mods_str, exp_vals|
-            expected = exp_vals[exp_val_position]
-            it "#{expected} for rec in #{coll_name}" do
-              smods_rec.from_str(mods_str)
-              expect(smods_rec.send(method_sym)).to eq((method_sym.to_s.match(/int/) ? expected.to_i : expected)) if expected
-            end
+        next if coll_name == 'papyri' && method_sym == :pub_year_int
+        coll_data.each_pair do |mods_str, exp_vals|
+          expected = exp_vals[exp_val_position]
+          it "#{expected} for rec in #{coll_name}" do
+            smods_rec.from_str(mods_str)
+            expect(smods_rec.send(method_sym)).to eq((method_sym.to_s =~ /int/ ? expected.to_i : expected)) if expected
           end
         end
       end
@@ -163,7 +161,7 @@ describe "computations from /originInfo field" do
         '<dateIssued keyDate="yes">2014</dateIssued>' +
         mods_origin_info_end_str
       smods_rec.from_str(mods_str)
-      expect(smods_rec.send(method_sym, smods_rec.date_issued_elements)).to eq method_sym.to_s.match(/int/) ? 2014 : '2014'
+      expect(smods_rec.send(method_sym, smods_rec.date_issued_elements)).to eq method_sym.to_s =~ /int/ ? 2014 : '2014'
     end
     it 'ignores invalid keyDate value' do
       mods_str = mods_origin_info_start_str +
@@ -171,7 +169,7 @@ describe "computations from /originInfo field" do
         '<dateIssued>1499</dateIssued>' +
         mods_origin_info_end_str
       smods_rec.from_str(mods_str)
-      expect(smods_rec.send(method_sym, smods_rec.date_issued_elements)).to eq method_sym.to_s.match(/int/) ? 1499 : '1499'
+      expect(smods_rec.send(method_sym, smods_rec.date_issued_elements)).to eq method_sym.to_s =~ /int/ ? 1499 : '1499'
     end
     it 'calls earliest_year_str if multiple keyDates present' do
       mods_str = mods_origin_info_start_str +
@@ -179,7 +177,7 @@ describe "computations from /originInfo field" do
         '<dateCreated keyDate="yes">2001</dateCreated>' +
         mods_origin_info_end_str
       smods_rec.from_str(mods_str)
-      if method_sym.to_s.match(/int/)
+      if method_sym.to_s =~ /int/
         expect(Stanford::Mods::Record).to receive(:earliest_year_int).with(smods_rec.date_created_elements)
       else
         expect(Stanford::Mods::Record).to receive(:earliest_year_str).with(smods_rec.date_created_elements)
@@ -193,7 +191,7 @@ describe "computations from /originInfo field" do
         '<dateIssued point="end" qualifier="questionable">uuuu</dateIssued>' +
         mods_origin_info_end_str
       smods_rec.from_str(mods_str)
-      if method_sym.to_s.match(/int/)
+      if method_sym.to_s =~ /int/
         expect(Stanford::Mods::Record).to receive(:earliest_year_int).with(smods_rec.date_issued_elements)
       else
         expect(Stanford::Mods::Record).to receive(:earliest_year_str).with(smods_rec.date_issued_elements)
@@ -208,21 +206,21 @@ describe "computations from /originInfo field" do
         '<dateIssued encoding="w3cdtf">1300</dateIssued>' +
         mods_origin_info_end_str
       smods_rec.from_str(mods_str)
-      expect(smods_rec.send(method_sym, smods_rec.date_issued_elements)).to eq method_sym.to_s.match(/int/) ? 1100 : '1100'
+      expect(smods_rec.send(method_sym, smods_rec.date_issued_elements)).to eq method_sym.to_s =~ /int/ ? 1100 : '1100'
       mods_str = mods_origin_info_start_str +
         '<dateIssued>1200</dateIssued>' +
         '<dateIssued encoding="marc">1300</dateIssued>' +
         '<dateIssued encoding="w3cdtf" keyDate="yes">1100</dateIssued>' +
         mods_origin_info_end_str
       smods_rec.from_str(mods_str)
-      expect(smods_rec.send(method_sym, smods_rec.date_issued_elements)).to eq method_sym.to_s.match(/int/) ? 1100 : '1100'
+      expect(smods_rec.send(method_sym, smods_rec.date_issued_elements)).to eq method_sym.to_s =~ /int/ ? 1100 : '1100'
       mods_str = mods_origin_info_start_str +
         '<dateIssued>1300</dateIssued>' +
         '<dateIssued encoding="marc" keyDate="yes">1100</dateIssued>' +
         '<dateIssued encoding="w3cdtf">1200</dateIssued>' +
         mods_origin_info_end_str
       smods_rec.from_str(mods_str)
-      expect(smods_rec.send(method_sym, smods_rec.date_issued_elements)).to eq method_sym.to_s.match(/int/) ? 1100 : '1100'
+      expect(smods_rec.send(method_sym, smods_rec.date_issued_elements)).to eq method_sym.to_s =~ /int/ ? 1100 : '1100'
     end
   end
 
@@ -307,7 +305,7 @@ describe "computations from /originInfo field" do
       end
       context "retains element when attribute qualifer=" do
         ['inferred', 'invalid_attr_val'].each do |attr_val|
-        let(:qual_attr_val) { attr_val }
+          let(:qual_attr_val) { attr_val }
           it attr_val do
             smods_rec.from_str mods_rec
             result = smods_rec.date_issued_elements(true)
@@ -319,7 +317,7 @@ describe "computations from /originInfo field" do
         end
       end
 
-      let(:start_str) {"#{mods_origin_info_start_str}<dateIssued>2015</dateIssued>"}
+      let(:start_str) { "#{mods_origin_info_start_str}<dateIssued>2015</dateIssued>" }
       it 'retains element without qualifier attribute"' do
         m = start_str + '<dateIssued>1666</dateIssued>' + mods_origin_info_end_str
         smods_rec.from_str m
@@ -376,7 +374,7 @@ describe "computations from /originInfo field" do
       end
       context "retains element when attribute qualifer=" do
         ['inferred', 'invalid_attr_val'].each do |attr_val|
-        let(:qual_attr_val) { attr_val }
+          let(:qual_attr_val) { attr_val }
           it attr_val do
             smods_rec.from_str mods_rec
             result = smods_rec.date_created_elements(true)
@@ -388,7 +386,7 @@ describe "computations from /originInfo field" do
         end
       end
 
-      let(:start_str) {"#{mods_origin_info_start_str}<dateCreated>2015</dateCreated>"}
+      let(:start_str) { "#{mods_origin_info_start_str}<dateCreated>2015</dateCreated>" }
       it 'retains element without qualifier attribute"' do
         m = start_str + '<dateCreated>1666</dateCreated>' + mods_origin_info_end_str
         smods_rec.from_str m
@@ -468,7 +466,7 @@ describe "computations from /originInfo field" do
              <dateIssued qualifier='#{attr_value}'>1968</dateIssued>
           #{mods_origin_info_end_str}"
         end
-        it "#{expected}" do
+        it expected.to_s do
           smods_rec.from_str(mods_str)
           date_el = smods_rec.date_issued_elements.first
           expect(Stanford::Mods::Record.date_is_approximate?(date_el)).to eq expected
@@ -491,4 +489,4 @@ describe "computations from /originInfo field" do
       expect(smods_rec.send(:get_u_year, ["9999"])).to be_nil
     end
   end
-end
+end