roqua-healthy 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 535dbe075acc71ad6cfb216f74c0459d30076680
-  data.tar.gz: d0ca4037f6610614aa35350fc9f7e3ac80f83c4e
+  metadata.gz: dc744ebcaa5350b012790082bce06fbfdcee8b50
+  data.tar.gz: cfe48aa98ec98439b7778fbea68005136fc35b90
 SHA512:
-  metadata.gz: 768b8effbda52101455902040e0ba9357778ab73070bf36626ce6f2addf1311dba1c5cf175c104bd894d09fb13cad530fff4602aca8f0b31d4c7e7b37f7295a4
-  data.tar.gz: 7559755407e7e2ba44079dd4e89e2b0f8bc2243fcf6d5b7eee88ca5cb9b4297728f8cc0cbe87957c63d7ed631a9862b6b8475e5663c80eb49918935802e6af19
+  metadata.gz: c151b7bad6d9070c4975376e79cdc0fd5400f103f9b3b5db795e9060b0c42641f08abf707b9f1de124be947ee371e2e29fcd385f824e5b0c77f52802f56c896a
+  data.tar.gz: 1e877165f35a47a7140f7f35a40133ce1b7b24ed6673acad7c8ab09c76214e214bd1b1fe7b21090e312572479a718b440e138189c17c1de80dbee7efb2c58052

data/.rubocop.yml

@@ -1,17 +1,12 @@
-# This configuration was generated by `rubocop --auto-gen-config`.
-# The point is for the user to remove these configuration records
-# one by one as the offences are removed from the code base.
+inherit_from: .rubocop_todo.yml
 
 AllCops:
-  Excludes:
-    - vendor/**
+  Exclude:
+    - vendor/**/*
 
 Documentation:
   Enabled: false
 
-LineLength:
-  Enabled: false
-
 Encoding:
   Enabled: false
 
@@ -24,8 +19,5 @@ SpaceInsideHashLiteralBraces:
 MethodLength:
   Max: 20
 
-FinalNewline:
-  Enabled: False
-
 SignalException:
   Enabled: False

data/.rubocop_todo.yml

@@ -0,0 +1,22 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-06-24 14:47:51 +0200 using RuboCop version 0.40.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 7
+Metrics/AbcSize:
+  Max: 26
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 102
+
+# Offense count: 80
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 234

data/ChangeLog.md

@@ -1,3 +1,7 @@
+### 1.2.1
+
+* Improved heuristic to pick cell phone numbers out of commonly used hl7 messages
+
 ### 1.2.0
 
 * Added support for MEDOQ hl7 a19 identities encoded in JSON

data/Gemfile

@@ -5,4 +5,4 @@ gemspec
 # Only add dependencies here if they're only used by CI or other services.
 # Normal development dependencies should go in the gemspec. People shouldn't
 # need to use bundler to develop on our gem.
-gem "codeclimate-test-reporter", group: :test, require: nil
+gem "codeclimate-test-reporter", group: :test, require: nil

data/Guardfile

@@ -1,11 +1,11 @@
 guard 'rspec', cmd: 'bundle exec rspec -f Fuubar' 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" }
+  watch('spec/spec_helper.rb') { "spec" }
   watch(%r{^spec/fixtures/([^_]+)_.*.xml}) { |m| "spec/integration/#{m[1]}_spec.rb" }
 end
 
 guard :rubocop, cli: ['-D'] do
-  watch(%r{.+\.rb$})
+  watch(/.+\.rb$/)
   watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end

data/README.md

@@ -1,4 +1,4 @@
-# Healthy [![Code Climate](https://codeclimate.com/repos/524944dd56b10217490074e8/badges/5dd696b69c4614c83c2d/gpa.png)](https://codeclimate.com/repos/524944dd56b10217490074e8/feed) [![CircleCi](https://circleci.com/gh/roqua/healthy.png?circle-token=ece8f36798b00bc8659d5c76f720b22693d6600a)](https://circleci.com/gh/roqua/healthy)
+# Healthy [![Code Climate](https://codeclimate.com/github/roqua/healthy/badges/gpa.svg)](https://codeclimate.com/github/roqua/healthy) [![CircleCi](https://circleci.com/gh/roqua/healthy.png?circle-token=ece8f36798b00bc8659d5c76f720b22693d6600a)](https://circleci.com/gh/roqua/healthy)
 
 ## Patient details aka QRY\^A19
 
@@ -31,8 +31,10 @@ There are two helpers in `bin`: `get_xml_for_patient` and `parse_local_xml`. The
 
 These two commands are then chained together by `bin/get`:
 
-`bin/get 7767853 10.20.11.100:60201`
+`bin/get 7767853 10.20.11.100:60201` NB: replace the client id and the ip and port of the a19 channel you want to use
 
 ## Copyright
 
-Copyright (c) 2013 Marten Veldthuis. Publicly available under an MIT license. See [LICENSE.txt](https://github.com/roqua/healthy/blob/master/LICENSE.txt) for details.
+Copyright (c) 2016 Marten Veldthuis, Jorn van de Beek, Samuel Esposito, Henk van der Veen
+
+Publicly available under an MIT license. See [LICENSE.txt](https://github.com/roqua/healthy/blob/master/LICENSE.txt) for details.

data/Rakefile

@@ -7,7 +7,7 @@ begin
 rescue LoadError => e
   warn e.message
   warn "Run `gem install bundler` to install Bundler."
-  exit -1
+  exit(-1)
 end
 
 begin
@@ -23,11 +23,11 @@ require 'rake'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
 
-task :test    => :spec
-task :default => :spec
+task test: :spec
+task default: :spec
 
 require "bundler/gem_tasks"
 
 require 'yard'
-YARD::Rake::YardocTask.new  
-task :doc => :yard
+YARD::Rake::YardocTask.new
+task doc: :yard

data/bin/get

@@ -5,4 +5,4 @@ unless ARGV[0] && ARGV[1]
   exit 1
 end
 
-exec "bin/get_xml_for_patient #{ARGV[0]} '#{ARGV[1]}' | ruby -Ilib bin/parse_local_xml"
+exec "bin/get_xml_for_patient #{ARGV[0]} '#{ARGV[1]}' | ruby -Ilib bin/parse_local_xml"

data/bin/get_xml_for_patient

@@ -1,6 +1,6 @@
 #!/bin/bash
 
 COMMAND="curl --data \"method=A19&application=healthy&patient_id=$1\" \"http://$2\""
-XML=$(ssh mirth "$COMMAND")
+XML=$(ssh prod-mirth "$COMMAND")
 
 echo $XML | xmllint --format -

data/circle.yml

@@ -0,0 +1,5 @@
+machine:
+  timezone:
+    Europe/Amsterdam
+  ruby:
+    version: 2.2.4

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

@@ -43,4 +43,4 @@ module Roqua
       end
     end
   end
-end
+end

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

@@ -20,9 +20,7 @@ module Roqua
           response = mirth_response
           parser   = ResponseParser.new(response)
 
-          if ResponseValidator.new(response.code, parser, patient_id).validate
-            parser.fetch("HL7Message")
-          end
+          parser.fetch("HL7Message") if ResponseValidator.new(response.code, parser, patient_id).validate
         end
 
         def mirth_response
@@ -60,4 +58,4 @@ module Roqua
       end
     end
   end
-end
+end

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

@@ -40,8 +40,7 @@ module Roqua
               names[:display] = record
             when 'N'
               names[:nick] = record
-            else
-              # ignore record
+              # else ignore record
             end
           end
           names

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

@@ -24,4 +24,4 @@ module Roqua
       end
     end
   end
-end
+end

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

@@ -90,18 +90,30 @@ module Roqua
           email_address
         end
 
+        # this is a heuristic to pick likely dutch cell phone numbers
+        # out of the peculiar hl7 messages we receive
         def phone_cell
-          phone_cell_record = message.fetch('PID').fetch('PID.13').find do |record|
-            record.fetch('PID.13.2', :unknown_type_of_phone_record) == 'ORN'
+          pid_13 = message.fetch('PID').fetch('PID.13')
+
+          # prefer ORN (Other Residence Number, usually used for cell phone) that contains '06'
+          phone_cell_record = pid_13.find do |record|
+            phone_number = record.fetch('PID.13.1', '') || ''
+            phone_number.start_with?('06') &&
+              record.fetch('PID.13.2', :unknown_type_of_phone_record) == 'ORN'
           end
 
-          phone_cell_record ||= message.fetch('PID').fetch('PID.13').find do |record|
-            record.fetch('PID.13.1', '') =~ /\A06/
+          # otherwise choose the first occuring '06' number
+          phone_cell_record ||= pid_13.find do |record|
+            phone_number = record.fetch('PID.13.1', '') || ''
+            phone_number.start_with?('06')
           end
 
-          return nil unless phone_cell_record
+          # in the last case (possibly a +316 number), just choose the ORN number
+          phone_cell_record ||= pid_13.find do |record|
+            record.fetch('PID.13.2', :unknown_type_of_phone_record) == 'ORN'
+          end
 
-          phone_cell_record.fetch('PID.13.1', "")
+          phone_cell_record.try(:fetch, 'PID.13.1', '')
         end
 
         def gender

data/lib/roqua/healthy/a19.rb

@@ -16,4 +16,4 @@ end
 
 require_relative 'a19/fetcher'
 require_relative 'a19/transformer'
-require_relative 'a19/correct_patient_check'
+require_relative 'a19/correct_patient_check'

data/lib/roqua/healthy/message_cleaner.rb

@@ -41,4 +41,4 @@ module Roqua
       end
     end
   end
-end
+end

data/lib/roqua/healthy/version.rb

@@ -1,6 +1,6 @@
 module Roqua
   module Healthy
     # healthy version
-    VERSION = "1.2.0"
+    VERSION = "1.2.1".freeze
   end
 end

data/lib/roqua/healthy.rb

@@ -12,4 +12,4 @@ module Roqua
       attr_accessor :a19_endpoint
     end
   end
-end
+end

data/lib/roqua-healthy.rb

@@ -1 +1,2 @@
+# rubocop:disable Style/FileName
 require 'roqua/healthy'

data/roqua-healthy.gemspec

@@ -5,14 +5,14 @@ require File.expand_path('../lib/roqua/healthy/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.name          = "roqua-healthy"
   gem.version       = Roqua::Healthy::VERSION
-  gem.summary       = %q{Arranges communication between Mirth and RoQua}
-  gem.description   = %q{Receives queries from RoQua, sends them to Mirth, and translates Mirth's responses back into Rubyland.}
+  gem.summary       = 'Arranges communication between Mirth and RoQua'
+  gem.description   = "Receives queries from RoQua, sends them to Mirth, and translates Mirth's responses back into Rubyland."
   gem.license       = "MIT"
-  gem.authors       = ["Marten Veldthuis", "Jorn van de Beek"]
+  gem.authors       = ["Marten Veldthuis", "Jorn van de Beek", 'Samuel Esposito', 'Henk van der Veen']
   gem.email         = "support@roqua.nl"
   gem.homepage      = "https://github.com/roqua/healthy"
 
-  gem.files         = `git ls-files`.split($/)
+  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']
@@ -33,8 +33,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'guard', '~> 2.1'
   gem.add_development_dependency 'guard-rspec', '~> 4.2.4'
   gem.add_development_dependency 'listen', '~> 2.1'
-  gem.add_development_dependency 'guard-rubocop', '~> 1.0.1'
-  gem.add_development_dependency 'rubocop', '= 0.17.0'
+  gem.add_development_dependency 'guard-rubocop', '~> 1.2.0'
+  gem.add_development_dependency 'rubocop', '~> 0.40'
   gem.add_development_dependency 'fuubar'
 
   # Documentation generation

data/spec/fixtures/xmcare_phone_cell_in_prn.xml

@@ -0,0 +1,314 @@
+<?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>XMCARE</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>20160621111111</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>8000000</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>f00bf00b00</MSA.2.1>
+    </MSA.2>
+  </MSA>
+  <QRD>
+    <QRD.1>
+      <QRD.1.1>20160621000000</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>f00bf00b00</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>88888888888</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>88888888888</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>222222222</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>20160101</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>Achternom</PID.5.1.1>
+        <PID.5.1.2>""</PID.5.1.2>
+        <PID.5.1.3>Achternom</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>V</PID.5.2>
+      <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>Achternom</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>Voorname</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>19900101</PID.7.1>
+    </PID.7>
+    <PID.8>
+      <PID.8.1>F</PID.8.1>
+    </PID.8>
+    <PID.9/>
+    <PID.10/>
+    <PID.11/>
+    <PID.11>
+      <PID.11.1>
+        <PID.11.1.1>Straat 8</PID.11.1.1>
+        <PID.11.1.2>Straat</PID.11.1.2>
+        <PID.11.1.3>8</PID.11.1.3>
+      </PID.11.1>
+      <PID.11.2>""</PID.11.2>
+      <PID.11.3>GRONINGEN</PID.11.3>
+      <PID.11.4/>
+      <PID.11.5>9711CR</PID.11.5>
+      <PID.11.6>NED</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>GRONINGEN</PID.11.3>
+      <PID.11.4/>
+      <PID.11.5>""</PID.11.5>
+      <PID.11.6>NED</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>0612345678</PID.13.1>
+      <PID.13.2>PRN</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>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>support@roqua.nl</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>
+  <PV1>
+    <PV1.1/>
+    <PV1.2>
+      <PV1.2.1>O</PV1.2.1>
+    </PV1.2>
+  </PV1>
+  <IN1>
+    <IN1.1>
+      <IN1.1.1>1</IN1.1.1>
+    </IN1.1>
+    <IN1.2>
+      <IN1.2.1>""</IN1.2.1>
+    </IN1.2>
+    <IN1.3>
+      <IN1.3.1>VERZEKER CODE</IN1.3.1>
+      <IN1.3.2/>
+      <IN1.3.3/>
+      <IN1.3.4>LOCAL</IN1.3.4>
+    </IN1.3>
+    <IN1.4>
+      <IN1.4.1>Verzekeraar Zorgverz</IN1.4.1>
+    </IN1.4>
+    <IN1.5/>
+    <IN1.6/>
+    <IN1.7/>
+    <IN1.8/>
+    <IN1.9/>
+    <IN1.10/>
+    <IN1.11/>
+    <IN1.12>
+      <IN1.12.1>20140101</IN1.12.1>
+    </IN1.12>
+    <IN1.13>
+      <IN1.13.1>""</IN1.13.1>
+    </IN1.13>
+    <IN1.14/>
+    <IN1.15/>
+    <IN1.16/>
+    <IN1.17/>
+    <IN1.18/>
+    <IN1.19/>
+    <IN1.20/>
+    <IN1.21/>
+    <IN1.22/>
+    <IN1.23/>
+    <IN1.24/>
+    <IN1.25/>
+    <IN1.26/>
+    <IN1.27/>
+    <IN1.28/>
+    <IN1.29/>
+    <IN1.30/>
+    <IN1.31/>
+    <IN1.32/>
+    <IN1.33/>
+    <IN1.34/>
+    <IN1.35/>
+    <IN1.36>
+      <IN1.36.1>111111111</IN1.36.1>
+    </IN1.36>
+  </IN1>
+</HL7Message>