openehr 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5394d0db01d215484074adc3241b636ad480509bc4d7e64dd472d0b81891f3c4
-  data.tar.gz: eebc02803922cf2e24d974f1f2d410ed488d335f02f35db1c95f827bf8a2d6c2
+  metadata.gz: 9e728b70dac1326f832dd44e631442ae3e9ed8b3a3c81a2b5300c23e01a9068e
+  data.tar.gz: 0003101647c193f7d35d575a3eef1a92a8e34038a849719a0598e34109f92a52
 SHA512:
-  metadata.gz: c00bcb8ba9313fcf1c0f2f15935efa92ac906e323fa67c2c6fbddd8350ecacd1111e958e22da2facbe7d77db0bcdbedd195bba17487516cb37ea351367849796
-  data.tar.gz: e077e96da7ee38994291a4b55f1cd2f6ef047e34017f9c8fd3213926c737860904a8d6ef90481f7f0b8794d01171fe6e28015a4ed67e39baf1b530150e06e447
+  metadata.gz: 334d9390f1e59a2a68a812fda1c946ddf3a74504b4234f6363dddee9e42d8763b01d8bbee50fed8c894318c4bec794b4ba743310961e4ba482164ccf9ec660e7
+  data.tar.gz: 611283bb569b4bc0672a502d09b6c485db8ca47131dd8393fdb6ac67589bbdfeb305d0a98a628997a6091ffd6dda03d57695560a61308104f96c06f7e95a9c98

data/README.rdoc

@@ -7,9 +7,9 @@ A Ruby implementation of the openEHR specifications
 
 = Requirements
 
-* Supports CRuby 3.1 or later.
-* Developed with CRuby 4.0.6 on Linux; CI covers 3.1-3.4 and 4.0.
-* 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/am/archetype/constraint_model.rb

@@ -286,7 +286,7 @@ module OpenEHR
         end
    
         class CComplexObject < CDefinedObject
-          attr_accessor :attributes
+          attr_reader :attributes
 
           def initialize(args = { })
             super

data/lib/openehr/assumed_library_types.rb

@@ -254,8 +254,8 @@ module OpenEHR
       end
 
       def to_days
-        days = nilthenzero(@year)*TimeDefinitions::NOMINAL_DAYS_IN_YEAR +
-          nilthenzero(@month)*TimeDefinitions::NOMINAL_DAYS_IN_MONTH +
+        days = (nilthenzero(@year)*TimeDefinitions::NOMINAL_DAYS_IN_YEAR) +
+          (nilthenzero(@month)*TimeDefinitions::NOMINAL_DAYS_IN_MONTH) +
           nilthenzero(@day)
         return days
       end
@@ -406,7 +406,7 @@ module OpenEHR
       end
 
       def to_second
-        second = (nilthenzero(@hour)*60 + nilthenzero(@minute))*60 +
+        second = (((nilthenzero(@hour)*60) + nilthenzero(@minute))*60) +
           nilthenzero(@second) +
           nilthenzero(@fractional_second)
         return second
@@ -472,18 +472,21 @@ module OpenEHR
           end
           # A timezone is optional in ISO 8601; its absence does not make an
           # otherwise-valid time invalid.
-          unless tz.nil?
-            timezone = Timezone.new(tz)
-            if timezone.hour < 0 or timezone.hour >= HOURS_IN_DAY
-              return false
-            end
-            if timezone.minute < 0 or timezone.minute >= MINUTES_IN_HOUR
-              return false
-            end
-          end
+          return false unless valid_timezone_part?(tz)
+
           return true
         end
       end
+
+      def self.valid_timezone_part?(tz)
+        return true if tz.nil?
+
+        timezone = Timezone.new(tz)
+        return false if timezone.hour < 0 or timezone.hour >= HOURS_IN_DAY
+        return false if timezone.minute < 0 or timezone.minute >= MINUTES_IN_HOUR
+
+        true
+      end
     end # end of ISO8601_TIME
 
     module ISO8601DateTimeModule
@@ -571,7 +574,7 @@ module OpenEHR
 
       protected
       def magnitude
-        return self.to_days*HOURS_IN_DAY*MINUTES_IN_HOUR*SECONDS_IN_MINUTE +
+        return (self.to_days*HOURS_IN_DAY*MINUTES_IN_HOUR*SECONDS_IN_MINUTE) +
           self.to_second
       end
     end
@@ -719,11 +722,11 @@ module OpenEHR
       end
 
       def to_seconds
-        days = nilthenzero(@years)*TimeDefinitions::DAYS_IN_YEAR +
-          nilthenzero(@months)*TimeDefinitions::DAYS_IN_MONTH +
-          nilthenzero(@weeks)*TimeDefinitions::DAYS_IN_WEEK + 
+        days = (nilthenzero(@years)*TimeDefinitions::DAYS_IN_YEAR) +
+          (nilthenzero(@months)*TimeDefinitions::DAYS_IN_MONTH) +
+          (nilthenzero(@weeks)*TimeDefinitions::DAYS_IN_WEEK) + 
           nilthenzero(@days)
-        seconds_with_fractional = (((days*TimeDefinitions::HOURS_IN_DAY + nilthenzero(@hours))*TimeDefinitions::MINUTES_IN_HOUR)+nilthenzero(@minutes))*TimeDefinitions::SECONDS_IN_MINUTE +
+        seconds_with_fractional = (((((days*TimeDefinitions::HOURS_IN_DAY) + nilthenzero(@hours))*TimeDefinitions::MINUTES_IN_HOUR)+nilthenzero(@minutes))*TimeDefinitions::SECONDS_IN_MINUTE) +
           nilthenzero(@seconds) +
           @fractional_second.to_f
         return negative? ? -seconds_with_fractional : seconds_with_fractional

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
@@ -9,10 +8,6 @@ module OpenEHR
     class ADLParser < ::OpenEHR::Parser::Base
       Treetop.load(File.join(File.dirname(__FILE__), 'adl_grammar.tt'))
 
-      def initialize(filename)
-        super
-      end
-      
       def parse(validate: false)
         archetype.tap do |a|
           ArchetypeValidator.new(a).validate! if validate

data/lib/openehr/parser/opt_parser.rb

@@ -31,10 +31,6 @@ module OpenEHR
         '/template/description/other_details'
       DEFINITION_PATH = '/template/definition'
       OCCURRENCE_PATH = '/occurrences'
-      
-      def initialize(filename)
-        super(filename)
-      end
 
       def parse
         @opt = Nokogiri::XML::Document.parse(File.open(@filename))

data/lib/openehr/rm/common/generic.rb

@@ -194,8 +194,8 @@ module OpenEHR
         end
 
         class Attestation < AuditDetails
-          attr_reader :reason
-          attr_accessor :proof, :attested_view, :is_pending, :items
+          attr_reader :reason, :items
+          attr_accessor :proof, :attested_view, :is_pending
 
           def initialize(args = { })
             super(args)

data/lib/openehr/rm/common/resource.rb

@@ -1,4 +1,3 @@
-require 'set'
 
 module OpenEHR
   module RM

data/lib/openehr/rm/data_structures/item_structure.rb

@@ -2,7 +2,6 @@
 # ItemStructure module
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109346709572_859750_3810Report.html
 # refs #54
-require 'set'
 
 require_relative '../data_structures'
 require_relative 'item_structure/representation'

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

@@ -25,20 +25,11 @@ module OpenEHR
         end
 
         class DvBoolean < DataValue
-          def initialize(args)
-            super(args)
-          end
-
           def value=(value)
             raise ArgumentError, "value must not be nil" if value.nil?
-            if value == true
-              @value = true
-            elsif  value == false
-              @value = false
-            elsif /TRUE/i =~ value
-              @value = true
-            elsif /FALSE/i =~ value
-              @value = false
+            case value
+            when true, /TRUE/i then @value = true
+            when false, /FALSE/i then @value = false
             end
           end
 

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

@@ -37,10 +37,10 @@ module OpenEHR
             @charset = charset
           end
 
-          private
-
           CHARSET_LIST_PATH = File.expand_path('charset.lst', __dir__)
 
+          private
+
           def charset_valid?(charset)
             result = false
             File.open(CHARSET_LIST_PATH) do |file|

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

@@ -55,20 +55,8 @@ module OpenEHR
               else
                 past, future = self, other
               end
-              year, month, day = 0, 0, 0
-              if (future.day >= past.day)
-                day = future.day - past.day
-              else
-                month = -1
-                previous_month = future.month - 1
-                if previous_month == 0
-                  previous_month = 12
-                end
-                day = DAYS_IN_MONTH[previous_month] + future.day - past.day
-                if leapyear?(future.year) && (previous_month == 2)
-                  day += 1
-                end
-              end
+              year = 0
+              month, day = day_borrow(past, future)
               week = day / 7
               if (future.month >= past.month)
                 month += future.month - past.month
@@ -82,11 +70,26 @@ module OpenEHR
               end
               year += future.year - past.year
               return DvDuration.new(:value =>
-                   'P' + year.to_s + 'Y' + month.to_s + 'M' + 
+                   'P' + year.to_s + 'Y' + month.to_s + 'M' +
                          week.to_s + 'W' + day.to_s + 'D')
             end
+
+            private
+
+            # Returns [month_adjustment, day] for diff: when future's
+            # day-of-month is behind past's, a month is borrowed from
+            # future's calendar to make day non-negative.
+            def day_borrow(past, future)
+              return [0, future.day - past.day] if future.day >= past.day
+
+              previous_month = future.month - 1
+              previous_month = 12 if previous_month == 0
+              day = DAYS_IN_MONTH[previous_month] + future.day - past.day
+              day += 1 if leapyear?(future.year) && previous_month == 2
+              [-1, day]
+            end
           end
-          
+
           class DvTime < DvTemporal
             include OpenEHR::AssumedLibraryTypes::ISO8601TimeModule
 
@@ -104,19 +107,19 @@ module OpenEHR
               if @fractional_second.nil? && @second.nil? && @minute.nil?
                 return @hour * 60 * 60
               elsif @fractional_second.nil? && @second.nil?
-                return @hour * 60 * 60 + @minute * 60
+                return (@hour * 60 * 60) + (@minute * 60)
               elsif @fractional_second.nil?
-                return @hour * 60 * 60 + @minute * 60 + @second
+                return (@hour * 60 * 60) + (@minute * 60) + @second
               else
-                return @hour*60*60+@minute* 60 + @second + @fractional_second
+                return (@hour*60*60)+(@minute* 60) + @second + @fractional_second
               end
             end
 
             def diff(other)
               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
+              minute = ((diff - (hour*60*60))/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
@@ -156,11 +159,11 @@ module OpenEHR
                   minute += @timezone.minute
                 end
               end
-              seconds = (((@year * 365.24 +
-                           @month * 30.42 +
-                           @day) * 24 +
-                           hour) * 60 +
-                           minute) * 60 + @second
+              seconds = (((((((@year * 365.24) +
+                           (@month * 30.42) +
+                           @day) * 24) +
+                           hour) * 60) +
+                           minute) * 60) + @second
               if @fractional_second.nil?
                 return seconds
               else
@@ -168,6 +171,9 @@ module OpenEHR
               end
             end
 
+            # rubocop:disable Metrics/AbcSize -- dense calendar arithmetic; refactoring
+            # without broader leap-year/borrow coverage (only 1 example exercises this
+            # method) is riskier than the lint value gained
             def diff(other)
               if self.magnitude >= other.magnitude
                 past, future = other, self
@@ -183,12 +189,12 @@ module OpenEHR
               end
               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
+              minute = ((time_diff - (hour*60*60))/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
@@ -196,6 +202,7 @@ module OpenEHR
                                       fractional_second.to_s[1..-1] + 'S')
               end
             end
+            # rubocop:enable Metrics/AbcSize
 
             private
             def split_date_time(date_time)

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

@@ -11,7 +11,8 @@ module OpenEHR
 
         class DvOrdered < OpenEHR::RM::DataTypes::Basic::DataValue
           include Comparable
-          attr_accessor :normal_range, :other_reference_ranges, :normal_status
+          attr_accessor :normal_range, :normal_status
+          attr_reader :other_reference_ranges
 
           def initialize(args = {})
             super(args)

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/data_types/time_specification.rb

@@ -1,5 +1,6 @@
 # This module is related to the ticket #47
 require_relative 'basic'
+require_relative 'quantity/date_time'
 
 module OpenEHR
   module RM
@@ -8,19 +9,24 @@ module OpenEHR
         class DvTimeSpecification < OpenEHR::RM::DataTypes::Basic::DataValue
           attr_reader :value
 
-          def initialize(value)
-            self.value=(value)
-          end
-
           def value=(value)
             raise ArgumentError, 'value must be not nil' if value.nil?
+            unless value.respond_to?(:formalism) && value.respond_to?(:value)
+              raise ArgumentError, 'value must be a DV_PARSABLE'
+            end
             @value = value
           end
-          
+
           def calendar_alignment
             raise NotImplementedError, "calendar_alignment must be implemented"
           end
-          alias calender_alignment calendar_alignment
+
+          # Legacy misspelling, deliberately kept (pinned by spec). Defined
+          # as a delegating method rather than `alias` so a subclass
+          # override of calendar_alignment is still reached through it.
+          def calender_alignment
+            calendar_alignment
+          end
 
           def event_alignment
             raise NotImplementedError, "event_alignment must be implemented"
@@ -35,39 +41,107 @@ module OpenEHR
 # because I could not obtain HL7 specification related them.
 
         class DvGeneralTimeSpecification < DvTimeSpecification
-          attr_reader :value
-          def initialize(value)
-            super(value)
-          end
+          FORMALISM = 'HL7:GTS'
+
           def value=(value)
-            raise ArgumentError, "value is not valied" unless value.formalism.is_equal?('HL7:GTS')
-            @value = value
-          end
-          private
-          def value_valid(value)
+            unless value.respond_to?(:formalism) && value.formalism == FORMALISM
+              raise ArgumentError, "formalism must be #{FORMALISM}"
+            end
+            super
           end
+          # calendar_alignment / event_alignment / institution_specified
+          # remain NotImplementedError (inherited from DvTimeSpecification):
+          # deriving them requires parsing the full HL7 GTS set-algebra
+          # (union/intersection/exclusion of interval sets), which is
+          # explicitly out of scope here.
         end
 
         class DvPeriodicTimeSpecification < DvTimeSpecification
-          attr_reader :value, :calender_alignment, :event_alingment, :period
-          def initialize(value)
-            value_valid(value)
-            super(value)
-          end
+          PIVL_FORMALISM = 'HL7:PIVL'
+          EIVL_FORMALISM = 'HL7:EIVL'
+
+          # Single-literal PIVL: [phase_low(;phase_high)?]/(period)@ALIGN? IST?
+          # e.g. "[200004181100;200004181110]/(7d)@DW IST"
+          PIVL_PATTERN = %r{\A\[(?<phase_low>\d+)(?:;(?<phase_high>\d+))?\]/
+                            \((?<period>\d+(?:\.\d+)?)(?<unit>[a-z]+)\)
+                            (?:@(?<alignment>[A-Z]{2}))?(?<ist>\ ?IST)?\z}x
+
+          # Single-literal EIVL: EVENT([+-]offset)? e.g. "ACM+10min"
+          EIVL_PATTERN = /\A(?<event>[A-Z]+)(?:(?<sign>[+-])(?<offset>\d+(?:\.\d+)?)(?<unit>[a-z]+))?\z/
+
+          # HL7 CalendarCycle codes (DW=day of week, HD=hour of day, ...)
+          CALENDAR_CYCLE_CODES = %w[CY MY CM CW WY DM CD DY DW HD CH NH CN SN CS].freeze
+          # HL7 TimingEvent codes (HS=bedtime, ACM=before breakfast, ...)
+          TIMING_EVENT_CODES = %w[HS WAKE C CM CD CV AC ACM ACD ACV PC PCM PCD PCV].freeze
+          # HL7 physical-quantity time units -> ISO8601 duration templates
+          PERIOD_UNIT_TO_ISO8601 = { 's' => 'PT%sS', 'min' => 'PT%sM', 'h' => 'PT%sH',
+                                     'd' => 'P%sD', 'wk' => 'P%sW', 'mo' => 'P%sM',
+                                     'a' => 'P%sY' }.freeze
+
+          attr_reader :period, :calendar_alignment, :event_alignment
+
           def value=(value)
-            unless value.formalism.is_equal('HL7:PIVL') or value.formalism.is_equal('HL7:EIVL')
-              raise ArgumentError, "value is not valid"
+            unless value.respond_to?(:formalism) &&
+                   [PIVL_FORMALISM, EIVL_FORMALISM].include?(value.formalism)
+              raise ArgumentError, "formalism must be #{PIVL_FORMALISM} or #{EIVL_FORMALISM}"
+            end
+            if value.formalism == PIVL_FORMALISM
+              parse_pivl(value.value)
+            else
+              parse_eivl(value.value)
             end
-            if value.formalism('HL7:PIVL')
-              /^\[(\d+)\;?(\d+)?\]\/\((\d+\w+)\)(@(\w+?))?(IST)?$/ =~ value
-              interval1, interval2, difference, allignment = $1, $2, $3, $5
+            super
+          end
+
+          def institution_specified
+            @institution_specified
+          end
+          alias institution_specified? institution_specified
+
+          private
+
+          def parse_pivl(raw)
+            match = PIVL_PATTERN.match(raw)
+            raise ArgumentError, 'value does not match HL7:PIVL syntax' unless match
+
+            unit = match[:unit]
+            unless PERIOD_UNIT_TO_ISO8601.key?(unit)
+              raise ArgumentError, "unknown HL7 PIVL period unit #{unit.inspect}"
             end
-            if value
+
+            alignment = match[:alignment]
+            if alignment && !CALENDAR_CYCLE_CODES.include?(alignment)
+              raise ArgumentError, "unknown HL7 CalendarCycle code #{alignment.inspect}"
             end
+
+            @period = DataTypes::Quantity::DateTime::DvDuration.new(:value => period_from(match[:period], unit))
+            @calendar_alignment = alignment
+            @event_alignment = nil
+            @institution_specified = !match[:ist].nil?
           end
 
-          def institution_specified?
+          def parse_eivl(raw)
+            match = EIVL_PATTERN.match(raw)
+            raise ArgumentError, 'value does not match HL7:EIVL syntax' unless match
+
+            event = match[:event]
+            unless TIMING_EVENT_CODES.include?(event)
+              raise ArgumentError, "unknown HL7 TimingEvent code #{event.inspect}"
+            end
+
+            unit = match[:unit]
+            if unit && !PERIOD_UNIT_TO_ISO8601.key?(unit)
+              raise ArgumentError, "unknown HL7 EIVL offset unit #{unit.inspect}"
+            end
+
+            @event_alignment = event
+            @calendar_alignment = nil
+            @period = nil
+            @institution_specified = false
+          end
 
+          def period_from(quantity, unit)
+            format(PERIOD_UNIT_TO_ISO8601[unit], quantity)
           end
         end
       end

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

@@ -31,10 +31,6 @@ module OpenEHR
     module DataTypes
       module URI
         class DvUri < OpenEHR::RM::DataTypes::Basic::DataValue
-          def initialize(args = {})
-            self.value = args[:value]
-          end
-
           def value
             @value
           end
@@ -69,10 +65,6 @@ module OpenEHR
         end
 
         class DvEhrUri < DvUri
-          def initialize(value)
-            super
-          end
-
           def value=(value)
             raise ArgumentError, "scheme must be ehr" if !(value =~ /^ehr/i)
             parse(value)

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,30 +38,49 @@ module OpenEHR
           param.each_with_object({}) do |item, parameters|
             key = item.shift
             value = item.shift
-            parameters[key] = convert_value(value)
+            parameters[key] = convert_value(key, value)
           end
         end
 
         private
 
         # A canonical-JSON attribute value is either a typed sub-object
-        # (Hash with _type), a List<...> of those (Array - openEHR RM
+        # (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 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(value)
+        # 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
-            Factory.create(value[:_type], **value)
+            convert_hash(key, value)
           elsif value.instance_of? Array
-            value.map { |element| convert_value(element) }
+            value.map { |element| convert_value(key, element) }
           else
             value
           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
@@ -241,6 +277,24 @@ module OpenEHR
       end
     end
 
+    class DvTimeSpecificationFactory
+      def self.create(param)
+        DataTypes::TimeSpecification::DvTimeSpecification.new(param)
+      end
+    end
+
+    class DvGeneralTimeSpecificationFactory
+      def self.create(param)
+        DataTypes::TimeSpecification::DvGeneralTimeSpecification.new(param)
+      end
+    end
+
+    class DvPeriodicTimeSpecificationFactory
+      def self.create(param)
+        DataTypes::TimeSpecification::DvPeriodicTimeSpecification.new(param)
+      end
+    end
+
     class ObservationFactory
       def self.create(param)
         Composition::Content::Entry::Observation.new(param)

data/lib/openehr/rm/security.rb

@@ -5,7 +5,9 @@ module OpenEHR
   module RM
     module Security
       class AccessControlSettings
-        
+        # Deliberate stub: openEHR RM 1.0.1 Security package class (see
+        # UML reference above); no behavior is specified for it beyond
+        # existence.
       end
     end
   end

data/lib/openehr/rm/type_name.rb

@@ -1,4 +1,3 @@
-require 'set'
 require 'active_support/core_ext/string/inflections'
 
 module OpenEHR

data/lib/openehr/serializer/adl_serializer.rb

@@ -1,66 +1,39 @@
+# frozen_string_literal: true
+
 require_relative 'base'
 
 module OpenEHR
   module Serializer
     class ADLSerializer < BaseSerializer
       def header
-        hd = 'archetype'
+        hd = +'archetype'
         unless @archetype.adl_version.nil?
           hd << " (adl_version = #{@archetype.adl_version})"
         end
-        hd << NL+INDENT + "#{@archetype.archetype_id.value}"+NL*2
-        hd << 'concept'+NL+ INDENT+"[#{@archetype.concept}]"+NL
-        hd << NL+'language'+NL+INDENT+'original_language = <['+
+        hd << (NL+INDENT + "#{@archetype.archetype_id.value}"+(NL*2))
+        hd << ('concept'+NL+ INDENT+"[#{@archetype.concept}]"+NL)
+        hd << (NL+'language'+NL+INDENT+'original_language = <['+
           @archetype.original_language.terminology_id.value+'::'+
-          @archetype.original_language.code_string+']>'+NL
+          @archetype.original_language.code_string+']>'+NL)
         return hd
       end
 
       def description
-        desc = ''
+        desc = +''
         if @archetype.description
           ad = @archetype.description
-          desc << 'description' + NL
-          desc << INDENT + 'original_author = <' + NL
+          desc << ('description' + NL)
+          desc << (INDENT + 'original_author = <' + NL)
           ad.original_author.each do |k,v|
-            desc << INDENT+INDENT+'["'+k+'"] = <"'+v+'">'+NL
+            desc << (INDENT+INDENT+'["'+k+'"] = <"'+v+'">'+NL)
           end
-          desc << INDENT+'>'+NL
-          desc << INDENT+'lifecycle_state = <"'+ad.lifecycle_state+'">'+NL
-          desc << INDENT+'details = <'+NL
+          desc << (INDENT+'>'+NL)
+          desc << (INDENT+'lifecycle_state = <"'+ad.lifecycle_state+'">'+NL)
+          desc << (INDENT+'details = <'+NL)
           ad.details.each do |lang,item|
-            desc << INDENT*2+'["'+lang+'"] = <'+NL
-            desc << INDENT*3+'language = <['+
-              item.language.terminology_id.value+'::'+
-              item.language.code_string+']>'+NL
-            desc << INDENT*3+'purpose = <"'+item.purpose+'">'+NL
-            if item.keywords then
-              desc << INDENT*3+'keywords = <'
-              item.keywords.each do |word|
-                desc << '"'+word+'",'
-              end
-              desc.chop! << '>'+NL
-            end
-            desc << INDENT*3+'use = <"'+item.use+'">'+NL if item.use
-            desc << INDENT*3+'misuse = <"'+item.misuse+'">'+NL if item.misuse
-            desc << INDENT*3+'copyright = <"'+item.copyright+'">'+NL if item.copyright
-            if item.original_resource_uri
-              desc << INDENT*3 + 'original_resource_uri = <'
-              item.original_resource_uri.each do |k,v|
-                desc << INDENT*4+'["'+k+'"] = <"'+v+'">'+NL
-              end
-              desc << INDENT*3+'>'+NL
-            end
-            if item.other_details
-              desc << INDENT*3 + 'other_details = <'
-              item.other_details.each do |k,v|
-                desc << INDENT*4+'["'+k+'"] = <"'+v+'">'+NL
-              end
-              desc << INDENT*3+'>'+NL
-            end
-            desc << INDENT*2+'>'+NL
+            desc << description_details_item(lang, item)
           end
-          desc << INDENT+'>'+NL
+          desc << (INDENT+'>'+NL)
         end
         return desc
       end
@@ -74,21 +47,7 @@ module OpenEHR
         ontology = 'ontology'+NL
         ontology << string_list_line('languages_available', ao.languages_available)
         ontology << string_list_line('terminologies_available', ao.terminologies_available)
-        ontology << INDENT + 'term_definitions = <' + NL
-        ao.term_definitions.each do |lang, items|
-          ontology << INDENT*2 + "[\"#{lang}\"] = <" + NL
-          ontology << INDENT*3 + 'items = <'  + NL
-          items.each do |code, item|
-            ontology << INDENT*4 + "[\"#{code}\"] = <" + NL
-            item.items.each do |name, desc|
-              ontology << INDENT*5 + "#{name} = <\"#{desc}\">" +NL
-            end
-            ontology << INDENT*4 + '>'+NL
-          end
-          ontology << INDENT*3 + '>' + NL
-          ontology << INDENT*2 + '>' + NL
-        end
-        ontology << INDENT + '>' + NL
+        ontology << term_definitions_block(ao.term_definitions)
         ontology << term_bindings_block(ao.term_bindings)
         ontology
       end
@@ -109,21 +68,80 @@ module OpenEHR
         INDENT + "#{keyword} = <" + values.map { |v| "\"#{v}\"" }.join(', ') + '>' + NL
       end
 
+      def description_details_item(lang, item)
+        block = (INDENT*2)+'["'+lang+'"] = <'+NL
+        block << description_language_line(item.language)
+        block << ((INDENT*3)+'purpose = <"'+item.purpose+'">'+NL)
+        block << description_keywords_line(item) if item.keywords
+        block << optional_field_line('use', item.use)
+        block << optional_field_line('misuse', item.misuse)
+        block << optional_field_line('copyright', item.copyright)
+        block << keyed_map_block('original_resource_uri', item.original_resource_uri) if item.original_resource_uri
+        block << keyed_map_block('other_details', item.other_details) if item.other_details
+        block << ((INDENT*2)+'>'+NL)
+      end
+
+      def description_language_line(language)
+        (INDENT*3)+'language = <['+
+          language.terminology_id.value+'::'+
+          language.code_string+']>'+NL
+      end
+
+      def optional_field_line(keyword, value)
+        return '' if value.nil?
+
+        (INDENT*3)+"#{keyword} = <\"#{value}\">"+NL
+      end
+
+      def description_keywords_line(item)
+        block = (INDENT*3)+'keywords = <'
+        item.keywords.each do |word|
+          block << ('"'+word+'",')
+        end
+        block.chop! << ('>'+NL)
+      end
+
+      def keyed_map_block(keyword, hash)
+        block = (INDENT*3) + "#{keyword} = <"
+        hash.each do |k,v|
+          block << ((INDENT*4)+'["'+k+'"] = <"'+v+'">'+NL)
+        end
+        block << ((INDENT*3)+'>'+NL)
+      end
+
+      def term_definitions_block(term_definitions)
+        block = INDENT + 'term_definitions = <' + NL
+        term_definitions.each do |lang, items|
+          block << ((INDENT*2) + "[\"#{lang}\"] = <" + NL)
+          block << ((INDENT*3) + 'items = <'  + NL)
+          items.each do |code, item|
+            block << ((INDENT*4) + "[\"#{code}\"] = <" + NL)
+            item.items.each do |name, desc|
+              block << ((INDENT*5) + "#{name} = <\"#{desc}\">" + NL)
+            end
+            block << ((INDENT*4) + '>'+NL)
+          end
+          block << ((INDENT*3) + '>' + NL)
+          block << ((INDENT*2) + '>' + NL)
+        end
+        block << (INDENT + '>' + NL)
+      end
+
       def term_bindings_block(term_bindings)
         return '' if term_bindings.nil? || term_bindings.empty?
 
         block = INDENT + 'term_bindings = <' + NL
         term_bindings.each do |terminology, codes|
-          block << INDENT*2 + "[\"#{terminology}\"] = <" + NL
-          block << INDENT*3 + 'items = <' + NL
+          block << ((INDENT*2) + "[\"#{terminology}\"] = <" + NL)
+          block << ((INDENT*3) + 'items = <' + NL)
           codes.each do |code, bindings|
             code_phrase = Array(bindings).first
-            block << INDENT*4 + "[\"#{code}\"] = <[#{code_phrase.terminology_id.value}::#{code_phrase.code_string}]>" + NL
+            block << ((INDENT*4) + "[\"#{code}\"] = <[#{code_phrase.terminology_id.value}::#{code_phrase.code_string}]>" + NL)
           end
-          block << INDENT*3 + '>' + NL
-          block << INDENT*2 + '>' + NL
+          block << ((INDENT*3) + '>' + NL)
+          block << ((INDENT*2) + '>' + NL)
         end
-        block << INDENT + '>' + NL
+        block << (INDENT + '>' + NL)
       end
 
       # Recursive cADL emitter for a single C_OBJECT node, dispatching
@@ -151,12 +169,12 @@ module OpenEHR
           head + ' matches {*}' + NL
         else
           body = node.attributes.map { |a| emit_c_attribute(a, depth + 1) }.join
-          head + ' matches {' + NL + body + INDENT*depth + '}' + NL
+          head + ' matches {' + NL + body + (INDENT*depth) + '}' + NL
         end
       end
 
       def complex_object_head(node, depth)
-        head = INDENT*depth + node.rm_type_name
+        head = (INDENT*depth) + node.rm_type_name
         head += "[#{node.node_id}]" if node.node_id
         head += " occurrences matches {#{interval_literal(node.occurrences)}}" if show_interval?(node.occurrences)
         head
@@ -177,12 +195,12 @@ module OpenEHR
           head + " matches {#{inline_body(children.first)}}" + NL
         else
           body = children.map { |c| emit_c_object(c, depth + 1) }.join
-          head + ' matches {' + NL + body + INDENT*depth + '}' + NL
+          head + ' matches {' + NL + body + (INDENT*depth) + '}' + NL
         end
       end
 
       def attribute_head(attribute, depth)
-        head = INDENT*depth + attribute.rm_attribute_name
+        head = (INDENT*depth) + attribute.rm_attribute_name
         head += " existence matches {#{interval_literal(attribute.existence)}}" if show_interval?(attribute.existence)
         head += " cardinality matches {#{cardinality_literal(attribute.cardinality)}}" if attribute.is_a?(CMultipleAttribute)
         head
@@ -208,30 +226,30 @@ module OpenEHR
       end
 
       def emit_archetype_slot(node, depth)
-        head = INDENT*depth + 'allow_archetype ' + node.rm_type_name
+        head = (INDENT*depth) + 'allow_archetype ' + node.rm_type_name
         head += "[#{node.node_id}]" if node.node_id
         head += " occurrences matches {#{interval_literal(node.occurrences)}}" if show_interval?(node.occurrences)
         lines = [head + ' matches {' + NL]
         lines << assertion_block(node.includes, 'include', depth + 1)
         lines << assertion_block(node.excludes, 'exclude', depth + 1)
-        lines << INDENT*depth + '}' + NL
+        lines << ((INDENT*depth) + '}' + NL)
         lines.join
       end
 
       def assertion_block(assertions, keyword, depth)
         return '' if assertions.nil?
 
-        lines = [INDENT*depth + keyword + NL]
-        assertions.each { |a| lines << INDENT*(depth+1) + a.string_expression + NL }
+        lines = [(INDENT*depth) + keyword + NL]
+        assertions.each { |a| lines << ((INDENT*(depth+1)) + a.string_expression + NL) }
         lines.join
       end
 
       def emit_internal_ref(node, depth)
-        INDENT*depth + "use_node #{node.rm_type_name} #{node.target_path}" + NL
+        (INDENT*depth) + "use_node #{node.rm_type_name} #{node.target_path}" + NL
       end
 
       def emit_constraint_ref(node, depth)
-        INDENT*depth + "[#{node.reference}]" + NL
+        (INDENT*depth) + "[#{node.reference}]" + NL
       end
 
       def primitive_body(item)

data/lib/openehr/serializer/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OpenEHR
   module Serializer
     NL = "\r\n"

data/lib/openehr/serializer/rm_json_serializer.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'set'
 
 module OpenEHR
   module Serializer

data/lib/openehr/serializer/xml_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rexml/document'
 require 'builder'
 require_relative 'base'
@@ -6,7 +8,7 @@ module OpenEHR
   module Serializer
     class XMLSerializer < BaseSerializer
       def header
-        header = ''
+        header = +''
         xml = Builder::XmlMarkup.new(:indent => 2, :target => header)
         xml.archetype_id do
           xml.value @archetype.archetype_id.value
@@ -22,7 +24,7 @@ module OpenEHR
       end
 
       def description
-        desc = ''
+        desc = +''
         xml = Builder::XmlMarkup.new(:indent => 2, :target => desc)
         ad = @archetype.description
         if ad
@@ -66,7 +68,7 @@ module OpenEHR
       end
 
       def definition
-        definition = ''
+        definition = +''
         xml = Builder::XmlMarkup.new(:indent => 2, :target => definition)
         xml.definition do
           emit_c_object_body(xml, @archetype.definition)
@@ -75,7 +77,7 @@ module OpenEHR
       end
 
       def ontology
-        ontology = ''
+        ontology = +''
         ao = @archetype.ontology
         xml = Builder::XmlMarkup.new(:indent => 2, :target => ontology)
         xml.ontology do

data/lib/openehr/version.rb

@@ -1,3 +1,3 @@
 module OpenEHR
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Shinji KOBAYASHI
@@ -139,146 +139,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-collection_matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: libnotify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: meowcop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: better_errors
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This project is an implementation of the openEHR specification on Ruby.
 email: skoba@moss.gr.jp
 executables: []
@@ -373,7 +233,8 @@ files:
 homepage: http://openehr.jp
 licenses:
 - Apache 2.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -381,14 +242,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.18
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Ruby implementation of the openEHR specification
 test_files: []