mods_display 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04b5809a32a151c63f3c9423f8917046060c12ed6a88a64e30b018f89256f144
-  data.tar.gz: a2104c15cdec18e265fd19349fece71736a2e92f2c0bceb8288d7977a4ffa2a0
+  metadata.gz: 586a8299be19e795bc90b434d9902084ca8fa10bb8cbe9690fc108471e1f5495
+  data.tar.gz: 00574a48dc3c3ba050529bf2d3fcd5e38df5de4c0e5ed4023ad07904dea29c99
 SHA512:
-  metadata.gz: 7f4505c49261d1a76e3f1ba8da36fce97a396c5a680de93ac61293d45aefde35716463172e0e92c29e90cbef2a8ed11b65ef9fa2787028e6f8be36f31dadf582
-  data.tar.gz: afbf6a24b41cdc0c097f66b7ff7173501cfd1de626c1ed850e54c6e85319edd4af4484b46612e7828622b78469536ce8d859a8e1068bacb2461ac4d2c8385b25
+  metadata.gz: 9430fa89a1efb94a17ec8c83f5fc96e55f96221f962480ff6a71a9283548d385e1afabe1c8653215155a8d7804648075aae93d217ff2d25ec29357c5b2e64544
+  data.tar.gz: 0d7b2e673cae7f336e65824c528b78abd59e8b730430570faa98910cf715e875a707dde7787a48cbf158f15bc596b057181c443d253387136604b307036812ea

data/lib/mods_display/fields/location.rb

@@ -24,7 +24,7 @@ module ModsDisplay
     private
 
     def location_field_keys
-      [:physicalLocation, :url, :shelfLocation, :holdingSimple, :holdingExternal]
+      [:physicalLocation, :url, :shelfLocator, :holdingSimple, :holdingExternal]
     end
 
     def location_label(element)

data/lib/mods_display/fields/title.rb

@@ -4,31 +4,10 @@ module ModsDisplay
       return_values = []
       if @values
         @values.each do |value|
-          if displayForm(value)
-            return_values << ModsDisplay::Values.new(
-              label: displayLabel(value) || title_label(value),
-              values: [displayForm(value)]
-            )
-          else
-            nonSort = nil
-            title = nil
-            subTitle = nil
-            nonSort = value.nonSort.text.strip unless value.nonSort.text.strip.empty?
-            title = value.title.text.strip unless value.title.text.strip.empty?
-            subTitle = value.subTitle.text unless value.subTitle.text.strip.empty?
-            preSubTitle = [nonSort, title].compact.join(' ')
-            preSubTitle = nil if preSubTitle.strip.empty?
-            preParts = compact_and_join_with_delimiter([preSubTitle, subTitle], ' : ')
-            preParts = nil if preParts.strip.empty?
-            parts = value.children.select do |child|
-              %w(partName partNumber).include?(child.name)
-            end.map(&:text).compact.join(parts_delimiter(value))
-            parts = nil if parts.strip.empty?
-            return_values << ModsDisplay::Values.new(
-              label: displayLabel(value) || title_label(value),
-              values: [compact_and_join_with_delimiter([preParts, parts], '. ')]
-            )
-          end
+          return_values << ModsDisplay::Values.new(
+            label: displayLabel(value) || title_label(value),
+            values: [assemble_title(value)]
+          )
         end
       end
       collapse_fields(return_values)
@@ -36,14 +15,42 @@ module ModsDisplay
 
     private
 
-    def parts_delimiter(element)
-      children = element.children.to_a
-      # index will retun nil which is not comparable so we call 100
-      # if the element isn't present (thus meaning it's at the end of the list)
-      if (children.index { |c| c.name == 'partNumber' } || 100) < (children.index { |c| c.name == 'partName' } || 100)
-        return ', '
+    def assemble_title(element)
+      return displayForm(element) if displayForm(element)
+
+      title = ''
+      previous_element = nil
+
+      element.children.select { |value| title_parts.include? value.name }.each do |value|
+        str = value.text.strip
+        next if str.empty?
+
+        delimiter = case
+        when title.empty?, title.end_with?(' ')
+          nil
+        when title.end_with?('.', ',', ':', ';')
+          ' '
+        when value.name == 'subTitle'
+          ' : '
+        when value.name == 'partName' && previous_element.name == 'partNumber'
+          ', '
+        when value.name == 'partNumber', value.name == 'partName'
+          '. '
+        else
+          ' '
+        end
+
+        title += delimiter if delimiter
+        title += str
+
+        previous_element = value
       end
-      '. '
+
+      title
+    end
+
+    def title_parts
+      %w[nonSort title subTitle partName partNumber]
     end
 
     def title_label(element)

data/lib/mods_display/version.rb

@@ -1,3 +1,3 @@
 module ModsDisplay
-  VERSION = '0.9.1'
+  VERSION = '0.10.0'
 end

data/spec/fields/location_spec.rb

@@ -5,7 +5,7 @@ describe ModsDisplay::Location do
     <<-XML
       <mods>
         <location>
-          <shelfLocation>On Shelf A</shelfLocation>
+          <shelfLocator>On Shelf A</shelfLocator>
         </location>
       </mods>
     XML

data/spec/fields/title_spec.rb

@@ -15,6 +15,7 @@ describe ModsDisplay::Title do
     @multi_label = Stanford::Mods::Record.new.from_str(multi_label_fixture, false).title_info
     @alt_title = Stanford::Mods::Record.new.from_str(alt_title_fixture, false).title_info
     @title_punctuation = Stanford::Mods::Record.new.from_str(title_puncutation_fixture, false).title_info
+    @ordered_title_fixture = Stanford::Mods::Record.new.from_str(ordered_title_fixture, false).title_info
   end
   describe 'labels' do
     it 'should return a default label of Title if nothing else is available' do
@@ -70,5 +71,12 @@ describe ModsDisplay::Title do
       expect(values.first).not_to include '..'
       expect(values.first).to eq 'A title that ends in punctuation. 2015'
     end
+
+    it 'combines the title parts in the order from the record' do
+      values = mods_display_title(@ordered_title_fixture).fields.first.values
+      expect(values.length).to eq 1
+
+      expect(values.first).to eq 'The medium term expenditure framework (MTEF) for ... and the annual estimates for ... 016, Ministry of Tourism : expenditure to be met out of moneys granted and drawn from the consolidated fund, central government budget'
+    end
   end
 end

data/spec/fixtures/title_fixtures.rb

@@ -98,4 +98,18 @@ module TitleFixtures
       </mods>
     XML
   end
+
+  def ordered_title_fixture
+    <<-XML
+    <mods>
+      <titleInfo>
+        <nonSort>The</nonSort>
+        <title>medium term expenditure framework (MTEF) for ... and the annual estimates for ...</title>
+        <partNumber>016</partNumber>
+        <partName>Ministry of Tourism</partName>
+        <subTitle>expenditure to be met out of moneys granted and drawn from the consolidated fund, central government budget</subTitle>
+      </titleInfo>
+    </mods>
+    XML
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Jessie Keck
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-12 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods