openehr 2.4.0 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d4cd8f720ac22f26e89145ebfd23cb474b2ad3e900c97fd6ff01c20a90bf638
-  data.tar.gz: ac478e309b65a00d314d3bf425b8d3ce25a7f07dd196e76c223508eca7410619
+  metadata.gz: 836651a22b98dce0fc91c853b66dbeff914d71edf989c3423cf30f8280f95a8a
+  data.tar.gz: 5ac2010eb5569ce720d6117822e82dc8edff381cf0d2dd0a61f7dfcb86b92a61
 SHA512:
-  metadata.gz: 4f72f3492c23d458ed840da441359318e03a58c4bc55ee2d35df060ff635f4ab98e9be5aafafd126d149d81dcc355620a5931f65b05ff6d9dee65666df371a62
-  data.tar.gz: d4ca02374caaf65f3d6a29087fa788f4a6c57c9415d5c5ac576f9e746d56f4a6d25c4ef95fa3b2b56d905823f2ff7c08cb6bdb2f2f92944ab04d3b4f0734b97a
+  metadata.gz: 371bbfaef6c80ba39391305194d8fa6d056a2e416876b9cb4f190f51c984084d3653972fe4a53abaedac0bff4b13d83ca3c648facb264fc91a956c10bd9a4aab
+  data.tar.gz: 39be96359d230f4f007400c50a7f775a7e113b1e8a072a647858729de8fd2969acb5f61acce3642cbead966b255d3ac7c43381e38af62d8aea1ececf7dd6c154

data/lib/openehr/aql/errors.rb

@@ -11,11 +11,12 @@ module OpenEHR
     class ParseError < Error
       attr_reader :line, :column
 
-      def initialize(message, line: nil, column: nil)
+      def initialize(message, line: nil, column: nil, hint: nil)
         @line = line
         @column = column
         location = line && column ? " (line #{line}, column #{column})" : ''
-        super("#{message}#{location}")
+        hint_text = hint ? "\nnote: #{hint}" : ''
+        super("#{message}#{location}#{hint_text}")
       end
     end
 

data/lib/openehr/aql/parser.rb

@@ -48,6 +48,7 @@ module OpenEHR
         top = check(:top) ? parse_top : nil
         columns = [parse_select_expr]
         columns << parse_select_expr while match(:comma)
+        @select_aliases = columns.filter_map(&:alias_name).to_set
         Model::SelectClause.new(columns: columns, distinct: distinct, top: top)
       end
 
@@ -298,7 +299,11 @@ module OpenEHR
         elsif match(:matches)
           Model::MatchesExpr.new(path: path, operand: parse_matches_operand)
         else
-          raise error("expected a comparison operator, LIKE or MATCHES, got #{describe(peek)}")
+          identifier = peek.type == :identifier ? peek.value : nil
+          hint = if identifier && @select_aliases.include?(identifier)
+                   "'#{identifier}' is a SELECT alias; aliases cannot be used in WHERE -- repeat the identified path"
+                 end
+          raise error("expected a comparison operator, LIKE or MATCHES, got #{describe(peek)}", hint: hint)
         end
       end
 
@@ -476,8 +481,8 @@ module OpenEHR
         token.type == :eof ? 'end of input' : "#{token.type} #{token.value.inspect}"
       end
 
-      def error(message)
-        ParseError.new(message, line: peek.line, column: peek.column)
+      def error(message, hint: nil)
+        ParseError.new(message, line: peek.line, column: peek.column, hint: hint)
       end
     end
   end

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,14 +65,27 @@ 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?
 
           hash[ivar.to_s.delete_prefix('@')] = to_value(field, seen)
         end
+        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.0"
+  VERSION = "2.4.2"
 end

metadata

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