roqua-healthy 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb0dd22a8a5f693541a7ebfa39210bdfe3df8e19
-  data.tar.gz: a06d6e42809e99705bb458d9912030b52083a26d
+  metadata.gz: 4e5499960a9c38757e49f6f943eba03deae4db03
+  data.tar.gz: 67d16e02512c7e3671d4c6e7cecf540b571b11b9
 SHA512:
-  metadata.gz: 869a5c07c41a79f4b543dd31efed8ca198bfcdae0cdb2ef00679032460876d58f9dc00164e9a3b45366e8918d42481357396e2f24b28482e8c11fdcd701efdd9
-  data.tar.gz: 3143b6944b2a2a12635d0fc6edd8d1b200284e3c868d38c2ab6f5c01b9926ffa08d6f7df4257f0843b12a84e7a1fda85f5925055e5e7ca094c07ccad1958ad93
+  metadata.gz: 0b5b506f6cb23b787eefd0bd517dd9c4ed856ed83ec4078d0b44681d565d7a845b23a794bd0c3c54713ceb2f77ae8ef94db919bcba777478c7e9d67354fb32b9
+  data.tar.gz: 1fd29af6071da287741fe6977e22069edad113f50d146afd786b35f8b7b19dae961f72586de10b3f68f041a1da6ffbb8f48f5df2086e390173f0d553ad74388c

data/.gitlab-ci.yml

@@ -1,8 +1,12 @@
-image: "roqua/roqua-build-images:ruby-2.3.3-phantomjs-2.1.1-bundler-gemnasium"
+image: "registry.roqua.nl/roqua/roqua-build-images:ruby-2.3-rails-base-test"
+
+cache:
+  paths:
+    - .gems
 
 before_script:
-  - ruby -v
-  - bundle-cache
+  - export BUNDLE_PATH=$CI_PROJECT_DIR/.gems
+  - bundle --jobs 2 --retry 3
   - gem install appraisal
   - bundle exec appraisal
 

data/Gemfile

@@ -7,3 +7,4 @@ gemspec
 # Normal development dependencies should go in the gemspec. People shouldn't
 # need to use bundler to develop on our gem.
 gem "codeclimate-test-reporter", "~> 1.0.0", group: :test, require: nil
+gem 'roqua_styleguide', git: 'https://gitlab.roqua.nl/roqua/styleguide.git'

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'phonelib'
+
+module Roqua
+  module Healthy
+    module A19
+      module PhoneValidator
+        EU_COUNTRY_CODES = Set.new(
+          %w[AT BE BG CY CZ DE DK EE EL ES FI FR HR HU IE IT LT LU LV MT NL PL PT RO SE SI SK UK]
+        )
+
+        def self.phone_cell_number?(number)
+          stripped_number = strip_non_phone_number_characters(number)
+
+          phone_cell_number_in_european_country?(stripped_number) &&
+            contains_only_phone_number_characters?(stripped_number)
+        end
+
+        def self.phone_cell_number_in_european_country?(number)
+          phone = Phonelib.parse(number, 'NL')
+
+          phone.type == :mobile && EU_COUNTRY_CODES.include?(phone.country)
+        end
+
+        def self.contains_only_phone_number_characters?(number)
+          /^\+?\d+$/.match(number).present?
+        end
+
+        def self.strip_non_phone_number_characters(number)
+          number.gsub(/[-\s\.]/, '')
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
+
 require 'roqua/healthy/a19/name_parser'
 require 'roqua/healthy/a19/cdis_name_parser'
 require 'roqua/healthy/a19/impulse_name_parser'
 require 'roqua/healthy/a19/address_parser'
+require 'roqua/healthy/a19/phone_validator'
 require 'active_support/core_ext/hash'
 
 module Roqua
@@ -123,11 +125,11 @@ module Roqua
         # letters are not stripped since they may be part of a comment, which usually means the
         # phone number is not useable for the purpose of a client's cell phone number
         def strip_non_phone_number_characters(number)
-          number.gsub(/[-\s\.]/, '')
+          Roqua::Healthy::A19::PhoneValidator.strip_non_phone_number_characters number
         end
 
         def phone_cell_number?(number)
-          strip_non_phone_number_characters(number) =~ /\A(\+31|0|0031)6\d{8}\z/
+          Roqua::Healthy::A19::PhoneValidator.phone_cell_number? number
         end
 
         def name

data/lib/roqua/healthy/version.rb

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

data/roqua-healthy.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activesupport', '>= 3.2', '< 6'
   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'
 
@@ -41,7 +42,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'guard-rspec', '~> 4.2.4'
   gem.add_development_dependency 'guard-rubocop', '~> 1.2.0'
   gem.add_development_dependency 'listen', '~> 2.1'
-  gem.add_development_dependency 'rubocop', '~> 0.40'
   gem.add_development_dependency 'simplecov'
 
   # Documentation generation

data/spec/fixtures/epic_test_client.xml

@@ -164,20 +164,20 @@
     </PID.11>
     <PID.12/>
     <PID.13>
-      <PID.13.1>06 67 89 54 31</PID.13.1>
+      <PID.13.1>06 12 34 56 78</PID.13.1>
       <PID.13.2>ORN</PID.13.2>
       <PID.13.3>PH</PID.13.3>
       <PID.13.4/>
       <PID.13.5>31</PID.13.5>
-      <PID.13.6>0667895431</PID.13.6>
+      <PID.13.6>0612345678</PID.13.6>
     </PID.13>
     <PID.13>
-      <PID.13.1>06 67 89 54 32</PID.13.1>
+      <PID.13.1>06 12 34 56 79</PID.13.1>
       <PID.13.2>PRN</PID.13.2>
       <PID.13.3>CP</PID.13.3>
       <PID.13.4/>
       <PID.13.5>31</PID.13.5>
-      <PID.13.6>0667895432</PID.13.6>
+      <PID.13.6>0612345679</PID.13.6>
     </PID.13>
     <PID.14/>
     <PID.15/>

data/spec/fixtures/medoq_patient.xml

@@ -88,7 +88,7 @@
         <PID.13.3>PH</PID.13.3>
       </PID.13>
       <PID.13>
-        <PID.13.1>0698765432</PID.13.1>
+        <PID.13.1>0612345678</PID.13.1>
         <PID.13.2>ORN</PID.13.2>
         <PID.13.3>PH</PID.13.3>
       </PID.13>

data/spec/integration/epic_spec.rb

@@ -23,7 +23,7 @@ describe 'Fetching A19 from EPIC' do
     it { expect(subject[:country]).to      eq('NLD') }
     it { expect(subject[:birthdate]).to    eq('19800101') }
     it { expect(subject[:gender]).to       eq('M') }
-    it { expect(subject[:phone_cell]).to   eq('0667895432') }
+    it { expect(subject[:phone_cell]).to   eq('0612345679') }
   end
 
   describe 'patient not found' do

data/spec/integration/medo_spec.rb

@@ -28,7 +28,7 @@ describe 'Fetching A19 from Medoq' do
     it { expect(subject[:country]).to      eq('Nederland') }
     it { expect(subject[:birthdate]).to    eq('19800525') }
     it { expect(subject[:gender]).to       eq('M') }
-    it { expect(subject[:phone_cell]).to   eq('0698765432') }
+    it { expect(subject[:phone_cell]).to   eq('0612345678') }
   end
 
   describe 'authentication failure' do

data/spec/unit/a19/address_parser_spec.rb

@@ -134,4 +134,5 @@ describe Roqua::Healthy::A19::AddressParser do
       expect(parser.country).to be_nil
     end
   end
+  # rubocop:enable Metrics/MethodLength
 end

data/spec/unit/a19/phone_validator_spec.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Roqua::Healthy::A19::PhoneValidator do
+  subject { described_class }
+
+  describe '#phone_cell_number?' do
+    it 'detects a Dutch mobile number' do
+      expect(subject.phone_cell_number?('+31612345678')).to be_truthy
+    end
+
+    it 'rejects a phone number that consists of something other than numbers' do
+      expect(subject.phone_cell_number?('0612345678mdr')).to be_falsey
+    end
+
+    it 'detects a Dutch mobile number without a country code' do
+      expect(subject.phone_cell_number?('0612345678')).to be_truthy
+    end
+
+    it 'rejects a normal Dutch phone number' do
+      expect(subject.phone_cell_number?('+31592123456')).to be_falsey
+    end
+
+    it 'detects a mobile number from Austria' do
+      expect(subject.phone_cell_number?('+4365012345678')).to be_truthy
+    end
+
+    it 'rejects a normal phone number from Austria' do
+      expect(subject.phone_cell_number?('+431123456')).to be_falsey
+    end
+
+    it 'rejects a mobile number from China' do
+      expect(subject.phone_cell_number?('+8613312345678')).to be_falsey
+    end
+
+    it 'rejects a normal phone number from China' do
+      expect(subject.phone_cell_number?('+86312123456')).to be_falsey
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roqua-healthy
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -61,6 +61,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: phonelib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -243,20 +257,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.40'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.40'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -323,6 +323,7 @@ files:
 - lib/roqua/healthy/a19/fetcher.rb
 - lib/roqua/healthy/a19/impulse_name_parser.rb
 - lib/roqua/healthy/a19/name_parser.rb
+- lib/roqua/healthy/a19/phone_validator.rb
 - lib/roqua/healthy/a19/response_parser.rb
 - lib/roqua/healthy/a19/response_validator.rb
 - lib/roqua/healthy/a19/transformer.rb
@@ -381,6 +382,7 @@ files:
 - spec/unit/a19/address_parser_spec.rb
 - spec/unit/a19/correct_patient_check_spec.rb
 - spec/unit/a19/fetcher_spec.rb
+- spec/unit/a19/phone_validator_spec.rb
 - spec/unit/a19/response_validator_spec.rb
 - spec/unit/a19_spec.rb
 - spec/unit/client_spec.rb
@@ -406,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: Arranges communication between Mirth and RoQua
@@ -458,6 +460,7 @@ test_files:
 - spec/unit/a19/address_parser_spec.rb
 - spec/unit/a19/correct_patient_check_spec.rb
 - spec/unit/a19/fetcher_spec.rb
+- spec/unit/a19/phone_validator_spec.rb
 - spec/unit/a19/response_validator_spec.rb
 - spec/unit/a19_spec.rb
 - spec/unit/client_spec.rb