glossarist 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d174478d1fdc030866f09175b1a229e7133ea77005fa00f7b3f46a904a12248e
-  data.tar.gz: 54fb2bfcbb816f5514d3bc0c54f3fd37debdbb87af2279b117edffaa3ea77aa7
+  metadata.gz: fe8b9555663cedc2258a960b19a10f9d6fc4575faf70006e1223c69f95678451
+  data.tar.gz: fbdd27366d93b637882ad7dd3b77bfbaca9ae68c489403d7595fbe39af901e68
 SHA512:
-  metadata.gz: 2ce6fffeda48412bda622570f2eee9ae17065346a520821293f16bf2d29bb4c90674e6a0ce3a7f8e3dc75cb871c9d9308841c318739f0a942ea9d42c108b0ae9
-  data.tar.gz: 56ff4885111df64c8fe8a179e15f73164ad1e0dd4651f63ae27685b23fbcb94ae32b1250b82e2fd99430a8fd07a7efc31fcf0f4b284364c2954c802435fea6ca
+  metadata.gz: 2e7030a8e328ee775641e8c4637b458c6746b872d597235bad00977c78a97d56f21ed48bbb9ef11ab0209ba74a93f7aeac19121bca32bd8c71aecdf67601223b
+  data.tar.gz: 1a5ddbc5c71542eb7f258d17c601cd08b54041053ddfb1089a5f6e7eca28dfb360fe2b1c21da4bfa9d8474c333ce37376aeccbf75fc609dd2cea3e2e28c1acd2

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

@@ -16,6 +16,7 @@ module Glossarist
     # @note Works with strings, but soon they may be replaced with symbols.
     # @return [String]
     attr_accessor :entry_status
+    alias_method :status=, :entry_status=
 
     # Must be one of the following:
     # +preferred+, +admitted+, +deprecated+.
@@ -27,11 +28,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 +42,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 +56,8 @@ module Glossarist
         "review_decision_event" => review_decision_event,
       }.compact).merge!(@extension_attributes)
 
+      hash["status"] = entry_status if entry_status
+
       hash
     end
 
@@ -63,7 +65,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/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Glossarist
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glossarist
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Ribose
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-18 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