roqua-healthy 1.5.12 → 1.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e402c30237a4c3eeeb578cb4c2a594eba83b6374ce8634259b5bac1c9cf1270b
-  data.tar.gz: 344a609880ddf08da1cf0d60dc9e70a1ef2d312a3de887aa11bd71680b5a49bb
+  metadata.gz: 2b61faf958cac88da6cfa1aeb5e5399b304035cdf8b10504032db95a94d69bf3
+  data.tar.gz: 6ff72116dcf9d778ec6ca08c26f5b14c71efdb000d86813027c39d8f70d531dc
 SHA512:
-  metadata.gz: 67ad548fab99cf59055a425891d0645afbd22598e4a6ce490f6adc26324289ec3c3c038f777b106c02e3746cdc26dcc8f92547c4661f2da71f7d3ac94932b41c
-  data.tar.gz: 42c200b696af931d3666a9aa9e0bddfe0983a3f6180c771dae7cbc4f5983fbd3133bf1dc7dc0539e53b4be2bc58bd70fc2afb76dfc1e4ca594d0e4c03ee9ee44
+  metadata.gz: 980c9941379027fd03236735a1ec93ee41e3143e022ed54f76271f71658a69128f1389060ee90ed32286e4396c45d76971d6f3b3560cc096ca18c6eb7c175699
+  data.tar.gz: 22349d8f91cd0dd30d99aa36c28d6c4280ee61326f168bbc8dd659ea60f6f014a26eaccf0c5b057d1380d07083a2c6082cb2734010dd6578cb75c80bbf020263

data/.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: "registry.roqua.nl/roqua/docker-base-images:ruby-2.5"
+image: "registry.roqua.nl/roqua/docker-base-images:ruby-2.6-builder"
 
 cache:
   paths:

data/.rubocop.yml

@@ -4,7 +4,7 @@ AllCops:
   Exclude:
     - vendor/**/*
     - gemfiles/*
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6
 
 Documentation:
   Enabled: false

data/lib/roqua/healthy/a19/phone_parser.rb

@@ -11,26 +11,33 @@ module Roqua
 
         # this is a heuristic to pick likely dutch cell phone numbers from hl7 messages
         def to_s
-          pid13 = message.dig('PID', 'PID.13') || []
-
           # prefer PRN (Primary Residence Number) that contains a cell phone number
-          phone_cell_record = pid13.find do |record|
-            phone_cell_number?(record.fetch('PID.13.1', '') || '') &&
-              record.fetch('PID.13.2', :unknown_type_of_phone_record) == 'PRN'
-          end
-
           # otherwise choose the first occuring cell phone number
-          phone_cell_record ||= pid13.find do |record|
-            phone_cell_number?(record.fetch('PID.13.1', '') || '')
-          end
-
           # any number for which phone_cell_number? returns false is ignored
+          phone_cell_record = first_matching_prn_record || first_matching_record
 
           strip_non_phone_number_characters(phone_cell_record.fetch('PID.13.1')) if phone_cell_record.present?
         end
 
         private
 
+        def pid13
+          @pid13 ||= message.dig('PID', 'PID.13') || []
+        end
+
+        def first_matching_prn_record
+          pid13.find do |record|
+            phone_cell_number?(record.fetch('PID.13.1', '') || '') &&
+              record.fetch('PID.13.2', :unknown_type_of_phone_record) == 'PRN'
+          end
+        end
+
+        def first_matching_record
+          pid13.find do |record|
+            phone_cell_number?(record.fetch('PID.13.1', '') || '')
+          end
+        end
+
         def strip_non_phone_number_characters(number)
           Roqua::Healthy::A19::PhoneValidator.strip_non_phone_number_characters number
         end

data/lib/roqua/healthy/version.rb

@@ -2,6 +2,6 @@
 module Roqua
   module Healthy
     # healthy version
-    VERSION = "1.5.12"
+    VERSION = "1.5.13"
   end
 end

data/roqua-healthy.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.email         = "support@roqua.nl"
   gem.homepage      = "https://github.com/roqua/healthy"
 
-  gem.required_ruby_version = '~> 2.3'
+  gem.required_ruby_version = '>= 2.6'
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.executables   = [] # executables in bin/ are helpers for use during development

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roqua-healthy
 version: !ruby/object:Gem::Version
-  version: 1.5.12
+  version: 1.5.13
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -389,17 +389,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Arranges communication between Mirth and RoQua