mods 3.0.0 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30381fee9ce7d47827010ce02902834f10118daeb381bdfa65bcc5adf778b65f
-  data.tar.gz: 65b9fac4ebee7589010039dbba9cbd8b204a94987443ec2c68e36a7509f39685
+  metadata.gz: f6ac4089b58e673c2783c670e689cb6901bbad611a7271c95f1f8909726beb07
+  data.tar.gz: ee1ee35aeae21d319485212f56535e4bc06068470295f5adcf3ff8593a06c9d0
 SHA512:
-  metadata.gz: e9ecec0384d8c4d931cace14b32ddc9e2b5161ed6ef9f61af27fb89d9993643db790f98966f8ddea419008bd03588cbc6aaf4dfee25b404c5a392deae1b3e78e
-  data.tar.gz: 79b733073abbf0ee6dc8da9835c86e44be67f1f298a4e09f3d6380772ff51713cd63c121daf2bb0ae0751ab9ffb3954003eb24ecffde1a7e89ed3c542cead994
+  metadata.gz: 553a4d9e91f50357ff56b5e2c19404386852308c30f06f67ccf6baa586f74f3f4bdbfd05826d3225aac8a0793bdccd5049994e5df04ef691a86c7777a21e554c
+  data.tar.gz: a496b63bef0f1b512d0e3c87886ee80b6665dd90044387d5ce318cc2471d855fcac64839d7d95e9bca75ca1705d786ee0b6220e254b10d31fa32a79768521d66

data/lib/mods/date.rb

@@ -56,6 +56,9 @@ module Mods
 
     # Less strict W3CDTF-encoded date parser
     class W3cdtfFormat < Date
+      def self.normalize_to_edtf(text)
+        super.gsub('-00', '')
+      end
     end
 
     # Strict EDTF parser
@@ -180,7 +183,7 @@ module Mods
 
       def self.munge_to_yyyy(text)
         value = roman_to_int(text.upcase)
-        (value - 1).to_s.rjust(2, "0") + 'XX'
+        (value - 1).to_s.rjust(2, "0") + 'xx'
       end
     end
 
@@ -191,7 +194,7 @@ module Mods
       REGEX = /(?<century>\d{2})--/
       def self.normalize_to_edtf(text)
         matches = text.match(REGEX)
-        "#{matches[:century]}XX"
+        "#{matches[:century]}xx"
       end
     end
 
@@ -201,7 +204,7 @@ module Mods
 
       def self.normalize_to_edtf(text)
         matches = text.match(REGEX)
-        "#{matches[:century].to_i - 1}XX"
+        "#{matches[:century].to_i - 1}xx"
       end
     end
 
@@ -221,7 +224,7 @@ module Mods
 
       def self.normalize_to_edtf(text)
         matches = text.match(REGEX)
-        "#{matches[:year]}X"
+        "#{matches[:year]}x"
       end
     end
 
@@ -231,7 +234,7 @@ module Mods
 
       def self.normalize_to_edtf(text)
         matches = text.match(REGEX)
-        "#{matches[:year]}X"
+        "#{matches[:year]}x"
       end
     end
 
@@ -457,6 +460,10 @@ module Mods
         :century
       elsif date_range.is_a? EDTF::Decade
         :decade
+      elsif date.is_a? EDTF::Season
+        :month
+      elsif date.is_a? EDTF::Interval
+        date_range.precision
       else
         case date.precision
         when :month
@@ -492,7 +499,7 @@ module Mods
       case date_range
       when EDTF::Unknown
         nil
-      when EDTF::Epoch, EDTF::Interval
+      when EDTF::Epoch, EDTF::Interval, EDTF::Season
         date_range.min
       when EDTF::Set
         date_range.to_a.first
@@ -517,7 +524,7 @@ module Mods
       case date_range
       when EDTF::Unknown
         nil
-      when EDTF::Epoch, EDTF::Interval
+      when EDTF::Epoch, EDTF::Interval, EDTF::Season
         date_range.max
       when EDTF::Set
         date_range.to_a.last.change(month: 12, day: 31)
@@ -533,7 +540,7 @@ module Mods
 
     def date_range
       @date_range ||= if text =~ /u/
-        ::Date.edtf(text.gsub('u', 'X')) || date
+        ::Date.edtf(text.gsub('u', 'x').gsub('X', 'x')) || date
       else
         date
       end

data/lib/mods/version.rb

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

data/spec/lib/date_spec.rb

@@ -101,6 +101,8 @@ RSpec.describe Mods::Date do
       '1900-06' => :month,
       '1900-06-uu' => :month,
       '1900-06-15' => :day,
+      '2014-01-01/2020-12-31' => :day,
+      '1986-22' => :month
     }.each do |data, expected|
       describe "with #{data}" do
         let(:date_element) { "<dateCreated encoding=\"edtf\">#{data}</dateCreated>" }
@@ -200,9 +202,9 @@ RSpec.describe Mods::Date do
     {
       '1905' => Date.parse('1905-01-01')..Date.parse('1905-12-31'),
       '190u' => Date.parse('1900-01-01')..Date.parse('1909-12-31'),
-      '190X' => Date.parse('1900-01-01')..Date.parse('1909-12-31'),
+      '190x' => Date.parse('1900-01-01')..Date.parse('1909-12-31'),
       '19uu' => Date.parse('1900-01-01')..Date.parse('1999-12-31'),
-      '19XX' => Date.parse('1900-01-01')..Date.parse('1999-12-31'),
+      '19xx' => Date.parse('1900-01-01')..Date.parse('1999-12-31'),
       '1856/1876' => Date.parse('1856-01-01')..Date.parse('1876-12-31'),
       '[1667,1668,1670..1672]' => Date.parse('1667-01-01')..Date.parse('1672-12-31'),
       '1900-uu' => Date.parse('1900-01-01')..Date.parse('1900-12-31'),
@@ -229,6 +231,7 @@ RSpec.describe Mods::Date do
     {
       '1753' => Date.parse('1753-01-01')..Date.parse('1753-12-31'),
       '-1753' => Date.parse('-1753-01-01')..Date.parse('-1753-12-31'),
+      '1992-00-00' => Date.parse('1992-01-01')..Date.parse('1992-12-31'),
       '1992-05-06' => Date.parse('1992-05-06')..Date.parse('1992-05-06'),
       '1992-04' => Date.parse('1992-04-01')..Date.parse('1992-04-30'),
       '2004-02' => Date.parse('2004-02-01')..Date.parse('2004-02-29'),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mods
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.3
 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-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri