roqua-healthy 1.5.7 → 1.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 188f815aa06bc9810fe1218d215bc2d8b0444945a4665c1bb35546bcc8e800b8
-  data.tar.gz: 8665aacab360207c3bf22037910a4fc58544aebed4f9f5e63b24fb997f7fddbe
+  metadata.gz: e402c30237a4c3eeeb578cb4c2a594eba83b6374ce8634259b5bac1c9cf1270b
+  data.tar.gz: 344a609880ddf08da1cf0d60dc9e70a1ef2d312a3de887aa11bd71680b5a49bb
 SHA512:
-  metadata.gz: f2a6638530dec574f3be0fcd81e534f73d2654af4f5be160d5c933474e8f6db45d49911cd043ad27aabecc8d7ecb42ca1a80d78415c0644e51d19a998510dfe1
-  data.tar.gz: f74860226be11358e36f2d69acfddf1f7cc20efa5ad439f4e5694c934c477c24ab89b9964442f60ec8fd1efa28a8586ae07a584c0080b31e2c0b91af0037db75
+  metadata.gz: 67ad548fab99cf59055a425891d0645afbd22598e4a6ce490f6adc26324289ec3c3c038f777b106c02e3746cdc26dcc8f92547c4661f2da71f7d3ac94932b41c
+  data.tar.gz: 42c200b696af931d3666a9aa9e0bddfe0983a3f6180c771dae7cbc4f5983fbd3133bf1dc7dc0539e53b4be2bc58bd70fc2afb76dfc1e4ca594d0e4c03ee9ee44

data/.gitlab-ci.yml

@@ -1,10 +1,11 @@
-image: "registry.roqua.nl/roqua/roqua-build-images:ruby-2.3-rails-base-test"
+image: "registry.roqua.nl/roqua/docker-base-images:ruby-2.5"
 
 cache:
   paths:
     - .gems
 
 before_script:
+  - gem uninstall bundler
   - export BUNDLE_PATH=$CI_PROJECT_DIR/.gems
   - bundle --jobs 2 --retry 3
   - gem install appraisal
@@ -13,10 +14,27 @@ before_script:
 rubocop:
   script:
   - bundle exec rubocop -D
-  
-rspec:
+
+rails41:
   script:
     - bundle exec appraisal rails41 bundle exec rspec
+
+rails42:
+  script:
     - bundle exec appraisal rails42 bundle exec rspec
+
+rails50:
+  script:
     - bundle exec appraisal rails50 bundle exec rspec
 
+rails51:
+  script:
+    - bundle exec appraisal rails51 bundle exec rspec
+
+rails52:
+  script:
+    - bundle exec appraisal rails52 bundle exec rspec
+
+rails60:
+  script:
+    - bundle exec appraisal rails60 bundle exec rspec

data/.rubocop.yml

@@ -31,3 +31,6 @@ Naming/FileName:
   Exclude:
     - Appraisals
 
+# No, I don't want to call my exceptions 'e' instead of 'exception' or 'error'.
+Naming/RescuedExceptionsVariableName:
+  Enabled: false

data/.rubocop_todo.yml

@@ -20,3 +20,6 @@ Metrics/BlockLength:
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 200
+
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false

data/Appraisals

@@ -11,3 +11,15 @@ end
 appraise "rails50" do
   gem "activesupport", "5.0"
 end
+
+appraise "rails51" do
+  gem "activesupport", "5.1"
+end
+
+appraise "rails52" do
+  gem "activesupport", "5.2"
+end
+
+appraise "rails60" do
+  gem "activesupport", "6.0"
+end

data/ChangeLog.md

@@ -1,3 +1,23 @@
+### 1.5.12
+
+* ActiveSupport 6.0 support
+
+### 1.5.11
+
+* Support for PID.11 and PID.13 completely missing from an hl7 response.
+
+### 1.5.10
+
+* Support for house number suffices in PID 11.2
+
+### 1.5.9
+
+* Ruby 2.5 support
+
+### 1.5.8
+
+* Add NoRouteToHostException in case Healthy cannot route to hl7 message server.
+
 ### 1.5.7
 
 * Add deceased attribute (boolean)

data/Guardfile

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-guard 'rspec', cmd: 'bundle exec rspec -f Fuubar' do
+guard 'rspec', cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/healthy/(.+)\.rb$}) { |m| ["spec/unit/#{m[1]}_spec.rb", "spec/integration"] }
   watch('spec/spec_helper.rb') { "spec" }

data/gemfiles/rails41.gemfile

@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "codeclimate-test-reporter", "~> 1.0.0", :group => :test, :require => nil
+gem "codeclimate-test-reporter", "~> 1.0.0", group: :test, require: nil
+gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
 gem "activesupport", "4.1"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails42.gemfile

@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "codeclimate-test-reporter", "~> 1.0.0", :group => :test, :require => nil
+gem "codeclimate-test-reporter", "~> 1.0.0", group: :test, require: nil
+gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
 gem "activesupport", "4.2"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails50.gemfile

@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "codeclimate-test-reporter", "~> 1.0.0", :group => :test, :require => nil
+gem "codeclimate-test-reporter", "~> 1.0.0", group: :test, require: nil
+gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
 gem "activesupport", "5.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails51.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "codeclimate-test-reporter", "~> 1.0.0", group: :test, require: nil
+gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
+gem "activesupport", "5.1"
+
+gemspec path: "../"

data/gemfiles/rails52.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "codeclimate-test-reporter", "~> 1.0.0", group: :test, require: nil
+gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
+gem "activesupport", "5.2"
+
+gemspec path: "../"

data/gemfiles/rails60.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "codeclimate-test-reporter", "~> 1.0.0", group: :test, require: nil
+gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
+gem "activesupport", "6.0"
+
+gemspec path: "../"

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

@@ -16,7 +16,15 @@ module Roqua
 
         def street
           return nil if record.blank? || record.fetch('PID.11.1').blank?
-          record.fetch('PID.11.1').fetch('PID.11.1.1')
+
+          street = record.fetch('PID.11.1').fetch('PID.11.1.1')
+          suffix = record.fetch('PID.11.2', nil)
+
+          if suffix.present? && !street.end_with?(suffix)
+            street + suffix
+          else
+            street
+          end
         end
 
         def city
@@ -50,7 +58,7 @@ module Roqua
         private
 
         def get_address_of_type(message, type)
-          message.fetch('PID').fetch('PID.11').find do |record|
+          message.dig('PID', 'PID.11')&.find do |record|
             record.fetch('PID.11.7', :unknown_type_of_address_record) == type
           end
         end

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

@@ -11,7 +11,7 @@ module Roqua
 
         # this is a heuristic to pick likely dutch cell phone numbers from hl7 messages
         def to_s
-          pid13 = message.fetch('PID').fetch('PID.13')
+          pid13 = message.dig('PID', 'PID.13') || []
 
           # prefer PRN (Primary Residence Number) that contains a cell phone number
           phone_cell_record = pid13.find do |record|

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

@@ -19,33 +19,33 @@ module Roqua
           raise ::Roqua::Healthy::PatientNotFound unless message['PID'].present?
           message['PID']['PID.3']  = [message.fetch('PID').fetch('PID.3')].flatten.compact
           message['PID']['PID.5']  = [message.fetch('PID').fetch('PID.5')].flatten.compact
-          message['PID']['PID.11'] = [message.fetch('PID').fetch('PID.11')].flatten.compact
-          message['PID']['PID.13'] = [message.fetch('PID').fetch('PID.13')].flatten.compact
+          message['PID']['PID.11'] = [message.dig('PID', 'PID.11')].flatten.compact
+          message['PID']['PID.13'] = [message.dig('PID', 'PID.13')].flatten.compact
           @message = MessageCleaner.new(message).message
         end
 
         # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         def to_patient
           {
-            status:       status,
-            source:       source,
-            identities:   identities,
-            firstname:    name.firstname,
-            initials:     name.initials,
-            lastname:     name.lastname,
+            status: status,
+            source: source,
+            identities: identities,
+            firstname: name.firstname,
+            initials: name.initials,
+            lastname: name.lastname,
             display_name: name.display_name,
-            nickname:     name.nickname,
-            email:        email,
+            nickname: name.nickname,
+            email: email,
             address_type: address.address_type,
-            street:       address.street,
-            city:         address.city,
-            zipcode:      address.zipcode,
-            country:      address.country,
-            birthdate:    birthdate,
-            gender:       gender,
-            phone_cell:   phone_cell,
-            medoq_data:   medoq_data,
-            deceased:     deceased
+            street: address.street,
+            city: address.city,
+            zipcode: address.zipcode,
+            country: address.country,
+            birthdate: birthdate,
+            gender: gender,
+            phone_cell: phone_cell,
+            medoq_data: medoq_data,
+            deceased: deceased
           }
         end
         # rubocop:enable Metrics/AbcSize, Metrics/MethodLength

data/lib/roqua/healthy/errors.rb

@@ -9,6 +9,7 @@ module Roqua
     class Timeout < ConnectionError; end
     class HostUnreachable < ConnectionError; end
     class ConnectionRefused < ConnectionError; end
+    class NoRouteToHost < ConnectionError; end
 
     class UnknownFailure < Error; end
     class PatientIdNotInRemote < Error; end
@@ -46,6 +47,8 @@ module Roqua
         ::Roqua::Healthy::ConnectionRefused,
       'ERROR: ConnectException: Connection refused' =>
         ::Roqua::Healthy::ConnectionRefused,
+      'ERROR: NoRouteToHostException: No route to host' =>
+        ::Roqua::Healthy::NoRouteToHost,
       "ERROR: NACK sent from receiver. (Rejected)" =>
         ::Roqua::Healthy::NACK,
       "ERROR: NACK sent from receiver. (Error)" => # ie. Patient not found

data/lib/roqua/healthy/oru/client.rb

@@ -22,7 +22,6 @@ module Roqua
             headers: {content_type: 'text/xml'},
             timeout: timeout.to_i
           ) do |response, _request, _result|
-
             xml_response = Hash.from_xml(response.body)
 
             if response.code == 200 && xml_response['oru']['status'] == 'ACK'

data/lib/roqua/healthy/version.rb

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

data/roqua-healthy.gemspec

@@ -20,24 +20,23 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'activesupport', '>= 3.2', '< 6'
+  gem.add_dependency 'activesupport', '>= 3.2', '< 6.1'
   gem.add_dependency 'addressable', '~> 2.3'
   gem.add_dependency 'builder'
   gem.add_dependency 'phonelib', '~> 0.6'
   gem.add_dependency 'rest-client', '>= 2.0.2'
-  gem.add_dependency 'roqua-support', '~> 0.1.22'
+  gem.add_dependency 'roqua-support', '~> 0.3.0'
 
   gem.add_development_dependency 'appraisal'
-  gem.add_development_dependency 'bundler', '~> 1.0'
+  gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'rake', '~> 10.0'
   gem.add_development_dependency 'rspec', '~> 3.3.0'
   gem.add_development_dependency 'yard', '~> 0.8'
 
   # Required for the tests
-  gem.add_development_dependency 'webmock', '~> 1.13'
+  gem.add_development_dependency 'webmock', '~> 3.2'
 
   # Workflow and tools
-  gem.add_development_dependency 'fuubar'
   gem.add_development_dependency 'guard', '~> 2.1'
   gem.add_development_dependency 'guard-rspec', '~> 4.2.4'
   gem.add_development_dependency 'guard-rubocop', '~> 1.2.0'

data/spec/fixtures/xmcare_house_number_addendum.xml

@@ -0,0 +1,335 @@
+<HL7Message>
+  <MSH>
+    <MSH.1>|</MSH.1>
+    <MSH.2>^~\&amp;</MSH.2>
+    <MSH.3>
+      <MSH.3.1>XMCARE</MSH.3.1>
+    </MSH.3>
+    <MSH.4>
+      <MSH.4.1>ZIS</MSH.4.1>
+    </MSH.4>
+    <MSH.5>
+      <MSH.5.1>ROQUA</MSH.5.1>
+    </MSH.5>
+    <MSH.6>
+      <MSH.6.1>RGOC</MSH.6.1>
+    </MSH.6>
+    <MSH.7>
+      <MSH.7.1>20190620121912</MSH.7.1>
+    </MSH.7>
+    <MSH.8/>
+    <MSH.9>
+      <MSH.9.1>ADR</MSH.9.1>
+      <MSH.9.2>A19</MSH.9.2>
+      <MSH.9.3>ADR_A19</MSH.9.3>
+    </MSH.9>
+    <MSH.10>
+      <MSH.10.1>10883208</MSH.10.1>
+    </MSH.10>
+    <MSH.11>
+      <MSH.11.1>P</MSH.11.1>
+    </MSH.11>
+    <MSH.12>
+      <MSH.12.1>2.4</MSH.12.1>
+    </MSH.12>
+    <MSH.13/>
+    <MSH.14/>
+    <MSH.15>
+      <MSH.15.1>NE</MSH.15.1>
+    </MSH.15>
+    <MSH.16>
+      <MSH.16.1>NE</MSH.16.1>
+    </MSH.16>
+  </MSH>
+  <MSA>
+    <MSA.1>
+      <MSA.1.1>CA</MSA.1.1>
+    </MSA.1>
+    <MSA.2>
+      <MSA.2.1>20190620121912766</MSA.2.1>
+    </MSA.2>
+  </MSA>
+  <QRD>
+    <QRD.1>
+      <QRD.1.1>20190620121912</QRD.1.1>
+    </QRD.1>
+    <QRD.2>
+      <QRD.2.1>R</QRD.2.1>
+    </QRD.2>
+    <QRD.3>
+      <QRD.3.1>I</QRD.3.1>
+    </QRD.3>
+    <QRD.4>
+      <QRD.4.1>766</QRD.4.1>
+    </QRD.4>
+    <QRD.5/>
+    <QRD.6/>
+    <QRD.7>
+      <QRD.7.1>1</QRD.7.1>
+      <QRD.7.2>RD</QRD.7.2>
+    </QRD.7>
+    <QRD.8>
+      <QRD.8.1>1234567890</QRD.8.1>
+    </QRD.8>
+    <QRD.9>
+      <QRD.9.1>DEM</QRD.9.1>
+    </QRD.9>
+  </QRD>
+  <PID>
+    <PID.1>
+      <PID.1.1>1</PID.1.1>
+    </PID.1>
+    <PID.2/>
+    <PID.3>
+      <PID.3.1>1234567890</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>XMCARE</PID.3.4>
+      <PID.3.5>PI</PID.3.5>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>999991234</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>NLMINBIZA</PID.3.4>
+      <PID.3.5>NNNLD</PID.3.5>
+      <PID.3.6/>
+      <PID.3.7>20190123</PID.3.7>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>""</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4/>
+      <PID.3.5>IBAN</PID.3.5>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>""</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>GIRO</PID.3.4>
+      <PID.3.5>BA</PID.3.5>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>""</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>BANK</PID.3.4>
+      <PID.3.5>BA</PID.3.5>
+    </PID.3>
+    <PID.4/>
+    <PID.5>
+      <PID.5.1>
+        <PID.5.1.1>Anton</PID.5.1.1>
+        <PID.5.1.2>""</PID.5.1.2>
+        <PID.5.1.3>Anton</PID.5.1.3>
+        <PID.5.1.4>""</PID.5.1.4>
+        <PID.5.1.5>""</PID.5.1.5>
+      </PID.5.1>
+      <PID.5.2>B</PID.5.2>
+      <PID.5.3>C</PID.5.3>
+      <PID.5.4/>
+      <PID.5.5/>
+      <PID.5.6/>
+      <PID.5.7>L</PID.5.7>
+    </PID.5>
+    <PID.5>
+      <PID.5.1>Anton</PID.5.1>
+      <PID.5.2/>
+      <PID.5.3/>
+      <PID.5.4/>
+      <PID.5.5/>
+      <PID.5.6/>
+      <PID.5.7>D</PID.5.7>
+    </PID.5>
+    <PID.5>
+      <PID.5.1/>
+      <PID.5.2>Tirol</PID.5.2>
+      <PID.5.3/>
+      <PID.5.4/>
+      <PID.5.5/>
+      <PID.5.6/>
+      <PID.5.7>N</PID.5.7>
+    </PID.5>
+    <PID.6/>
+    <PID.7>
+      <PID.7.1>19991212</PID.7.1>
+    </PID.7>
+    <PID.8>
+      <PID.8.1>M</PID.8.1>
+    </PID.8>
+    <PID.9/>
+    <PID.10/>
+    <PID.11/>
+    <PID.11>
+      <PID.11.1>
+        <PID.11.1.1>Straatnaam 123</PID.11.1.1>
+        <PID.11.1.2>Straatnaam</PID.11.1.2>
+        <PID.11.1.3>123</PID.11.1.3>
+      </PID.11.1>
+      <PID.11.2>ab</PID.11.2>
+      <PID.11.3>DEURNE</PID.11.3>
+      <PID.11.4/>
+      <PID.11.5>1234AB</PID.11.5>
+      <PID.11.6>NL</PID.11.6>
+      <PID.11.7>H</PID.11.7>
+    </PID.11>
+    <PID.11>
+      <PID.11.1>
+        <PID.11.1.1/>
+        <PID.11.1.2>""</PID.11.1.2>
+        <PID.11.1.3>""</PID.11.1.3>
+      </PID.11.1>
+      <PID.11.2>""</PID.11.2>
+      <PID.11.3>'S-GRAVENHAGE</PID.11.3>
+      <PID.11.4/>
+      <PID.11.5>""</PID.11.5>
+      <PID.11.6>NL</PID.11.6>
+      <PID.11.7>N</PID.11.7>
+    </PID.11>
+    <PID.11>
+      <PID.11.1>
+        <PID.11.1.1/>
+        <PID.11.1.2>""</PID.11.1.2>
+        <PID.11.1.3>""</PID.11.1.3>
+      </PID.11.1>
+      <PID.11.2>""</PID.11.2>
+      <PID.11.3>""</PID.11.3>
+      <PID.11.4/>
+      <PID.11.5>""</PID.11.5>
+      <PID.11.6>""</PID.11.6>
+      <PID.11.7>C</PID.11.7>
+    </PID.11>
+    <PID.12/>
+    <PID.13>
+      <PID.13.1>0123-444444</PID.13.1>
+      <PID.13.2>PRN</PID.13.2>
+      <PID.13.3>PH</PID.13.3>
+    </PID.13>
+    <PID.13>
+      <PID.13.1>0031612345678</PID.13.1>
+      <PID.13.2>ORN</PID.13.2>
+      <PID.13.3>PH</PID.13.3>
+    </PID.13>
+    <PID.13>
+      <PID.13.1>""</PID.13.1>
+      <PID.13.2>ORN</PID.13.2>
+      <PID.13.3>FX</PID.13.3>
+    </PID.13>
+    <PID.13>
+      <PID.13.1/>
+      <PID.13.2>NET</PID.13.2>
+      <PID.13.3>Internet</PID.13.3>
+      <PID.13.4>voornaam+test@example.org</PID.13.4>
+    </PID.13>
+    <PID.14/>
+    <PID.15/>
+    <PID.16/>
+    <PID.17/>
+    <PID.18/>
+    <PID.19/>
+    <PID.20/>
+    <PID.21/>
+    <PID.22/>
+    <PID.23/>
+    <PID.24/>
+    <PID.25/>
+    <PID.26>
+      <PID.26.1>""</PID.26.1>
+    </PID.26>
+    <PID.27/>
+    <PID.28/>
+    <PID.29>
+      <PID.29.1>""</PID.29.1>
+    </PID.29>
+    <PID.30>
+      <PID.30.1>N</PID.30.1>
+    </PID.30>
+    <PID.31>
+      <PID.31.1>N</PID.31.1>
+    </PID.31>
+  </PID>
+  <ROL>
+    <ROL.1/>
+    <ROL.2>
+      <ROL.2.1>UP</ROL.2.1>
+    </ROL.2>
+    <ROL.3>
+      <ROL.3.1>PP</ROL.3.1>
+    </ROL.3>
+    <ROL.4>
+      <ROL.4.1>BENU-DEUR</ROL.4.1>
+      <ROL.4.2>
+        <ROL.4.2.1/>
+        <ROL.4.2.2/>
+        <ROL.4.2.3>Benu Apotheek</ROL.4.2.3>
+      </ROL.4.2>
+      <ROL.4.3/>
+      <ROL.4.4/>
+      <ROL.4.5/>
+      <ROL.4.6/>
+      <ROL.4.7/>
+      <ROL.4.8>P</ROL.4.8>
+      <ROL.4.9>LOCAL</ROL.4.9>
+    </ROL.4>
+    <ROL.4>
+      <ROL.4.1>01239000</ROL.4.1>
+      <ROL.4.2/>
+      <ROL.4.3/>
+      <ROL.4.4/>
+      <ROL.4.5/>
+      <ROL.4.6/>
+      <ROL.4.7/>
+      <ROL.4.8>02</ROL.4.8>
+      <ROL.4.9>VEKTIS</ROL.4.9>
+    </ROL.4>
+    <ROL.5/>
+    <ROL.6/>
+    <ROL.7/>
+    <ROL.8/>
+    <ROL.9>
+      <ROL.9.1>02</ROL.9.1>
+      <ROL.9.2/>
+      <ROL.9.3>VEKTIS</ROL.9.3>
+    </ROL.9>
+  </ROL>
+  <ROL>
+    <ROL.1/>
+    <ROL.2>
+      <ROL.2.1>UP</ROL.2.1>
+    </ROL.2>
+    <ROL.3>
+      <ROL.3.1>PP</ROL.3.1>
+    </ROL.3>
+    <ROL.4>
+      <ROL.4.1>OPEN-DEUR</ROL.4.1>
+      <ROL.4.2>
+        <ROL.4.2.1/>
+        <ROL.4.2.2>de</ROL.4.2.2>
+        <ROL.4.2.3>Open</ROL.4.2.3>
+      </ROL.4.2>
+      <ROL.4.3>M</ROL.4.3>
+      <ROL.4.4>P</ROL.4.4>
+      <ROL.4.5/>
+      <ROL.4.6/>
+      <ROL.4.7/>
+      <ROL.4.8>H</ROL.4.8>
+      <ROL.4.9>LOCAL</ROL.4.9>
+    </ROL.4>
+    <ROL.5/>
+    <ROL.6/>
+    <ROL.7/>
+    <ROL.8/>
+    <ROL.9>
+      <ROL.9.1>01</ROL.9.1>
+      <ROL.9.2/>
+      <ROL.9.3>VEKTIS</ROL.9.3>
+    </ROL.9>
+  </ROL>
+  <PV1>
+    <PV1.1/>
+    <PV1.2>
+      <PV1.2.1>O</PV1.2.1>
+    </PV1.2>
+  </PV1>
+</HL7Message>

data/spec/fixtures/xmcare_missing_whole_pids.xml

@@ -0,0 +1,162 @@
+<?xml version="1.0"?>
+<HL7Message>
+  <MSH>
+    <MSH.1>|</MSH.1>
+    <MSH.2>^~\&amp;</MSH.2>
+    <MSH.3>
+      <MSH.3.1>XMCARE</MSH.3.1>
+    </MSH.3>
+    <MSH.4>
+      <MSH.4.1>ZIS</MSH.4.1>
+    </MSH.4>
+    <MSH.5>
+      <MSH.5.1>ROQUA</MSH.5.1>
+    </MSH.5>
+    <MSH.6>
+      <MSH.6.1>RGOC</MSH.6.1>
+    </MSH.6>
+    <MSH.7>
+      <MSH.7.1>20130924132007</MSH.7.1>
+    </MSH.7>
+    <MSH.8/>
+    <MSH.9>
+      <MSH.9.1>ADR</MSH.9.1>
+      <MSH.9.2>A19</MSH.9.2>
+      <MSH.9.3>ADR_A19</MSH.9.3>
+    </MSH.9>
+    <MSH.10>
+      <MSH.10.1>23099201</MSH.10.1>
+    </MSH.10>
+    <MSH.11>
+      <MSH.11.1>P</MSH.11.1>
+    </MSH.11>
+    <MSH.12>
+      <MSH.12.1>2.4</MSH.12.1>
+    </MSH.12>
+    <MSH.13/>
+    <MSH.14/>
+    <MSH.15>
+      <MSH.15.1>NE</MSH.15.1>
+    </MSH.15>
+    <MSH.16>
+      <MSH.16.1>NE</MSH.16.1>
+    </MSH.16>
+  </MSH>
+  <MSA>
+    <MSA.1>
+      <MSA.1.1>CA</MSA.1.1>
+    </MSA.1>
+    <MSA.2>
+      <MSA.2.1>2013092413200823</MSA.2.1>
+    </MSA.2>
+  </MSA>
+  <QRD>
+    <QRD.1>
+      <QRD.1.1>20130924132008</QRD.1.1>
+    </QRD.1>
+    <QRD.2>
+      <QRD.2.1>R</QRD.2.1>
+    </QRD.2>
+    <QRD.3>
+      <QRD.3.1>I</QRD.3.1>
+    </QRD.3>
+    <QRD.4>
+      <QRD.4.1>23</QRD.4.1>
+    </QRD.4>
+    <QRD.5/>
+    <QRD.6/>
+    <QRD.7>
+      <QRD.7.1>1</QRD.7.1>
+      <QRD.7.2>RD</QRD.7.2>
+    </QRD.7>
+    <QRD.8>
+      <QRD.8.1>12345678901</QRD.8.1>
+    </QRD.8>
+    <QRD.9>
+      <QRD.9.1>DEM</QRD.9.1>
+    </QRD.9>
+  </QRD>
+  <PID>
+    <PID.1>
+      <PID.1.1>1</PID.1.1>
+    </PID.1>
+    <PID.2/>
+    <PID.3>
+      <PID.3.1>12345678901</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>XMCARE</PID.3.4>
+      <PID.3.5>PI</PID.3.5>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>123456789</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>NLMINBIZA</PID.3.4>
+      <PID.3.5>NNNLD</PID.3.5>
+      <PID.3.6/>
+      <PID.3.7>20120820</PID.3.7>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>""</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4/>
+      <PID.3.5>IBAN</PID.3.5>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>""</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>GIRO</PID.3.4>
+      <PID.3.5>BA</PID.3.5>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>""</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>BANK</PID.3.4>
+      <PID.3.5>BA</PID.3.5>
+    </PID.3>
+    <PID.4/>
+    <PID.5>
+      <PID.5.1>
+        <PID.5.1.1>Achternaam</PID.5.1.1>
+        <PID.5.1.2>""</PID.5.1.2>
+        <PID.5.1.3>Achternaam</PID.5.1.3>
+        <PID.5.1.4>""</PID.5.1.4>
+        <PID.5.1.5>""</PID.5.1.5>
+      </PID.5.1>
+      <PID.5.2>A</PID.5.2>
+      <PID.5.3>B</PID.5.3>
+      <PID.5.4/>
+      <PID.5.5/>
+      <PID.5.6/>
+      <PID.5.7>L</PID.5.7>
+    </PID.5>
+    <PID.5>
+      <PID.5.1>Achternaam</PID.5.1>
+      <PID.5.2/>
+      <PID.5.3/>
+      <PID.5.4/>
+      <PID.5.5/>
+      <PID.5.6/>
+      <PID.5.7>D</PID.5.7>
+    </PID.5>
+    <PID.5>
+      <PID.5.1/>
+      <PID.5.2>Babette</PID.5.2>
+      <PID.5.3/>
+      <PID.5.4/>
+      <PID.5.5/>
+      <PID.5.6/>
+      <PID.5.7>N</PID.5.7>
+    </PID.5>
+    <PID.7>
+      <PID.7.1>17070415</PID.7.1>
+    </PID.7>
+    <PID.8>
+      <PID.8.1>F</PID.8.1>
+    </PID.8>
+  </PID>
+</HL7Message>

data/spec/integration/xmcare_spec.rb

@@ -207,6 +207,24 @@ describe 'Fetching A19 from XMcare' do
     end
   end
 
+  describe 'a patient with an address suffix' do
+    before { load_fixture 'xmcare_house_number_addendum', '1234567890' }
+    subject { Roqua::Healthy::A19.fetch("1234567890") }
+
+    it 'returns the street with suffix appended' do
+      expect(subject[:street]).to eq("Straatnaam 123ab")
+    end
+  end
+
+  describe 'a patient with no PID.11 (address) or PID.13 (phone) at all' do
+    before { load_fixture 'xmcare_missing_whole_pids', '12345678901' }
+    subject { Roqua::Healthy::A19.fetch("12345678901") }
+
+    it 'loads the rest' do
+      expect(subject[:firstname]).to eq("Babette")
+    end
+  end
+
   describe 'a patient that does not exist' do
     before { load_fixture 'xmcare_patient_not_found', '12345678901' }
 

data/spec/unit/a19/address_parser_spec.rb

@@ -8,6 +8,7 @@ describe Roqua::Healthy::A19::AddressParser do
     if types.include?('M')
       addresses << {'PID.11.7' => 'M',
                     'PID.11.1' => {'PID.11.1.1' => 'Mailstreet 1'},
+                    'PID.11.2' => '',
                     'PID.11.3' => 'Mailcity',
                     'PID.11.5' => 'Mailzipcode',
                     'PID.11.6' => 'Mailcountry'}
@@ -53,6 +54,11 @@ describe Roqua::Healthy::A19::AddressParser do
       parser  = described_class.new(message)
       expect(parser.address_type).to be_nil
     end
+
+    it 'handles missing PID' do
+      parser = described_class.new('PID' => {})
+      expect(parser.address_type).to be_nil
+    end
   end
 
   describe '#street' do
@@ -73,6 +79,35 @@ describe Roqua::Healthy::A19::AddressParser do
       parser  = described_class.new(message)
       expect(parser.street).to be_nil
     end
+
+    it 'appends house number suffix' do
+      addresses = [{'PID.11.7' => 'M',
+                    'PID.11.1' => {'PID.11.1.1' => 'Homestreet 1'},
+                    'PID.11.2' => "ab",
+                    'PID.11.3' => 'Homecity',
+                    'PID.11.5' => 'Homezipcode',
+                    'PID.11.6' => 'Homecountry'}]
+      message = {'PID' => {'PID.11' => addresses}}
+      parser  = described_class.new(message)
+      expect(parser.street).to eq("Homestreet 1ab")
+    end
+
+    it 'does not append house number suffix if full field already ends in it' do
+      addresses = [{'PID.11.7' => 'M',
+                    'PID.11.1' => {'PID.11.1.1' => 'Homestreet 1ab'},
+                    'PID.11.2' => "ab",
+                    'PID.11.3' => 'Homecity',
+                    'PID.11.5' => 'Homezipcode',
+                    'PID.11.6' => 'Homecountry'}]
+      message = {'PID' => {'PID.11' => addresses}}
+      parser  = described_class.new(message)
+      expect(parser.street).to eq("Homestreet 1ab")
+    end
+
+    it 'handles missing PID' do
+      parser = described_class.new('PID' => {})
+      expect(parser.street).to be_nil
+    end
   end
 
   describe '#city' do
@@ -93,6 +128,11 @@ describe Roqua::Healthy::A19::AddressParser do
       parser  = described_class.new(message)
       expect(parser.city).to be_nil
     end
+
+    it 'handles missing PID' do
+      parser = described_class.new('PID' => {})
+      expect(parser.city).to be_nil
+    end
   end
 
   describe '#zipcode' do
@@ -113,6 +153,10 @@ describe Roqua::Healthy::A19::AddressParser do
       parser  = described_class.new(message)
       expect(parser.zipcode).to be_nil
     end
+    it 'handles missing PID' do
+      parser = described_class.new('PID' => {})
+      expect(parser.zipcode).to be_nil
+    end
   end
 
   describe '#country' do
@@ -133,6 +177,11 @@ describe Roqua::Healthy::A19::AddressParser do
       parser  = described_class.new(message)
       expect(parser.country).to be_nil
     end
+
+    it 'handles missing PID' do
+      parser = described_class.new('PID' => {})
+      expect(parser.country).to be_nil
+    end
   end
   # rubocop:enable Metrics/MethodLength
 end

data/spec/unit/a19/phone_parser_spec.rb

@@ -31,6 +31,13 @@ RSpec.describe Roqua::Healthy::A19::PhoneParser do
     it { should be_nil }
   end
 
+  describe 'no phone number field at all' do
+    let(:message) do
+      {'PID' => {}}
+    end
+    it { should be_nil }
+  end
+
   describe 'mobile type in PRN is preferred over other mobile numbers' do
     let(:message) do
       {'PID' => {'PID.13' => [{'PID.13.1' => '0612345678', 'PID.13.2' => 'CP'},

data/spec/unit/a19/response_validator_spec.rb

@@ -31,17 +31,23 @@ describe Roqua::Healthy::A19::ResponseValidator do
     end
 
     context "Unable to connect to destination\tConnectException\tConnection refused" do
-      it 'raises ::Roqua::Healthy::Timeout' do
+      it 'raises ::Roqua::Healthy::ConnectionRefused' do
         expect { subject.validate }.to raise_error(::Roqua::Healthy::ConnectionRefused)
       end
     end
 
     context 'ERROR: ConnectException: Connection refused' do
-      it 'raises ::Roqua::Healthy::Timeout' do
+      it 'raises ::Roqua::Healthy::ConnectionRefused' do
         expect { subject.validate }.to raise_error(::Roqua::Healthy::ConnectionRefused)
       end
     end
 
+    context 'ERROR: NoRouteToHostException: No route to host' do
+      it 'raises ::Roqua::Healthy::NoRouteToHost' do
+        expect { subject.validate }.to raise_error(::Roqua::Healthy::NoRouteToHost)
+      end
+    end
+
     context "ERROR: NACK sent from receiver. (Rejected)" do
       it 'raises ::Roqua::Healthy::NACK' do
         expect { subject.validate }.to raise_error(::Roqua::Healthy::NACK)

data/spec/unit/oru/client_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Roqua::Healthy::Oru::Client do
           'hash%3E%0A++%3Coru+type%3D%22symbol%22%3Edata%3C%2Foru%3E%0A%3C%2Fhash%3E%0A',
         headers: {
           'Accept' => '*/*',
-          'Accept-Encoding' => 'gzip, deflate',
+          'Accept-Encoding' => /gzip.*?deflate.*/,
           'Content-Length' => '140',
           'Content-Type' => 'text/xml'
         }

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: roqua-healthy
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.12
 platform: ruby
 authors:
 - Marten Veldthuis
 - Jorn van de Beek
 - Samuel Esposito
 - Henk van der Veen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -22,7 +22,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -95,14 +95,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -121,16 +121,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -179,28 +179,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  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'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -314,6 +300,9 @@ files:
 - gemfiles/rails41.gemfile
 - gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
+- gemfiles/rails51.gemfile
+- gemfiles/rails52.gemfile
+- gemfiles/rails60.gemfile
 - lib/roqua/errors.rb
 - lib/roqua/healthy.rb
 - lib/roqua/healthy/a19.rb
@@ -356,7 +345,9 @@ files:
 - spec/fixtures/user_patient_not_found.xml
 - spec/fixtures/user_patient_with_gsm_and_email.xml
 - spec/fixtures/user_patient_with_maiden_name.xml
+- spec/fixtures/xmcare_house_number_addendum.xml
 - spec/fixtures/xmcare_impersonating_cdis.xml
+- spec/fixtures/xmcare_missing_whole_pids.xml
 - spec/fixtures/xmcare_patient.xml
 - spec/fixtures/xmcare_patient_email_in_field_number_four.xml
 - spec/fixtures/xmcare_patient_not_found.xml
@@ -392,7 +383,7 @@ homepage: https://github.com/roqua/healthy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -407,9 +398,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Arranges communication between Mirth and RoQua
 test_files:
@@ -432,7 +423,9 @@ test_files:
 - spec/fixtures/user_patient_not_found.xml
 - spec/fixtures/user_patient_with_gsm_and_email.xml
 - spec/fixtures/user_patient_with_maiden_name.xml
+- spec/fixtures/xmcare_house_number_addendum.xml
 - spec/fixtures/xmcare_impersonating_cdis.xml
+- spec/fixtures/xmcare_missing_whole_pids.xml
 - spec/fixtures/xmcare_patient.xml
 - spec/fixtures/xmcare_patient_email_in_field_number_four.xml
 - spec/fixtures/xmcare_patient_not_found.xml