roqua-healthy 1.5.9 → 1.6.0

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/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'
         }
@@ -30,7 +30,7 @@ RSpec.describe Roqua::Healthy::Oru::Client do
 
   let(:subject) { Roqua::Healthy::Oru::Client }
   let(:oru_url) { 'https://example.com' }
-  let(:timeout) { 5.seconds }
+  let(:timeout) { 5 }
 
   def execute_request
     subject.execute(oru_url, {oru: :data}, timeout: timeout)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: roqua-healthy
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.6.0
 platform: ruby
 authors:
 - Marten Veldthuis
 - Jorn van de Beek
 - Samuel Esposito
 - Henk van der Veen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,20 +19,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -93,16 +93,22 @@ dependencies:
   name: roqua-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -187,20 +193,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-- !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'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -221,28 +213,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -311,10 +303,9 @@ files:
 - bin/get_xml_for_patient
 - bin/parse_local_xml
 - circle.yml
-- gemfiles/rails41.gemfile
-- gemfiles/rails42.gemfile
-- gemfiles/rails50.gemfile
-- lib/roqua/errors.rb
+- gemfiles/rails52.gemfile
+- gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
 - lib/roqua/healthy.rb
 - lib/roqua/healthy/a19.rb
 - lib/roqua/healthy/a19/address_parser.rb
@@ -356,7 +347,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,23 +385,23 @@ homepage: https://github.com/roqua/healthy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 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: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Arranges communication between Mirth and RoQua
 test_files:
@@ -431,7 +424,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

data/gemfiles/rails41.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codeclimate-test-reporter", "~> 1.0.0", :group => :test, :require => nil
-gem "activesupport", "4.1"
-
-gemspec :path => "../"

data/gemfiles/rails42.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codeclimate-test-reporter", "~> 1.0.0", :group => :test, :require => nil
-gem "activesupport", "4.2"
-
-gemspec :path => "../"

data/gemfiles/rails50.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codeclimate-test-reporter", "~> 1.0.0", :group => :test, :require => nil
-gem "activesupport", "5.0"
-
-gemspec :path => "../"