stanford-mods 3.0.0.alpha1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bccde0bc740f4135ee9de0b7255f3ac347a16c858ca463801111f37f8ad84ecc
-  data.tar.gz: a6e3fc9534efe4e37b05bf047007a5b9e3cd41f662e568b1b2333a1cc1213dce
+  metadata.gz: 57865ef64be3774919a58f9771243fb7f5090b09867fae098d3fa5ae6e2523cf
+  data.tar.gz: 1a09641f450a3739c9c61598ec4ad7a4f1f7b410c804d12df6d50530fb249cb7
 SHA512:
-  metadata.gz: 7ab80915b8f299e35822e9f2b6e0047cf1b32c62bec9ac0218daeb0d7bd3fb4753d1668075b754e5a9a955098fb785c94a9c188654295894c2867fc7d04f7574
-  data.tar.gz: fb1e1835b67fb30c7d19c2046c08a9a60bddda35b6b4067bb3518c8d8d9385a09d80846fc46e958f67d9a0eb89dcb2aef36ede3da03fc723f0158d1db3b81ee9
+  metadata.gz: c86f9171a032d1349068b43f6cf1272fbdf4a24419a58f66040132d7de2ea745853707b803608ea3344a137e544eff0e7e291a7b9c3922c09fe0568c68409a5e
+  data.tar.gz: d031a52bb328ae6efa0e42e7050fc4f990295509e4ee0a4b4c1f93f51b2412049b16c87091f27b95a02ed95be1278ccd5cbcc11771f59272bf77f82d73bd3bb2

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

@@ -15,7 +15,7 @@ module Stanford
       #  look for a keyDate and use it if there is one;  otherwise pick earliest date
       # @param [Boolean] ignore_approximate true if approximate dates (per qualifier attribute) should be ignored; false if approximate dates should be included
       # @return [Integer] publication year as an Integer
-      # @note for sorting:  5 B.C. => -5;  666 B.C. => -666
+      # @note for sorting:  5 BCE => -5;  666 BCE => -666
       def pub_year_int(fields = [:dateIssued, :dateCreated, :dateCaptured], ignore_approximate: false)
         fields.each do |date_key|
           values = mods_ng_xml.origin_info.send(date_key)
@@ -31,7 +31,7 @@ module Stanford
       #  look for a keyDate and use it if there is one;  otherwise pick earliest date
       # @param [Boolean] ignore_approximate true if approximate dates (per qualifier attribute) should be ignored; false if approximate dates should be included
       # @return [String] single String containing publication year for lexical sorting
-      # @note for string sorting  5 B.C. = -5  => -995;  6 B.C. => -994, so 6 B.C. sorts before 5 B.C.
+      # @note for string sorting  5 BCE = -5  => -995;  6 BCE => -994, so 6 BCE sorts before 5 BCE
       # @deprecated use pub_year_int
       def pub_year_sort_str(fields = [:dateIssued, :dateCreated, :dateCaptured], ignore_approximate: false)
         fields.each do |date_key|
@@ -44,12 +44,12 @@ module Stanford
       end
 
       # return a single string intended for display of pub year
-      # 0 < year < 1000:  add A.D. suffix
-      # year < 0:  add B.C. suffix.  ('-5'  =>  '5 B.C.', '700 B.C.'  => '700 B.C.')
+      # 0 < year < 1000:  add CE suffix
+      # year < 0:  add BCE suffix.  ('-5'  =>  '5 BCE', '700 BCE'  => '700 BCE')
       # 195u =>  195x
       # 19uu => 19xx
-      #   '-5'  =>  '5 B.C.'
-      #   '700 B.C.'  => '700 B.C.'
+      #   '-5'  =>  '5 BCE'
+      #   '700 BCE'  => '700 BCE'
       #   '7th century' => '7th century'
       # date ranges?
       # prefer dateIssued (any) before dateCreated (any) before dateCaptured (any)
@@ -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/coordinate.rb

@@ -65,11 +65,14 @@ module Stanford
       # @param [String] point coordinate point in degrees notation
       # @return [Float] converted value in decimal notation
       def coord_to_decimal(point)
-        regex = /(?<dir>[NESW])\s*(?<deg>\d+)[°⁰º](?:(?<min>\d+)[ʹ'])?(?:(?<sec>\d+)[ʺ"])?/
+        regex = Regexp.union(
+          /(?<dir>[NESW])\s*(?<deg>\d+)[°⁰º](?:(?<min>\d+)[ʹ'])?(?:(?<sec>\d+)[ʺ"])?/,
+          /^\s*(?<dir>[NESW])\s*(?<deg>\d+(?:[.]\d+)?)\s*$/
+        )
         match = regex.match(point)
         return Float::INFINITY unless match
 
-        dec = match['deg'].to_i
+        dec = match['deg'].to_f
         dec += match['min'].to_f / 60
         dec += match['sec'].to_f / 60 / 60
         dec = -1 * dec if match['dir'] == 'W' || match['dir'] == 'S'

data/lib/stanford-mods/date_parsing.rb

@@ -15,7 +15,7 @@ module Stanford
         @xml = xml
       end
 
-      # get display value for year, generally an explicit year or "17th century" or "5 B.C." or "1950s" or '845 A.D.'
+      # get display value for year, generally an explicit year or "17th century" or "5 BCE" or "1950s" or '845 CE'
       # @return [String, nil] String value for year if we could parse one, nil otherwise
       def date_str_for_display
         date = xml&.as_object&.date
@@ -32,9 +32,9 @@ module Stanford
           if !self.class.year_int_valid? date.year
             xml.text
           elsif date.year < 1
-            "#{date.year.abs + 1} B.C."
+            "#{date.year.abs + 1} BCE"
           elsif date.year < 1000
-            "#{date.year} A.D."
+            "#{date.year} CE"
           else
             date.year.to_s
           end
@@ -49,7 +49,7 @@ module Stanford
 
       # get String sortable value year if we can parse date_str to get a year.
       #   SearchWorks currently uses a string field for pub date sorting; thus so does Spotlight.
-      #   The values returned must *lexically* sort in chronological order, so the B.C. dates are tricky
+      #   The values returned must *lexically* sort in chronological order, so the BCE dates are tricky
       # @return [String, nil] String sortable year if we could parse one, nil otherwise
       #  note that these values must *lexically* sort to create a chronological sort.
       def sortable_year_string_from_date_str

data/lib/stanford-mods/imprint.rb

@@ -149,7 +149,7 @@ module Stanford
         end
 
         # Element text reduced to digits and hyphen. Captures date ranges and
-        # negative (B.C.) dates. Used for comparison/deduping.
+        # negative (BCE) dates. Used for comparison/deduping.
         def base_value
           if text =~ /^\[?1\d{3}-\d{2}\??\]?$/
             return text.sub(/(\d{2})(\d{2})-(\d{2})/, '\1\2-\1\3')
@@ -166,8 +166,26 @@ module Stanford
             return text.strip unless text =~ /^-?\d+$/ || text =~ /^[\dXxu?-]{4}$/
           end
 
-          # Delegate to the appropriate decoding method, if any
-          case value.precision
+          if date.is_a?(EDTF::Interval)
+            if value.precision == :century || value.precision == :decade
+              return format_date(date, value.precision)
+            end
+
+            range = [
+              format_date(date.min, date.min.precision),
+              format_date(date.max, date.max.precision)
+            ].uniq.compact
+
+            return text.strip if range.empty?
+
+            range.join(' - ')
+          else
+            format_date(date, value.precision) || text.strip
+          end
+        end
+
+        def format_date(date, precision)
+          case precision
           when :day
             date.strftime('%B %e, %Y')
           when :month
@@ -175,32 +193,39 @@ module Stanford
           when :year
             year = date.year
             if year < 1
-              "#{year.abs + 1} B.C."
-            # Any dates before the year 1000 are explicitly marked A.D.
+              "#{year.abs + 1} BCE"
+            # Any dates before the year 1000 are explicitly marked CE
             elsif year > 1 && year < 1000
-              "#{year} A.D."
+              "#{year} CE"
             else
               year.to_s
             end
           when :century
-            return "#{(date.to_s[0..1].to_i + 1).ordinalize} century"
+            if date.year.negative?
+              "#{((date.year / 100).abs + 1).ordinalize} century BCE"
+            else
+              "#{((date.year / 100) + 1).ordinalize} century"
+            end
           when :decade
-            return "#{date.year}s"
-          else
-            text.strip
+            "#{date.year}s"
           end
         end
 
-        # Decoded date with "B.C." or "A.D." and qualifier markers. See (outdated):
+        # Decoded date with "BCE" or "CE" and qualifier markers. See (outdated):
         # https://consul.stanford.edu/display/chimera/MODS+display+rules#MODSdisplayrules-3b.%3CoriginInfo%3E
         def qualified_value
-          date = decoded_value
-
-          return "[ca. #{date}]" if qualifier == 'approximate'
-          return "[#{date}?]" if qualifier == 'questionable'
-          return "[#{date}]" if qualifier == 'inferred'
+          qualified_format = case qualifier
+          when 'approximate'
+            '[ca. %s]'
+          when 'questionable'
+            '[%s?]'
+          when 'inferred'
+            '[%s]'
+          else
+            '%s'
+          end
 
-          date
+          format(qualified_format, decoded_value)
         end
       end
 
@@ -225,7 +250,7 @@ module Stanford
           @start&.encoding || @stop&.encoding
         end
 
-        # Decoded dates with "B.C." or "A.D." and qualifier markers applied to
+        # Decoded dates with "BCE" or "CE" and qualifier markers applied to
         # the entire range, or individually if dates differ.
         def qualified_value
           if @start&.qualifier == @stop&.qualifier
@@ -281,7 +306,7 @@ module Stanford
 
         dates = dates - duplicated_ranges
 
-        # output formatted dates with qualifiers, A.D./B.C., etc.
+        # output formatted dates with qualifiers, CE/BCE, etc.
         dates.map(&:qualified_value)
       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.2.0'.freeze
   end
 end

data/spec/fixtures/searchworks_imprint_data.rb

@@ -700,7 +700,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued encoding="marc" point="start" keyDate="yes">0850</dateIssued>
         <dateIssued encoding="marc" point="end">1499</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => 'California, 850 A.D. - 1499',
+        mods_origin_info_end_str => 'California, 850 CE - 1499',
       # coll rec  bd001pp3337
       # coll rec fn508pj9953
       mods_origin_info_start_str +
@@ -728,7 +728,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateCreated point="start" qualifier="approximate" keyDate="yes">850</dateCreated>
         <dateCreated point="end" qualifier="approximate">1499</dateCreated>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => 'England, [ca. 850 A.D. - 1499]',
+        mods_origin_info_end_str => 'England, [ca. 850 CE - 1499]',
       # sc582cv9633
       mods_origin_info_start_str +
         '<dateCreated keydate="yes">1314</dateCreated>
@@ -1055,7 +1055,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <originInfo>
           <dateCreated encoding="edtf" point="start" keyDate="yes">-18</dateCreated>
           <dateCreated encoding="edtf" point="end">-17</dateCreated>' +
-        mods_origin_info_end_str => 'Spain; 19 B.C. - 18 B.C.',
+        mods_origin_info_end_str => 'Spain; 19 BCE - 18 BCE',
       # bb408km1389
       mods_origin_info_start_str +
         ' <place supplied="yes">
@@ -1065,7 +1065,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <originInfo>
           <dateCreated encoding="edtf" point="start" keyDate="yes">-1</dateCreated>
           <dateCreated encoding="edtf" point="end">11</dateCreated>' +
-        mods_origin_info_end_str => 'Lyon (France); 2 B.C. - 11 A.D.',
+        mods_origin_info_end_str => 'Lyon (France); 2 BCE - 11 CE',
       # cs470ng8064
       mods_origin_info_start_str +
         ' <place supplied="yes">
@@ -1075,7 +1075,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <originInfo>
           <dateCreated encoding="edtf" point="start" keyDate="yes">-1</dateCreated>
           <dateCreated encoding="edtf" point="end">0</dateCreated>' +
-        mods_origin_info_end_str => 'Antioch (Turkey) (?); 2 B.C. - 1 B.C.',
+        mods_origin_info_end_str => 'Antioch (Turkey) (?); 2 BCE - 1 BCE',
       # vh834jh5059
       mods_origin_info_start_str +
         ' <place supplied="yes">
@@ -1085,7 +1085,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <originInfo>
           <dateCreated encoding="edtf" point="start" keyDate="yes">13</dateCreated>
           <dateCreated encoding="edtf" point="end">14</dateCreated>' +
-        mods_origin_info_end_str => 'Lyon (France); 13 A.D. - 14 A.D.',
+        mods_origin_info_end_str => 'Lyon (France); 13 CE - 14 CE',
       # sk424bh9379
       mods_origin_info_start_str +
         ' <place supplied="yes">
@@ -1095,7 +1095,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <originInfo>
           <dateCreated encoding="edtf" point="start" keyDate="yes">34</dateCreated>
           <dateCreated encoding="edtf" point="end">35</dateCreated>' +
-        mods_origin_info_end_str => 'Alexandria (Egypt); 34 A.D. - 35 A.D.'
+        mods_origin_info_end_str => 'Alexandria (Egypt); 34 CE - 35 CE'
     },
   # rigler
   'rumsey' =>
@@ -1235,7 +1235,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         '<dateIssued encoding="marc" point="start">800</dateIssued>
         <dateIssued encoding="marc" point="end">1899</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => '800 A.D. - 1899',
+        mods_origin_info_end_str => '800 CE - 1899',
       # dc882bs3541
       mods_origin_info_start_str +
         '<place>
@@ -1245,7 +1245,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateCreated encoding="w3cdtf" point="end" qualifier="approximate">0799</dateCreated>
         <dateCreated encoding="w3cdtf" keyDate="yes"/>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => 'Egypt, [ca. 700 A.D. - 799 A.D.]',
+        mods_origin_info_end_str => 'Egypt, [ca. 700 CE - 799 CE]',
       # hg026ds6978
       mods_origin_info_start_str +
         '<place>
@@ -1253,7 +1253,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         </place>
         <dateCreated encoding="w3cdtf" keyDate="yes">0816</dateCreated>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => 'Central Arab lands, 816 A.D.',
+        mods_origin_info_end_str => 'Central Arab lands, 816 CE',
       # ch617yk2621
       mods_origin_info_start_str +
         '<place>
@@ -1273,7 +1273,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateCreated encoding="w3cdtf" point="end" qualifier="approximate">1000</dateCreated>
         <dateCreated encoding="w3cdtf" keyDate="yes"/>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => 'Byzantine Empire, [ca. 950 A.D. - 1000]',
+        mods_origin_info_end_str => 'Byzantine Empire, [ca. 950 CE - 1000]',
       # hj537kj5737
       mods_origin_info_start_str +
         '<dateIssued>15th century CE</dateIssued>

data/spec/fixtures/searchworks_pub_date_data.rb

@@ -607,7 +607,7 @@ SEARCHWORKS_PUB_DATE_DATA = {
       mods_origin_info_start_str +
         '<dateIssued encoding="marc" point="start" keyDate="yes">0850</dateIssued>' +
         '<dateIssued encoding="marc" point="end">1499</dateIssued>' +
-        mods_origin_info_end_str => [850, '850 A.D. - 1499'],
+        mods_origin_info_end_str => [850, '850 CE - 1499'],
       # coll rec  bd001pp3337
       mods_origin_info_start_str +
         '<dateIssued encoding="marc" keyDate="yes" point="start">1000</dateIssued>' +
@@ -637,7 +637,7 @@ SEARCHWORKS_PUB_DATE_DATA = {
       mods_origin_info_start_str +
         '<dateCreated point="start" qualifier="approximate" keyDate="yes">850</dateCreated>' +
         '<dateCreated point="end" qualifier="approximate">1499</dateCreated>' +
-        mods_origin_info_end_str => [850, '850 A.D. - 1499'],
+        mods_origin_info_end_str => [850, '850 CE - 1499'],
       # sc582cv9633
       mods_origin_info_start_str +
         '<dateCreated keydate="yes">1314</dateCreated>' +
@@ -722,12 +722,12 @@ SEARCHWORKS_PUB_DATE_DATA = {
       mods_origin_info_start_str +
         '<dateCreated keyDate="yes" point="start" qualifier="approximate">199 B.C.</dateCreated>' +
         '<dateCreated keyDate="yes" point="end" qualifier="approximate">100 B.C.</dateCreated>' +
-        mods_origin_info_end_str => [-198, '199 B.C. - 100 B.C.'],
+        mods_origin_info_end_str => [-198, '199 BCE - 100 BCE'],
       # ww728rz0477
       mods_origin_info_start_str +
         '<dateCreated keyDate="yes" point="start" qualifier="approximate">211 B.C.</dateCreated>' +
         '<dateCreated keyDate="yes" point="end" qualifier="approximate">150 B.C.</dateCreated>' +
-        mods_origin_info_end_str => [-210, '211 B.C. - 150 B.C.']
+        mods_origin_info_end_str => [-210, '211 BCE - 150 BCE']
     },
   # pcc
   # peace
@@ -796,27 +796,27 @@ SEARCHWORKS_PUB_DATE_DATA = {
       mods_origin_info_start_str +
         '<dateCreated encoding="edtf" point="start" keyDate="yes">-18</dateCreated>' +
         '<dateCreated encoding="edtf" point="end">-17</dateCreated>' +
-        mods_origin_info_end_str => [-18, '19 B.C. - 17 B.C.'],
+        mods_origin_info_end_str => [-18, '19 BCE - 17 BCE'],
       # bb408km1389
       mods_origin_info_start_str +
         '<dateCreated encoding="edtf" point="start" keyDate="yes">-1</dateCreated>' +
         '<dateCreated encoding="edtf" point="end">11</dateCreated>' +
-        mods_origin_info_end_str => [-1, '2 B.C. - 11 A.D.'],
+        mods_origin_info_end_str => [-1, '2 BCE - 11 CE'],
       # cs470ng8064
       mods_origin_info_start_str +
         '<dateCreated encoding="edtf" point="start" keyDate="yes">-1</dateCreated>' +
         '<dateCreated encoding="edtf" point="end">0</dateCreated>' +
-        mods_origin_info_end_str => [-1, '2 B.C. - 0 A.D.'],
+        mods_origin_info_end_str => [-1, '2 BCE - 0 CE'],
       # vh834jh5059
       mods_origin_info_start_str +
         '<dateCreated encoding="edtf" point="start" keyDate="yes">13</dateCreated>' +
         '<dateCreated encoding="edtf" point="end">14</dateCreated>' +
-        mods_origin_info_end_str => [13, '13 A.D. - 14 A.D.'],
+        mods_origin_info_end_str => [13, '13 CE - 14 CE'],
       # sk424bh9379
       mods_origin_info_start_str +
         '<dateCreated encoding="edtf" point="start" keyDate="yes">34</dateCreated>' +
         '<dateCreated encoding="edtf" point="end">35</dateCreated>' +
-        mods_origin_info_end_str => [34, '34 A.D. - 35 A.D.']
+        mods_origin_info_end_str => [34, '34 CE - 35 CE']
     },
   # rigler
   # rumsey
@@ -931,23 +931,23 @@ SEARCHWORKS_PUB_DATE_DATA = {
       mods_origin_info_start_str +
         '<dateIssued encoding="marc" point="start">800</dateIssued>' +
         '<dateIssued encoding="marc" point="start">1899</dateIssued>' +
-        mods_origin_info_end_str => [800, '800 A.D.'],
+        mods_origin_info_end_str => [800, '800 CE'],
       # dc882bs3541
       mods_origin_info_start_str +
         '<dateCreated encoding="w3cdtf" point="start" qualifier="approximate" keyDate="yes">0700</dateCreated>' +
         '<dateCreated encoding="w3cdtf" point="end" qualifier="approximate">0799</dateCreated>' +
         '<dateCreated encoding="w3cdtf" keyDate="yes"/>' +
-        mods_origin_info_end_str => [700, '700 A.D. - 799 A.D.'],
+        mods_origin_info_end_str => [700, '700 CE - 799 CE'],
       # hg026ds6978
       mods_origin_info_start_str +
         '<dateCreated encoding="w3cdtf" keyDate="yes">0816</dateCreated>' +
-        mods_origin_info_end_str => [816, '816 A.D.'],
+        mods_origin_info_end_str => [816, '816 CE'],
       # ct437ht0445
       mods_origin_info_start_str +
         '<dateCreated encoding="w3cdtf" keyDate="yes" point="start" qualifier="approximate">0900</dateCreated>' +
         '<dateCreated encoding="w3cdtf" point="end" qualifier="approximate">0999</dateCreated>' +
         '<dateCreated encoding="w3cdtf" keyDate="yes"/>' +
-        mods_origin_info_end_str => [900, '900 A.D. - 999 A.D.'],
+        mods_origin_info_end_str => [900, '900 CE - 999 CE'],
       # ch617yk2621
       mods_origin_info_start_str +
         '<dateCreated encoding="w3cdtf" keyDate="yes" point="start" qualifier="approximate">1000</dateCreated>' +
@@ -959,7 +959,7 @@ SEARCHWORKS_PUB_DATE_DATA = {
         '<dateCreated encoding="w3cdtf" keyDate="yes" point="start" qualifier="approximate">0950</dateCreated>' +
         '<dateCreated encoding="w3cdtf" point="end" qualifier="approximate">1000</dateCreated>' +
         '<dateCreated encoding="w3cdtf" keyDate="yes"/>' +
-        mods_origin_info_end_str => [950, '950 A.D. - 1000'],
+        mods_origin_info_end_str => [950, '950 CE - 1000'],
       # hj537kj5737
       mods_origin_info_start_str +
         '<dateIssued>15th century CE</dateIssued>' +

data/spec/fixtures/spotlight_pub_date_data.rb

@@ -156,7 +156,7 @@ SPOTLIGHT_PUB_DATE_DATA = {
       mods_origin_info_start_str +
         '<dateIssued encoding="marc" point="start" keyDate="yes">0850</dateIssued>' +
         '<dateIssued encoding="marc" point="end">1499</dateIssued>' +
-        mods_origin_info_end_str => ['0850', '850 A.D.'],
+        mods_origin_info_end_str => ['0850', '850 CE'],
       # nc881qb8504
       mods_origin_info_start_str +
         '<dateCreated point="start" qualifier="approximate" keyDate="yes">1000</dateCreated>' +
@@ -236,12 +236,12 @@ SPOTLIGHT_PUB_DATE_DATA = {
       mods_origin_info_start_str +
         '<dateCreated keyDate="yes" point="start" qualifier="approximate">200 B.C.</dateCreated>' +
         '<dateCreated keyDate="yes" point="end" qualifier="approximate">180 B.C.</dateCreated>' +
-        mods_origin_info_end_str => ['-801', '200 B.C.'],
+        mods_origin_info_end_str => ['-801', '200 BCE'],
       # ww728rz0477
       mods_origin_info_start_str +
         '<dateCreated keyDate="yes" point="start" qualifier="approximate">211 B.C.</dateCreated>' +
         '<dateCreated keyDate="yes" point="end" qualifier="approximate">150 B.C.</dateCreated>' +
-        mods_origin_info_end_str => ['-790', '211 B.C.']
+        mods_origin_info_end_str => ['-790', '211 BCE']
     },
   'renaissance' =>
     { # key is mods_xml;  values = [pub date sortable facet value, pub date single string facet value]

data/spec/imprint_spec.rb

@@ -108,7 +108,7 @@ describe Stanford::Mods::Imprint do
     it 'presents centuries' do
       smods_rec.from_str <<-XML
         #{mods_origin_info_start_str}
-          <dateIssued encoding="edtf">18XX</dateIssued>
+          <dateIssued encoding="edtf">18xx</dateIssued>
         #{mods_origin_info_end_str}
       XML
 
@@ -120,7 +120,7 @@ describe Stanford::Mods::Imprint do
     it 'presents decades' do
       smods_rec.from_str <<-XML
         #{mods_origin_info_start_str}
-          <dateIssued encoding="edtf">147X</dateIssued>
+          <dateIssued encoding="edtf">147x</dateIssued>
         #{mods_origin_info_end_str}
       XML
 
@@ -129,7 +129,7 @@ describe Stanford::Mods::Imprint do
       expect(updated_element).to eq '1470s'
     end
 
-    it 'adds A.D. to early years' do
+    it 'adds CE to early years' do
       smods_rec.from_str <<-XML
         #{mods_origin_info_start_str}
           <dateIssued encoding="edtf">988</dateIssued>
@@ -138,10 +138,10 @@ describe Stanford::Mods::Imprint do
 
       imp = stanford_mods_imprint(smods_rec)
       updated_element = imp.send(:date_str)
-      expect(updated_element).to eq '988 A.D.'
+      expect(updated_element).to eq '988 CE'
     end
 
-    it 'adds B.C. to B.C. years' do
+    it 'adds BCE to BCE years' do
       smods_rec.from_str <<-XML
         #{mods_origin_info_start_str}
           <dateIssued encoding="edtf">-5</dateIssued>
@@ -150,10 +150,10 @@ describe Stanford::Mods::Imprint do
 
       imp = stanford_mods_imprint(smods_rec)
       updated_element = imp.send(:date_str)
-      expect(updated_element).to eq '6 B.C.'
+      expect(updated_element).to eq '6 BCE'
     end
 
-    it 'has special handling for the year 0 (1 B.C.)' do
+    it 'has special handling for the year 0 (1 BCE)' do
       smods_rec.from_str <<-XML
         #{mods_origin_info_start_str}
           <dateIssued>0</dateIssued>
@@ -162,7 +162,7 @@ describe Stanford::Mods::Imprint do
 
       imp = stanford_mods_imprint(smods_rec)
       updated_element = imp.send(:date_str)
-      expect(updated_element).to eq '1 B.C.'
+      expect(updated_element).to eq '1 BCE'
     end
 
     it 'presents years + months' do
@@ -189,6 +189,31 @@ describe Stanford::Mods::Imprint do
       expect(updated_element).to eq 'April  2, 1948'
     end
 
+    it 'handles very precise EDTF ranges' do
+      smods_rec.from_str <<-XML
+        #{mods_origin_info_start_str}
+          <dateIssued encoding="edtf">2014-01/2020-12-31</dateIssued>
+        #{mods_origin_info_end_str}
+      XML
+
+      imp = stanford_mods_imprint(smods_rec)
+      updated_element = imp.send(:date_str)
+      expect(updated_element).to eq 'January 2014 - December 31, 2020'
+    end
+
+    xit 'handles BC EDTF centuries' do
+      # ruby-edtf apparently can't handle this format
+      smods_rec.from_str <<-XML
+        #{mods_origin_info_start_str}
+          <dateIssued encoding="edtf">-09XX</dateIssued>
+        #{mods_origin_info_end_str}
+      XML
+
+      imp = stanford_mods_imprint(smods_rec)
+      updated_element = imp.send(:date_str)
+      expect(updated_element).to eq '10th century BCE'
+    end
+
     it 'handles the approximate qualifier' do
       smods_rec.from_str <<-XML
         #{mods_origin_info_start_str}
@@ -210,13 +235,13 @@ describe Stanford::Mods::Imprint do
 
       imp = stanford_mods_imprint(smods_rec)
       updated_element = imp.send(:date_str)
-      expect(updated_element).to eq '[322 A.D.?]'
+      expect(updated_element).to eq '[322 CE?]'
     end
 
     it 'handles the inferred qualifier' do
       smods_rec.from_str <<-XML
         #{mods_origin_info_start_str}
-          <dateIssued encoding="edtf" qualifier="inferred">190X</dateIssued>
+          <dateIssued encoding="edtf" qualifier="inferred">190x</dateIssued>
         #{mods_origin_info_end_str}
       XML
 

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

@@ -9,10 +9,6 @@ describe Stanford::Mods::Coordinate do
       expect(described_class.new('W80°--E100°/N487°--S42°')).not_to be_valid
     end
 
-    it 'rejects coordinates without degree symbols' do
-      expect(described_class.new('W 650--W 100/N 700--N 550')).not_to be_valid
-    end
-
     it 'rejects malformed coordinates' do
       expect(described_class.new('(E29°--E35/°S12°--S16°).')).not_to be_valid
     end
@@ -43,7 +39,9 @@ describe Stanford::Mods::Coordinate do
       %((W 170⁰--E 55⁰/N 40⁰--S 36⁰).) =>
         '-170.0 -36.0 55.0 40.0', # superscript 0 is almost a degree character..
       %((W 0°-W 0°/S 90°---S 90°)) =>
-        '-0.0 -90.0 -0.0 -90.0' # one dash, two dashes, three dashes.. what's the difference?
+        '-0.0 -90.0 -0.0 -90.0', # one dash, two dashes, three dashes.. what's the difference?
+      %((W 030.6--E 068.1/N 041.7--S 042.4)) =>
+        '-30.6 -42.4 68.1 41.7'
     }.each do |value, expected|
       describe 'parsing' do
         let(:subject) { described_class.new(value) }

data/spec/origin_info_spec.rb

@@ -89,7 +89,7 @@ describe "computations from /originInfo field" do
   context '#pub_year_int' do
     it_behaves_like "single pub date value", :pub_year_int, 0
     # papyri - the only Spotlight data with BC dates
-    it '-200 for 200 B.C.' do
+    it '-199 for 200 B.C.' do
       # hd778hw9236
       mods_str = mods_origin_info_start_str +
         '<dateCreated keyDate="yes" point="start" qualifier="approximate">200 B.C.</dateCreated>' +
@@ -98,7 +98,7 @@ describe "computations from /originInfo field" do
       smods_rec.from_str(mods_str)
       expect(smods_rec.pub_year_int).to eq(-199)
     end
-    it '-211 for 211 B.C.' do
+    it '-210 for 211 B.C.' do
       # ww728rz0477
       mods_str = mods_origin_info_start_str +
         '<dateCreated keyDate="yes" point="start" qualifier="approximate">211 B.C.</dateCreated>' +

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

data/stanford-mods.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^spec/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'mods', '~> 3.0', '>= 3.0.1'
+  gem.add_dependency 'mods', '~> 3.0', '>= 3.0.3'
   # active_support for .ordinalize, eg. 1 -> 1st, 2 -> 2nd for centuries
   gem.add_dependency 'activesupport'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha1
+  version: 3.2.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-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mods
@@ -20,7 +20,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -213,11 +213,11 @@ 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
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Stanford specific wrangling of MODS metadata