cocina_display 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2b164eda474dc396b74c8b911fe50bbba7c2dbbce17b29c24923db4f25ff8a5
-  data.tar.gz: c782186b53a4dcb7f53b11a3d552dcf5f892f4435fc46fb4bcddd65ad444d9be
+  metadata.gz: b6eddb643cc7413aaefd5b2b73df29c7d9aaa98ce7a0008816d405c82f73517d
+  data.tar.gz: 0ce368a036754577ab65e1f917750f4b6142d48bcb413eb202a4538324fca2ea
 SHA512:
-  metadata.gz: efed0c780617aaeadb7187391c74691bcacddcb24cb2850e14918ab755acfaef273c8e3277a9c4674b2b41201a72ffe91a79a0065daa07ad469e2178ea17fd92
-  data.tar.gz: 28933bab6be3f6cd2fed4155d5b4a73bf9f9d9301e5edc679018f6428d90f88ca14ab8a6614d1c07e53f1723644b0871786fb075b664bb7e2fb73dba96d21588
+  metadata.gz: e1a2cff79e052b77dfa25a84ac2899b21143342fdbff2b16c12a8f059c15b7a3cbfbb75b6daf52db21778989aea4beab60c35ad590f1ce4badea4ed7322f3876
+  data.tar.gz: 52f9cb5bba2e219da180275de8c2db31e82e4dfea8bc72987be4ccaaa4239007af4491f8db2f2633e03cf2cc4141d6963483f408740dfdeeb8f03ef661c14a0c

data/lib/cocina_display/dates/date.rb

@@ -37,6 +37,7 @@ module CocinaDisplay
           # Try to match against known date formats using their regexes
           # Order matters here; more specific formats should be checked first
           date_class ||= [
+            UndeclaredEdtfFormat,
             MMDDYYYYFormat,
             MMDDYYFormat,
             YearRangeFormat,
@@ -86,10 +87,16 @@ module CocinaDisplay
       # @return [String, nil]
       attr_accessor :type
 
+      # The encoding name of this date, if specified.
+      # @example "iso8601"
+      # @return [String, nil]
+      attr_accessor :encoding
+
       def initialize(cocina)
         @cocina = cocina
         @date = self.class.parse_date(cocina["value"])
         @type = cocina["type"] unless ["start", "end"].include?(cocina["type"])
+        @encoding = cocina.dig("encoding", "code")
       end
 
       # Compare this date to another {Date} or {DateRange} using its {sort_key}.
@@ -115,14 +122,6 @@ module CocinaDisplay
         qualifier.present?
       end
 
-      # The encoding of this date, if specified.
-      # @example
-      #   date.encoding #=> "iso8601"
-      # @return [String, nil]
-      def encoding
-        cocina.dig("encoding", "code")
-      end
-
       # Was an encoding declared for this date?
       # @return [Boolean]
       def encoding?
@@ -515,6 +514,12 @@ module CocinaDisplay
       end
     end
 
+    # Extractor for dates that already match EDTF, they just didn't declare it
+    # Matches YYYY-MM-DD, YYYY-MM and YYYY; no further normalization needed
+    class UndeclaredEdtfFormat < ExtractorDateFormat
+      REGEX = /^(?<year>\d{4})(?:-(?<month>\d{2}))?(?:-(?<day>\d{2}))?$/
+    end
+
     # Extractor for MM/DD/YYYY and MM/DD/YYY-formatted dates
     class MMDDYYYYFormat < ExtractorDateFormat
       REGEX = /(?<month>\d{1,2})\/(?<day>\d{1,2})\/(?<year>\d{3,4})/

data/lib/cocina_display/dates/date_range.rb

@@ -13,7 +13,16 @@ module CocinaDisplay
       def self.from_cocina(cocina)
         return unless cocina["structuredValue"].present?
 
-        dates = cocina["structuredValue"].map { |sv| Date.from_cocina(sv) }
+        # Create the individual dates; if no encoding/type declared give them
+        # top-level encoding/type
+        dates = cocina["structuredValue"].map do |sv|
+          date = Date.from_cocina(sv)
+          date.encoding ||= cocina.dig("encoding", "code")
+          date.type ||= cocina["type"]
+          date
+        end
+
+        # Ensure we have at least a start or a stop
         start = dates.find(&:start?)
         stop = dates.find(&:end?)
         return unless start || stop

data/lib/cocina_display/version.rb

@@ -2,5 +2,5 @@
 
 # :nodoc:
 module CocinaDisplay
-  VERSION = "1.1.1" # :nodoc:
+  VERSION = "1.1.2" # :nodoc:
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocina_display
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Nick Budak