openehr 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f34e667ae737ff2718bb8d2e676d75711b0753fd2fb39f64cba6e6eb3bef59a
-  data.tar.gz: bfede641c16301632b2a3647727a10036dff325b2e8bed288bbca1aa820e075c
+  metadata.gz: 3ee9bac169579e3747a7620ea835317f3c58c6eef05782d7ec3631c324bb4128
+  data.tar.gz: 51db4fef2f14ea1de6a472e2c3a876e4c48670d1a57c9385874c9ecd8623b8a6
 SHA512:
-  metadata.gz: 1eabc54006e29b679f16d9d085f097ddb808037a97190611331161b435d1dc77fd7f53ae08f686eda74c3186094a0a15f45351e5fc4d1e1079c13029a10be4e9
-  data.tar.gz: 035d2e2a083d64cb84984c20c7362c4cb8a40912406855a9472c0d1fc240ec43e97547bd17fa83f29f3026b7d55483106b53691f45ceefd813ef858f36026fef
+  metadata.gz: dadd78aeb5e2ddbcaf042468ad6f25ac48e50887f78d9abe6513f2574d017451418fc43607529861fcc0f29a9fd0ba033ec7bfc9cac72ed3305b1c62683ec51d
+  data.tar.gz: b25f5f631f71b01d3de6941ec1bd8261c40a14366ac7f0ef43e333a41039a7b53e7a2d1172dc04093a4630ea38644089df1e433c16caa31aae82c3107d9ca888

data/README.rdoc

@@ -7,9 +7,9 @@ A Ruby implementation of the openEHR specifications
 
 = Requirements
 
-* Supports CRuby 3.1 or later.
-* Developed with CRuby 3.4 on Linux; CI covers 3.1-3.4.
-* Ruby 3.0 or earlier are no longer supported.
+* Supports the Ruby versions currently maintained upstream by Ruby core: 3.2, 3.4, and 4.0.
+* Developed with CRuby 4.0.6 on Linux; CI covers 3.2, 3.4, and 4.0.
+* Other versions, including 3.1 and 3.3, are not supported.
 
 =Description
 

data/lib/openehr/parser/adl_grammar.tt

@@ -3140,10 +3140,6 @@ module OpenEHR
         [Uu] [Nn] [Ii] [Qq] [Uu] [Ee] space
       end
 
-      rule SYM_INFINITY
-        [Ii] [Nn] [Ff] [Ii] [Nn] [Ii] [Tt] [Yy] space
-      end
-
       rule SYM_USE_NODE
         [Uu] [Ss] [Ee] '_' [Nn] [Oo] [Dd] [Ee] space
       end

data/lib/openehr/parser/adl_parser.rb

@@ -1,7 +1,6 @@
 require 'treetop'
 #require 'polyglot'
 
-require_relative '../parser'
 #require_relative './adl_grammar'
 
 module OpenEHR

data/lib/openehr/rm/data_types/quantity/date_time.rb

@@ -116,7 +116,7 @@ module OpenEHR
               diff = (other.magnitude - self.magnitude).abs
               hour = (diff / 60 / 60).to_i
               minute = ((diff - hour*60*60)/60).to_i
-              second = (diff - hour * 60 *60 - minute * 60).to_i
+              second = (diff - hour * 60 * 60 - minute * 60).to_i
               fractional_second = ((diff - diff.to_i)*1000000.0).to_i/1000000.0
               str = 'P0Y0M0W0DT' + hour.to_s + 'H' +
                 minute.to_s + 'M' + second.to_s
@@ -184,11 +184,11 @@ module OpenEHR
               date_duration = past_date.diff(future_date)
               hour = (time_diff / 60 / 60).to_i
               minute = ((time_diff - hour*60*60)/60).to_i
-              second = (time_diff - hour * 60 *60 - minute * 60).to_i
+              second = (time_diff - hour * 60 * 60 - minute * 60).to_i
               str = date_duration.value + 'T' + hour.to_s + 'H' +
                 minute.to_s + 'M' + second.to_s
               if @fractional_second.nil?
-                return DvDuration.new(:value => str +'S')
+                return DvDuration.new(:value => str + 'S')
               else
                 fractional_second =
                   ((time_diff - time_diff.to_i)*1000000.0).to_i/1000000.0

data/lib/openehr/rm/data_types/text.rb

@@ -86,7 +86,7 @@ module OpenEHR
         end # of CodePhrase
 
         class DvText < OpenEHR::RM::DataTypes::Basic::DataValue
-          attr_reader :formatting, :hyperlink, :mappings,
+          attr_reader :formatting, :mappings,
                       :language, :encoding
           attr_accessor :hyperlink
 

data/lib/openehr/rm/factory.rb

@@ -3,6 +3,23 @@ require 'active_support/inflector'
 module OpenEHR
   module RM
     class Factory
+      # Attribute keys whose openEHR RM type is always exactly one
+      # concrete class (never actually polymorphic), so a real-world
+      # canonical-JSON serializer may legally omit _type for them - e.g.
+      # openehr-rails's own CanonicalSerializer does. Consulted only as
+      # a fallback when _type is absent; see convert_hash below.
+      #
+      # Deliberately does NOT include attributes whose declared type is
+      # abstract (e.g. LOCATABLE.uid : UID_BASED_ID, which could be an
+      # ObjectVersionID or a HierObjectID; OBJECT_REF.id : OBJECT_ID,
+      # similarly abstract) - guessing there would silently build the
+      # wrong object instead of failing loudly.
+      NON_POLYMORPHIC_TYPE_FOR_KEY = {
+        archetype_id: 'ARCHETYPE_ID',
+        template_id: 'TEMPLATE_ID',
+        terminology_id: 'TERMINOLOGY_ID'
+      }.freeze
+
       def initialize(cobject)
         @cobject = cobject
       end
@@ -21,13 +38,49 @@ module OpenEHR
           param.each_with_object({}) do |item, parameters|
             key = item.shift
             value = item.shift
-            if value.instance_of? Hash
-              parameters[key] = Factory.create(value[:_type], **value)
-            else
-              parameters[key] = value
-            end
+            parameters[key] = convert_value(key, value)
+          end
+        end
+
+        private
+
+        # A canonical-JSON attribute value is either a typed sub-object
+        # (Hash, normally with _type - see convert_hash for the
+        # _type-less case), a List<...> of those (Array - openEHR RM
+        # multiplicity 0..*/1..* attributes, e.g. COMPOSITION.content,
+        # HISTORY.events, ITEM_TREE.items), or a plain value (String,
+        # Numeric, ...). Arrays recurse (passing the same attribute key
+        # down, since none of NON_POLYMORPHIC_TYPE_FOR_KEY's keys are
+        # ever Array-valued) so nested multiplicities (e.g. a CLUSTER's
+        # own items) convert too; non-Hash array elements (there is no
+        # List<String>/List<Numeric> attribute in this RM, but doubles/
+        # pre-built objects show up in specs) pass through unchanged.
+        def convert_value(key, value)
+          if value.instance_of? Hash
+            convert_hash(key, value)
+          elsif value.instance_of? Array
+            value.map { |element| convert_value(key, element) }
+          else
+            value
           end
-        end          
+        end
+
+        # _type is how a Hash normally says what RM class to become;
+        # when it's absent, fall back to NON_POLYMORPHIC_TYPE_FOR_KEY.
+        # Anything else raises with the attribute name rather than
+        # silently guessing or passing a raw Hash through where an RM
+        # object is expected (downstream code - e.g. Locatable#concept
+        # calling archetype_id.concept_name - would then fail far from
+        # the real cause).
+        def convert_hash(key, value)
+          type = value[:_type] || NON_POLYMORPHIC_TYPE_FOR_KEY[key]
+          unless type
+            raise ArgumentError,
+                  "cannot determine the RM type for attribute #{key.inspect}: its Hash value has no _type key " \
+                  "and #{key.inspect} is not a known non-polymorphic attribute (keys: #{value.keys.inspect})"
+          end
+          Factory.create(type, **value)
+        end
       end
 
       def build

data/lib/openehr/serializer/adl_serializer.rb

@@ -81,7 +81,7 @@ module OpenEHR
           items.each do |code, item|
             ontology << INDENT*4 + "[\"#{code}\"] = <" + NL
             item.items.each do |name, desc|
-              ontology << INDENT*5 + "#{name} = <\"#{desc}\">" +NL
+              ontology << INDENT*5 + "#{name} = <\"#{desc}\">" + NL
             end
             ontology << INDENT*4 + '>'+NL
           end

data/lib/openehr/version.rb

@@ -1,3 +1,3 @@
 module OpenEHR
-  VERSION = "2.0.0"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Shinji KOBAYASHI
@@ -381,7 +381,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="