glossarist 2.3.0 → 2.3.1

data/lib/glossarist/utilities/uuid.rb

@@ -21,12 +21,13 @@ module Glossarist
       #
       # See RFC 4122 for details of UUID at: https://www.ietf.org/rfc/rfc4122.txt
       def self.uuid_from_hash(hash_class, namespace, name)
-        if hash_class == Digest::MD5 || hash_class == OpenSSL::Digest::MD5
+        if [Digest::MD5, OpenSSL::Digest::MD5].include?(hash_class)
           version = 3
-        elsif hash_class == Digest::SHA1 || hash_class == OpenSSL::Digest::SHA1
+        elsif [Digest::SHA1, OpenSSL::Digest::SHA1].include?(hash_class)
           version = 5
         else
-          raise ArgumentError, "Expected OpenSSL::Digest::SHA1 or OpenSSL::Digest::MD5, got #{hash_class.name}."
+          raise ArgumentError,
+                "Expected OpenSSL::Digest::SHA1 or OpenSSL::Digest::MD5, got #{hash_class.name}."
         end
 
         uuid_namespace = pack_uuid_namespace(namespace)
@@ -58,12 +59,16 @@ module Glossarist
       end
 
       def self.pack_uuid_namespace(namespace)
-        if [DNS_NAMESPACE, OID_NAMESPACE, URL_NAMESPACE, X500_NAMESPACE].include?(namespace)
+        if [DNS_NAMESPACE, OID_NAMESPACE, URL_NAMESPACE,
+            X500_NAMESPACE].include?(namespace)
           namespace
         else
           match_data = namespace.match(/\A(\h{8})-(\h{4})-(\h{4})-(\h{4})-(\h{4})(\h{8})\z/)
 
-          raise ArgumentError, "Only UUIDs are valid namespace identifiers" unless match_data.present?
+          unless match_data.present?
+            raise ArgumentError,
+                  "Only UUIDs are valid namespace identifiers"
+          end
 
           match_data.captures.map { |s| s.to_i(16) }.pack("NnnnnN")
         end

data/lib/glossarist/utilities.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
 
-require_relative "utilities/enum"
-require_relative "utilities/boolean_attributes"
 require_relative "utilities/common_functions"
 require_relative "utilities/uuid"

data/lib/glossarist/version.rb

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

data/lib/glossarist.rb

@@ -5,28 +5,29 @@
 
 require "psych"
 require "thor"
+require "lutaml/model"
 
 require_relative "glossarist/utilities"
 require_relative "glossarist/version"
 require_relative "glossarist/glossary_definition"
 
+require_relative "glossarist/designation"
 require_relative "glossarist/asset"
-require_relative "glossarist/model"
-require_relative "glossarist/concept_date"
-require_relative "glossarist/detailed_definition"
-require_relative "glossarist/related_concept"
 require_relative "glossarist/citation"
+require_relative "glossarist/collection"
+require_relative "glossarist/concept_date"
+require_relative "glossarist/concept_manager"
 require_relative "glossarist/concept_set"
 require_relative "glossarist/concept_source"
-require_relative "glossarist/collection"
-require_relative "glossarist/designation"
+require_relative "glossarist/detailed_definition"
+require_relative "glossarist/related_concept"
+require_relative "glossarist/concept_data"
 require_relative "glossarist/concept"
 require_relative "glossarist/localized_concept"
-require_relative "glossarist/managed_concept_collection"
-require_relative "glossarist/concept_manager"
+require_relative "glossarist/managed_concept_data"
 require_relative "glossarist/managed_concept"
+require_relative "glossarist/managed_concept_collection"
 require_relative "glossarist/non_verb_rep"
-require_relative "glossarist/v1_reader"
 
 require_relative "glossarist/collections"
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: glossarist
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Ribose
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-19 00:00:00.000000000 Z
+date: 2025-01-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: lutaml-model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: relaton
   requirement: !ruby/object:Gem::Requirement
@@ -38,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - open.source@ribose.com
 executables:
@@ -53,6 +67,7 @@ files:
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - Gemfile
 - LICENSE.txt
 - README.adoc
@@ -70,6 +85,7 @@ files:
 - lib/glossarist/collections/collection.rb
 - lib/glossarist/collections/designation_collection.rb
 - lib/glossarist/concept.rb
+- lib/glossarist/concept_data.rb
 - lib/glossarist/concept_date.rb
 - lib/glossarist/concept_manager.rb
 - lib/glossarist/concept_set.rb
@@ -92,18 +108,12 @@ files:
 - lib/glossarist/localized_concept.rb
 - lib/glossarist/managed_concept.rb
 - lib/glossarist/managed_concept_collection.rb
-- lib/glossarist/model.rb
+- lib/glossarist/managed_concept_data.rb
 - lib/glossarist/non_verb_rep.rb
 - lib/glossarist/related_concept.rb
 - lib/glossarist/utilities.rb
-- lib/glossarist/utilities/boolean_attributes.rb
 - lib/glossarist/utilities/common_functions.rb
-- lib/glossarist/utilities/enum.rb
-- lib/glossarist/utilities/enum/class_methods.rb
-- lib/glossarist/utilities/enum/enum_collection.rb
-- lib/glossarist/utilities/enum/instance_methods.rb
 - lib/glossarist/utilities/uuid.rb
-- lib/glossarist/v1_reader.rb
 - lib/glossarist/version.rb
 homepage: https://github.com/glossarist/glossarist-ruby
 licenses:
@@ -112,7 +122,7 @@ metadata:
   homepage_uri: https://github.com/glossarist/glossarist-ruby
   source_code_uri: https://github.com/glossarist/glossarist-ruby
   bug_tracker_uri: https://github.com/glossarist/glossarist-ruby/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Concept models for terminology glossaries conforming ISO 10241-1.
 test_files: []

data/lib/glossarist/model.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-# (c) Copyright 2021 Ribose Inc.
-#
-
-module Glossarist
-  class Model
-    def self.new(params = {})
-      return params if params.is_a?(self)
-
-      super
-    end
-
-    def initialize(attributes = {})
-      attributes.each_pair { |k, v| set_attribute(k, v) }
-    end
-
-    def set_attribute(name, value)
-      public_send("#{name}=", value)
-    rescue NoMethodError
-      if Config.extension_attributes.include?(name)
-        extension_attributes[name] = value
-      elsif name.match?(/[A-Z]/) # adding support for camel case
-        name = snake_case(name.to_s).to_sym
-        retry
-      else
-        raise ArgumentError, "#{self.class.name} does not have " +
-          "attribute #{name} defined or the attribute is read only."
-      end
-    end
-
-    def self.from_h(hash)
-      new(hash)
-    end
-
-    def snake_case(str)
-      str.gsub(/([A-Z])/) { "_#{$1.downcase}" }
-    end
-  end
-end

data/lib/glossarist/utilities/boolean_attributes.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Glossarist
-  module Utilities
-    module BooleanAttributes
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      def self.extended(base)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-        def register_boolean_attributes(attributes)
-          attributes.each do |attribute|
-            register_boolean_attribute(attribute)
-          end
-        end
-
-        def register_boolean_attribute(attribute)
-          attr_reader attribute
-
-          define_method("#{attribute}=") do |value|
-            instance_variable_set("@#{attribute}", !!value)
-          end
-
-          define_method("#{attribute}?") do
-            !!instance_variable_get("@#{attribute}")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/glossarist/utilities/enum/class_methods.rb

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-require "set"
-
-module Glossarist
-  module Utilities
-    module Enum
-      module ClassMethods
-        def add_inheritable_attribute(attribute)
-          @inheritable_attributes ||= Set[:inheritable_attributes]
-          @inheritable_attributes << attribute
-        end
-
-        def inherited(subclass)
-          @inheritable_attributes.each do |inheritable_attribute|
-            instance_var = "@#{inheritable_attribute}"
-            subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
-          end
-        end
-
-        def enums
-          @enums ||= EnumCollection.new
-        end
-
-        def register_enum(name, values, options = {})
-          values = standardize_values(values)
-
-          enums.add(name, values, options)
-
-          add_inheritable_attribute(:enums)
-          register_type_accessor(name)
-
-          values.each do |value|
-            register_check_method(name, value)
-            register_set_method(name, value)
-          end
-        end
-
-        def registered_enums
-          enums.registered_enums
-        end
-
-        def valid_types(name)
-          enums.valid_types(name)
-        end
-
-        def type_options(name)
-          enums.type_options(name)
-        end
-
-        def register_type_reader(name)
-          define_method(name) do
-            if self.class.type_options(name)[:multiple]
-              selected_type[name].map(&:to_s)
-            else
-              selected_type[name].first&.to_s
-            end
-          end
-        end
-
-        def register_type_writer(name)
-          define_method("#{name}=") do |type|
-            select_type(name, type)
-          end
-        end
-
-        # Adds a reader and writer for the type name given.
-        def register_type_accessor(name)
-          register_type_reader(name)
-          register_type_writer(name)
-        end
-
-        def register_check_method(name, value)
-          define_method("#{value}?") do
-            !!selected_type[name]&.include?(value.to_sym)
-          end
-        end
-
-        def register_set_method(name, value)
-          define_method("#{value}=") do |input|
-            if input
-              select_type(name, value)
-            else
-              deselect_type(name, value)
-            end
-          end
-        end
-
-        def standardize_values(values)
-          if values.is_a?(Array)
-            values.map(&:to_sym)
-          else
-            [values.to_sym]
-          end
-        end
-      end
-    end
-  end
-end

data/lib/glossarist/utilities/enum/enum_collection.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module Glossarist
-  module Utilities
-    module Enum
-      class EnumCollection
-        include Enumerable
-
-        def initialize
-          @collection = {}
-        end
-
-        def add(name, values, options = {})
-          @collection[name] = { registered_values: values, options: options }
-        end
-
-        def each(&block)
-          if block_given?
-            @collection.each do |object|
-              block.call(object)
-            end
-          else
-            enum_for(:each)
-          end
-        end
-
-        def registered_enums
-          @collection&.keys || []
-        end
-
-        def valid_types(name)
-          @collection[name][:registered_values]
-        end
-
-        def type_options(name)
-          @collection[name][:options]
-        end
-
-        def [](name)
-          @collection[name]
-        end
-      end
-    end
-  end
-end

data/lib/glossarist/utilities/enum/instance_methods.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module Glossarist
-  module Utilities
-    module Enum
-      module InstanceMethods
-        def selected_type
-          initialize_selected_type if @selected_type.nil?
-
-          @selected_type
-        end
-
-        def select_type(type_name, values)
-          values = if values.is_a?(Array)
-                     values
-                   else
-                     [values]
-                   end
-
-          values.each do |value|
-            select_type_value(type_name, value)
-          end
-        end
-
-        def deselect_type(type_name, value)
-          selected_type[type_name].delete(value)
-        end
-
-        private
-
-        def select_type_value(type_name, value)
-          if !value
-            selected_type[type_name].clear
-          elsif self.class.valid_types(type_name).include?(value.to_sym)
-            selected_type[type_name].clear unless self.class.type_options(type_name)[:multiple]
-            selected_type[type_name] << value.to_sym
-          else
-            raise(
-              Glossarist::InvalidTypeError,
-              "`#{value}` is not a valid #{type_name}. Supported #{type_name} are #{self.class.enums[type_name][:registered_values].to_a.join(", ")}"
-            )
-          end
-        end
-
-        def initialize_selected_type
-          @selected_type = {}
-
-          self.class.registered_enums.each do |type|
-            @selected_type[type] = []
-          end
-        end
-      end
-    end
-  end
-end

data/lib/glossarist/utilities/enum.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "enum/enum_collection"
-require_relative "enum/class_methods"
-require_relative "enum/instance_methods"
-
-module Glossarist
-  module Utilities
-    module Enum
-      def self.included(base)
-        base.include(InstanceMethods)
-        base.extend(ClassMethods)
-      end
-
-      def self.extended(base)
-        base.include(InstanceMethods)
-        base.extend(ClassMethods)
-      end
-    end
-  end
-end

data/lib/glossarist/v1_reader.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Glossarist
-  # An adapter to read concepts in V1 format, converts them to v2 format and
-  # load into glossarist concept model.
-  class V1Reader
-    def self.load_concept_from_file(filename)
-      new.load_concept_from_file(filename)
-    end
-
-    def load_concept_from_file(filename)
-      concept_hash = Psych.safe_load(File.read(filename), permitted_classes: [Date, Time])
-      Config.class_for(:managed_concept).new(generate_v2_concept_hash(concept_hash))
-    end
-
-    private
-
-    def generate_v2_concept_hash(concept_hash)
-      v2_concept = { "groups" => concept_hash["groups"] }
-      v2_concept["data"] = {
-        "identifier" => concept_hash["termid"],
-        "localized_concepts" => concept_hash.values.grep(Hash),
-      }
-
-      v2_concept
-    end
-  end
-end