feat: support paneron glossarist attributes in localized concept

lib/glossarist/concept.rb

@@ -69,19 +69,20 @@ def initialize(*args)
     def uuid
       @uuid ||= Glossarist::Utilities::UUID.uuid_v5(
         Glossarist::Utilities::UUID::OID_NAMESPACE,
-        to_h.to_yaml,
+        to_h_no_uuid.to_yaml,
       )
     end
 
     def id=(id)
-      # Some of the glossaries that are not generated using glossarist, contains ids that are integers 
+      # Some of the glossaries that are not generated using glossarist, contains ids that are integers
       # so adding a temporary check until every glossary is updated using glossarist.
       if !id.nil? && (id.is_a?(String) || id.is_a?(Integer))
         @id = id
       else
         raise(Glossarist::Error, "Expect id to be a String or Integer, Got #{id.class} (#{id})")
       end
     end
+
     alias :termid= :id=
     alias :identifier= :id=
 
@@ -119,6 +120,7 @@ def designations=(designations)
     def preferred_designations
       @designations.select(&:preferred?)
     end
+
     alias :preferred_terms :preferred_designations
 
     def dates=(dates)
@@ -141,7 +143,22 @@ def authoritative_source=(sources)
       end
     end
 
-    def to_h
+    def date_accepted=(date)
+      date_hash = {
+        "type" => "accepted",
+        "date" => date,
+      }
+
+      @dates ||= []
+      @dates << ConceptDate.new(date_hash)
+    end
+
+    def date_accepted
+      return nil unless @dates
+      @dates.find { |date| date.accepted? }
+    end
+
+    def to_h_no_uuid
       {
         "data" => {
           "dates" => dates&.map(&:to_h),
@@ -154,10 +171,18 @@ def to_h
           "sources" => sources.empty? ? nil : sources&.map(&:to_h),
           "terms" => (terms&.map(&:to_h) || []),
           "related" => related&.map(&:to_h),
+          "domain" => domain,
         }.compact,
+
+        "date_accepted" => date_accepted&.date,
+
       }.compact
     end
 
+    def to_h
+      to_h_no_uuid.merge("id" => uuid)
+    end
+
     # @deprecated For legacy reasons only.
     #   Implicit conversion (i.e. {#to_hash} alias) will be removed soon.
     alias :to_hash :to_h

lib/glossarist/localized_concept.rb

@@ -27,11 +27,11 @@ class LocalizedConcept < Concept
     # Temporary fields
     # @todo Need to remove these once the isotc211-glossary is fixed
     attr_accessor *%i[
-      review_date
-      review_decision_date
-      review_decision_event
-      review_type
-    ]
+                    review_date
+                    review_decision_date
+                    review_decision_event
+                    review_type
+                  ]
 
     def language_code=(language_code)
       if language_code.is_a?(String) && language_code.length == 3
@@ -41,11 +41,10 @@ def language_code=(language_code)
       end
     end
 
-    def to_h # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+    def to_h_no_uuid # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       hash = super
 
       hash["data"].merge!({
-        "domain" => domain,
         "language_code" => language_code,
         "entry_status" => entry_status,
         "sources" => sources.empty? ? nil : sources&.map(&:to_h),
@@ -56,14 +55,16 @@ def to_h # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         "review_decision_event" => review_decision_event,
       }.compact).merge!(@extension_attributes)
 
+      hash["status"] = entry_status if entry_status
+
       hash
     end
 
     def self.from_h(hash)
       terms = hash["terms"]&.map { |h| Designation::Base.from_h(h) } || []
       sources = hash["authoritative_source"]&.each { |source| source.merge({ "type" => "authoritative" }) }
 
-      super(hash.merge({"terms" => terms, "sources" => sources}))
+      super(hash.merge({ "terms" => terms, "sources" => sources }))
     end
 
     # @deprecated For legacy reasons only.

spec/features/v1_serialization_spec.rb

@@ -17,7 +17,7 @@
         localized_concept_path = File.join(localized_concepts_folder, "#{id}.yaml")
         localized_concept = load_yaml_file(localized_concept_path)
 
-        expect(localized_concept["data"]).to eq(concept.localizations[lang].to_h["data"])
+        expect(localized_concept["data"]).to eq(concept.localizations[lang].to_h_no_uuid["data"])
       end
     end
 

spec/features/v2_serialization_spec.rb

@@ -18,7 +18,7 @@
           localized_concept_path = File.join(localized_concepts_folder, "#{id}.yaml")
           localized_concept = load_yaml_file(localized_concept_path)
 
-          expect(localized_concept["data"]).to eq(concept.localizations[lang].to_h["data"])
+          expect(localized_concept["data"]).to eq(concept.localizations[lang].to_h_no_uuid["data"])
         end
       end
 
@@ -59,7 +59,7 @@
           localized_concept_path = File.join(localized_concepts_folder, "#{id}.yaml")
           localized_concept = load_yaml_file(localized_concept_path)
 
-          expect(localized_concept["data"]).to eq(concept.localizations[lang].to_h["data"])
+          expect(localized_concept["data"]).to eq(concept.localizations[lang].to_h_no_uuid["data"])
         end
       end
 

spec/fixtures/concept_collection_v1/output/concept/09767627-efa4-5d13-9503-b06ba3f18cda.yaml

@@ -0,0 +1,6 @@
+---
+data:
+  identifier: 3.1.1.6
+  localized_concepts:
+    eng: b69609eb-0b27-50bf-86a0-634409e25872
+id: '09767627-efa4-5d13-9503-b06ba3f18cda'

spec/fixtures/concept_collection_v1/output/concept/17d42136-6e1f-58ec-8b20-64ec244dfe4c.yaml

@@ -0,0 +1,6 @@
+---
+data:
+  identifier: 3.1.1.5
+  localized_concepts:
+    eng: 285b90e7-2f7d-586a-bf5b-016dbfcdcf77
+id: 17d42136-6e1f-58ec-8b20-64ec244dfe4c

spec/fixtures/concept_collection_v1/output/concept/2be5e463-8e95-5a4d-9796-27fbd9eea33a.yaml

@@ -0,0 +1,9 @@
+---
+data:
+  identifier: 3.1.1.1
+  localized_concepts:
+    eng: 2d05fd15-6c65-501b-b1e2-77389a1efd3a
+  groups:
+  - foo
+  - bar
+id: 2be5e463-8e95-5a4d-9796-27fbd9eea33a

spec/fixtures/concept_collection_v1/output/concept/4268ae1d-fbc6-5ce2-aec9-7b0065b9576d.yaml

@@ -0,0 +1,6 @@
+---
+data:
+  identifier: 3.1.1.2
+  localized_concepts:
+    eng: 6660ed79-d78b-5940-887f-9c86597eed26
+id: 4268ae1d-fbc6-5ce2-aec9-7b0065b9576d

spec/fixtures/concept_collection_v1/output/concept/a7c18f14-095c-51a6-9c60-5219d2937e5a.yaml

@@ -0,0 +1,6 @@
+---
+data:
+  identifier: 3.1.1.4
+  localized_concepts:
+    eng: b90879f4-9627-5c09-a660-827b44f4fb24
+id: a7c18f14-095c-51a6-9c60-5219d2937e5a

spec/fixtures/concept_collection_v1/output/concept/a9be0faa-aadc-5dbe-8128-f70708ee88cc.yaml

@@ -0,0 +1,6 @@
+---
+data:
+  identifier: 3.1.1.3
+  localized_concepts:
+    eng: dca5c779-33de-5621-a824-b8054ea26316
+id: a9be0faa-aadc-5dbe-8128-f70708ee88cc

spec/fixtures/concept_collection_v1/output/localized_concept/9ea138b3-decf-5435-a067-2a581c5c663c.yaml → spec/fixtures/concept_collection_v1/output/localized_concept/285b90e7-2f7d-586a-bf5b-016dbfcdcf77.yaml

@@ -17,3 +17,5 @@ data:
     designation: biological_entity
   language_code: eng
   entry_status: valid
+status: valid
+id: 285b90e7-2f7d-586a-bf5b-016dbfcdcf77

spec/fixtures/concept_collection_v1/output/localized_concept/cb3f57c3-f67f-56b8-a0d2-4d16349ed89b.yaml → spec/fixtures/concept_collection_v1/output/localized_concept/2d05fd15-6c65-501b-b1e2-77389a1efd3a.yaml

@@ -1,7 +1,7 @@
 ---
 data:
   dates:
-  - date: 2008-11-15 00:00:00.000000000 +08:00
+  - date: &1 2008-11-15 00:00:00.000000000 +08:00
     type: accepted
   definition:
   - content: concrete or abstract thing that exists, did exist, or can possibly exist,
@@ -21,3 +21,6 @@ data:
     designation: entity
   language_code: eng
   entry_status: valid
+date_accepted: *1
+status: valid
+id: 2d05fd15-6c65-501b-b1e2-77389a1efd3a

spec/fixtures/concept_collection_v1/output/localized_concept/d74f5f2e-40f2-5fd2-be7e-42af2891a882.yaml → spec/fixtures/concept_collection_v1/output/localized_concept/6660ed79-d78b-5940-887f-9c86597eed26.yaml

@@ -18,3 +18,5 @@ data:
     designation: immaterial_entity
   language_code: eng
   entry_status: valid
+status: valid
+id: 6660ed79-d78b-5940-887f-9c86597eed26

spec/fixtures/concept_collection_v1/output/localized_concept/9c15f53f-b4b1-5e29-b27b-e971fbe85740.yaml → spec/fixtures/concept_collection_v1/output/localized_concept/b69609eb-0b27-50bf-86a0-634409e25872.yaml

@@ -17,3 +17,5 @@ data:
     designation: person
   language_code: eng
   entry_status: valid
+status: valid
+id: b69609eb-0b27-50bf-86a0-634409e25872

spec/fixtures/concept_collection_v1/output/localized_concept/cd5b9b55-4d46-5a17-840d-ac315074c909.yaml → spec/fixtures/concept_collection_v1/output/localized_concept/b90879f4-9627-5c09-a660-827b44f4fb24.yaml

@@ -17,3 +17,5 @@ data:
     designation: non-biological entity
   language_code: eng
   entry_status: valid
+status: valid
+id: b90879f4-9627-5c09-a660-827b44f4fb24

spec/fixtures/concept_collection_v1/output/localized_concept/c8763b71-b695-5117-9309-c7d998f63ad7.yaml → spec/fixtures/concept_collection_v1/output/localized_concept/dca5c779-33de-5621-a824-b8054ea26316.yaml

@@ -19,3 +19,5 @@ data:
     designation: material entity
   language_code: eng
   entry_status: valid
+status: valid
+id: dca5c779-33de-5621-a824-b8054ea26316

spec/fixtures/concept_collection_v2/localized_concept/081154c5-89d6-5192-8147-373bd6060eaa.yaml

@@ -24,3 +24,5 @@ data:
     normative_status: preferred
     designation: دلالة
   language_code: ara
+date_accepted: '2010-11-01T00:00:00.000Z'
+id: '081154c5-89d6-5192-8147-373bd6060eaa'

spec/fixtures/concept_collection_v2/localized_concept/27457e38-89b5-5694-8d19-0dd3973ec71d.yaml

@@ -29,3 +29,5 @@ data:
   - type: expression
     designation: ellipsoidal latitude
   language_code: eng
+date_accepted: '2003-02-15T00:00:00.000Z'
+id: 27457e38-89b5-5694-8d19-0dd3973ec71d

spec/fixtures/concept_collection_v2/localized_concept/527bd617-f471-5523-9b98-59bb181f3df8.yaml

@@ -23,3 +23,5 @@ data:
     normative_status: preferred
     designation: Intension
   language_code: deu
+date_accepted: '2010-11-01T00:00:00.000Z'
+id: 527bd617-f471-5523-9b98-59bb181f3df8

spec/fixtures/concept_collection_v2/localized_concept/becf3892-886d-5dab-8a7c-af303e576a8d.yaml

@@ -23,3 +23,5 @@ data:
   - type: expression
     designation: Sistema de Coordenadas Cartesianas
   language_code: spa
+date_accepted: '2015-08-15T00:00:00.000Z'
+id: becf3892-886d-5dab-8a7c-af303e576a8d

spec/fixtures/concept_collection_v2/localized_concept/bf1691ef-6b21-590a-aef1-9e67ad54378e.yaml

@@ -24,3 +24,5 @@ data:
     normative_status: preferred
     designation: intension
   language_code: eng
+date_accepted: '2010-11-01T00:00:00.000Z'
+id: bf1691ef-6b21-590a-aef1-9e67ad54378e

spec/fixtures/concept_collection_v2/localized_concept/c2cc493d-bc21-50a5-96fc-6774f3d53496.yaml

@@ -29,3 +29,5 @@ data:
   - type: expression
     designation: ellipsoidal latitude
   language_code: deu
+date_accepted: '2003-02-15T00:00:00.000Z'
+id: c2cc493d-bc21-50a5-96fc-6774f3d53496

spec/fixtures/concept_collection_v2/localized_concept/c87dfcd1-c38a-55f9-87bd-9da33bfede80.yaml

@@ -23,3 +23,5 @@ data:
   - type: expression
     designation: Cartesian coordinate system
   language_code: eng
+date_accepted: '2015-08-15T00:00:00.000Z'
+id: c87dfcd1-c38a-55f9-87bd-9da33bfede80

spec/fixtures/concept_collection_v2/localized_concept/da24b782-1551-5128-a043-ba6135a25acf.yaml

@@ -29,3 +29,5 @@ data:
     designation: postal address component
   domain: postal address
   language_code: eng
+date_accepted: '2017-11-15T00:00:00.000Z'
+id: da24b782-1551-5128-a043-ba6135a25acf

spec/fixtures/concept_collection_v2/localized_concept/e4ee4f5c-07b0-577e-8bc0-37e0f98d7a2b.yaml

@@ -29,3 +29,5 @@ data:
   - type: expression
     designation: ellipsoidal latitude
   language_code: ara
+date_accepted: '2003-02-15T00:00:00.000Z'
+id: e4ee4f5c-07b0-577e-8bc0-37e0f98d7a2b

spec/fixtures/concept_collection_v2/localized_concept/eaea6d0f-c655-59c9-98f7-9affbdce7612.yaml

@@ -26,3 +26,5 @@ data:
   - type: expression
     designation: geodætisk bredde
   language_code: dan
+date_accepted: '2003-02-15T00:00:00.000Z'
+id: eaea6d0f-c655-59c9-98f7-9affbdce7612

spec/fixtures/concept_collection_v2_dashed/localized-concept/081154c5-89d6-5192-8147-373bd6060eaa.yaml

@@ -24,3 +24,5 @@ data:
     normative_status: preferred
     designation: دلالة
   language_code: ara
+date_accepted: '2010-11-01T00:00:00.000Z'
+id: '081154c5-89d6-5192-8147-373bd6060eaa'

spec/fixtures/concept_collection_v2_dashed/localized-concept/27457e38-89b5-5694-8d19-0dd3973ec71d.yaml

@@ -29,3 +29,5 @@ data:
   - type: expression
     designation: ellipsoidal latitude
   language_code: eng
+date_accepted: '2003-02-15T00:00:00.000Z'
+id: 27457e38-89b5-5694-8d19-0dd3973ec71d

spec/fixtures/concept_collection_v2_dashed/localized-concept/527bd617-f471-5523-9b98-59bb181f3df8.yaml

@@ -23,3 +23,5 @@ data:
     normative_status: preferred
     designation: Intension
   language_code: deu
+date_accepted: '2010-11-01T00:00:00.000Z'
+id: 527bd617-f471-5523-9b98-59bb181f3df8

spec/fixtures/concept_collection_v2_dashed/localized-concept/becf3892-886d-5dab-8a7c-af303e576a8d.yaml

@@ -23,3 +23,5 @@ data:
   - type: expression
     designation: Sistema de Coordenadas Cartesianas
   language_code: spa
+date_accepted: '2015-08-15T00:00:00.000Z'
+id: becf3892-886d-5dab-8a7c-af303e576a8d

spec/fixtures/concept_collection_v2_dashed/localized-concept/bf1691ef-6b21-590a-aef1-9e67ad54378e.yaml

@@ -24,3 +24,5 @@ data:
     normative_status: preferred
     designation: intension
   language_code: eng
+date_accepted: '2010-11-01T00:00:00.000Z'
+id: bf1691ef-6b21-590a-aef1-9e67ad54378e

spec/fixtures/concept_collection_v2_dashed/localized-concept/c2cc493d-bc21-50a5-96fc-6774f3d53496.yaml

@@ -29,3 +29,5 @@ data:
   - type: expression
     designation: ellipsoidal latitude
   language_code: deu
+date_accepted: '2003-02-15T00:00:00.000Z'
+id: c2cc493d-bc21-50a5-96fc-6774f3d53496

spec/fixtures/concept_collection_v2_dashed/localized-concept/c87dfcd1-c38a-55f9-87bd-9da33bfede80.yaml

@@ -23,3 +23,5 @@ data:
   - type: expression
     designation: Cartesian coordinate system
   language_code: eng
+date_accepted: '2015-08-15T00:00:00.000Z'
+id: c87dfcd1-c38a-55f9-87bd-9da33bfede80

spec/fixtures/concept_collection_v2_dashed/localized-concept/da24b782-1551-5128-a043-ba6135a25acf.yaml

@@ -29,3 +29,5 @@ data:
     designation: postal address component
   domain: postal address
   language_code: eng
+date_accepted: '2017-11-15T00:00:00.000Z'
+id: da24b782-1551-5128-a043-ba6135a25acf

spec/fixtures/concept_collection_v2_dashed/localized-concept/e4ee4f5c-07b0-577e-8bc0-37e0f98d7a2b.yaml

@@ -29,3 +29,5 @@ data:
   - type: expression
     designation: ellipsoidal latitude
   language_code: ara
+date_accepted: '2003-02-15T00:00:00.000Z'
+id: e4ee4f5c-07b0-577e-8bc0-37e0f98d7a2b