glossarist 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9f794633ad83fc5d35fec74fad5006d187a4cd3c5c1ba91e563506a16ddaed
-  data.tar.gz: 1c0af3de4b228856e9adc0f579f709e2f4c63a44d827b66325f2ea1b79df776a
+  metadata.gz: 9111f4d1d6b0ea9180c0a61faee7fa8a823aef40b3712803757bf0cc4df76509
+  data.tar.gz: 47255c6c4ad7b725198d7b3f3e256e30cc2c1489d0a1a8315c84e3aabae73d32
 SHA512:
-  metadata.gz: 0cb0ad5ac9ea10c2aaad16062c6c5a10878b7c7f7bf6dd7a9e7641417ed2d1f47ee3fd3c9fc86fbca7262234e5a05141a11f584e798fe493d99064b73bcead0d
-  data.tar.gz: e4431def5662c9f7eceff74cbff8258128525e657fb4901e06fd21a2243ad8f3d98fad62e28766aa5bdf0d20149ffd66525389fd3b703c57907e4fb2873dbd03
+  metadata.gz: 635ff3fb8d7f56a2e25968700c9b025946d4fb00ae0d8785619c438a2f4aaee5a93f82ff6022298a2c89d71da9c38d4095d215509addc1c3060b66fe9ff09bff
+  data.tar.gz: d04bf458f1e88b0f325e2c38403d426179e8ca33277ac1e6efe12fc85837bdddf7fd80899cc370ca1930f0a0f91da97b67aef7087009217a89b06f0d861cecbe

data/Gemfile

@@ -2,4 +2,8 @@
 
 source "https://rubygems.org"
 
+gem "pry", "~> 0.14.0"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.10"
+
 gemspec

data/glossarist.gemspec

@@ -30,10 +30,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "relaton", "~> 1.16"
+  spec.add_dependency "relaton", "~> 1.19"
   spec.add_dependency "thor"
-
-  spec.add_development_dependency "pry", "~> 0.14.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.10"
 end

data/lib/glossarist/concept.rb

@@ -69,12 +69,12 @@ module Glossarist
     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
@@ -82,6 +82,7 @@ module Glossarist
         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 @@ module Glossarist
     def preferred_designations
       @designations.select(&:preferred?)
     end
+
     alias :preferred_terms :preferred_designations
 
     def dates=(dates)
@@ -141,7 +143,22 @@ module Glossarist
       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 @@ module Glossarist
           "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

data/lib/glossarist/localized_concept.rb

@@ -27,11 +27,11 @@ module Glossarist
     # 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 @@ module Glossarist
       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,6 +55,8 @@ module Glossarist
         "review_decision_event" => review_decision_event,
       }.compact).merge!(@extension_attributes)
 
+      hash["status"] = entry_status if entry_status
+
       hash
     end
 
@@ -63,7 +64,7 @@ module Glossarist
       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.

data/lib/glossarist/managed_concept.rb

@@ -57,7 +57,7 @@ module Glossarist
     end
 
     def uuid
-      @uuid ||= Glossarist::Utilities::UUID.uuid_v5(@uuid_namespace, to_h.to_yaml)
+      @uuid ||= Glossarist::Utilities::UUID.uuid_v5(@uuid_namespace, to_h_no_uuid.to_yaml)
     end
 
     def related=(related)
@@ -141,7 +141,7 @@ module Glossarist
 
     alias :l10n :localization
 
-    def to_h
+    def to_h_no_uuid
       {
         "data" => {
           "identifier" => id,
@@ -149,9 +149,16 @@ module Glossarist
           "groups" => groups,
           "sources" => sources&.map(&:to_h),
         }.compact,
+        "related" => related&.map(&:to_h),
+        "date_accepted" => date_accepted&.date,
+        "status" => status,
       }.compact
     end
 
+    def to_h
+      to_h_no_uuid.merge("id" => uuid)
+    end
+
     def default_designation
       localized = localization("eng") || localizations.values.first
       terms = localized&.preferred_terms&.first || localized&.terms&.first
@@ -178,6 +185,7 @@ module Glossarist
     end
 
     def date_accepted
+      return nil unless @dates
       @dates.find { |date| date.accepted? }
     end
 

data/lib/glossarist/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Glossarist
-  VERSION = "2.1.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glossarist
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Ribose
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-29 00:00:00.000000000 Z
+date: 2024-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -38,48 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
 description: 
 email:
 - open.source@ribose.com