stanford-mods 2.6.0 → 2.6.4

data/lib/stanford-mods/imprint.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/integer/inflections'
+
 module Stanford
   module Mods
     ##
@@ -45,9 +47,10 @@ module Stanford
                           else
                             date_field_keys.map do |date_field|
                               next unless origin_info_node.respond_to?(date_field)
+
                               date_elements = origin_info_node.send(date_field)
                               date_elements.map(&:as_object).map(&:first) if date_elements.any?
-                            end.first
+                            end.compact.first
                           end
 
           if date_elements.nil? || date_elements.none?
@@ -82,6 +85,7 @@ module Stanford
         compact_values = values.compact.reject { |v| v.strip.empty? }
         return compact_values.join(delimiter) if compact_values.length == 1 ||
                                                  !ends_in_terminating_punctuation?(delimiter)
+
         compact_values.each_with_index.map do |value, i|
           if (compact_values.length - 1) == i || # last item?
              ends_in_terminating_punctuation?(value)
@@ -104,6 +108,7 @@ module Stanford
 
       def publisher_vals_str(origin_info_node)
         return if origin_info_node.publisher.text.strip.empty?
+
         publishers = origin_info_node.publisher.reject do |p|
           p.text.strip.empty?
         end.map(&:text)
@@ -114,6 +119,7 @@ module Stanford
 
       def place_vals_str(origin_info_node)
         return if origin_info_node.place.text.strip.empty?
+
         places = place_terms(origin_info_node).reject do |p|
           p.text.strip.empty?
         end.map(&:text)
@@ -130,6 +136,7 @@ module Stanford
       def place_terms(origin_info_element)
         return [] unless origin_info_element.respond_to?(:place) &&
                          origin_info_element.place.respond_to?(:placeTerm)
+
         if unencoded_place_terms?(origin_info_element)
           origin_info_element.place.placeTerm.select do |term|
             !term.attributes['type'].respond_to?(:value) ||
@@ -142,6 +149,7 @@ module Stanford
                         term.attributes['authority'].respond_to?(:value) &&
                         term.attributes['authority'].value == 'marccountry' &&
                         MARC_COUNTRIES.include?(term.text.strip)
+
             term = term.clone
             term.content = MARC_COUNTRIES[term.text.strip]
             term
@@ -154,12 +162,14 @@ module Stanford
       def date_str(origin_info_node)
         date_vals = origin_info_date_vals(origin_info_node)
         return if date_vals.empty?
+
         date_vals.map(&:strip).join(' ')
       end
 
       def origin_info_date_vals(origin_info_node)
         date_field_keys.map do |date_field|
           next unless origin_info_node.respond_to?(date_field)
+
           date_elements = origin_info_node.send(date_field)
           date_elements_display_vals(date_elements) if date_elements.present?
         end.compact.flatten
@@ -338,8 +348,8 @@ module Stanford
           else
             ng_date_element.content
           end
-        rescue
-          ng_date_element.content
+                                  rescue
+                                    ng_date_element.content
         end
         ng_date_element
       end
@@ -352,8 +362,8 @@ module Stanford
           else
             ng_date_element.content
           end
-        rescue
-          ng_date_element.content
+                                  rescue
+                                    ng_date_element.content
         end
         ng_date_element
       end
@@ -376,8 +386,8 @@ module Stanford
           else
             my_ng_date_element.content
           end
-        rescue
-          my_ng_date_element.content
+                                     rescue
+                                       my_ng_date_element.content
         end
         my_ng_date_element
       end
@@ -392,14 +402,13 @@ module Stanford
           # note:  not calling DateParsing.display_str_for_century directly because non-year text is lost
           century_matches = orig_date_str.match(CENTURY_4CHAR_REGEXP) if orig_date_str
           if century_matches
-            require 'active_support/core_ext/integer/inflections'
             new_century_str = "#{(century_matches[3].to_i + 1).ordinalize} century"
             my_ng_date_element.content = "#{century_matches[1]}#{new_century_str}#{century_matches[4]}"
           else
             my_ng_date_element.content
           end
-        rescue
-          my_ng_date_element.content
+                                     rescue
+                                       my_ng_date_element.content
         end
         my_ng_date_element
       end

data/lib/stanford-mods/name.rb

@@ -17,7 +17,7 @@ module Stanford
           first_wo_role ||= n if n.role.empty?
           n.role.each { |r|
             if r.authority.include?('marcrelator') &&
-                  (r.value.include?('Creator') || r.value.include?('Author'))
+                 r.value.any? { |v| v.match(/creator/i) || v.match?(/author/i) }
               result ||= n.display_value_w_date
             end
           }
@@ -45,6 +45,7 @@ module Stanford
         result = []
         mods_ng_xml.personal_name.map do |n|
           next if n.role.size.zero?
+
           n.role.each { |r|
             result << n.display_value_w_date unless includes_marc_relator_collector_role?(r)
           }
@@ -58,6 +59,7 @@ module Stanford
         result = []
         mods_ng_xml.personal_name.each do |n|
           next if n.role.size.zero?
+
           n.role.each { |r|
             result << n.display_value_w_date if includes_marc_relator_collector_role?(r)
           }

data/lib/stanford-mods/origin_info.rb

@@ -82,6 +82,7 @@ module Stanford
       def year_display_str(date_el_array)
         result = date_parsing_result(date_el_array, :date_str_for_display)
         return result if result
+
         _ignore, orig_str_to_parse = self.class.earliest_year_str(date_el_array)
         DateParsing.date_str_for_display(orig_str_to_parse) if orig_str_to_parse
       end
@@ -93,6 +94,7 @@ module Stanford
       def year_int(date_el_array)
         result = date_parsing_result(date_el_array, :year_int_from_date_str)
         return result if result
+
         year_int, _ignore = self.class.earliest_year_int(date_el_array)
         year_int if year_int
       end
@@ -104,6 +106,7 @@ module Stanford
       def year_sort_str(date_el_array)
         result = date_parsing_result(date_el_array, :sortable_year_string_from_date_str)
         return result if result
+
         sortable_str, _ignore = self.class.earliest_year_str(date_el_array)
         sortable_str if sortable_str
       end
@@ -115,6 +118,7 @@ module Stanford
       def date_created_elements(ignore_approximate = false)
         date_created_nodeset = mods_ng_xml.origin_info.dateCreated
         return self.class.remove_approximate(date_created_nodeset) if ignore_approximate
+
         date_created_nodeset.to_a
       end
 
@@ -125,6 +129,7 @@ module Stanford
       def date_issued_elements(ignore_approximate = false)
         date_issued_nodeset = mods_ng_xml.origin_info.dateIssued
         return self.class.remove_approximate(date_issued_nodeset) if ignore_approximate
+
         date_issued_nodeset.to_a
       end
 
@@ -194,6 +199,7 @@ module Stanford
       # @return [Integer, String] year as a String or Integer, depending on method_sym
       def date_parsing_result(date_el_array, method_sym)
         return if date_el_array.empty?
+
         # prefer keyDate
         key_date_el = self.class.keyDate(date_el_array)
         DateParsing.send(method_sym, key_date_el.content) if key_date_el
@@ -239,6 +245,7 @@ module Stanford
         return nil unless pub_date
         return "#{pub_date.to_i + 1000} B.C." if pub_date.start_with?('-')
         return pub_date unless pub_date.include? '--'
+
         "#{pub_date[0, 2].to_i + 1}th century"
       end
 
@@ -251,6 +258,7 @@ module Stanford
           pd = pd.gsub('--', '00')
         end
         fail "pub_date_sort was about to return a non 4 digit value #{pd}!" if pd && pd.length != 4
+
         pd
       end
 
@@ -261,6 +269,7 @@ module Stanford
       def pub_date_display
         return dates_no_marc_encoding.first unless dates_no_marc_encoding.empty?
         return dates_marc_encoding.first unless dates_marc_encoding.empty?
+
         nil
       end
 
@@ -274,6 +283,7 @@ module Stanford
         # use the cached year if there is one
         if @pub_year
           return nil if @pub_year == ''
+
           return @pub_year
         end
 
@@ -307,6 +317,7 @@ module Stanford
       def pub_dates
         return dates_marc_encoding unless dates_marc_encoding.empty?
         return dates_no_marc_encoding unless dates_no_marc_encoding.empty?
+
         nil
       end
 
@@ -410,6 +421,7 @@ module Stanford
         dates.each do |f_date|
           matches = f_date.scan(/\d{1}th/)
           next if matches.empty?
+
           if matches.length == 1
             @pub_year = (matches.first[0, 2].to_i - 1).to_s + '--'
             return @pub_year
@@ -436,6 +448,7 @@ module Stanford
         dates.each do |f_date|
           matches = f_date.scan(/\d{2}th/)
           next if matches.empty?
+
           if matches.length == 1
             @pub_year = (matches.first[0, 2].to_i - 1).to_s + '--'
             return @pub_year
@@ -464,6 +477,7 @@ module Stanford
           # Single digit u notation
           matches = f_date.scan(/\d{3}u/)
           return matches.first.tr('u', '0') if matches.length == 1
+
           # Double digit u notation
           matches = f_date.scan(/\d{2}u{2}/)
           return matches.first.tr('u', '-') if matches.length == 1

data/lib/stanford-mods/searchworks.rb

@@ -153,12 +153,13 @@ module Stanford
         first_title_info_node.title.text.strip.empty?   ? nil : first_title_info_node.title.text.strip
       end
 
+      # Searchworks requires that the MODS has a '//titleInfo/title'
       # @return [String] value for title_245_search, title_full_display
       def sw_full_title
+        return nil if !first_title_info_node || !title
 
-        return nil unless first_title_info_node
         preSubTitle = nonSort_title ? [nonSort_title, title].compact.join(" ") : title
-        preSubTitle.sub!(/:$/, '') if preSubTitle # remove trailing colon
+        preSubTitle.sub!(/:$/, '')
 
         subTitle = first_title_info_node.subTitle.text.strip
         preParts = subTitle.empty? ? preSubTitle : preSubTitle + " : " + subTitle
@@ -178,6 +179,7 @@ module Stanford
 
         result = parts ? preParts + ". " + parts : preParts
         return nil unless result
+
         result += "." unless result =~ /[[:punct:]]$/
         result.strip!
         result = nil if result.empty?
@@ -191,13 +193,20 @@ module Stanford
       def sw_title_display
         result = sw_full_title
         return nil unless result
+
         result.sub(/[\.,;:\/\\]+$/, '').strip
       end
 
       # this includes all titles except
       # @return [Array<String>] values for title_variant_search
       def sw_addl_titles
-        full_titles.select { |s| s !~ Regexp.new(Regexp.escape(sw_short_title)) }
+        excluded_title = sw_short_title || sw_title_display
+        if excluded_title.present?
+          title_regex = Regexp.new(Regexp.escape(excluded_title))
+          full_titles.reject { |s| s =~ title_regex }.reject(&:blank?)
+        else
+          full_titles.reject(&:blank?)
+        end
       end
 
       # Returns a sortable version of the main title
@@ -235,6 +244,7 @@ module Stanford
       def format_main
         types = typeOfResource
         return [] unless types
+
         article_genres = ['article', 'Article',
           'book chapter', 'Book chapter', 'Book Chapter',
           'issue brief', 'Issue brief', 'Issue Brief',
@@ -295,6 +305,7 @@ module Stanford
       def sw_genre
         genres = term_values(:genre)
         return [] unless genres
+
         val = genres.map(&:to_s)
         thesis_pub = ['thesis', 'Thesis']
         val << 'Thesis/Dissertation' if (genres & thesis_pub).any?
@@ -314,6 +325,7 @@ module Stanford
       def catkey
         catkey = term_values([:record_info, :recordIdentifier])
         return nil unless catkey && !catkey.empty?
+
         catkey.first.tr('a', '') # ensure catkey is numeric only
       end
     end # class Record

data/lib/stanford-mods/searchworks_languages.rb

@@ -1,5 +1,7 @@
 # Language Values used by SearchWorks
 # From  https://github.com/solrmarc/stanford-solr-marc/blob/master/stanford-sw/translation_maps/language_map.properties
+# code 'ase' from iso639-3
+# code egy-Egyd from rfc5646
 SEARCHWORKS_LANGUAGES = {
   'aaa' => 'Afar',
   'abk' => 'Abkhaz',
@@ -30,6 +32,7 @@ SEARCHWORKS_LANGUAGES = {
   'arp' => 'Arapaho',
   'art' => 'Artificial (Other)',
   'arw' => 'Arawak',
+  'ase' => 'American Sign Language',
   'asm' => 'Assamese',
   'ast' => 'Bable',
   'ath' => 'Athapascan (Other)',
@@ -123,6 +126,7 @@ SEARCHWORKS_LANGUAGES = {
   'dzo' => 'Dzongkha',
   'efi' => 'Efik',
   'egy' => 'Egyptian',
+  'egy-Egyd' => 'Egyptian, Demotic',
   'eka' => 'Ekajuk',
   'elx' => 'Elamite',
   'eng' => 'English',

data/lib/stanford-mods/searchworks_subjects.rb

@@ -109,12 +109,14 @@ module Stanford
           if codes && codes.size > xvals.size
             subject.geographicCode.each { |n|
               next unless n.authority != 'marcgac' && n.authority != 'marccountry'
+
               sw_logger.info("#{druid} has subject geographicCode element with untranslated encoding (#{n.authority}): #{n.to_xml}")
             }
           end
 
           # FIXME:  stanford-mods should be returning [], not nil ...
           return nil if !result || result.empty?
+
           result
         end
       end

data/lib/stanford-mods/version.rb

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

data/lib/stanford-mods.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'mods'
 require 'stanford-mods/date_parsing'
 require 'stanford-mods/coordinate'

data/spec/date_parsing_spec.rb

@@ -272,7 +272,7 @@ describe "date parsing methods" do
     '10/1/90' => '1990',
     '10/21/08' => '2008',
     '5-1-59' => '1959',
-    '5-1-21' => '1921',
+    '5-1-29' => '1929',
     '5-1-14' => '2014'
   }
   # example string as key, expected parsed value as value
@@ -394,12 +394,14 @@ describe "date parsing methods" do
       Stanford::Mods::DateParsing.date_str_for_display('1666')
     end
   end
+
   context '*sortable_year_string_from_date_str' do
     it 'calls instance method sortable_year_string_from_date_str' do
       expect_any_instance_of(Stanford::Mods::DateParsing).to receive(:sortable_year_string_from_date_str)
       Stanford::Mods::DateParsing.sortable_year_string_from_date_str('1666')
     end
   end
+
   context '*year_int_from_date_str' do
     it 'calls instance method year_int_from_date_str' do
       expect_any_instance_of(Stanford::Mods::DateParsing).to receive(:year_int_from_date_str)

data/spec/fixtures/searchworks_imprint_data.rb

@@ -1293,7 +1293,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued>1500 CE</dateIssued>
         <issuance>monographic</issuance>' +
         mods_origin_info_end_str => 'Italy, 1500 CE'
-    },
+    }
   # water
   # wilpf?
   # yotsuba

data/spec/fixtures/searchworks_pub_date_data.rb

@@ -972,7 +972,7 @@ SEARCHWORKS_PUB_DATE_DATA = {
       mods_origin_info_start_str +
         '<dateIssued>1500 CE</dateIssued>' +
         mods_origin_info_end_str => [1500, '1500']
-    },
+    }
   # water
   # wilpf?
   # yotsuba

data/spec/imprint_spec.rb

@@ -14,6 +14,7 @@ describe Stanford::Mods::Imprint do
         '' => [],
         '<dateIssued point="start">unparsable</dateIssued>' => [],
         '<dateIssued>1957</dateIssued>' => [1957],
+        '<dateCreated>1957</dateCreated>' => [1957],
         '<dateIssued>195u</dateIssued>' => (1950..1959).to_a,
         '<dateCreated keyDate="yes">1964</dateCreated><dateIssued>195u</dateIssued>' => [1964],
         '<dateIssued>1964</dateIssued><dateCreated>195u</dateCreated>' => [1964],
@@ -30,6 +31,7 @@ describe Stanford::Mods::Imprint do
         end
       end
     end
+
     describe 'bad dates' do
       it 'ignores bad date values' do
         smods_rec.from_str(mods_origin_info_start_str +

data/spec/name_spec.rb

@@ -11,7 +11,7 @@ describe "name/author concepts" do
                           </name>" }
     let(:plain_creator_text) { "<name>
                               <namePart>plain_creator_text</namePart>
-                              <role><roleTerm type='text' authority='marcrelator'>Creator</roleTerm></role>
+                              <role><roleTerm type='text' authority='marcrelator'>creator</roleTerm></role>
                           </name>" }
     let(:plain_creator_non_mr) { "<name>
                               <namePart>plain_creator_non_mr</namePart>
@@ -23,7 +23,7 @@ describe "name/author concepts" do
                           </name>" }
     let(:plain_author_text) { "<name>
                               <namePart>plain_author_text</namePart>
-                              <role><roleTerm type='text' authority='marcrelator'>Author</roleTerm></role>
+                              <role><roleTerm type='text' authority='marcrelator'>author</roleTerm></role>
                           </name>" }
     let(:plain_author_non_mr) { "<name>
                               <namePart>plain_author_non_mr</namePart>
@@ -284,6 +284,7 @@ describe "name/author concepts" do
         expect(smods_rec.non_collector_person_authors).to eq [name]
       end
     end
+
     it 'nil if only collectors' do
       name_snippet =
         <<-EOF
@@ -345,6 +346,7 @@ describe "name/author concepts" do
         expect(smods_rec.collectors_w_dates).to eq [collector_name]
       end
     end
+
     context 'no valueURI for roleTerm' do
       it 'collector marc relator code' do
         name_snippet =
@@ -373,6 +375,7 @@ describe "name/author concepts" do
         expect(smods_rec.collectors_w_dates).to eq [collector_name]
       end
     end
+
     it 'does not include non-collectors' do
       name_snippet =
         <<-EOF

data/spec/origin_info_spec.rb

@@ -66,6 +66,7 @@ describe "computations from /originInfo field" do
       SPOTLIGHT_PUB_DATE_DATA.each_pair.each do |coll_name, coll_data|
         # papyri - the only Spotlight data with BC dates
         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
@@ -303,6 +304,7 @@ describe "computations from /originInfo field" do
           end
         end
       end
+
       context "retains element when attribute qualifer=" do
         ['inferred', 'invalid_attr_val'].each do |attr_val|
           let(:qual_attr_val) { attr_val }
@@ -372,6 +374,7 @@ describe "computations from /originInfo field" do
           end
         end
       end
+
       context "retains element when attribute qualifer=" do
         ['inferred', 'invalid_attr_val'].each do |attr_val|
           let(:qual_attr_val) { attr_val }

data/spec/physical_location_spec.rb

@@ -74,6 +74,7 @@ describe "Physical Location for series, box, folder" do
             expect(@smods_rec.box).to eq expected
           end
         end
+
         context 'in /relatedItem/location/physicalLocation' do
           it "has the expected box label '#{expected}'" do
             @smods_rec.from_str(mods_rel_item_loc_phys_loc)
@@ -131,6 +132,7 @@ describe "Physical Location for series, box, folder" do
             expect(@smods_rec.folder).to eq expected
           end
         end
+
         context 'in /relatedItem/location/physicalLocation' do
           it "has the expected folder label '#{expected}'" do
             @smods_rec.from_str(mods_rel_item_loc_phys_loc)
@@ -179,12 +181,14 @@ describe "Physical Location for series, box, folder" do
             expect(@smods_rec.physical_location_str).to eq expected
           end
         end
+
         context 'in /relatedItem/location/physicalLocation' do
           it "has the expected location '#{expected}'" do
             @smods_rec.from_str(mods_rel_item_loc_phys_loc)
             expect(@smods_rec.physical_location_str).to eq expected
           end
         end
+
         context 'with multiple physicalLocation elements' do
           it "has the expected location '#{expected}'" do
             @smods_rec.from_str(mods_loc_multiple_phys_loc)
@@ -233,12 +237,14 @@ describe "Physical Location for series, box, folder" do
             expect(@smods_rec.series).to eq expected
           end
         end
+
         context 'in /relatedItem/location/physicalLocation' do
           it "has the expected series name '#{expected}'" do
             @smods_rec.from_str(mods_rel_item_loc_phys_loc)
             expect(@smods_rec.series).to eq expected
           end
         end
+
         context 'with multiple physicalLocation elements' do
           it "has the expected series name '#{expected}'" do
             @smods_rec.from_str(mods_loc_multiple_phys_loc)

data/spec/searchworks_pub_dates_spec.rb

@@ -212,6 +212,7 @@ describe "Date methods (searchworks.rb)" do
       expect(smods_rec.send(:pub_date)).to eq('8--')
     end
   end # pub_date
+
   context "pub_dates (protected)" do
     it "puts dateIssued values before dateCreated values" do
       m = "<mods #{ns_decl}><originInfo>

data/spec/searchworks_spec.rb

@@ -97,6 +97,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
       </mods>"
       @smods_rec.from_str(m)
     end
+
     it "main author (for author_1xx_search)" do
       expect(@smods_rec).to receive(:main_author_w_date) # in stanford-mods.rb
       @smods_rec.sw_main_author

data/spec/searchworks_subject_raw_spec.rb

@@ -128,6 +128,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
               </mods>"
           @smods_rec.from_str m
         end
+
         it "uses a ', ' as the separator by default" do
           expect(@smods_rec.sw_subject_names).to eq ['first, second']
         end
@@ -192,6 +193,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
               </mods>"
           @smods_rec.from_str m
         end
+
         it "uses a ' ' as the separator by default" do
           expect(@smods_rec.sw_subject_titles).to eq ['first second']
         end
@@ -276,6 +278,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
           expect(@smods_rec.sw_geographic_search).to eq([])
         end
       end
+
       context "hierarchicalGeographic subelement" do
         it "should have a separate value for each hierarchicalGeographic element" do
           m = "<mods #{@ns_decl}>
@@ -305,6 +308,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
             </subject></mods>"
             @smods_rec.from_str m
           end
+
           it "uses a space as the separator by default" do
             expect(@smods_rec.sw_geographic_search).to eq ['Canada British Columbia Vancouver']
           end
@@ -313,6 +317,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
           end
         end
       end # hierarchicalGeographic
+
       context "geographicCode subelement" do
         before(:all) do
           m = "<mods #{@ns_decl}>
@@ -324,6 +329,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
           @smods_rec.from_str m
           @geo_search_from_codes = @smods_rec.sw_geographic_search
         end
+
         it "should not add untranslated values" do
           expect(@geo_search_from_codes).not_to include('n-us-md')
           expect(@geo_search_from_codes).not_to include('e-er')

data/spec/searchworks_subject_spec.rb

@@ -240,6 +240,7 @@ describe "Subject fields (searchworks.rb)" do
           expect(@smods_rec.subject_other_subvy_search).to be_nil
         end
       end
+
       context "genre subelement" do
         it "should have a separate value for each genre element" do
           m = "<mods #{@ns_decl}>
@@ -266,6 +267,7 @@ describe "Subject fields (searchworks.rb)" do
       before :each do
         allow(@smods_rec.sw_logger).to receive(:info).with(/ has subject geographicCode element with untranslated encoding \(iso3166\): <geographicCode authority=.*>us<\/geographicCode>/)
       end
+
       it "should be nil if there are no values in the MODS" do
         @smods_rec = Stanford::Mods::Record.new
         @smods_rec.from_str(@ng_mods_no_subject.to_s)