stanford-mods 3.0.0.alpha1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bccde0bc740f4135ee9de0b7255f3ac347a16c858ca463801111f37f8ad84ecc
-  data.tar.gz: a6e3fc9534efe4e37b05bf047007a5b9e3cd41f662e568b1b2333a1cc1213dce
+  metadata.gz: 70d3b7093c830baa3c12f4c2c438549eb451fa4b6bb6c57f458382f0e8e53dc2
+  data.tar.gz: 044edaeef524c4a701ebbc0e25f08d0c3fb5068b04cc36ab8769772004a73a85
 SHA512:
-  metadata.gz: 7ab80915b8f299e35822e9f2b6e0047cf1b32c62bec9ac0218daeb0d7bd3fb4753d1668075b754e5a9a955098fb785c94a9c188654295894c2867fc7d04f7574
-  data.tar.gz: fb1e1835b67fb30c7d19c2046c08a9a60bddda35b6b4067bb3518c8d8d9385a09d80846fc46e958f67d9a0eb89dcb2aef36ede3da03fc723f0158d1db3b81ee9
+  metadata.gz: '097830e7c3b1136a279dfce41ac426ae860ab020f27bb1550a3f2a5f23b7fcbc1c7f7952f35f06a44aed7100d0d410c39adcbb17a70b270174c85b757d1aca4b'
+  data.tar.gz: 7aa1c33f53fdbd4160d99a14739b4dcbd37950f4d8ab8238ee1886d4b6db4aaa9b5dec4c92f74842db80aa9839ec2d7e27a570a4fb7cde4862afc54b79c9e6a4

data/lib/stanford-mods/concerns/name.rb

@@ -25,7 +25,7 @@ module Stanford
 
       # @return [Array<String>] values for author_person_facet, author_person_display
       def sw_person_authors
-        mods_ng_xml.personal_names.map(&:display_value_w_date)
+        mods_ng_xml.personal_name.map(&:display_value_w_date)
       end
 
       # return the display_value_w_date for all <mods><name> elements that do not have type='personal'

data/lib/stanford-mods/concerns/origin_info.rb

@@ -72,6 +72,10 @@ module Stanford
         origin_info.map { |el| Stanford::Mods::Imprint.new(el) }
       end
 
+      def place
+        term_values([:origin_info, :place, :placeTerm])
+      end
+
       # @return [String] single String containing imprint information for display
       def imprint_display_str
         imprints.map(&:display_str).reject(&:empty?).join('; ')

data/lib/stanford-mods/concerns/title.rb

@@ -9,41 +9,49 @@ module Stanford
       # Searchworks requires that the MODS has a '//titleInfo/title'
       # @return [String] value for title_245_search, title_full_display
       def sw_full_title(title_info = first_title_info_node, sortable: false)
-        return unless title_info
+        return unless title_info&.children&.any?
 
         title = title_info.title&.text&.strip
-
         return if title.nil? || title.empty?
 
-        nonSort_title = title_info.nonSort&.text&.strip
+        title = ''
+        previous_element = nil
+
+        title_info.children.select { |value| title_parts.include? value.name }.each do |value|
+          next if value.name == 'nonSort' && sortable
 
-        preSubTitle = [(nonSort_title unless sortable), title].compact.join(' ')
+          str = value.text.strip
+          next if str.empty?
 
-        preSubTitle.sub!(/:$/, '')
+          delimiter = if title.empty? || title.end_with?(' ')
+                        nil
+                      elsif previous_element&.name == 'nonSort' && title.end_with?('-', '\'')
+                        nil
+                      elsif title.end_with?('.', ',', ':', ';')
+                        ' '
+                      elsif value.name == 'subTitle'
+                        ' : '
+                      elsif value.name == 'partName' && previous_element.name == 'partNumber'
+                        ', '
+                      elsif value.name == 'partNumber' || value.name == 'partName'
+                        '. '
+                      else
+                        ' '
+                      end
 
-        subTitle = title_info.subTitle.text.strip
-        preParts = subTitle.empty? ? preSubTitle : preSubTitle + " : " + subTitle
-        preParts.sub!(/\.$/, '') if preParts # remove trailing period
+          title += delimiter if delimiter
+          title += str
 
-        partName   = title_info.partName.text.strip   unless title_info.partName.text.strip.empty?
-        partNumber = title_info.partNumber.text.strip unless title_info.partNumber.text.strip.empty?
-        partNumber.sub!(/,$/, '') if partNumber # remove trailing comma
-        if partNumber && partName
-          parts = partNumber + ", " + partName
-        elsif partNumber
-          parts = partNumber
-        elsif partName
-          parts = partName
+          previous_element = value
         end
-        parts.sub!(/\.$/, '') if parts
 
-        result = parts ? preParts + ". " + parts : preParts
-        return nil unless result
+        title += "." unless title =~ /\s*[[:punct:]]$/
+
+        title.strip
+      end
 
-        result += "." unless result =~ /[[:punct:]]$/
-        result.strip!
-        result = nil if result.empty?
-        result
+      def title_parts
+        %w[nonSort title subTitle partName partNumber]
       end
 
       # like sw_full_title without trailing \,/;:.
@@ -57,7 +65,7 @@ module Stanford
       # this includes all titles except
       # @return [Array<String>] values for title_variant_search
       def sw_addl_titles
-        (full_titles - first_title_info_node.full_title).reject(&:blank?)
+        (full_titles - Array(first_title_info_node&.full_title)).reject(&:blank?)
       end
 
       # Returns a sortable version of the main title
@@ -76,4 +84,4 @@ module Stanford
       end
     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 = '3.0.0.alpha1'.freeze
+    VERSION = '3.0.0'.freeze
   end
 end

data/spec/searchworks_title_spec.rb

@@ -3,7 +3,7 @@ describe 'title fields (searchworks.rb)' do
   before(:all) do
     @smods_rec = Stanford::Mods::Record.new
     @ns_decl = "xmlns='#{Mods::MODS_NS}'"
-    m = "<mods #{@ns_decl}><titleInfo><title>Jerk</title><subTitle>A Tale of Tourettes</subTitle><nonSort>The</nonSort></titleInfo></mods>"
+    m = "<mods #{@ns_decl}><titleInfo><nonSort>The</nonSort><title>Jerk</title><subTitle>A Tale of Tourettes</subTitle></titleInfo></mods>"
     @smods_rec.from_str m
   end
 
@@ -19,7 +19,7 @@ describe 'title fields (searchworks.rb)' do
 
   context 'blank title node' do
     it 'should deal with a second blank titleInfo node' do
-      m = "<mods #{@ns_decl}><titleInfo> </titleInfo><otherStuff>goes here</otherStuff><titleInfo><title>Jerk</title><subTitle>A Tale of Tourettes</subTitle><nonSort>The</nonSort></titleInfo></mods>"
+      m = "<mods #{@ns_decl}><titleInfo> </titleInfo><otherStuff>goes here</otherStuff><titleInfo><nonSort>The</nonSort><title>Jerk</title><subTitle>A Tale of Tourettes</subTitle>></titleInfo></mods>"
       smods_rec_blank_node = Stanford::Mods::Record.new
       smods_rec_blank_node.from_str m
       expect(smods_rec_blank_node.sw_short_title).to eq 'The Jerk'
@@ -113,7 +113,7 @@ describe 'title fields (searchworks.rb)' do
               <subTitle>a history</subTitle>
             </titleInfo></mods>"
           @smods_rec.from_str(m)
-          expect(@smods_rec.sw_full_title).to eq 'The Olympics : a history.'
+          expect(@smods_rec.sw_full_title).to eq 'The Olympics: a history.'
         end #
         # "end subtitle with period" - see above
         it 'subtitle already ends with period' do
@@ -389,7 +389,7 @@ describe 'title fields (searchworks.rb)' do
             <subTitle>a history</subTitle>
           </titleInfo></mods>"
         @smods_rec.from_str(m)
-        expect(@smods_rec.sw_title_display).to eq 'The Olympics : a history'
+        expect(@smods_rec.sw_title_display).to eq 'The Olympics: a history'
       end #
       # "end subtitle with period" - see above
       it 'subtitle already ends with period' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha1
+  version: 3.0.0
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mods
@@ -213,9 +213,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.32
 signing_key: