openehr 2.4.1 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86ae366cb519cde86548c821f97ad6b6a436e6b6f56bef45be7db6686f35dbc4
-  data.tar.gz: 9f4f54f3b9ec3b6cf64993d9a33a7ab76cc528b9a4237b44483c9feed1c70bd5
+  metadata.gz: 40ff9f4331d4dabef29f1178e862387d3aadb7c416268c97f5ac71bd239509a3
+  data.tar.gz: fa2d3bc4b12109804ef131f9f498f1115f8a01e45f3482ede38a714d81e00fd1
 SHA512:
-  metadata.gz: ad76805a27fae1e62e90a90e73bf721d517ad7e531ead2776326afe08a5d8ff6efa196dd339aaed0dc3e2ebf93e4e4c8413a8ee5c8f01f0cf15f05a30ee1c3d5
-  data.tar.gz: b72051c293181e20c55718ab42b8f5083fb4c467a4641af8df30e7ea6fbf5ffed16acd615969c8b02fe7f31058078122cd8edbfad57fb85a8203f6b785d01dca
+  metadata.gz: a53690dd8004f16b0f2f130f1ec07f59c848878e1f13e1d4835cb0bb2712ca8a61d8005e2f202a58b7e86e899dcb7e861bc4495546bc7436de907ea81fe457c9
+  data.tar.gz: 04eab1bf336f86d3f37790d3bb5d4615058c5f3fdb57e4777bb997b1912cfa8e7178031f5320e7b621c60fa6a82de3d3cbd2ec1850a5ae866f837e4a3ec6cfb3

data/lib/openehr/parser/adl_grammar.tt

@@ -449,6 +449,12 @@ module OpenEHR
             OpenEHR::AM::Archetype::ConstraintModel::ArchetypeSlot.new(args)
           end
         }
+      / c_archetype_slot_head SYM_MATCHES SYM_START_CBLOCK SYM_END_CBLOCK space {
+          # empty slot block (neither include nor exclude): any archetype allowed (#51)
+          def value(node)
+            OpenEHR::AM::Archetype::ConstraintModel::ArchetypeSlot.new(c_archetype_slot_head.value(node))
+          end
+        }
       end
 
       rule c_archetype_slot_head
@@ -3225,7 +3231,7 @@ module OpenEHR
       end
 
       rule V_ARCHETYPE_ID
-        NAMESTR ('-' NAMESTR) 2..2 '.' NAMESTR ('-' NAMESTR)* '.v' [1-9] [0-9]* {
+        NAMESTR ('-' NAMESTR) 2..2 '.' NAMESTR ('-' NAMESTR)* '.v' [0-9]+ {
           def value
             text_value
           end

data/lib/openehr/parser/adl_helper.rb

@@ -37,7 +37,7 @@ module OpenEHR
               code, details  = lang
               td = OpenEHR::RM::Common::Resource::TranslationDetails.new(
                      :language => details['language'],
-                     :author => details['author'],
+                     :author => details['author'] || { },
                      :accreditation => details['accreditation'],
                      :other_details => details['other_details'])
               trans.update Hash[code, td]

data/lib/openehr/rm/support/identification.rb

@@ -69,6 +69,7 @@ module OpenEHR
 
           def value=(value)
             if /\A([a-zA-Z]\w+)-([a-zA-Z]\w+)-([a-zA-Z]\w+)\.([a-zA-Z]\w+)(-([a-zA-Z]\w+))?\.(v\d+)\z/ =~ value
+              @value = value
               self.rm_originator = $1
               self.rm_name = $2
               self.rm_entity = $3
@@ -171,6 +172,7 @@ module OpenEHR
 
           def value=(value)
             raise ArgumentError, "value not valid" if value.nil? or value.empty?
+            @value = value
             if /(.*)\((.*)\)/ =~ value
               self.name = $1
               self.version_id = $2

data/lib/openehr/serializer/rm_json_serializer.rb

@@ -24,9 +24,19 @@ module OpenEHR
         :@hour, :@minute, :@second, :@fractional_second, # DvTime, DvDateTime
         :@timezone,                                  # DvTime (String), DvDateTime (Timezone)
         :@root, :@extension,                         # UIDBasedID, HierObjectID, ObjectVersionID
-        :@oid, :@creating_system_id, :@version_tree_id # ObjectVersionID
+        :@oid, :@creating_system_id, :@version_tree_id, # ObjectVersionID
+        :@rm_originator, :@rm_name, :@rm_entity,     # ArchetypeID
+        :@concept_name, :@specialisation, :@version_id, # ArchetypeID, TerminologyID
+        :@name                                       # TerminologyID
       ].freeze
 
+      ARCHETYPE_ID_IVARS = [
+        :@rm_originator, :@rm_name, :@rm_entity,
+        :@concept_name, :@specialisation, :@version_id
+      ].freeze
+      TERMINOLOGY_ID_IVARS = [:@name, :@version_id].freeze
+      IDENTIFIER_IVARS = (ARCHETYPE_ID_IVARS + TERMINOLOGY_ID_IVARS).uniq.freeze
+
       def initialize(rm_instance)
         @rm_instance = rm_instance
       end
@@ -55,7 +65,7 @@ module OpenEHR
 
         seen << value
         hash = {'_type' => OpenEHR::RM.type_name_of(value)}
-        (value.instance_variables - EXCLUDED_IVARS).each do |ivar|
+        (value.instance_variables - excluded_ivars(value)).each do |ivar|
           field = value.instance_variable_get(ivar)
           next if field.nil?
 
@@ -64,6 +74,18 @@ module OpenEHR
         seen.delete(value)
         hash
       end
+
+      def excluded_ivars(value)
+        exclusions = EXCLUDED_IVARS - IDENTIFIER_IVARS
+        case value
+        when OpenEHR::RM::Support::Identification::ArchetypeID
+          exclusions + ARCHETYPE_ID_IVARS
+        when OpenEHR::RM::Support::Identification::TerminologyID
+          exclusions + TERMINOLOGY_ID_IVARS
+        else
+          exclusions
+        end
+      end
     end
 
     # RMJSONSerializer's reflection walker has no RM-specific logic

data/lib/openehr/version.rb

@@ -1,3 +1,3 @@
 module OpenEHR
-  VERSION = "2.4.1"
+  VERSION = "2.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.3
 platform: ruby
 authors:
 - Shinji KOBAYASHI