stanford-mods 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70d3b7093c830baa3c12f4c2c438549eb451fa4b6bb6c57f458382f0e8e53dc2
-  data.tar.gz: 044edaeef524c4a701ebbc0e25f08d0c3fb5068b04cc36ab8769772004a73a85
+  metadata.gz: 22cc1cc8aafefb053ea3856e273e17be7089862160e91d87c483393b60c02aca
+  data.tar.gz: dbeea673e2c79744215c278ebf2fa73b78de3de7f79602590948bf4ee117b1df
 SHA512:
-  metadata.gz: '097830e7c3b1136a279dfce41ac426ae860ab020f27bb1550a3f2a5f23b7fcbc1c7f7952f35f06a44aed7100d0d410c39adcbb17a70b270174c85b757d1aca4b'
-  data.tar.gz: 7aa1c33f53fdbd4160d99a14739b4dcbd37950f4d8ab8238ee1886d4b6db4aaa9b5dec4c92f74842db80aa9839ec2d7e27a570a4fb7cde4862afc54b79c9e6a4
+  metadata.gz: fb3d7b5761a6e4811dd85b6d4972ce238e5b507e957d617b5e4a3935bcd3e9f791176d250418a198d2b68a63babfc58dcb9c39d1b8b4fbbbdd01eecc504fa8a2
+  data.tar.gz: 3fe0f6181376c4cca9618a90e9a03244328f3a93a16ea55f1b5a72c7f842ddd0de8addbfb2da75efa4875bc4c04e4dd73caaad543745faf9461da7928566487e

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/imprint.rb

@@ -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
@@ -183,24 +201,31 @@ module Stanford
               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 B.C."
+            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):
         # 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
 

data/lib/stanford-mods/version.rb

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

data/spec/imprint_spec.rb

@@ -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 B.C.'
+    end
+
     it 'handles the approximate qualifier' do
       smods_rec.from_str <<-XML
         #{mods_origin_info_start_str}

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) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mods