roqua-healthy 1.5.9 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd1dc3e8ce6e055eaa889059f77e2d31c85cdb304610f897488fe5b62aaad19c
-  data.tar.gz: 7c51e0e0f982adc0085d05a5cb71234fa71a039b9244e060446e73c3d30e3437
+  metadata.gz: 676e3d78e93d705fbf01f1e7eb726ca8c250b64fb7e226262b8bebd9d4ca540d
+  data.tar.gz: 5a5eac93225350b7446eaf8c3c22f29d53d3673437488fe04e4c8d8b9ccc25ca
 SHA512:
-  metadata.gz: 46c3a927a35d6ebd92be5a3342774dd9cfc421e4fee5d2200998c36b886b6795bc9cd31f3ba106d21361ac947ad97f29a65d731397f04fb6cc6a1ab93ce1e163
-  data.tar.gz: af5d642130dff9324205ee27c33591fbc21fd2fbf8963127f13fbb4abbed39f572530cb3c8442d82c691bf679bf6b6e3881b4821456d5201186e0b2efeb6e624
+  metadata.gz: 7b54a9724e9035399b542b8d034cde91808a32938293c1da699dc1ab9d5ba626bc5a56bc0afc047fc1989b12e307e728562abc87d1d04147691791327f99a01b
+  data.tar.gz: d992da02d82847037d5881ead65ee81281ccc1a1eb111f44b5f68600f26c6af31e31f0b5acf2304fba34bf48db98dfe8bf44f9dd90188bbcb972a955ad4509c0

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.7-builder"
 
 cache:
   paths:
@@ -15,8 +15,14 @@ rubocop:
   script:
   - bundle exec rubocop -D
 
-rspec:
+rails52:
   script:
-    - bundle exec appraisal rails41 bundle exec rspec
-    - bundle exec appraisal rails42 bundle exec rspec
-    - bundle exec appraisal rails50 bundle exec rspec
+    - bundle exec appraisal rails52 bundle exec rspec
+
+rails60:
+  script:
+    - bundle exec appraisal rails60 bundle exec rspec
+
+rails61:
+  script:
+    - bundle exec appraisal rails61 bundle exec rspec

data/.rubocop.yml

@@ -4,7 +4,7 @@ AllCops:
   Exclude:
     - vendor/**/*
     - gemfiles/*
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6
 
 Documentation:
   Enabled: false
@@ -27,7 +27,13 @@ SignalException:
 Layout/EmptyLineAfterMagicComment:
   Enabled: False
 
+Layout/EmptyLineBetweenDefs:
+  AllowAdjacentOneLineDefs: true
+
 Naming/FileName:
   Exclude:
     - Appraisals
 
+# No, I don't want to call my exceptions 'e' instead of 'exception' or 'error'.
+Naming/RescuedExceptionsVariableName:
+  Enabled: false

data/Appraisals

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
-appraise "rails41" do
-  gem "activesupport", "4.1"
+appraise "rails52" do
+  gem "activesupport", "5.2"
+  gem "roqua-support", "~> 0.3.0"
 end
 
-appraise "rails42" do
-  gem "activesupport", "4.2"
+appraise "rails60" do
+  gem "activesupport", "6.0"
 end
 
-appraise "rails50" do
-  gem "activesupport", "5.0"
+appraise "rails61" do
+  gem "activesupport", "6.1"
 end

data/ChangeLog.md

@@ -1,3 +1,21 @@
+### 1.6.0
+
+* ActiveSupport 6.1 support
+* Removed ActiveSupport 4.1, 4.2, 5.0 and 5.1
+* Add roqua_support 0.4 support.
+
+### 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

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/rails52.gemfile

@@ -0,0 +1,10 @@
+# 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"
+gem "roqua-support", "~> 0.3.0"
+
+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/gemfiles/rails61.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.1"
+
+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/fetcher.rb

@@ -9,8 +9,7 @@ module Roqua
   module Healthy
     module A19
       class Fetcher
-        attr_reader :patient_id
-        attr_reader :client
+        attr_reader :client, :patient_id
 
         def initialize(patient_id, client)
           @patient_id = patient_id

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.fetch('PID').fetch('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/a19/phone_validator.rb

@@ -28,7 +28,7 @@ module Roqua
         end
 
         def self.strip_non_phone_number_characters(number)
-          number.gsub(/[-\s\.]/, '')
+          number.gsub(/[-\s.]/, '')
         end
       end
     end

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

@@ -7,9 +7,7 @@ module Roqua
       class ResponseValidator
         require 'roqua/healthy/errors'
 
-        attr_reader :response_code
-        attr_reader :parser
-        attr_reader :patient_id
+        attr_reader :parser, :patient_id, :response_code
 
         def initialize(response_code, parser, patient_id)
           @response_code = response_code
@@ -20,41 +18,41 @@ module Roqua
         def validate
           case response_code
           when '200'
-            validate_200
+            validate200
           when '401', '403'
-            validate_403
+            validate403
           when '404'
-            validate_404
+            validate404
           when '500'
-            validate_500
+            validate500
           else
             raise ::Roqua::Healthy::UnknownFailure, "Unexpected HTTP response code #{response_code}."
           end
         end
 
-        def validate_200
+        private
+
+        def validate200
           parsed_message = parser.fetch("HL7Message")
           ensure_patient_found(parsed_message)
           ensure_correct_patient(parsed_message)
           true
         end
 
-        def validate_403
+        def validate403
           raise ::Roqua::Healthy::AuthenticationFailure
         end
 
-        def validate_404
+        def validate404
           raise ::Roqua::Healthy::PatientNotFound
         end
 
-        def validate_500
+        def validate500
           error = parser.fetch('failure')['error']
           raise ::Roqua::Healthy::ERRORS[error], error if ::Roqua::Healthy::ERRORS[error]
           raise ::Roqua::Healthy::UnknownFailure, error
         end
 
-        private
-
         def ensure_patient_found(parsed_message)
           raise ::Roqua::Healthy::PatientNotFound if parsed_message.key?("ERR") && parsed_message.fetch("ERR").fetch("ERR.1").fetch("ERR.1.4").fetch("ERR.1.4.2") =~ /Patient \(@\) niet gevonden\(.*\)/
           raise ::Roqua::Healthy::PatientNotFound if parsed_message.key?("QAK") && parsed_message.fetch("QAK").fetch("QAK.2").fetch("QAK.2.1") == "NF"

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/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.9"
+    VERSION = "1.6.0"
   end
 end

data/roqua-healthy.gemspec

@@ -13,19 +13,19 @@ 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
   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', '>= 5.1', '< 6.2'
   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.3.0'
+  gem.add_dependency 'roqua-support', '>= 0.3.0', '< 0.5.0'
 
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'bundler'
@@ -37,10 +37,9 @@ Gem::Specification.new do |gem|
   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'
+  gem.add_development_dependency 'guard-rspec', '~> 4.2'
+  gem.add_development_dependency 'guard-rubocop', '~> 1.2'
   gem.add_development_dependency 'listen', '~> 2.1'
   gem.add_development_dependency 'simplecov'